From 0e979b37b3d961e1e9405c018e65d21cd5127add Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 28 Jan 2013 09:25:50 -0800
Subject: [PATCH 001/330] Add milliseconds to Message Decoder Output

Messages arrive very very fast.  Adding milliseconds to the print log helps debug what is going on.
---
 lib/Insteon_PLM.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index ac24168e5..267721fc6 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -309,7 +309,7 @@ sub _send_cmd {
         }
 
 	&::print_log( "[Insteon_PLM] DEBUG3: Sending  PLM raw data: ".lc($command)) if $main::Debug{insteon} >= 3;
-	&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($command)) if $main::Debug{insteon} >= 4;
+	&::print_log( "[Insteon_PLM] DEBUG4: " . substr(&main::get_tickcount-1,-6) . "\n" .Insteon::MessageDecoder::plm_decode($command)) if $main::Debug{insteon} >= 4;
 	my $data = pack("H*",$command);
 	$main::Serial_Ports{$instance}{object}->write($data) if $main::Serial_Ports{$instance};
 
@@ -343,7 +343,7 @@ sub _parse_data {
         }
 
 	&::print_log( "[Insteon_PLM] DEBUG3: Received PLM raw data: $data") if $main::Debug{insteon} >= 3;
-	&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($data)) if $main::Debug{insteon} >= 4;
+	&::print_log( "[Insteon_PLM] DEBUG4: ". substr(&main::get_tickcount-1,-6) . "\n" .Insteon::MessageDecoder::plm_decode($data)) if $main::Debug{insteon} >= 4;
 
 	# begin by pulling out any PLM ack/nacks
 	my $prev_cmd = '';
@@ -707,4 +707,4 @@ sub firmware {
 }
 
 
-1;
\ No newline at end of file
+1;

From f92fc5fc2c1fae669823d715d799e4bf350daba0 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 6 Feb 2013 18:55:35 -0800
Subject: [PATCH 002/330] Fix decimal places in milliseconds

Trailing zeros were previously omitted.

Printing the milliseconds helps a lot in debugging corrupt messages
---
 lib/Insteon_PLM.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index 267721fc6..2e96cd5e0 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -309,7 +309,7 @@ sub _send_cmd {
         }
 
 	&::print_log( "[Insteon_PLM] DEBUG3: Sending  PLM raw data: ".lc($command)) if $main::Debug{insteon} >= 3;
-	&::print_log( "[Insteon_PLM] DEBUG4: " . substr(&main::get_tickcount-1,-6) . "\n" .Insteon::MessageDecoder::plm_decode($command)) if $main::Debug{insteon} >= 4;
+	&::print_log( "[Insteon_PLM] DEBUG4: Milliseconds " . substr(sprintf('%.2f', &main::get_tickcount),-6) . "\n" .Insteon::MessageDecoder::plm_decode($command)) if $main::Debug{insteon} >= 4;
 	my $data = pack("H*",$command);
 	$main::Serial_Ports{$instance}{object}->write($data) if $main::Serial_Ports{$instance};
 
@@ -343,7 +343,7 @@ sub _parse_data {
         }
 
 	&::print_log( "[Insteon_PLM] DEBUG3: Received PLM raw data: $data") if $main::Debug{insteon} >= 3;
-	&::print_log( "[Insteon_PLM] DEBUG4: ". substr(&main::get_tickcount-1,-6) . "\n" .Insteon::MessageDecoder::plm_decode($data)) if $main::Debug{insteon} >= 4;
+	&::print_log( "[Insteon_PLM] DEBUG4: Milliseconds ". substr(sprintf('%.2f', &main::get_tickcount),-6) . "\n" .Insteon::MessageDecoder::plm_decode($data)) if $main::Debug{insteon} >= 4;
 
 	# begin by pulling out any PLM ack/nacks
 	my $prev_cmd = '';

From d1a3c3c01d79b56a3779a1a539906bb77b14e6dd Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 2 Mar 2013 12:22:58 -0800
Subject: [PATCH 003/330] Move Old Insteon Thermostat Code to Insteon lib

---
 lib/{Insteon_Thermostat.pm => Insteon/Thermostat.pm} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/{Insteon_Thermostat.pm => Insteon/Thermostat.pm} (100%)

diff --git a/lib/Insteon_Thermostat.pm b/lib/Insteon/Thermostat.pm
similarity index 100%
rename from lib/Insteon_Thermostat.pm
rename to lib/Insteon/Thermostat.pm

From abf31522940968835434db38749cbe246afa778f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 2 Mar 2013 12:40:05 -0800
Subject: [PATCH 004/330] Recode Initialization of Inteon Thermostat Object

---
 lib/Insteon/Thermostat.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index bd4885e49..d5eb0ce1e 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -10,7 +10,7 @@ In user code:
 
 In items.mht:
 
-IPLT, 12.34.56, thermostat, HVAC, plm
+INSTEON_THERMOSTAT, 12.34.56, thermostat, HVAC
 
 BUGS
 
@@ -94,20 +94,21 @@ All of the functions available:
  - Manage aldb - should be able to adjust setpoints based on plm scene. <- may be overkill
 =cut
 
-use strict;
+package Insteon::Thermostat;
 
-package Insteon_Thermostat;
+use strict;
+use Insteon::BaseInsteon;
 
-@Insteon_Thermostat::ISA = ('Insteon_Device');
+@Insteon::Thermostat::ISA = ('Insteon::DeviceController','Insteon::BaseDevice');
 
 
 # -------------------- START OF SUBROUTINES --------------------
 # --------------------------------------------------------------
 
 sub new {
-   my ($class, $p_interface, $p_deviceid, $p_devcat) = @_;
+   my ($class, $p_deviceid, $p_interface) = @_;
 
-   my $self = $class->SUPER::new($p_interface, $p_deviceid, $p_devcat);
+   my $self = new Insteon::BaseDevice($p_deviceid,$p_interface)
    bless $self, $class;
    $$self{temp} = undef; 
    $$self{mode} = undef; 

From 364c9324c5fac1b431f01942102628a27bbaf201 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 2 Mar 2013 13:17:20 -0800
Subject: [PATCH 005/330] Convert all calls to _send_cmd to use Message Class

---
 lib/Insteon/Thermostat.pm | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index d5eb0ce1e..fe31267ad 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -122,8 +122,8 @@ sub new {
 
 sub poll_mode {
    my ($self) = @_;
-   my $subcmd = '02';
-   $self->_send_cmd(command => 'thermostat_get_mode', type => 'standard', extra => $subcmd, 'is_synchronous' => 1);
+   my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_get_mode', '02');
+   $self->_send_cmd($message);
    return;
 }
 
@@ -150,7 +150,8 @@ sub mode{
 		print "Insteon_Thermostat: Invalid Mode state: $state\n";
 		return();
 	}
-   $self->_send_cmd(command => 'thermostat_control', type => 'standard', extra => $mode);
+   my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_control', $mode);
+   $self->_send_cmd($message);
 }
 
 sub fan{
@@ -160,15 +161,16 @@ sub fan{
 	my $fan;
 	if (($state eq 'on') or ($state eq 'fan_on')) {
 		$fan = '07';
-      $state = 'fan_on';
+		$state = 'fan_on';
 	} elsif ($state eq 'auto' or $state eq 'off' or $state eq 'fan_auto') {
 		$fan = '08';
-      $state = 'fan_auto';
+		$state = 'fan_auto';
 	} else {
 		print "Insteon_Thermostat: Invalid Fan state: $state\n";
 		return();
 	}
-   $self->_send_cmd(command => 'thermostat_control', type => 'standard', extra => $fan);
+   my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_control', $fan);
+   $self->_send_cmd($message);
 }
 
 sub cool_setpoint{
@@ -178,8 +180,8 @@ sub cool_setpoint{
          print "$::Time_Date: [Insteon_Thermostat] ERROR: cool_setpoint $temp not numeric\n";
          return;
       }
-
-      $self->_send_cmd(command => 'thermostat_setpoint_cool', type => 'standard', extra => sprintf('%02X',($temp*2)));
+	my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_setpoint_cool', sprintf('%02X',($temp*2)));
+	$self->_send_cmd($message);
 }
 
 sub heat_setpoint{
@@ -189,14 +191,14 @@ sub heat_setpoint{
 		print "$::Time_Date: [Insteon_Thermostat] ERROR: heat_setpoint $temp not numeric\n";
 		return;
 	}
-
-   $self->_send_cmd(command => 'thermostat_setpoint_heat', type => 'standard', extra => sprintf('%02X',($temp*2)));
+	my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_setpoint_heat', sprintf('%02X',($temp*2)));
+	$self->_send_cmd($message);
 }
 
 sub poll_temp {
    my ($self) = @_;
-   my $subcmd = '00';
-   $self->_send_cmd(command => 'thermostat_get_zone_temp', type => 'standard', extra => $subcmd, 'is_synchronous' => 1);
+   my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_get_zone_temp', '00');
+   $self->_send_cmd($message);
    return;
 }
 
@@ -212,8 +214,8 @@ sub get_temp() {
 sub poll_setpoint {
    my ($self) = @_;
    $self->poll_mode();
-   my $subcmd = '20';
-   $self->_send_cmd(command => 'thermostat_get_zone_setpoint', type => 'standard', extra => $subcmd, 'is_synchronous' => 1);
+   my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_get_zone_setpoint', '20');
+   $self->_send_cmd($message);
    return;
 }
 

From 95780d9f508781782896beed41b0697c256d795a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 2 Mar 2013 13:36:58 -0800
Subject: [PATCH 006/330] Convert Print Log Messages to the Proper Format

---
 lib/Insteon/Thermostat.pm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index fe31267ad..ea70b098e 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -130,7 +130,7 @@ sub poll_mode {
 sub mode{
 	my ($self, $state) = @_;
 	$state = lc($state);
-	print "$::Time_Date: Insteon_Thermostat -> Mode $state\n" unless $main::config_parms{no_log} =~/Insteon_Thermostat/;
+	main::print_log("[Insteon_Thermostat] Mode $state") if  $main::Debug{insteon};
 	my $mode;
 	if ($state eq 'off') {
 		$mode = "09";
@@ -147,7 +147,7 @@ sub mode{
 	} elsif ($state eq 'program_auto') {
 		$mode = "0c";
 	} else {
-		print "Insteon_Thermostat: Invalid Mode state: $state\n";
+		main::print_log("[Insteon_Thermostat] ERROR: Invalid Mode state: $state");
 		return();
 	}
    my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_control', $mode);
@@ -157,7 +157,7 @@ sub mode{
 sub fan{
 	my ($self, $state) = @_;
 	$state = lc($state);
-	print "$::Time_Date: Insteon_Thermostat -> Fan $state\n" unless $main::config_parms{no_log} =~/Insteon_Thermostat/;
+	main::print_log("[Insteon_Thermostat] Fan $state") if $main::Debug{insteon};
 	my $fan;
 	if (($state eq 'on') or ($state eq 'fan_on')) {
 		$fan = '07';
@@ -166,7 +166,7 @@ sub fan{
 		$fan = '08';
 		$state = 'fan_auto';
 	} else {
-		print "Insteon_Thermostat: Invalid Fan state: $state\n";
+		main::print_log("[Insteon_Thermostat] ERROR: Invalid Fan state: $state");
 		return();
 	}
    my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_control', $fan);
@@ -175,9 +175,9 @@ sub fan{
 
 sub cool_setpoint{
 	my ($self, $temp) = @_;
-      print "$::Time_Date: [Insteon_Thermostat] Cool setpoint -> $temp\n" unless $main::config_parms{no_log} =~/Insteon_Thermostat/;
+      main::print_log("[Insteon_Thermostat] Cool setpoint -> $temp") if $main::Debug{insteon};
       if($temp !~ /^\d+$/){
-         print "$::Time_Date: [Insteon_Thermostat] ERROR: cool_setpoint $temp not numeric\n";
+         main::print_log("[Insteon_Thermostat] ERROR: cool_setpoint $temp not numeric");
          return;
       }
 	my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_setpoint_cool', sprintf('%02X',($temp*2)));
@@ -186,9 +186,9 @@ sub cool_setpoint{
 
 sub heat_setpoint{
 	my ($self, $temp) = @_;
-	print "$::Time_Date: [Insteon_Thermostat] Heat setpoint -> $temp\n" unless $main::config_parms{no_log} =~/Insteon_Thermostat/;
+	main::print_log("[Insteon_Thermostat] Heat setpoint -> $temp") if $main::Debug{insteon};
 	if($temp !~ /^\d+$/){
-		print "$::Time_Date: [Insteon_Thermostat] ERROR: heat_setpoint $temp not numeric\n";
+		main::print_log("[Insteon_Thermostat] ERROR: heat_setpoint $temp not numeric");
 		return;
 	}
 	my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_setpoint_heat', sprintf('%02X',($temp*2)));
@@ -282,7 +282,7 @@ sub _is_info_request {
    	or $cmd eq 'thermostat_get_mode' or $cmd eq 'thermostat_get_temp') ? 1 : 0;
    if ($is_info_request) {
       my $val = $msg{extra};
-      &::print_log("[Insteon_Thermostat] Processing data for $cmd with value: $val") if $main::Debug{insteon}; 
+      main::print_log("[Insteon_Thermostat] Processing data for $cmd with value: $val") if $main::Debug{insteon}; 
       if ($cmd eq 'thermostat_get_temp' or $cmd eq 'thermostat_get_zone_temp') {
          $val = (hex $val) / 2; # returned value is twice the real value
          if (exists $$self{'temp'} and ($$self{'temp'} != $val)) {

From ac0e056b76385ea1d4536106f7ec73cfadf3dbea Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 2 Mar 2013 21:54:53 -0800
Subject: [PATCH 007/330] Add Thermostat Message Types

---
 lib/Insteon/Thermostat.pm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index ea70b098e..0e9c90d1c 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -105,6 +105,20 @@ use Insteon::BaseInsteon;
 # -------------------- START OF SUBROUTINES --------------------
 # --------------------------------------------------------------
 
+my %message_types = (
+	%Insteon::BaseDevice::message_types,
+	thermostat_temp_up => 0x68,
+	thermostat_temp_down => 0x69,
+	thermostat_get_zone_temp => 0x6a,
+	thermostat_get_zone_setpoint => 0x6a,
+	thermostat_get_zone_humidity => 0x6a,
+	thermostat_control => 0x6b,
+	thermostat_get_mode => 0x6b,
+	thermostat_get_temp => 0x6b,
+	thermostat_setpoint_cool => 0x6c,
+	thermostat_setpoint_heat => 0x6d
+);
+
 sub new {
    my ($class, $p_deviceid, $p_interface) = @_;
 

From 96baeabbc4d0a74619ca35cc045093a654e6e462 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 2 Mar 2013 22:10:31 -0800
Subject: [PATCH 008/330] Revise Read_Table_A to Point to Thermostat.pm

---
 lib/read_table_A.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index f86834765..e4c96d264 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -150,10 +150,10 @@ sub read_table_A {
         }
     }
     elsif($type eq 'IPLT' or $type eq 'INSTEON_THERMOSTAT') {
-        require 'Insteon_Thermostat.pm';
+        require Insteon::Thermostat;
         ($address, $name, $grouplist, $object, @other) = @item_info;
         $other = join ', ', (map {"'$_'"} @other); # Quote data
-        $object = "Insteon_Thermostat(\$$object, \'$address\', $other)";
+        $object = "Insteon::Thermostat(\'$address\', $other)";
     }
     elsif($type eq "INSTEON_IRRIGATION") {
         require 'Insteon_Irrigation.pm';

From 06f3fa8e923979756236afaaf8e764e3c12d3ef7 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 2 Mar 2013 22:14:07 -0800
Subject: [PATCH 009/330] Fix Missing Semicolon

---
 lib/Insteon/Thermostat.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 0e9c90d1c..5b2f20f07 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -122,7 +122,7 @@ my %message_types = (
 sub new {
    my ($class, $p_deviceid, $p_interface) = @_;
 
-   my $self = new Insteon::BaseDevice($p_deviceid,$p_interface)
+   my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
    bless $self, $class;
    $$self{temp} = undef; 
    $$self{mode} = undef; 

From cc9cc32b54eac64ada9cf75e449f10c62ebc76d5 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 4 Mar 2013 19:25:33 -0800
Subject: [PATCH 010/330] Fix Message Creation, Add Awaiting Ack for Thermostat

---
 lib/Insteon/BaseInsteon.pm |  2 ++
 lib/Insteon/Thermostat.pm  | 17 +++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index c57e7abe5..7e8c42678 100755
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -516,6 +516,7 @@ sub _process_message
 		}
                 else
                 {
+main::print_log("[krk2] " . $self->get_object_name);
 			# allow non-synchronous messages to also use the _is_info_request hook
 			$self->_is_info_request($pending_cmd,$p_setby,%msg);
 			$self->is_acknowledged(1);
@@ -597,6 +598,7 @@ sub _process_command_stack
                         	or $message->command eq 'status_request'
                                 or $message->command eq 'do_read_ee'
                                 or $message->command eq 'set_address_msb'
+                                or $message->command eq 'thermostat_get_mode'
                                 )
                         {
 				$$self{awaiting_ack} = 1;
diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 5b2f20f07..556e67194 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -130,13 +130,14 @@ sub new {
    $$self{heat_sp}  = undef; 
    $$self{cool_sp}  = undef; 
    $self->restore_data('temp','mode','fan_mode','heat_sp','cool_sp');
-   $$self{m_pending_setpoint} = undef; 
+   $$self{m_pending_setpoint} = undef;
+   $$self{message_types} = \%message_types;
    return $self;
 }
 
 sub poll_mode {
    my ($self) = @_;
-   my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_get_mode', '02');
+   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_get_mode', '02');
    $self->_send_cmd($message);
    return;
 }
@@ -164,7 +165,7 @@ sub mode{
 		main::print_log("[Insteon_Thermostat] ERROR: Invalid Mode state: $state");
 		return();
 	}
-   my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_control', $mode);
+   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_control', $mode);
    $self->_send_cmd($message);
 }
 
@@ -183,7 +184,7 @@ sub fan{
 		main::print_log("[Insteon_Thermostat] ERROR: Invalid Fan state: $state");
 		return();
 	}
-   my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_control', $fan);
+   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_control', $fan);
    $self->_send_cmd($message);
 }
 
@@ -194,7 +195,7 @@ sub cool_setpoint{
          main::print_log("[Insteon_Thermostat] ERROR: cool_setpoint $temp not numeric");
          return;
       }
-	my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_setpoint_cool', sprintf('%02X',($temp*2)));
+	my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_setpoint_cool', sprintf('%02X',($temp*2)));
 	$self->_send_cmd($message);
 }
 
@@ -205,13 +206,13 @@ sub heat_setpoint{
 		main::print_log("[Insteon_Thermostat] ERROR: heat_setpoint $temp not numeric");
 		return;
 	}
-	my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_setpoint_heat', sprintf('%02X',($temp*2)));
+	my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_setpoint_heat', sprintf('%02X',($temp*2)));
 	$self->_send_cmd($message);
 }
 
 sub poll_temp {
    my ($self) = @_;
-   my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_get_zone_temp', '00');
+   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_get_zone_temp', '00');
    $self->_send_cmd($message);
    return;
 }
@@ -228,7 +229,7 @@ sub get_temp() {
 sub poll_setpoint {
    my ($self) = @_;
    $self->poll_mode();
-   my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'thermostat_get_zone_setpoint', '20');
+   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_get_zone_setpoint', '20');
    $self->_send_cmd($message);
    return;
 }

From ad0d3b798ba53e63226c50cae755b82c4c68aef3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 4 Mar 2013 20:09:55 -0800
Subject: [PATCH 011/330] Condense Duplicate Thermostat Message Types

---
 lib/Insteon/BaseInsteon.pm |  3 ++-
 lib/Insteon/Thermostat.pm  | 31 +++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 7e8c42678..e21132cf1 100755
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -598,7 +598,8 @@ sub _process_command_stack
                         	or $message->command eq 'status_request'
                                 or $message->command eq 'do_read_ee'
                                 or $message->command eq 'set_address_msb'
-                                or $message->command eq 'thermostat_get_mode'
+                                or $message->command eq 'thermostat_control'
+                                or $message->command eq 'thermostat_get_zone_info'
                                 )
                         {
 				$$self{awaiting_ack} = 1;
diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 556e67194..080644869 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -109,12 +109,8 @@ my %message_types = (
 	%Insteon::BaseDevice::message_types,
 	thermostat_temp_up => 0x68,
 	thermostat_temp_down => 0x69,
-	thermostat_get_zone_temp => 0x6a,
-	thermostat_get_zone_setpoint => 0x6a,
-	thermostat_get_zone_humidity => 0x6a,
+	thermostat_get_zone_info => 0x6a,
 	thermostat_control => 0x6b,
-	thermostat_get_mode => 0x6b,
-	thermostat_get_temp => 0x6b,
 	thermostat_setpoint_cool => 0x6c,
 	thermostat_setpoint_heat => 0x6d
 );
@@ -137,7 +133,8 @@ sub new {
 
 sub poll_mode {
    my ($self) = @_;
-   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_get_mode', '02');
+   $$self{_control_action} = "mode";
+   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_control', '02');
    $self->_send_cmd($message);
    return;
 }
@@ -212,7 +209,8 @@ sub heat_setpoint{
 
 sub poll_temp {
    my ($self) = @_;
-   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_get_zone_temp', '00');
+   $$self{_zone_action} = "temp";
+   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_get_zone_info', '00');
    $self->_send_cmd($message);
    return;
 }
@@ -229,7 +227,8 @@ sub get_temp() {
 sub poll_setpoint {
    my ($self) = @_;
    $self->poll_mode();
-   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_get_zone_setpoint', '20');
+   $$self{_zone_info} = "setpoint";
+   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_get_zone_info', '20');
    $self->_send_cmd($message);
    return;
 }
@@ -292,19 +291,18 @@ sub get_fan_mode() {
 
 sub _is_info_request {
    my ($self, $cmd, $ack_setby, %msg) = @_;
-   my $is_info_request = ($cmd eq 'thermostat_get_zone_temp'
-   	or $cmd eq 'thermostat_get_zone_setpoint' or $cmd eq 'thermostat_get_zone_humidity'
-   	or $cmd eq 'thermostat_get_mode' or $cmd eq 'thermostat_get_temp') ? 1 : 0;
+   my $is_info_request = ($cmd eq 'thermostat_get_zone_info'
+   	or $cmd eq 'thermostat_control') ? 1 : 0;
    if ($is_info_request) {
       my $val = $msg{extra};
       main::print_log("[Insteon_Thermostat] Processing data for $cmd with value: $val") if $main::Debug{insteon}; 
-      if ($cmd eq 'thermostat_get_temp' or $cmd eq 'thermostat_get_zone_temp') {
+      if ($$self{_zone_info} eq "temp") {
          $val = (hex $val) / 2; # returned value is twice the real value
          if (exists $$self{'temp'} and ($$self{'temp'} != $val)) {
             $self->set_receive('temp_change');
          }
          $$self{'temp'} = $val;
-      } elsif ($cmd eq 'thermostat_get_mode') {
+      } elsif ($$self{_control_action} eq "mode") {
          if ($val eq '00') {
             $self->_mode('off');
          } elsif ($val eq '01') {
@@ -324,7 +322,7 @@ sub _is_info_request {
          } elsif ($val eq '08') {
             $self->_fan_mode('fan_auto');
          }
-      } elsif ($cmd eq 'thermostat_get_zone_setpoint') {
+      } elsif ($$self{_zone_info} eq 'setpoint') {
          $val = (hex $val) / 2; # returned value is twice the real value
          # in auto modes, expect direct message with cool_setpoint to follow 
          if ($self->get_mode() eq 'auto' or 'program_auto') {
@@ -338,7 +336,8 @@ sub _is_info_request {
       }
 
    }
-
+   $$self{_control_action} = undef;
+   $$self{_zone_action} = undef;
    return $is_info_request;
 
 }
@@ -398,7 +397,7 @@ sub _process_message
       &::print_log("[Insteon_Thermostat] device category: $msg{devcat} received for " . $self->{object_name});
       #stop ping timer now that we have a devcat; possibly may want to change this behavior to allow recurring pings
       $$self{ping_timer}->stop();
-   } elsif ($msg{command} eq 'thermostat_get_zone_setpoint' && $$self{m_pending_setpoint}) {
+   } elsif ($$self{_zone_info} eq 'setpoint' && $$self{m_pending_setpoint}) {
       # we got our cool setpoint in auto mode
       my $val = (hex $msg{extra})/2;
       $self->_cool_sp($val);

From 7a59f691237d195b407c1d7fc7d6a5ffb6dd4041 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 5 Mar 2013 17:45:25 -0800
Subject: [PATCH 012/330] Fix Library Name in Print_Log Messages

---
 lib/Insteon/Thermostat.pm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 080644869..8dac67758 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -142,7 +142,7 @@ sub poll_mode {
 sub mode{
 	my ($self, $state) = @_;
 	$state = lc($state);
-	main::print_log("[Insteon_Thermostat] Mode $state") if  $main::Debug{insteon};
+	main::print_log("[Insteon::Thermostat] Mode $state") if  $main::Debug{insteon};
 	my $mode;
 	if ($state eq 'off') {
 		$mode = "09";
@@ -159,7 +159,7 @@ sub mode{
 	} elsif ($state eq 'program_auto') {
 		$mode = "0c";
 	} else {
-		main::print_log("[Insteon_Thermostat] ERROR: Invalid Mode state: $state");
+		main::print_log("[Insteon::Thermostat] ERROR: Invalid Mode state: $state");
 		return();
 	}
    my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_control', $mode);
@@ -169,7 +169,7 @@ sub mode{
 sub fan{
 	my ($self, $state) = @_;
 	$state = lc($state);
-	main::print_log("[Insteon_Thermostat] Fan $state") if $main::Debug{insteon};
+	main::print_log("[Insteon::Thermostat] Fan $state") if $main::Debug{insteon};
 	my $fan;
 	if (($state eq 'on') or ($state eq 'fan_on')) {
 		$fan = '07';
@@ -178,7 +178,7 @@ sub fan{
 		$fan = '08';
 		$state = 'fan_auto';
 	} else {
-		main::print_log("[Insteon_Thermostat] ERROR: Invalid Fan state: $state");
+		main::print_log("[Insteon::Thermostat] ERROR: Invalid Fan state: $state");
 		return();
 	}
    my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_control', $fan);
@@ -187,9 +187,9 @@ sub fan{
 
 sub cool_setpoint{
 	my ($self, $temp) = @_;
-      main::print_log("[Insteon_Thermostat] Cool setpoint -> $temp") if $main::Debug{insteon};
+      main::print_log("[Insteon::Thermostat] Cool setpoint -> $temp") if $main::Debug{insteon};
       if($temp !~ /^\d+$/){
-         main::print_log("[Insteon_Thermostat] ERROR: cool_setpoint $temp not numeric");
+         main::print_log("[Insteon::Thermostat] ERROR: cool_setpoint $temp not numeric");
          return;
       }
 	my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_setpoint_cool', sprintf('%02X',($temp*2)));
@@ -198,9 +198,9 @@ sub cool_setpoint{
 
 sub heat_setpoint{
 	my ($self, $temp) = @_;
-	main::print_log("[Insteon_Thermostat] Heat setpoint -> $temp") if $main::Debug{insteon};
+	main::print_log("[Insteon::Thermostat] Heat setpoint -> $temp") if $main::Debug{insteon};
 	if($temp !~ /^\d+$/){
-		main::print_log("[Insteon_Thermostat] ERROR: heat_setpoint $temp not numeric");
+		main::print_log("[Insteon::Thermostat] ERROR: heat_setpoint $temp not numeric");
 		return;
 	}
 	my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_setpoint_heat', sprintf('%02X',($temp*2)));
@@ -295,7 +295,7 @@ sub _is_info_request {
    	or $cmd eq 'thermostat_control') ? 1 : 0;
    if ($is_info_request) {
       my $val = $msg{extra};
-      main::print_log("[Insteon_Thermostat] Processing data for $cmd with value: $val") if $main::Debug{insteon}; 
+      main::print_log("[Insteon::Thermostat] Processing data for $cmd with value: $val") if $main::Debug{insteon}; 
       if ($$self{_zone_info} eq "temp") {
          $val = (hex $val) / 2; # returned value is twice the real value
          if (exists $$self{'temp'} and ($$self{'temp'} != $val)) {
@@ -349,7 +349,7 @@ sub _process_message
 {
 	my ($self,$p_setby,%msg) = @_;
 	my $p_state = undef;
-#   &::print_log("[Insteon_Thermostat] _process_message Type: ".$msg{type}.
+#   &::print_log("[Insteon::Thermostat] _process_message Type: ".$msg{type}.
 #         "  Command: (" . $msg{command} . "  CMD2: " .$msg{extra}) if $main::Debug{insteon}; #XXX
 
 	# the current approach assumes that links from other controllers to some responder
@@ -371,30 +371,30 @@ sub _process_message
 				$self->is_acknowledged(1);
 				# signal receipt of message to the command stack in case commands are queued
 				$self->_process_command_stack(%msg);
-				&::print_log("[Insteon_Thermostat] received command/state (awaiting) acknowledge from " . $self->{object_name} 
+				&::print_log("[Insteon::Thermostat] received command/state (awaiting) acknowledge from " . $self->{object_name} 
 					. ": $pending_cmd and data: $msg{extra}") if $main::Debug{insteon};
 			} 
 		} else {
 			$self->is_acknowledged(1);
 			# signal receipt of message to the command stack in case commands are queued
 			$self->_process_command_stack(%msg);
-			&::print_log("[Insteon_Thermostat] received command/state acknowledge from " . $self->{object_name} 
+			&::print_log("[Insteon::Thermostat] received command/state acknowledge from " . $self->{object_name} 
 				. ": " . (($msg{command}) ? $msg{command} : "(unknown)")
 				. " and data: $msg{extra}") if $main::Debug{insteon};
 		}
 	} elsif ($msg{is_nack}) {
 		if ($$self{awaiting_ack}) {
-			&::print_log("[Insteon_Thermostat] WARN!! encountered a nack message for " . $self->{object_name} 
+			&::print_log("[Insteon::Thermostat] WARN!! encountered a nack message for " . $self->{object_name} 
 				. " ... waiting for retry");
 		} else {
-			&::print_log("[Insteon_Thermostat] WARN!! encountered a nack message for " . $self->{object_name} 
+			&::print_log("[Insteon::Thermostat] WARN!! encountered a nack message for " . $self->{object_name} 
 				. " ... skipping");
 			$self->is_acknowledged(0);
 			$self->_process_command_stack(%msg);
 		}
    } elsif ($msg{type} eq 'broadcast') {
       $self->devcat($msg{devcat});
-      &::print_log("[Insteon_Thermostat] device category: $msg{devcat} received for " . $self->{object_name});
+      &::print_log("[Insteon::Thermostat] device category: $msg{devcat} received for " . $self->{object_name});
       #stop ping timer now that we have a devcat; possibly may want to change this behavior to allow recurring pings
       $$self{ping_timer}->stop();
    } elsif ($$self{_zone_info} eq 'setpoint' && $$self{m_pending_setpoint}) {

From 0914b7ac21b0dab1f23a44f8909a9f1338d9fd48 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 5 Mar 2013 17:55:25 -0800
Subject: [PATCH 013/330] Remove Duplicate Entries in _is_info_request and
 _process_message

Test for unique items first, then call the routine in SUPER to handle the remaining
---
 lib/Insteon/BaseInsteon.pm |  1 -
 lib/Insteon/Thermostat.pm  | 86 +++++++++-----------------------------
 2 files changed, 19 insertions(+), 68 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index e21132cf1..b7ff7c8e4 100755
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -516,7 +516,6 @@ sub _process_message
 		}
                 else
                 {
-main::print_log("[krk2] " . $self->get_object_name);
 			# allow non-synchronous messages to also use the _is_info_request hook
 			$self->_is_info_request($pending_cmd,$p_setby,%msg);
 			$self->is_acknowledged(1);
diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 8dac67758..afa24cc27 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -334,86 +334,38 @@ sub _is_info_request {
             $self->_cool_sp($val);
          }
       }
-
+	$$self{_control_action} = undef;
+	$$self{_zone_action} = undef;
+   } 
+   else #This was not a thermostat info_request
+   {
+   	#Check if this was a generic info_request
+   	$is_info_request = $self->SUPER::_is_info_request($cmd, $ack_setby, %msg);
    }
-   $$self{_control_action} = undef;
-   $$self{_zone_action} = undef;
    return $is_info_request;
 
 }
 
-# Need to handle some of these messages differently than Insteon_Device
-# Trimming what I know we don't need, leaving what I'm unsure of. Still an excess
-# of duplicated code.
+## Unique messages handled first, non-unique sent to SUPER
 sub _process_message
 {
 	my ($self,$p_setby,%msg) = @_;
-	my $p_state = undef;
-#   &::print_log("[Insteon::Thermostat] _process_message Type: ".$msg{type}.
-#         "  Command: (" . $msg{command} . "  CMD2: " .$msg{extra}) if $main::Debug{insteon}; #XXX
-
-	# the current approach assumes that links from other controllers to some responder
-	# would be seen by the plm by also direct linking the controller as a responder
-	# and not putting the plm into monitor mode.  This means that updating the state
-	# of the responder based upon the link controller's request is handled
-	# by Insteon_Link.
-	$$self{m_is_locally_set} = 1 if $msg{source} eq lc $self->device_id;
-	if ($msg{is_ack}) {
-		if ($$self{awaiting_ack}) {
-			my $pending_cmd = ($$self{_prior_msg}) ? $$self{_prior_msg}{command} : $msg{command};
-			my $ack_setby = (ref $$self{m_status_request_pending}) 
-				? $$self{m_status_request_pending} : $p_setby;
-			if ($self->_is_info_request($pending_cmd,$ack_setby,%msg)) {
-				$self->is_acknowledged(1);
-				$$self{m_status_request_pending} = 0;
-				$self->_process_command_stack(%msg);
-			} else {
-				$self->is_acknowledged(1);
-				# signal receipt of message to the command stack in case commands are queued
-				$self->_process_command_stack(%msg);
-				&::print_log("[Insteon::Thermostat] received command/state (awaiting) acknowledge from " . $self->{object_name} 
-					. ": $pending_cmd and data: $msg{extra}") if $main::Debug{insteon};
-			} 
-		} else {
-			$self->is_acknowledged(1);
-			# signal receipt of message to the command stack in case commands are queued
-			$self->_process_command_stack(%msg);
-			&::print_log("[Insteon::Thermostat] received command/state acknowledge from " . $self->{object_name} 
-				. ": " . (($msg{command}) ? $msg{command} : "(unknown)")
-				. " and data: $msg{extra}") if $main::Debug{insteon};
-		}
-	} elsif ($msg{is_nack}) {
-		if ($$self{awaiting_ack}) {
-			&::print_log("[Insteon::Thermostat] WARN!! encountered a nack message for " . $self->{object_name} 
-				. " ... waiting for retry");
-		} else {
-			&::print_log("[Insteon::Thermostat] WARN!! encountered a nack message for " . $self->{object_name} 
-				. " ... skipping");
-			$self->is_acknowledged(0);
-			$self->_process_command_stack(%msg);
-		}
-   } elsif ($msg{type} eq 'broadcast') {
-      $self->devcat($msg{devcat});
-      &::print_log("[Insteon::Thermostat] device category: $msg{devcat} received for " . $self->{object_name});
-      #stop ping timer now that we have a devcat; possibly may want to change this behavior to allow recurring pings
-      $$self{ping_timer}->stop();
-   } elsif ($$self{_zone_info} eq 'setpoint' && $$self{m_pending_setpoint}) {
-      # we got our cool setpoint in auto mode
-      my $val = (hex $msg{extra})/2;
-      $self->_cool_sp($val);
-      $$self{m_setpoint_pending} = 0;
+	my $clear_message = 0;
+	if ($$self{_zone_info} eq 'setpoint' && $$self{m_pending_setpoint}) {
+		# we got our cool setpoint in auto mode
+		my $val = (hex $msg{extra})/2;
+		$self->_cool_sp($val);
+		$$self{m_setpoint_pending} = 0;
+		$clear_message = 1;
 	} else {
-		## TO-DO: make sure that the state passed by command is something that is reasonable to set
-		$p_state = $msg{command};
-		$$self{_pending_cleanup} = 1 if $msg{type} eq 'alllink';
-#		$self->set($p_state, $p_setby) unless (lc($self->state) eq lc($p_state)) and 
-		$self->set($p_state, $self) unless (lc($self->state) eq lc($p_state)) and 
-			($msg{type} eq 'cleanup' and $$self{_pending_cleanup});
-		$$self{_pending_cleanup} = 0 if $msg{type} eq 'cleanup';
+		$clear_message = $self->SUPER::_process_message($p_setby,%msg);
 	}
+	return $clear_message;
 }
 
 # Overload methods we don't use, but would otherwise cause Insteon traffic.
 sub request_status { return 0 }
 
+sub level { return 0 }
+
 1;

From 181fc280faada372aa75a5c598f3abe33c9ca835 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 5 Mar 2013 16:05:25 -0800
Subject: [PATCH 014/330] Fix Typo in _zone_action tracking, allow for
 subsequent setpoint messages

---
 lib/Insteon/Thermostat.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index afa24cc27..ff2867516 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -296,7 +296,7 @@ sub _is_info_request {
    if ($is_info_request) {
       my $val = $msg{extra};
       main::print_log("[Insteon::Thermostat] Processing data for $cmd with value: $val") if $main::Debug{insteon}; 
-      if ($$self{_zone_info} eq "temp") {
+      if ($$self{_zone_action} eq "temp") {
          $val = (hex $val) / 2; # returned value is twice the real value
          if (exists $$self{'temp'} and ($$self{'temp'} != $val)) {
             $self->set_receive('temp_change');
@@ -333,6 +333,11 @@ sub _is_info_request {
          } elsif ($self->get_mode() eq 'cool' or 'program_cool') {
             $self->_cool_sp($val);
          }
+      } elsif ($$self{'m_pending_setpoint'} == 1) {
+	#This is the second message with the cool_setpoint
+	$val = (hex $val) / 2;
+	$self->_cool_sp($val);
+	$$self{'m_pending_setpoint'} = undef;
       }
 	$$self{_control_action} = undef;
 	$$self{_zone_action} = undef;

From 53cf854165d893442b8071216b93e6da50944a2b Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 6 Mar 2013 17:45:25 -0800
Subject: [PATCH 015/330] Add Documentation to Existing Code

---
 lib/Insteon/Thermostat.pm | 149 +++++++++++++++++++++++++-------------
 1 file changed, 100 insertions(+), 49 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index ff2867516..9884c43e8 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -1,27 +1,18 @@
-=begin comment
+=head1 NAME
 
-AUTHORS 
-Gregg Liming <gregg@limings.net>
-Brian Warren <brian@7811.net>
-
-INITIAL CONFIGURATION
-In user code:
-   $thermostat = new Insteon_Thermostat($myPLM, '12.34.56');
-
-In items.mht:
-
-INSTEON_THERMOSTAT, 12.34.56, thermostat, HVAC
+B<Thermostat.pm> - Insteon Thermostat
 
-BUGS
+=head1 DESCRIPTION
 
+Enables support for an Insteon Thermostat.
 
-EXAMPLE USAGE
-see code/examples/Insteon_thermostat.pl for more.
-
-Creating the object:
+=head1 SYNOPSIS
 
-   $thermostat = new Insteon_Thermostat($myPLM, '12.34.56');
+In user code:
+	$thermostat = new Insteon_Thermostat($myPLM, '12.34.56');
 
+In items.mht:
+	INSTEON_THERMOSTAT, 12.34.56, thermostat, HVAC
 
 Poll for temperature changes.
 
@@ -29,7 +20,6 @@ Poll for temperature changes.
          $thermostat->poll_temp();
    }
 
-
 Watch for temperature changes.
 
    if (state_now $thermostat eq 'temp_change') {
@@ -57,41 +47,42 @@ All of the states that may be set:
    fan_mode_change: Fan mode changed
       (call get_fan_mode() to get value).
 
-All of the functions available:
-   mode(): 
-      Sets system mode to argument: 'off', 'heat', 'cool', 'auto',
-      'program_heat', 'program_cool', 'program_auto'
-   poll_mode(): 
-      Causes thermostat to return mode; detected as state change if mode changes
-   get_mode(): 
-      Returns the last mode returned by poll_mode().
-   fan(): 
-      Sets fan to 'on' or 'auto'
-   get_fan_mode(): 
-      Returns the current fan mode (fan_on or fan_auto)
-   poll_setpoint(): 
-      Causes thermostat to return setpoint(s); detected as state change if setpoint changes
-      Returns setpoint based on mode, auto modes return both heat and cool.
-   cool_setpoint(): 
-      Sets a new cool setpoint.
-   get_cool_sp(): 
-      Returns the current cool setpoint.
-   heat_setpoint(): 
-      Sets a new heat setpoint.
-   get_heat_sp(): 
-      Returns the current heat setpoint.
-   poll_temp(): 
-      Causes thermostat to return temp; detected as state change
-   get_temp(): 
-      Returns the current temperature at the thermostat.
-
-
-#TODO 
+see code/examples/Insteon_thermostat.pl for more.
+
+=head1 BUGS
+
+Initial code for Venstar thermostats, which use Insteon engine version i1, only
+provided basic features.  The new Insteon 2441TH thermostats use the i2cs engine
+and only allow the polling, but not setting, of the thermostat attributes using
+i2 code.  As such, I am unable to test or provide enhancements to certain i1 
+only aspects.
+
+=head1 AUTHOR
+
+Initial Code by:
+Gregg Liming <gregg@limings.net>
+Brian Warren <brian@7811.net>
+
+Enhanced to i2 by:
+Kevin Rober Keegan <kevin@krkeegan.com>
+
+=head1 TODO
+
  - Look at possible bugs when starting from factory defaults
       There seemed to be an issue with the setpoints changing when changing modes until
       they were set programatically.
  - Test fan modes and associated state_changes
  - Manage aldb - should be able to adjust setpoints based on plm scene. <- may be overkill
+
+=head1 INHERITS
+
+B<Insteon::DeviceController>
+
+B<Insteon::BaseDevice>
+
+=head1 Methods
+
+=over
 =cut
 
 package Insteon::Thermostat;
@@ -131,6 +122,10 @@ sub new {
    return $self;
 }
 
+=item C<poll_mode()>
+
+Causes thermostat to return mode; detected as state change if mode changes
+=cut
 sub poll_mode {
    my ($self) = @_;
    $$self{_control_action} = "mode";
@@ -139,6 +134,11 @@ sub poll_mode {
    return;
 }
 
+=item C<mode()>
+
+Sets system mode to argument: 'off', 'heat', 'cool', 'auto', 'program_heat', 
+'program_cool', 'program_auto'
+=cut
 sub mode{
 	my ($self, $state) = @_;
 	$state = lc($state);
@@ -166,6 +166,10 @@ sub mode{
    $self->_send_cmd($message);
 }
 
+=item C<fan()>
+
+Sets fan to 'on' or 'auto'
+=cut
 sub fan{
 	my ($self, $state) = @_;
 	$state = lc($state);
@@ -185,6 +189,10 @@ sub fan{
    $self->_send_cmd($message);
 }
 
+=item C<cool_setpoint()>
+
+Sets a new cool setpoint.
+=cut
 sub cool_setpoint{
 	my ($self, $temp) = @_;
       main::print_log("[Insteon::Thermostat] Cool setpoint -> $temp") if $main::Debug{insteon};
@@ -196,6 +204,10 @@ sub cool_setpoint{
 	$self->_send_cmd($message);
 }
 
+=item C<heat_setpoint()>
+
+Sets a new heat setpoint.
+=cut
 sub heat_setpoint{
 	my ($self, $temp) = @_;
 	main::print_log("[Insteon::Thermostat] Heat setpoint -> $temp") if $main::Debug{insteon};
@@ -207,6 +219,10 @@ sub heat_setpoint{
 	$self->_send_cmd($message);
 }
 
+=item C<poll_temp()>
+
+Causes thermostat to return temp; detected as state change.
+=cut
 sub poll_temp {
    my ($self) = @_;
    $$self{_zone_action} = "temp";
@@ -215,11 +231,20 @@ sub poll_temp {
    return;
 }
 
+=item C<get_temp()>
+
+Returns the current temperature at the thermostat. 
+=cut
 sub get_temp() {
    my ($self) = @_;
    return $$self{'temp'};
 }
 
+=item C<poll_setpoint()>
+
+Causes thermostat to return setpoint(s); detected as state change if setpoint changes. 
+Returns setpoint based on mode, auto modes return both heat and cool. 
+=cut
 # The setpoint is returned in 2 messages while in the auto modes.
 # The heat setpoint is returned in the ACK, which is followed by 
 # a direct message containing the cool setpoint.  Because of this,
@@ -233,11 +258,19 @@ sub poll_setpoint {
    return;
 }
 
+=item C<get_heat_sp()>
+
+Returns the current heat setpoint. 
+=cut
 sub get_heat_sp() {
    my ($self) = @_;
    return $$self{'heat_sp'};
 }
 
+=item C<get_cool_sp()>
+
+Returns the current cool setpoint. 
+=cut
 sub get_cool_sp() {
    my ($self) = @_;
    return $$self{'cool_sp'};
@@ -279,11 +312,19 @@ sub _mode() {
    return $$self{'mode'};
 }
 
+=item C<get_mode()>
+
+Returns the last mode returned by C<poll_mode()>. 
+=cut
 sub get_mode() {
    my ($self) = @_;
    return $$self{'mode'};
 }
 
+=item C<get_fan_mode()>
+
+Returns the current fan mode (fan_on or fan_auto) 
+=cut
 sub get_fan_mode() {
    my ($self) = @_;
    return $$self{'fan_mode'};
@@ -374,3 +415,13 @@ sub request_status { return 0 }
 sub level { return 0 }
 
 1;
+=back
+
+=head1 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+=cut

From d3544c0bb6d0cef78ddfca43822be3dd8ebee2e4 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 7 Mar 2013 17:45:25 -0800
Subject: [PATCH 016/330] Test out Extended Message for Mode

---
 lib/Insteon/Thermostat.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 9884c43e8..a6ad76886 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -162,8 +162,13 @@ sub mode{
 		main::print_log("[Insteon::Thermostat] ERROR: Invalid Mode state: $state");
 		return();
 	}
-   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_control', $mode);
-   $self->_send_cmd($message);
+	if ($self->_aldb->isa('Insteon::ALDB_i2'){
+		my $extra = $mode . "00000000000000000000000000";
+		my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'thermostat_control', $extra);
+	} else {
+		my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_control', $mode);
+	}
+	$self->_send_cmd($message);
 }
 
 =item C<fan()>

From 1aee18dfc310f84bac849069574334452eaad48d Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 7 Mar 2013 17:55:25 -0800
Subject: [PATCH 017/330] Create simple_message(), Use for all subs that set
 data

simple_message() is a stop-gap to bring support of i1, i2, & i2cs thermostats up to the level provided before Insteon Redux.  This should allow for quick merging into the stable codebase before release 3.0.

Next steps will be to split the thermostat class into an i1 and i2 class.
---
 lib/Insteon/Thermostat.pm | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index a6ad76886..972c88228 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -162,13 +162,7 @@ sub mode{
 		main::print_log("[Insteon::Thermostat] ERROR: Invalid Mode state: $state");
 		return();
 	}
-	if ($self->_aldb->isa('Insteon::ALDB_i2'){
-		my $extra = $mode . "00000000000000000000000000";
-		my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'thermostat_control', $extra);
-	} else {
-		my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_control', $mode);
-	}
-	$self->_send_cmd($message);
+	$self->_send_cmd($self->simple_message('thermostat_control', $mode));
 }
 
 =item C<fan()>
@@ -190,8 +184,7 @@ sub fan{
 		main::print_log("[Insteon::Thermostat] ERROR: Invalid Fan state: $state");
 		return();
 	}
-   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_control', $fan);
-   $self->_send_cmd($message);
+   $self->_send_cmd($self->simple_message('thermostat_control', $fan));
 }
 
 =item C<cool_setpoint()>
@@ -205,8 +198,7 @@ sub cool_setpoint{
          main::print_log("[Insteon::Thermostat] ERROR: cool_setpoint $temp not numeric");
          return;
       }
-	my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_setpoint_cool', sprintf('%02X',($temp*2)));
-	$self->_send_cmd($message);
+	$self->_send_cmd($self->simple_message('thermostat_setpoint_cool', sprintf('%02X',($temp*2))));
 }
 
 =item C<heat_setpoint()>
@@ -220,8 +212,7 @@ sub heat_setpoint{
 		main::print_log("[Insteon::Thermostat] ERROR: heat_setpoint $temp not numeric");
 		return;
 	}
-	my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_setpoint_heat', sprintf('%02X',($temp*2)));
-	$self->_send_cmd($message);
+	$self->_send_cmd($self->simple_message('thermostat_setpoint_heat', sprintf('%02X',($temp*2))));
 }
 
 =item C<poll_temp()>
@@ -414,6 +405,20 @@ sub _process_message
 	return $clear_message;
 }
 
+## Creates either a Standard or Extended Message depending on the device type
+## Can be used to create different classes later
+sub simple_message {
+	my ($self,$type,$extra) = @_;
+	my $message;
+	if ($self->_aldb->isa('Insteon::ALDB_i2')){
+		$extra = $extra . "0000000000000000000000000000";
+		$message = new Insteon::InsteonMessage('insteon_ext_send', $self, $type, $extra);
+	} else {
+		$message = new Insteon::InsteonMessage('insteon_send', $self, $type, $extra);
+	}
+	return $message;
+}
+
 # Overload methods we don't use, but would otherwise cause Insteon traffic.
 sub request_status { return 0 }
 

From 1079eeda01a113f9e5d2acff2fbe01109ff39d2e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 7 Mar 2013 20:02:24 -0800
Subject: [PATCH 018/330] Final cleanup of Insteon Thermostat

---
 lib/Insteon/Thermostat.pm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 972c88228..24d0be61b 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -137,7 +137,8 @@ sub poll_mode {
 =item C<mode()>
 
 Sets system mode to argument: 'off', 'heat', 'cool', 'auto', 'program_heat', 
-'program_cool', 'program_auto'
+'program_cool', 'program_auto'.  The 2441TH thermostat does not have program_heat
+ or program_cool.
 =cut
 sub mode{
 	my ($self, $state) = @_;
@@ -158,6 +159,7 @@ sub mode{
 		$mode = "0b";
 	} elsif ($state eq 'program_auto') {
 		$mode = "0c";
+		$mode = "0a" if $self->_aldb->isa('Insteon::ALDB_i2');
 	} else {
 		main::print_log("[Insteon::Thermostat] ERROR: Invalid Mode state: $state");
 		return();
@@ -248,7 +250,7 @@ Returns setpoint based on mode, auto modes return both heat and cool.
 sub poll_setpoint {
    my ($self) = @_;
    $self->poll_mode();
-   $$self{_zone_info} = "setpoint";
+   $$self{_zone_action} = "setpoint";
    my $message = new Insteon::InsteonMessage('insteon_send', $self, 'thermostat_get_zone_info', '20');
    $self->_send_cmd($message);
    return;
@@ -310,7 +312,7 @@ sub _mode() {
 
 =item C<get_mode()>
 
-Returns the last mode returned by C<poll_mode()>. 
+Returns the last mode returned by C<poll_mode()>  I2 devices will report auto for both auto and program_auto. 
 =cut
 sub get_mode() {
    my ($self) = @_;
@@ -359,7 +361,8 @@ sub _is_info_request {
          } elsif ($val eq '08') {
             $self->_fan_mode('fan_auto');
          }
-      } elsif ($$self{_zone_info} eq 'setpoint') {
+         $$self{_control_action} = undef;
+      } elsif ($$self{_zone_action} eq 'setpoint') {
          $val = (hex $val) / 2; # returned value is twice the real value
          # in auto modes, expect direct message with cool_setpoint to follow 
          if ($self->get_mode() eq 'auto' or 'program_auto') {
@@ -370,14 +373,13 @@ sub _is_info_request {
          } elsif ($self->get_mode() eq 'cool' or 'program_cool') {
             $self->_cool_sp($val);
          }
+         $$self{_zone_action} = undef;
       } elsif ($$self{'m_pending_setpoint'} == 1) {
 	#This is the second message with the cool_setpoint
 	$val = (hex $val) / 2;
 	$self->_cool_sp($val);
 	$$self{'m_pending_setpoint'} = undef;
       }
-	$$self{_control_action} = undef;
-	$$self{_zone_action} = undef;
    } 
    else #This was not a thermostat info_request
    {
@@ -393,7 +395,7 @@ sub _process_message
 {
 	my ($self,$p_setby,%msg) = @_;
 	my $clear_message = 0;
-	if ($$self{_zone_info} eq 'setpoint' && $$self{m_pending_setpoint}) {
+	if ($$self{_zone_action} eq 'setpoint' && $$self{m_pending_setpoint}) {
 		# we got our cool setpoint in auto mode
 		my $val = (hex $msg{extra})/2;
 		$self->_cool_sp($val);

From 012b54f1d411982d25188d98808958c1babdc526 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 8 Mar 2013 23:36:20 -0800
Subject: [PATCH 019/330] Add Initial Thermo i1 & i2 Subclasses

Objects are reblessed when aldb version is checked
---
 lib/Insteon/BaseInsteon.pm |  7 +++++++
 lib/Insteon/Thermostat.pm  | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index dfdcbe5f7..475891fbd 100755
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1434,6 +1434,13 @@ sub check_aldb_version
 			if $@ and $main::Debug{insteon};
 		package Insteon::BaseDevice;
 	}
+
+	if ($self->isa('Insteon::Thermostat')&& $self->_aldb->aldb_version() eq "I2"){
+		bless $self, 'Insteon::Thermo_i2';
+	}
+	elsif ($self->isa('Insteon::Thermostat')&& $self->_aldb->aldb_version() eq "I1"){
+		bless $self, 'Insteon::Thermo_i1';
+	}
 }
 
 
diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 24d0be61b..6d8805363 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -108,7 +108,7 @@ my %message_types = (
 
 sub new {
    my ($class, $p_deviceid, $p_interface) = @_;
-
+print "[KRK] $class, $p_deviceid, $p_interface";
    my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
    bless $self, $class;
    $$self{temp} = undef; 
@@ -426,6 +426,19 @@ sub request_status { return 0 }
 
 sub level { return 0 }
 
+
+package Insteon::Thermo_i1;
+use strict;
+
+@Insteon::Thermo_i1::ISA = ('Insteon::Thermostat');
+
+
+package Insteon::Thermo_i2;
+use strict;
+
+@Insteon::Thermo_i2::ISA = ('Insteon::Thermostat');
+
+
 1;
 =back
 

From 54f08ff7c318973e3824a7f3166ac79501bb009a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 11 Mar 2013 22:43:46 -0700
Subject: [PATCH 020/330] Create Thermostat Broadcast Dummy Object

The 2441th Insteon thermostat will broadcast changes to all devices registered as a responder to group EF.  Created a dummy object under thermostat that is registered as a subdevice on group EF of the thermostat.  Sync links properly handles adding the link to the device, but has an error adding it to the PLM.  PLM responder link is not necessary, but will solve in future commit.

Moved reclass of thermostat to i1 and i2 to Insteon.pm.  Will add subchildren to same sub in future.
---
 lib/Insteon.pm             | 25 +++++++++++++++++++++++++
 lib/Insteon/BaseInsteon.pm |  7 -------
 lib/Insteon/Thermostat.pm  | 32 +++++++++++++++++++++++++++++++-
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 14ccd1946..c173e9cb3 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -556,6 +556,30 @@ sub check_all_aldb_versions
 	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices completed") if ($main::Debug{insteon} >= 4);
 }
 
+sub check_thermo_versions
+{
+	main::print_log("[Insteon] DEBUG4 Checking thermostat versions") if ($main::Debug{insteon} >= 4);
+
+	my @thermo_devices = ();
+	push @thermo_devices, Insteon::find_members("Insteon::Thermostat");
+	foreach my $thermo_device (@thermo_devices)
+	{
+		main::print_log("[Insteon] DEBUG4 Checking thermostat version for "
+			. $thermo_device->get_object_name()) 
+			if ($main::Debug{insteon} >= 4);
+		if ($thermo_device->isa('Insteon::Thermostat') && 
+			$thermo_device->_aldb->aldb_version() eq "I2"){
+			bless $thermo_device, 'Insteon::Thermo_i2';
+			$thermo_device->init();
+		}
+		elsif ($thermo_device->isa('Insteon::Thermostat')
+			&& $thermo_device->_aldb->aldb_version() eq "I1"){
+			bless $thermo_device, 'Insteon::Thermo_i1';
+		}
+	}
+	main::print_log("[Insteon] DEBUG4 Checking thermostat version of all devices completed") if ($main::Debug{insteon} >= 4);	
+}
+
 
 package InsteonManager;
 
@@ -582,6 +606,7 @@ sub _active_interface
       $init_complete = 0;
       &main::MainLoop_pre_add_hook(\&Insteon::init, 1);
       &main::Reload_post_add_hook(\&Insteon::generate_voice_commands, 1);
+      &main::Reload_post_add_hook(\&Insteon::check_thermo_versions, 1);
    }
    $$self{active_interface} = $interface if $interface;
    return $$self{active_interface};
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 475891fbd..dfdcbe5f7 100755
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1434,13 +1434,6 @@ sub check_aldb_version
 			if $@ and $main::Debug{insteon};
 		package Insteon::BaseDevice;
 	}
-
-	if ($self->isa('Insteon::Thermostat')&& $self->_aldb->aldb_version() eq "I2"){
-		bless $self, 'Insteon::Thermo_i2';
-	}
-	elsif ($self->isa('Insteon::Thermostat')&& $self->_aldb->aldb_version() eq "I1"){
-		bless $self, 'Insteon::Thermo_i1';
-	}
 }
 
 
diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 6d8805363..b846c1c9e 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -108,7 +108,6 @@ my %message_types = (
 
 sub new {
    my ($class, $p_deviceid, $p_interface) = @_;
-print "[KRK] $class, $p_deviceid, $p_interface";
    my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
    bless $self, $class;
    $$self{temp} = undef; 
@@ -438,6 +437,37 @@ use strict;
 
 @Insteon::Thermo_i2::ISA = ('Insteon::Thermostat');
 
+sub init {
+	my ($self) = @_;
+	my $dev_id = $self->device_id();
+	$dev_id =~ /(\w\w)(\w\w)(\w\w)/;
+	$dev_id = "$1.$2.$3";
+	$$self{bcast} = new Insteon::Thermo_bcast("$dev_id".':EF');
+	Insteon::add($$self{bcast});
+	
+	## Child objects
+	#my $obj_group = ::get_object_by_name('HVAC');
+	#$obj_group->add($$self{bcast});
+	#&main::register_object_by_name($self->get_object_name ."{bcast}",$$self{bcast});
+	#$$self{bcast}->{category} = "sample";
+	#$$self{bcast}->{filename} = "sample";
+	#$$self{bcast}->{object_name} = $self->get_object_name ."{bcast}";
+}
+
+package Insteon::Thermo_bcast;
+use strict;
+
+@Insteon::Thermo_bcast::ISA = ('Insteon::Thermostat');
+
+###This is basically a dummy object, it is designed to allow a link from group
+###EF to be added as part of sync links.
+
+sub new {
+   my ($class, $p_deviceid) = @_;
+   my $self = new Insteon::Thermostat($p_deviceid);
+   bless $self, $class;
+   return $self;
+}
 
 1;
 =back

From e4d977a65c0a79d49b0767cbb70d07bbcd46ae97 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 12 Mar 2013 21:14:52 -0700
Subject: [PATCH 021/330] Continue to work on adding Broadcast Device

---
 lib/Insteon/Thermostat.pm | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index b846c1c9e..d2d4f9569 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -90,7 +90,7 @@ package Insteon::Thermostat;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::Thermostat::ISA = ('Insteon::DeviceController','Insteon::BaseDevice');
+@Insteon::Thermostat::ISA = ('Insteon::BaseDevice','Insteon::DeviceController');
 
 
 # -------------------- START OF SUBROUTINES --------------------
@@ -439,32 +439,40 @@ use strict;
 
 sub init {
 	my ($self) = @_;
+	
+	## Create the broadcast dummy item
 	my $dev_id = $self->device_id();
 	$dev_id =~ /(\w\w)(\w\w)(\w\w)/;
 	$dev_id = "$1.$2.$3";
-	$$self{bcast} = new Insteon::Thermo_bcast("$dev_id".':EF');
+	$$self{bcast} = new Insteon::Thermo_i2_bcast("$dev_id".':EF');
+	# Add bcast object to list of Insteon objects
 	Insteon::add($$self{bcast});
+	# Register bcast object with MH
+	&main::register_object_by_name('$' . $self->get_object_name ."{bcast}",$$self{bcast});
+	$$self{bcast}->{object_name} = '$' . $self->get_object_name ."{bcast}";
 	
-	## Child objects
+	## Create the child objects
+	my @child_objs = ("mode", "fan", "temp", "humidity", "setpoint_h", "setpoint_c");
 	#my $obj_group = ::get_object_by_name('HVAC');
 	#$obj_group->add($$self{bcast});
 	#&main::register_object_by_name($self->get_object_name ."{bcast}",$$self{bcast});
 	#$$self{bcast}->{category} = "sample";
 	#$$self{bcast}->{filename} = "sample";
-	#$$self{bcast}->{object_name} = $self->get_object_name ."{bcast}";
+	#$$self{bcast}->{object_name} = '$' . $self->get_object_name ."{bcast}";
 }
 
-package Insteon::Thermo_bcast;
+package Insteon::Thermo_i2_bcast;
 use strict;
 
-@Insteon::Thermo_bcast::ISA = ('Insteon::Thermostat');
+@Insteon::Thermo_i2_bcast::ISA = ('Insteon::BaseDevice', 'Insteon::DeviceController');
 
 ###This is basically a dummy object, it is designed to allow a link from group
-###EF to be added as part of sync links.
+###EF to be added as part of sync links.  Group EF is the broadcast group used
+###by the 2441th thermostat to announce changes.
 
 sub new {
    my ($class, $p_deviceid) = @_;
-   my $self = new Insteon::Thermostat($p_deviceid);
+   my $self = new Insteon::BaseDevice($p_deviceid);
    bless $self, $class;
    return $self;
 }

From cb07a83bbf2fd9c8a72f9f3dea8f80b8d5798e39 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 13 Mar 2013 17:55:25 -0800
Subject: [PATCH 022/330] Change Insteon Thermostat i2 Broadcast Item Name

---
 lib/Insteon/Thermostat.pm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index d2d4f9569..28038b7f8 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -444,12 +444,14 @@ sub init {
 	my $dev_id = $self->device_id();
 	$dev_id =~ /(\w\w)(\w\w)(\w\w)/;
 	$dev_id = "$1.$2.$3";
-	$$self{bcast} = new Insteon::Thermo_i2_bcast("$dev_id".':EF');
+	$$self{bcast_item} = new Insteon::Thermo_i2_bcast("$dev_id".':EF');
+
 	# Add bcast object to list of Insteon objects
-	Insteon::add($$self{bcast});
+	Insteon::add($$self{bcast_item});
+
 	# Register bcast object with MH
-	&main::register_object_by_name('$' . $self->get_object_name ."{bcast}",$$self{bcast});
-	$$self{bcast}->{object_name} = '$' . $self->get_object_name ."{bcast}";
+	&main::register_object_by_name('$' . $self->get_object_name ."{bcast_item}",$$self{bcast_item});
+	$$self{bcast_item}->{object_name} = '$' . $self->get_object_name ."{bcast_item}";
 	
 	## Create the child objects
 	my @child_objs = ("mode", "fan", "temp", "humidity", "setpoint_h", "setpoint_c");

From 55d578afd327cde0009a3422f5f2e4d073ab5ddb Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 13 Mar 2013 18:05:25 -0800
Subject: [PATCH 023/330] Create Insteon Thermostat i2 Child Device Objects

---
 lib/Insteon/Thermostat.pm | 72 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 28038b7f8..482923902 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -479,6 +479,78 @@ sub new {
    return $self;
 }
 
+package Insteon::Thermo_i2_mode;
+use strict;
+
+@Insteon::Thermo_i2_mode::ISA = ('Generic_Item');
+
+sub new {
+	my ($class) = @_;
+	my $self = new Generic_Item();
+	bless $self, $class;
+	return $self;
+}
+
+package Insteon::Thermo_i2_fan;
+use strict;
+
+@Insteon::Thermo_i2_fan::ISA = ('Generic_Item');
+
+sub new {
+	my ($class) = @_;
+	my $self = new Generic_Item();
+	bless $self, $class;
+	return $self;
+}
+
+package Insteon::Thermo_i2_temp;
+use strict;
+
+@Insteon::Thermo_i2_temp::ISA = ('Generic_Item');
+
+sub new {
+	my ($class) = @_;
+	my $self = new Generic_Item();
+	bless $self, $class;
+	return $self;
+}
+
+package Insteon::Thermo_i2_humidity;
+use strict;
+
+@Insteon::Thermo_i2_humidity::ISA = ('Generic_Item');
+
+sub new {
+	my ($class) = @_;
+	my $self = new Generic_Item();
+	bless $self, $class;
+	return $self;
+}
+
+package Insteon::Thermo_i2_setpoint_h;
+use strict;
+
+@Insteon::Thermo_i2_setpoint_h::ISA = ('Generic_Item');
+
+sub new {
+	my ($class) = @_;
+	my $self = new Generic_Item();
+	bless $self, $class;
+	return $self;
+}
+
+package Insteon::Thermo_i2_setpoint_c;
+use strict;
+
+@Insteon::Thermo_i2_setpoint_c::ISA = ('Generic_Item');
+
+sub new {
+	my ($class) = @_;
+	my $self = new Generic_Item();
+	bless $self, $class;
+	return $self;
+}
+
 1;
 =back
 

From f052ccc1be69ffcc59dbe21c1f9097edbc501058 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 13 Mar 2013 18:15:25 -0800
Subject: [PATCH 024/330] Create Insteon Thermostat i2 Child Items on Init

---
 lib/Insteon/Thermostat.pm | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 482923902..5b63705fe 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -454,13 +454,27 @@ sub init {
 	$$self{bcast_item}->{object_name} = '$' . $self->get_object_name ."{bcast_item}";
 	
 	## Create the child objects
-	my @child_objs = ("mode", "fan", "temp", "humidity", "setpoint_h", "setpoint_c");
-	#my $obj_group = ::get_object_by_name('HVAC');
-	#$obj_group->add($$self{bcast});
-	#&main::register_object_by_name($self->get_object_name ."{bcast}",$$self{bcast});
-	#$$self{bcast}->{category} = "sample";
-	#$$self{bcast}->{filename} = "sample";
-	#$$self{bcast}->{object_name} = '$' . $self->get_object_name ."{bcast}";
+	my @child_objs = ('mode_item', 'fan_item', 'temp_item', 'humidity_item',
+		'setpoint_h_item', 'setpoint_c_item');
+	foreach my $obj (@child_objs) {
+		$$self{$obj} = new Insteon::Thermo_i2_mode() if ($obj eq 'mode_item');
+		$$self{$obj} = new Insteon::Thermo_i2_fan() if ($obj eq 'fan_item');
+		$$self{$obj} = new Insteon::Thermo_i2_temp() if ($obj eq 'temp_item');
+		$$self{$obj} = new Insteon::Thermo_i2_humidity() if ($obj eq 'humidity_item');
+		$$self{$obj} = new Insteon::Thermo_i2_setpoint_h() if ($obj eq 'setpoint_h_item');
+		$$self{$obj} = new Insteon::Thermo_i2_setpoint_c() if ($obj eq 'setpoint_c_item');
+
+		# Register child object with MH
+		&main::register_object_by_name('$' . $self->get_object_name ."{$obj}",$$self{$obj});
+		$$self{$obj}->{object_name} = '$' . $self->get_object_name ."{$obj}";
+		$$self{$obj}{parent} = $self;
+		
+		#Add child to the same groups as parent
+		foreach my $parent_group (::list_groups_by_object($self)){
+			$parent_group->add($$self{$obj});
+		}
+	}
+}
 }
 
 package Insteon::Thermo_i2_bcast;

From 5873c95a88fde211bd395c4238f47d9cff979db3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 13 Mar 2013 18:25:25 -0800
Subject: [PATCH 025/330] Insteon::Thermo_i2 Inject Broadcast Setting Message
 into Sync_links

The device requires that a specific flag be enabled for it to provide broadcast updates.

Now, when sync_links is called, this flag will be automatically set.  This is done by injecting code into the sync_links sub before calling the main sync_links in BaseDevice
---
 lib/Insteon/Thermostat.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 5b63705fe..d13944d12 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -475,6 +475,14 @@ sub init {
 		}
 	}
 }
+
+sub sync_links{
+	my ($self, $audit_mode, $callback, $failure_callback) = @_;
+	#Make sure thermostat is set to broadcast changes
+	::print_log("[Insteon::Thermo_i2] (sync_links) Enabling thermostat broadcast setting.") unless $audit_mode;
+	## send command unless $audit_mode;
+	# Call the main sync_links code
+	return $self->SUPER::sync_links($audit_mode, $callback, $failure_callback);
 }
 
 package Insteon::Thermo_i2_bcast;

From 60af877ab9036116e1a20fd01d3ff309e9d33779 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 13 Mar 2013 18:35:25 -0800
Subject: [PATCH 026/330] Insteon::Thermo_i2 Add Message Types

---
 lib/Insteon/Thermostat.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index d13944d12..952b3de76 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -437,8 +437,14 @@ use strict;
 
 @Insteon::Thermo_i2::ISA = ('Insteon::Thermostat');
 
+my %message_types = (
+	%Insteon::Thermostat::message_types,
+	extended_set_get => 0x2e
+);
+
 sub init {
 	my ($self) = @_;
+	$$self{message_types} = \%message_types
 	
 	## Create the broadcast dummy item
 	my $dev_id = $self->device_id();

From aea4e57b7b68749d472ad3b918e8bbce5026f1c9 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 13 Mar 2013 18:45:25 -0800
Subject: [PATCH 027/330] Insteon::Thermo_i2 Set Broadcast Flag with Sync Links

---
 lib/Insteon/BaseInsteon.pm | 1 +
 lib/Insteon/Thermostat.pm  | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index dfdcbe5f7..91a58398e 100755
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -740,6 +740,7 @@ sub _process_command_stack
                                 or $message->command eq 'read_write_aldb'
                                 or $message->command eq 'thermostat_control'
                                 or $message->command eq 'thermostat_get_zone_info'
+                                or $message->command eq 'extended_set_get'
                                 )
                         {
 				$$self{awaiting_ack} = 1;
diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 952b3de76..03e3b55c7 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -444,7 +444,7 @@ my %message_types = (
 
 sub init {
 	my ($self) = @_;
-	$$self{message_types} = \%message_types
+	$$self{message_types} = \%message_types;
 	
 	## Create the broadcast dummy item
 	my $dev_id = $self->device_id();
@@ -486,7 +486,9 @@ sub sync_links{
 	my ($self, $audit_mode, $callback, $failure_callback) = @_;
 	#Make sure thermostat is set to broadcast changes
 	::print_log("[Insteon::Thermo_i2] (sync_links) Enabling thermostat broadcast setting.") unless $audit_mode;
-	## send command unless $audit_mode;
+	my $extra = "000008000000000000000000000000";
+	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+	$self->_send_cmd($message);
 	# Call the main sync_links code
 	return $self->SUPER::sync_links($audit_mode, $callback, $failure_callback);
 }

From 65ed4bf87ad2ef246e4fd2f9cc118d264a917cd2 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 13 Mar 2013 18:50:25 -0800
Subject: [PATCH 028/330] Insteon::Thermo_i2 Fix Debug Logging

---
 lib/Insteon.pm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index c173e9cb3..166d5e61a 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -558,26 +558,29 @@ sub check_all_aldb_versions
 
 sub check_thermo_versions
 {
-	main::print_log("[Insteon] DEBUG4 Checking thermostat versions") if ($main::Debug{insteon} >= 4);
+	#main::print_log("[Insteon] DEBUG4 Checking thermostat versions") if ($main::Debug{insteon} >= 4);
 
 	my @thermo_devices = ();
 	push @thermo_devices, Insteon::find_members("Insteon::Thermostat");
 	foreach my $thermo_device (@thermo_devices)
 	{
-		main::print_log("[Insteon] DEBUG4 Checking thermostat version for "
-			. $thermo_device->get_object_name()) 
-			if ($main::Debug{insteon} >= 4);
 		if ($thermo_device->isa('Insteon::Thermostat') && 
 			$thermo_device->_aldb->aldb_version() eq "I2"){
+			main::print_log("[Insteon] DEBUG4 Setting thermostat "
+				. $thermo_device->get_object_name() . " to i2") 
+			if ($main::Debug{insteon} >= 4);
 			bless $thermo_device, 'Insteon::Thermo_i2';
 			$thermo_device->init();
 		}
 		elsif ($thermo_device->isa('Insteon::Thermostat')
 			&& $thermo_device->_aldb->aldb_version() eq "I1"){
+			main::print_log("[Insteon] DEBUG4 Setting thermostat "
+				. $thermo_device->get_object_name() . " to i2") 
+			if ($main::Debug{insteon} >= 4);
 			bless $thermo_device, 'Insteon::Thermo_i1';
 		}
 	}
-	main::print_log("[Insteon] DEBUG4 Checking thermostat version of all devices completed") if ($main::Debug{insteon} >= 4);	
+	#main::print_log("[Insteon] DEBUG4 Checking thermostat version of all devices completed") if ($main::Debug{insteon} >= 4);	
 }
 
 

From 4f543821f14bf18b597cb9a5e0264b8ba68edcf4 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 13 Mar 2013 18:55:25 -0800
Subject: [PATCH 029/330] Insteon::Thermo_i2 Fix inheritance problem in
 message_types

---
 lib/Insteon/Thermostat.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 03e3b55c7..2bcd542b0 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -96,7 +96,7 @@ use Insteon::BaseInsteon;
 # -------------------- START OF SUBROUTINES --------------------
 # --------------------------------------------------------------
 
-my %message_types = (
+our %message_types = (
 	%Insteon::BaseDevice::message_types,
 	thermostat_temp_up => 0x68,
 	thermostat_temp_down => 0x69,
@@ -437,7 +437,7 @@ use strict;
 
 @Insteon::Thermo_i2::ISA = ('Insteon::Thermostat');
 
-my %message_types = (
+our %message_types = (
 	%Insteon::Thermostat::message_types,
 	extended_set_get => 0x2e
 );

From feb2c895c80d495f5521507bca55ddfef0b5982a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 13 Mar 2013 20:21:14 -0700
Subject: [PATCH 030/330] Insteon::Thermo_i2 Child default states and tie
 parent state to child

Add default states to child items.

Tie changes in the parent item so that they cause state updates in the children

Fix error with get_setpoint when used in auto mode.
---
 lib/Insteon/Thermostat.pm | 43 +++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 2bcd542b0..a29c376f9 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -369,15 +369,11 @@ sub _is_info_request {
             $$self{'m_pending_setpoint'} = 1;
          } elsif ($self->get_mode() eq 'heat' or 'program_heat') {
             $self->_heat_sp($val);
+            $$self{_zone_action} = undef;
          } elsif ($self->get_mode() eq 'cool' or 'program_cool') {
             $self->_cool_sp($val);
+            $$self{_zone_action} = undef;
          }
-         $$self{_zone_action} = undef;
-      } elsif ($$self{'m_pending_setpoint'} == 1) {
-	#This is the second message with the cool_setpoint
-	$val = (hex $val) / 2;
-	$self->_cool_sp($val);
-	$$self{'m_pending_setpoint'} = undef;
       }
    } 
    else #This was not a thermostat info_request
@@ -396,9 +392,11 @@ sub _process_message
 	my $clear_message = 0;
 	if ($$self{_zone_action} eq 'setpoint' && $$self{m_pending_setpoint}) {
 		# we got our cool setpoint in auto mode
+		main::print_log("[Insteon::Thermostat] Processing data for $msg{command} with value: $msg{extra}") if $main::Debug{insteon};
 		my $val = (hex $msg{extra})/2;
 		$self->_cool_sp($val);
 		$$self{m_setpoint_pending} = 0;
+		$$self{_zone_action} = undef;
 		$clear_message = 1;
 	} else {
 		$clear_message = $self->SUPER::_process_message($p_setby,%msg);
@@ -480,6 +478,15 @@ sub init {
 			$parent_group->add($$self{$obj});
 		}
 	}
+	#Set child saved states
+	$$self{temp_item}->set($self->get_temp());
+	$$self{setpoint_h_item}->set($self->get_heat_sp());
+	$$self{setpoint_c_item}->set($self->get_cool_sp());
+	$$self{fan_item}->set($self->get_fan_mode());
+	$$self{mode_item}->set($self->get_mode());
+		
+	#Tie changes in parent item to children
+	$self -> tie_event ('Insteon::Thermo_i2::parent_event(\''.$$self{object_name} . '\', "$state")');
 }
 
 sub sync_links{
@@ -493,6 +500,26 @@ sub sync_links{
 	return $self->SUPER::sync_links($audit_mode, $callback, $failure_callback);
 }
 
+sub parent_event {
+	my ($self, $p_state) = @_;
+	$self = ::get_object_by_name($self);
+	if ($p_state eq 'temp_change'){
+		$$self{temp_item}->set($self->get_temp());
+	}
+	elsif ($p_state eq 'heat_setpoint_change'){
+		$$self{setpoint_h_item}->set($self->get_heat_sp());
+	}
+	elsif ($p_state eq 'cool_setpoint_change'){
+		$$self{setpoint_c_item}->set($self->get_cool_sp());
+	}
+	elsif ($p_state eq 'fan_mode_change'){
+		$$self{fan_item}->set($self->get_fan_mode());
+	}
+	elsif ($p_state eq 'mode_change'){
+		$$self{mode_item}->set($self->get_mode());
+	}
+}
+
 package Insteon::Thermo_i2_bcast;
 use strict;
 
@@ -518,6 +545,7 @@ sub new {
 	my ($class) = @_;
 	my $self = new Generic_Item();
 	bless $self, $class;
+	@{$$self{states}} = ('Off', 'Heat', 'Cool', 'Auto');
 	return $self;
 }
 
@@ -530,6 +558,7 @@ sub new {
 	my ($class) = @_;
 	my $self = new Generic_Item();
 	bless $self, $class;
+	@{$$self{states}} = ('Auto', 'On');
 	return $self;
 }
 
@@ -566,6 +595,7 @@ sub new {
 	my ($class) = @_;
 	my $self = new Generic_Item();
 	bless $self, $class;
+	@{$$self{states}} = ('Cooler' , 'Warmer');
 	return $self;
 }
 
@@ -578,6 +608,7 @@ sub new {
 	my ($class) = @_;
 	my $self = new Generic_Item();
 	bless $self, $class;
+	@{$$self{states}} = ('Cooler', 'Warmer');
 	return $self;
 }
 

From 9a1a05b80374f8292ac392718412fa9aa96ae248 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 14 Mar 2013 15:45:25 -0800
Subject: [PATCH 031/330] Insteon::Thermo_i2 Only put child objects into
 non-recursive groups

Child objects should only be put into the groups which the parent is directly a member of, not the parent groups of the member.
---
 lib/Insteon/Thermostat.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index a29c376f9..bc9559fb3 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -474,7 +474,7 @@ sub init {
 		$$self{$obj}{parent} = $self;
 		
 		#Add child to the same groups as parent
-		foreach my $parent_group (::list_groups_by_object($self)){
+		foreach my $parent_group (::list_groups_by_object($self,1)){
 			$parent_group->add($$self{$obj});
 		}
 	}

From 59d0113bfef89f6f81136eb39c76fd9da2a1ef28 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 14 Mar 2013 20:56:30 -0700
Subject: [PATCH 032/330] Insteon:Thermo_i2 Add Poll All Request, and
 Processing

One of the 0x2E commands for the i2 devices provides a single response that
contains almost all of the data we would need to get started.

Not sure how often this message would need to be called, as we will be getting status updates.
---
 lib/Insteon/Thermostat.pm | 102 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index bc9559fb3..7a82a9e25 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -518,6 +518,108 @@ sub parent_event {
 	elsif ($p_state eq 'mode_change'){
 		$$self{mode_item}->set($self->get_mode());
 	}
+	elsif ($p_state eq 'humid_change'){
+		$$self{humidity_item}->set($$self{humid});
+	}
+}
+
+sub poll_simple{
+	my ($self) = @_;
+	my $extra = "020000000000000000000000000000";
+	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+	$$message{add_crc16} = 1;
+	$self->_send_cmd($message);
+}
+
+sub _process_message {
+	my ($self,$p_setby,%msg) = @_;
+	my $clear_message = 0;
+	if ($msg{command} eq "extended_set_get" && $msg{is_ack}){
+		##Don't clear until data packet received
+		main::print_log("[Insteon::Thermo_i2] Extended Set/Get ACK Received for " . $self->get_object_name) if $main::Debug{insteon};
+	} 
+	elsif ($msg{command} eq "extended_set_get" && $msg{is_extended}) {
+		if (substr($msg{extra},0,4) eq "0201") {
+			main::print_log("[Insteon::Thermo_i2] Extended Set/Get Data ".
+				"Received for ". $self->get_object_name) if $main::Debug{insteon};
+			#0 = 2				#14 = Cool SP 
+			#2 = 1				#16 = humidity
+			#3 = day			#18 = temp in Celsius High byte
+			#6 = hour			#20 = temp low byte
+			#8 = minute			#22 = status flag
+			#10 = second			#24 = Heat SP
+			#12 = Sys_mode * 16 + Fan_mode
+			my $mode = hex(substr($msg{extra}, 12, 2)); 
+			my $fan_mode = ($mode % 16);
+			$self->dec_mode(($mode - $fan_mode) / 16);
+			$self->dec_fan($fan_mode);
+			$self->hex_cool(substr($msg{extra}, 14, 2));
+			$self->hex_humid(substr($msg{extra}, 16, 2));
+			$self->hex_long_temp(substr($msg{extra}, 18, 4));
+			$self->hex_status(substr($msg{extra}, 22, 2));
+			$self->hex_heat(substr($msg{extra}, 24, 2));			
+			$clear_message = 1;
+			$self->_process_command_stack(%msg);
+		} else {
+			main::print_log("[Insteon::Thermo_i2] WARN: Corrupt Extended "
+				."Set/Get Data Received for ". $self->get_object_name) if $main::Debug{insteon};
+		}
+	}
+	else {
+		$clear_message = $self->SUPER::_process_message($p_setby,%msg);
+	}
+	return $clear_message;
+}
+
+sub dec_mode{
+	my ($self, $dec_mode) = @_;
+	my $mode;
+	$mode = 'Off' if ($dec_mode == 0);
+	$mode = 'Auto' if ($dec_mode == 1); 
+	$mode = 'Heat' if ($dec_mode == 2); 
+	$mode = 'Cool' if ($dec_mode == 3);  
+	$mode = 'Program' if ($dec_mode == 4);
+	$self->_mode($mode);
+}
+sub dec_fan{
+	my ($self, $dec_fan) = @_;
+	my $fan;
+	$fan = 'Auto' if ($dec_fan == 0);
+	$fan = 'Always On' if ($dec_fan == 1); 
+	$self->_fan_mode($fan);
+}
+
+sub hex_cool{
+	my ($self, $hex_cool) = @_;
+	$self->_cool_sp(hex($hex_cool));
+}
+sub hex_humid{
+	my ($self, $hex_humid) = @_;
+	$self->_humid(hex($hex_humid));
+}
+sub hex_long_temp{
+	my ($self, $hex_temp) = @_;
+	my $temp_cel = (hex($hex_temp)/10);
+	## ATM I am going to assume farenheit b/c that is what I have
+	# in future, can pull setting bit from thermometer
+	$$self{temp} = (($temp_cel*9)/5 +32);
+	$self->set_receive('temp_change');
+}
+sub hex_status{
+	### Not sure about this one yet, was 80 when set to auto but no activity
+}
+sub hex_heat{
+	my ($self, $hex_heat) = @_;
+	$self->_heat_sp(hex($hex_heat));	
+}
+
+sub _humid {
+	my ($self,$p_state) = @_;
+	if ($p_state ne $$self{humid}) {
+		$$self{humid} = $p_state;
+		$self->set_receive('humid_change');
+	}
+	return $$self{humid};
 }
 
 package Insteon::Thermo_i2_bcast;

From 1c7c0e8fe0dc6735b5b0a9bda24662039ff9eb6a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 14 Mar 2013 15:45:25 -0800
Subject: [PATCH 033/330] Modify list_groups_by_object to allow for
 non-recursive listing

list_groups_by_object identifies all of the groups that an object is a member of.  Currently, if an object is a member of a child group, the child and parent group will be returned in the list.

This change allows for only the groups which the object is a direct member of to be returned.
---
 bin/mh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/mh b/bin/mh
index 5e23a889a..1f7d5ee3f 100755
--- a/bin/mh
+++ b/bin/mh
@@ -3186,12 +3186,12 @@ sub list_files_by_webname {
 }
 
 sub list_groups_by_object {
-    my ($object) = @_;
+    my ($object, $no_child_members) = @_;
     my @groups;
     for my $group_name (&list_objects_by_type('Group')) {
       my $group = &get_object_by_name($group_name);
 #     print "testing group=$group_name -> $group\n";
-      for my $object2 (list $group) {
+      for my $object2 ($group->list(undef, undef,$no_child_members)) {
     push @groups, $group if $object eq $object2;
       }
     }

From ac56b79f95972fb48e460aaf2dca4f32975fe9a8 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 14 Mar 2013 22:36:36 -0700
Subject: [PATCH 034/330] Insteon::Thermo_i2 Save and Restore Humidity State

---
 lib/Insteon/Thermostat.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 7a82a9e25..64b929a2c 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -478,12 +478,16 @@ sub init {
 			$parent_group->add($$self{$obj});
 		}
 	}
+	#Set saved state unique to i2
+	$self->restore_data('humid');
+
 	#Set child saved states
 	$$self{temp_item}->set($self->get_temp());
 	$$self{setpoint_h_item}->set($self->get_heat_sp());
 	$$self{setpoint_c_item}->set($self->get_cool_sp());
 	$$self{fan_item}->set($self->get_fan_mode());
 	$$self{mode_item}->set($self->get_mode());
+	$$self{humidity_item}->set($$self{humid});
 		
 	#Tie changes in parent item to children
 	$self -> tie_event ('Insteon::Thermo_i2::parent_event(\''.$$self{object_name} . '\', "$state")');

From 88d779144a2ff0074d5619a094efc3a41a6bf1bb Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 14 Mar 2013 22:37:41 -0700
Subject: [PATCH 035/330] Insteon::Thermo_i2 Add Status Message Types

---
 lib/Insteon/Thermostat.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 64b929a2c..9715f0acb 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -437,7 +437,12 @@ use strict;
 
 our %message_types = (
 	%Insteon::Thermostat::message_types,
-	extended_set_get => 0x2e
+	extended_set_get => 0x2e,
+	status_temp	=> 0x6e,
+	status_humid	=> 0x6f,
+	status_mode	=> 0x70,
+	status_cool	=> 0x71,
+	status_heat	=> 0x72
 );
 
 sub init {

From 85135d832efac34de9277c719a70926f3c135384 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 14 Mar 2013 22:38:28 -0700
Subject: [PATCH 036/330] Insteon::Thermo_i2 Add subs to interpret status mode
 and temp

Insteon is so annoying, why can't it pick a single format for the same data?

Anyways, temp in status message is tempx2, instead of long temp form.

In addition, for reasons beyond comprehension, the mode in a status message conveys the same data, but uses a different flag than a extended get response.  So stupid.
---
 lib/Insteon/Thermostat.pm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 9715f0acb..e6fb23491 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -590,6 +590,22 @@ sub dec_mode{
 	$mode = 'Program' if ($dec_mode == 4);
 	$self->_mode($mode);
 }
+
+sub status_mode{
+	my ($self, $status_mode) = @_;
+	my $mode;
+	my $conv_mode = (hex($status_mode)%16);
+	$mode = 'Off' if ($conv_mode == 0);
+	$mode = 'Heat' if ($conv_mode == 1); 
+	$mode = 'Cool' if ($conv_mode == 2); 
+	$mode = 'Auto' if ($conv_mode == 3);  
+	$mode = 'Program' if ($conv_mode == 4);
+	$self->_mode($mode);
+	my $fan_mode;
+	$fan_mode = (hex($status_mode) >= 16) ? 'Always On' : 'Auto';
+	$self->_fan_mode($fan_mode);
+}
+
 sub dec_fan{
 	my ($self, $dec_fan) = @_;
 	my $fan;
@@ -614,6 +630,13 @@ sub hex_long_temp{
 	$$self{temp} = (($temp_cel*9)/5 +32);
 	$self->set_receive('temp_change');
 }
+
+sub hex_short_temp{
+	my ($self, $hex_temp) = @_;
+	$$self{temp} = (hex($hex_temp)/2);
+	$self->set_receive('temp_change');
+}
+
 sub hex_status{
 	### Not sure about this one yet, was 80 when set to auto but no activity
 }

From fb2e38dd79b12f259ca93d71cbf3cf7acf0eda25 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 14 Mar 2013 22:40:40 -0700
Subject: [PATCH 037/330] Insteon::Thermo_i2 add steps in _process_message to
 catch and process status messages

---
 lib/Insteon/Thermostat.pm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index e6fb23491..1c1b89ba1 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -574,6 +574,31 @@ sub _process_message {
 				."Set/Get Data Received for ". $self->get_object_name) if $main::Debug{insteon};
 		}
 	}
+	elsif ($msg{command} eq "status_temp" && !$msg{is_ack}){
+		main::print_log("[Insteon::Thermo_i2] Received Status Temp Message ".
+			"for ". $self->get_object_name) if $main::Debug{insteon};	
+		$self->hex_short_temp($msg{extra});
+	}
+	elsif ($msg{command} eq "status_mode" && !$msg{is_ack}){
+		main::print_log("[Insteon::Thermo_i2] Received Status Mode Message ".
+			"for ". $self->get_object_name) if $main::Debug{insteon};	
+		$self->status_mode($msg{extra});
+	}
+	elsif ($msg{command} eq "status_cool" && !$msg{is_ack}){
+		main::print_log("[Insteon::Thermo_i2] Received Status Cool Message ".
+			"for ". $self->get_object_name) if $main::Debug{insteon};	
+		$self->hex_cool($msg{extra});
+	}
+	elsif ($msg{command} eq "status_humid" && !$msg{is_ack}){
+		main::print_log("[Insteon::Thermo_i2] Received Status Humid Message ".
+			"for ". $self->get_object_name) if $main::Debug{insteon};	
+		$self->hex_humid($msg{extra});
+	}
+	elsif ($msg{command} eq "status_heat" && !$msg{is_ack}){
+		main::print_log("[Insteon::Thermo_i2] Received Status Heat Message ".
+			"for ". $self->get_object_name) if $main::Debug{insteon};	
+		$self->hex_heat($msg{extra});
+	}
 	else {
 		$clear_message = $self->SUPER::_process_message($p_setby,%msg);
 	}

From 5f47ec1b1256b534d26019a9a75aa6b3f8160d28 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 18 Mar 2013 21:59:07 -0700
Subject: [PATCH 038/330] Insteon:Thermostat Distinguish Between Extended
 Set/Get Messages that Need to be Cleared

---
 lib/Insteon/Thermostat.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 1c1b89ba1..77c7c6ee6 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -504,6 +504,7 @@ sub sync_links{
 	::print_log("[Insteon::Thermo_i2] (sync_links) Enabling thermostat broadcast setting.") unless $audit_mode;
 	my $extra = "000008000000000000000000000000";
 	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+	$$self{_ext_set_get_action} = 'set';
 	$self->_send_cmd($message);
 	# Call the main sync_links code
 	return $self->SUPER::sync_links($audit_mode, $callback, $failure_callback);
@@ -544,8 +545,14 @@ sub _process_message {
 	my ($self,$p_setby,%msg) = @_;
 	my $clear_message = 0;
 	if ($msg{command} eq "extended_set_get" && $msg{is_ack}){
-		##Don't clear until data packet received
+		#If this was a get request don't clear until data packet received
 		main::print_log("[Insteon::Thermo_i2] Extended Set/Get ACK Received for " . $self->get_object_name) if $main::Debug{insteon};
+		if ($$self{_ext_set_get_action} eq 'set'){
+			main::print_log("[Insteon::Thermo_i2] Clearing active message") if $main::Debug{insteon};
+			$clear_message = 1;
+			$$self{_ext_set_get_action} = undef;
+			$self->_process_command_stack(%msg);	
+		}
 	} 
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_extended}) {
 		if (substr($msg{extra},0,4) eq "0201") {

From 2908e6cd251836ab90d96b00c25c1677714bdc9f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 18 Mar 2013 22:00:12 -0700
Subject: [PATCH 039/330] Insteon:Thermo_i2 Add Set Routine to Children

---
 lib/Insteon/Thermostat.pm | 57 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 77c7c6ee6..6cc9aff43 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -715,6 +715,21 @@ sub new {
 	return $self;
 }
 
+sub set {
+	my ($self, $p_state, $p_setby, $p_response) = @_;
+	my $found_state = 0;
+	foreach my $test_state (@{$$self{states}}){
+		if (lc($test_state) eq lc($p_state)){
+			$found_state = 1;
+		}
+	}
+	if ($found_state){
+		::print_log("[Insteon::Thermo_i2] Received set mode request to "
+			. $p_state . " for device " . $self->get_object_name);
+	}
+}
+
+
 package Insteon::Thermo_i2_fan;
 use strict;
 
@@ -728,6 +743,20 @@ sub new {
 	return $self;
 }
 
+sub set {
+	my ($self, $p_state, $p_setby, $p_response) = @_;
+	my $found_state = 0;
+	foreach my $test_state (@{$$self{states}}){
+		if (lc($test_state) eq lc($p_state)){
+			$found_state = 1;
+		}
+	}
+	if ($found_state){
+		::print_log("[Insteon::Thermo_i2] Received set mode request to "
+			. $p_state . " for device " . $self->get_object_name);
+	}
+}
+
 package Insteon::Thermo_i2_temp;
 use strict;
 
@@ -765,6 +794,20 @@ sub new {
 	return $self;
 }
 
+sub set {
+	my ($self, $p_state, $p_setby, $p_response) = @_;
+	my $found_state = 0;
+	foreach my $test_state (@{$$self{states}}){
+		if (lc($test_state) eq lc($p_state)){
+			$found_state = 1;
+		}
+	}
+	if ($found_state){
+		::print_log("[Insteon::Thermo_i2] Received set mode request to "
+			. $p_state . " for device " . $self->get_object_name);
+	}
+}
+
 package Insteon::Thermo_i2_setpoint_c;
 use strict;
 
@@ -778,6 +821,20 @@ sub new {
 	return $self;
 }
 
+sub set {
+	my ($self, $p_state, $p_setby, $p_response) = @_;
+	my $found_state = 0;
+	foreach my $test_state (@{$$self{states}}){
+		if (lc($test_state) eq lc($p_state)){
+			$found_state = 1;
+		}
+	}
+	if ($found_state){
+		::print_log("[Insteon::Thermo_i2] Received set mode request to "
+			. $p_state . " for device " . $self->get_object_name);
+	}
+}
+
 1;
 =back
 

From 3f94bc043940799a4ff724262229959ac0419c91 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 19 Mar 2013 21:28:54 -0700
Subject: [PATCH 040/330] Insteon::Thermostat Split Mode Routine into i1 and i2
 Specific Routines

For whatever reason the commands are different between the two
---
 lib/Insteon/Thermostat.pm | 98 +++++++++++++++++++++++++--------------
 1 file changed, 64 insertions(+), 34 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 6cc9aff43..b6f8929ad 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -133,39 +133,6 @@ sub poll_mode {
    return;
 }
 
-=item C<mode()>
-
-Sets system mode to argument: 'off', 'heat', 'cool', 'auto', 'program_heat', 
-'program_cool', 'program_auto'.  The 2441TH thermostat does not have program_heat
- or program_cool.
-=cut
-sub mode{
-	my ($self, $state) = @_;
-	$state = lc($state);
-	main::print_log("[Insteon::Thermostat] Mode $state") if  $main::Debug{insteon};
-	my $mode;
-	if ($state eq 'off') {
-		$mode = "09";
-	} elsif ($state eq 'heat') {
-		$mode = "04";
-	} elsif ($state eq 'cool') {
-		$mode = "05";
-	} elsif ($state eq 'auto') {
-		$mode = "06";
-	} elsif ($state eq 'program_heat') {
-		$mode = "0a";
-	} elsif ($state eq 'program_cool') {
-		$mode = "0b";
-	} elsif ($state eq 'program_auto') {
-		$mode = "0c";
-		$mode = "0a" if $self->_aldb->isa('Insteon::ALDB_i2');
-	} else {
-		main::print_log("[Insteon::Thermostat] ERROR: Invalid Mode state: $state");
-		return();
-	}
-	$self->_send_cmd($self->simple_message('thermostat_control', $mode));
-}
-
 =item C<fan()>
 
 Sets fan to 'on' or 'auto'
@@ -429,6 +396,39 @@ use strict;
 
 @Insteon::Thermo_i1::ISA = ('Insteon::Thermostat');
 
+=item C<mode()>
+
+Sets system mode to argument: 'off', 'heat', 'cool', 'auto', 'program_heat', 
+'program_cool', 'program_auto'.  The 2441TH thermostat does not have program_heat
+ or program_cool.
+=cut
+sub mode{
+	my ($self, $state) = @_;
+	$state = lc($state);
+	main::print_log("[Insteon::Thermostat] Mode $state") if  $main::Debug{insteon};
+	my $mode;
+	if ($state eq 'off') {
+		$mode = "09";
+	} elsif ($state eq 'heat') {
+		$mode = "04";
+	} elsif ($state eq 'cool') {
+		$mode = "05";
+	} elsif ($state eq 'auto') {
+		$mode = "06";
+	} elsif ($state eq 'program_heat') {
+		$mode = "0a";
+	} elsif ($state eq 'program_cool') {
+		$mode = "0b";
+	} elsif ($state eq 'program_auto') {
+		$mode = "0c";
+	} else {
+		main::print_log("[Insteon::Thermostat] ERROR: Invalid Mode state: $state");
+		return();
+	}
+	$$self{_control_action} = "mode";
+	$self->_send_cmd($self->simple_message('thermostat_control', $mode));
+}
+
 
 package Insteon::Thermo_i2;
 use strict;
@@ -686,6 +686,36 @@ sub _humid {
 	return $$self{humid};
 }
 
+=item C<mode()>
+
+Sets system mode to argument: 'off', 'heat', 'cool', 'auto', 'program_heat', 
+'program_cool', 'program_auto'.  The 2441TH thermostat does not have program_heat
+ or program_cool.
+=cut
+sub mode{
+	my ($self, $state) = @_;
+	$state = lc($state);
+	main::print_log("[Insteon::Thermostat] Mode $state") if  $main::Debug{insteon};
+	my $mode;
+	if ($state eq 'off') {
+		$mode = "09";
+	} elsif ($state eq 'heat') {
+		$mode = "04";
+	} elsif ($state eq 'cool') {
+		$mode = "05";
+	} elsif ($state eq 'auto') {
+		$mode = "06";
+	} elsif ($state eq 'program') {
+		$mode = "0a" if $self->_aldb->isa('Insteon::ALDB_i2');
+	} else {
+		main::print_log("[Insteon::Thermostat] ERROR: Invalid Mode state: $state");
+		return();
+	}
+	$$self{_control_action} = "mode";
+	$self->_send_cmd($self->simple_message('thermostat_control', $mode));
+}
+
+
 package Insteon::Thermo_i2_bcast;
 use strict;
 
@@ -711,7 +741,7 @@ sub new {
 	my ($class) = @_;
 	my $self = new Generic_Item();
 	bless $self, $class;
-	@{$$self{states}} = ('Off', 'Heat', 'Cool', 'Auto');
+	@{$$self{states}} = ('Off', 'Heat', 'Cool', 'Auto', 'Program');
 	return $self;
 }
 

From 7b7e3883102732575f647118b0f6a9e6ff045312 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 19 Mar 2013 21:31:43 -0700
Subject: [PATCH 041/330] Insteon::Thermostat Split _is_info_request for Mode
 Change into i1 and i2

The response from the devices use different bytes to signify their modes
---
 lib/Insteon/Thermostat.pm | 89 ++++++++++++++++++++++++++++-----------
 1 file changed, 65 insertions(+), 24 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index b6f8929ad..f8c7349e8 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -296,38 +296,16 @@ sub get_fan_mode() {
 
 sub _is_info_request {
    my ($self, $cmd, $ack_setby, %msg) = @_;
-   my $is_info_request = ($cmd eq 'thermostat_get_zone_info'
-   	or $cmd eq 'thermostat_control') ? 1 : 0;
+   my $is_info_request = ($cmd eq 'thermostat_get_zone_info') ? 1 : 0;
    if ($is_info_request) {
       my $val = $msg{extra};
-      main::print_log("[Insteon::Thermostat] Processing data for $cmd with value: $val") if $main::Debug{insteon}; 
+      main::print_log("[Insteon::Thermostat] Processing is_info_request for $cmd with value: $val") if $main::Debug{insteon}; 
       if ($$self{_zone_action} eq "temp") {
          $val = (hex $val) / 2; # returned value is twice the real value
          if (exists $$self{'temp'} and ($$self{'temp'} != $val)) {
             $self->set_receive('temp_change');
          }
          $$self{'temp'} = $val;
-      } elsif ($$self{_control_action} eq "mode") {
-         if ($val eq '00') {
-            $self->_mode('off');
-         } elsif ($val eq '01') {
-            $self->_mode('heat');
-         } elsif ($val eq '02') {
-            $self->_mode('cool');
-         } elsif ($val eq '03') {
-            $self->_mode('auto');
-         } elsif ($val eq '04') {
-            $self->_fan_mode('fan_on');
-         } elsif ($val eq '05') {
-            $self->_mode('program_auto');
-         } elsif ($val eq '06') {
-            $self->_mode('program_heat');
-         } elsif ($val eq '07') {
-            $self->_mode('program_cool');
-         } elsif ($val eq '08') {
-            $self->_fan_mode('fan_auto');
-         }
-         $$self{_control_action} = undef;
       } elsif ($$self{_zone_action} eq 'setpoint') {
          $val = (hex $val) / 2; # returned value is twice the real value
          # in auto modes, expect direct message with cool_setpoint to follow 
@@ -429,6 +407,41 @@ sub mode{
 	$self->_send_cmd($self->simple_message('thermostat_control', $mode));
 }
 
+sub _is_info_request {
+	my ($self, $cmd, $ack_setby, %msg) = @_;
+	my $is_info_request;
+	if ($cmd eq 'thermostat_control' && $$self{_control_action} eq "mode") {
+		my $val = $msg{extra};
+		main::print_log("[Insteon::Thermo_i1] Processing is_info_request for $cmd with value: $val") if $main::Debug{insteon}; 
+		if ($val eq '00') {
+			$self->_mode('off');
+		} elsif ($val eq '01') {
+			$self->_mode('heat');
+		} elsif ($val eq '02') {
+			$self->_mode('cool');
+		} elsif ($val eq '03') {
+			$self->_mode('auto');
+		} elsif ($val eq '04') {
+			$self->_fan_mode('fan_on');
+		} elsif ($val eq '05') {
+			$self->_mode('program_auto');
+		} elsif ($val eq '06') {
+			$self->_mode('program_heat');
+		} elsif ($val eq '07') {
+			$self->_mode('program_cool');
+		} elsif ($val eq '08') {
+			$self->_fan_mode('fan_auto');
+		}
+		$$self{_control_action} = undef;
+		$is_info_request = 1;
+	}
+	else #This was not a thermo_1 info_request
+	{
+		#Check if this was a generic info_request
+		$is_info_request = $self->SUPER::_is_info_request($cmd, $ack_setby, %msg);
+	}
+	return $is_info_request;
+}
 
 package Insteon::Thermo_i2;
 use strict;
@@ -612,6 +625,34 @@ sub _process_message {
 	return $clear_message;
 }
 
+sub _is_info_request {
+	my ($self, $cmd, $ack_setby, %msg) = @_;
+	my $is_info_request;
+	if ($cmd eq 'thermostat_control' && $$self{_control_action} eq "mode") {
+		my $val = $msg{extra};
+		main::print_log("[Insteon::Thermo_i2] Processing is_info_request for $cmd with value: $val") if $main::Debug{insteon}; 
+		if ($val eq '09') {
+			$self->_mode('Off');
+		} elsif ($val eq '04') {
+			$self->_mode('Heat');
+		} elsif ($val eq '05') {
+			$self->_mode('Cool');
+		} elsif ($val eq '06') {
+			$self->_mode('Auto');
+		} elsif ($val eq '0a') {
+			$self->_mode('Program');
+		}
+		$$self{_control_action} = undef;
+		$is_info_request = 1;
+	}
+	else #This was not a thermo_i2 info_request
+	{
+		#Check if this was a generic info_request
+		$is_info_request = $self->SUPER::_is_info_request($cmd, $ack_setby, %msg);
+	}
+	return $is_info_request;
+}
+
 sub dec_mode{
 	my ($self, $dec_mode) = @_;
 	my $mode;

From 1ea9faa70384d000d50c24f715e59b84757f6ed5 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 19 Mar 2013 21:34:20 -0700
Subject: [PATCH 042/330] Insteon::Thermo_i2 Create set_receive Routines in
 Child Objects

Need to distinguish between a command that we send to set the device and commands received in which the device notifies MH of a new state
---
 lib/Insteon/Thermostat.pm | 50 +++++++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index f8c7349e8..dd82aad48 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -500,12 +500,12 @@ sub init {
 	$self->restore_data('humid');
 
 	#Set child saved states
-	$$self{temp_item}->set($self->get_temp());
-	$$self{setpoint_h_item}->set($self->get_heat_sp());
-	$$self{setpoint_c_item}->set($self->get_cool_sp());
-	$$self{fan_item}->set($self->get_fan_mode());
-	$$self{mode_item}->set($self->get_mode());
-	$$self{humidity_item}->set($$self{humid});
+	$$self{temp_item}->set_receive($self->get_temp());
+	$$self{setpoint_h_item}->set_receive($self->get_heat_sp());
+	$$self{setpoint_c_item}->set_receive($self->get_cool_sp());
+	$$self{fan_item}->set_receive($self->get_fan_mode());
+	$$self{mode_item}->set_receive($self->get_mode());
+	$$self{humidity_item}->set_receive($$self{humid});
 		
 	#Tie changes in parent item to children
 	$self -> tie_event ('Insteon::Thermo_i2::parent_event(\''.$$self{object_name} . '\', "$state")');
@@ -527,22 +527,22 @@ sub parent_event {
 	my ($self, $p_state) = @_;
 	$self = ::get_object_by_name($self);
 	if ($p_state eq 'temp_change'){
-		$$self{temp_item}->set($self->get_temp());
+		$$self{temp_item}->set_receive($self->get_temp());
 	}
 	elsif ($p_state eq 'heat_setpoint_change'){
-		$$self{setpoint_h_item}->set($self->get_heat_sp());
+		$$self{setpoint_h_item}->set_receive($self->get_heat_sp());
 	}
 	elsif ($p_state eq 'cool_setpoint_change'){
-		$$self{setpoint_c_item}->set($self->get_cool_sp());
+		$$self{setpoint_c_item}->set_receive($self->get_cool_sp());
 	}
 	elsif ($p_state eq 'fan_mode_change'){
-		$$self{fan_item}->set($self->get_fan_mode());
+		$$self{fan_item}->set_receive($self->get_fan_mode());
 	}
 	elsif ($p_state eq 'mode_change'){
-		$$self{mode_item}->set($self->get_mode());
+		$$self{mode_item}->set_receive($self->get_mode());
 	}
 	elsif ($p_state eq 'humid_change'){
-		$$self{humidity_item}->set($$self{humid});
+		$$self{humidity_item}->set_receive($$self{humid});
 	}
 }
 
@@ -800,6 +800,10 @@ sub set {
 	}
 }
 
+sub set_receive {
+	my ($self, $p_state) = @_;
+	$self->SUPER::set($p_state);
+}
 
 package Insteon::Thermo_i2_fan;
 use strict;
@@ -828,6 +832,10 @@ sub set {
 	}
 }
 
+sub set_receive {
+	my ($self, $p_state) = @_;
+	$self->SUPER::set($p_state);
+}
 package Insteon::Thermo_i2_temp;
 use strict;
 
@@ -840,6 +848,10 @@ sub new {
 	return $self;
 }
 
+sub set_receive {
+	my ($self, $p_state) = @_;
+	$self->SUPER::set($p_state);
+}
 package Insteon::Thermo_i2_humidity;
 use strict;
 
@@ -852,6 +864,11 @@ sub new {
 	return $self;
 }
 
+sub set_receive {
+	my ($self, $p_state) = @_;
+	$self->SUPER::set($p_state);
+}
+
 package Insteon::Thermo_i2_setpoint_h;
 use strict;
 
@@ -879,6 +896,11 @@ sub set {
 	}
 }
 
+sub set_receive {
+	my ($self, $p_state) = @_;
+	$self->SUPER::set($p_state);
+}
+
 package Insteon::Thermo_i2_setpoint_c;
 use strict;
 
@@ -906,6 +928,10 @@ sub set {
 	}
 }
 
+sub set_receive {
+	my ($self, $p_state) = @_;
+	$self->SUPER::set($p_state);
+}
 1;
 =back
 

From f861c331a58412741d5becb0313d48b3df977af0 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 19 Mar 2013 21:36:42 -0700
Subject: [PATCH 043/330] Insteon::Thermo_i2 Allow Changes to Child Objects to
 be Propogated to Parent Item

---
 lib/Insteon/Thermostat.pm | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index dd82aad48..bcda5c40a 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -797,6 +797,7 @@ sub set {
 	if ($found_state){
 		::print_log("[Insteon::Thermo_i2] Received set mode request to "
 			. $p_state . " for device " . $self->get_object_name);
+		$$self{parent}->mode($p_state);
 	}
 }
 
@@ -827,8 +828,9 @@ sub set {
 		}
 	}
 	if ($found_state){
-		::print_log("[Insteon::Thermo_i2] Received set mode request to "
+		::print_log("[Insteon::Thermo_i2] Received set fan to "
 			. $p_state . " for device " . $self->get_object_name);
+		$$self{parent}->fan($p_state);
 	}
 }
 
@@ -891,8 +893,14 @@ sub set {
 		}
 	}
 	if ($found_state){
-		::print_log("[Insteon::Thermo_i2] Received set mode request to "
+		::print_log("[Insteon::Thermo_i2] Received request to set heat setpoint "
 			. $p_state . " for device " . $self->get_object_name);
+		if (lc($p_state) eq 'cooler'){
+			$$self{parent}->heat_setpoint($$self{parent}->get_heat_sp - 1);
+		}
+		elsif (lc($p_state) eq 'warmer'){
+			$$self{parent}->heat_setpoint($$self{parent}->get_heat_sp + 1);
+		}
 	}
 }
 
@@ -923,8 +931,14 @@ sub set {
 		}
 	}
 	if ($found_state){
-		::print_log("[Insteon::Thermo_i2] Received set mode request to "
+		::print_log("[Insteon::Thermo_i2] Received request to set cool setpoint "
 			. $p_state . " for device " . $self->get_object_name);
+		if (lc($p_state) eq 'cooler'){
+			$$self{parent}->cool_setpoint($$self{parent}->get_cool_sp - 1);
+		}
+		elsif (lc($p_state) eq 'warmer'){
+			$$self{parent}->cool_setpoint($$self{parent}->get_cool_sp + 1);
+		}
 	}
 }
 

From c44c80e42205e4df32853bfaedabbb3c4a03605b Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 19 Mar 2013 21:37:46 -0700
Subject: [PATCH 044/330] Insteon::Thermo_i2 Catch ACK of Setpoint Changes and
 Update State

---
 lib/Insteon/Thermostat.pm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index bcda5c40a..bc09a61dc 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -335,7 +335,19 @@ sub _process_message
 {
 	my ($self,$p_setby,%msg) = @_;
 	my $clear_message = 0;
-	if ($$self{_zone_action} eq 'setpoint' && $$self{m_pending_setpoint}) {
+	if ($msg{command} eq "thermostat_setpoint_cool" && $msg{is_ack}){
+		main::print_log("[Insteon::Thermostat] Received ACK of cool setpoint ".
+			"for ". $self->get_object_name) if $main::Debug{insteon};	
+		$self->_cool_sp((hex($msg{extra})/2));
+		$clear_message = 1;
+	}
+	elsif ($msg{command} eq "thermostat_setpoint_heat" && $msg{is_ack}){
+		main::print_log("[Insteon::Thermostat] Received ACK of heat setpoint ".
+			"for ". $self->get_object_name) if $main::Debug{insteon};	
+		$self->_heat_sp((hex($msg{extra})/2));
+		$clear_message = 1;
+	}
+	elsif ($$self{_zone_action} eq 'setpoint' && $$self{m_pending_setpoint}) {
 		# we got our cool setpoint in auto mode
 		main::print_log("[Insteon::Thermostat] Processing data for $msg{command} with value: $msg{extra}") if $main::Debug{insteon};
 		my $val = (hex $msg{extra})/2;

From f8c55ec51dc80c1fbecc80e5d48de46b53797dd2 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 19 Mar 2013 21:46:17 -0700
Subject: [PATCH 045/330] Insteon::Thermostat Split simple_message into i1 and
 i2

---
 lib/Insteon/Thermostat.pm | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index bc09a61dc..9cce2f867 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -361,20 +361,6 @@ sub _process_message
 	return $clear_message;
 }
 
-## Creates either a Standard or Extended Message depending on the device type
-## Can be used to create different classes later
-sub simple_message {
-	my ($self,$type,$extra) = @_;
-	my $message;
-	if ($self->_aldb->isa('Insteon::ALDB_i2')){
-		$extra = $extra . "0000000000000000000000000000";
-		$message = new Insteon::InsteonMessage('insteon_ext_send', $self, $type, $extra);
-	} else {
-		$message = new Insteon::InsteonMessage('insteon_send', $self, $type, $extra);
-	}
-	return $message;
-}
-
 # Overload methods we don't use, but would otherwise cause Insteon traffic.
 sub request_status { return 0 }
 
@@ -455,6 +441,14 @@ sub _is_info_request {
 	return $is_info_request;
 }
 
+## Creates a simple Standard Message
+sub simple_message {
+	my ($self,$type,$extra) = @_;
+	my $message;
+	$message = new Insteon::InsteonMessage('insteon_send', $self, $type, $extra);
+	return $message;
+}
+
 package Insteon::Thermo_i2;
 use strict;
 
@@ -768,6 +762,14 @@ sub mode{
 	$self->_send_cmd($self->simple_message('thermostat_control', $mode));
 }
 
+## Creates an Extended Message
+sub simple_message {
+	my ($self,$type,$extra) = @_;
+	my $message;
+	$extra = $extra . "0000000000000000000000000000";
+	$message = new Insteon::InsteonMessage('insteon_ext_send', $self, $type, $extra);
+	return $message;
+}
 
 package Insteon::Thermo_i2_bcast;
 use strict;

From 779bbb34ce0f491ec78e0943358ec121d16500f6 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 19 Mar 2013 22:33:10 -0700
Subject: [PATCH 046/330] Insteon::Thermo_i2 Added sync_time Function

Syncs the thermostat time to your computer time, as simple as that
---
 lib/Insteon/Thermostat.pm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 9cce2f867..224f660ab 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -595,6 +595,26 @@ sub _process_message {
 			$self->hex_heat(substr($msg{extra}, 24, 2));			
 			$clear_message = 1;
 			$self->_process_command_stack(%msg);
+			if ($$self{set_time}){
+				#This poll was requested as part of sync_time
+				my $message;
+				my $extra;
+				my @time_array = localtime(time);
+				my @req_items = ($time_array[6], $time_array[2], 
+						$time_array[1], $time_array[0]);
+				my $time_str = '';
+				foreach (@req_items){
+					$time_str .= sprintf("%02d", $_);
+				}
+				$extra = $extra . "0202". $time_str . substr($msg{extra}, 12, 18);
+				#This will include the prior CRC16 message, but it will
+				#get overwritten with the correct value in Message.pm
+				$message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+				$$message{add_crc16} = 1;
+				$$self{_ext_set_get_action} = 'set';
+				$$self{set_time} = undef;
+				$self->_send_cmd($message);
+			}
 		} else {
 			main::print_log("[Insteon::Thermo_i2] WARN: Corrupt Extended "
 				."Set/Get Data Received for ". $self->get_object_name) if $main::Debug{insteon};
@@ -771,6 +791,15 @@ sub simple_message {
 	return $message;
 }
 
+sub sync_time {
+	my ($self) = @_;
+	#In order to set the time, we need to know the current value of other data
+	#points such as mode and what not becuase we can't just set the time without
+	#setting these variables too.
+	$$self{set_time} = 1;
+	$self->poll_simple();
+}
+
 package Insteon::Thermo_i2_bcast;
 use strict;
 

From 304b7026445f300e759090f688a5b381c21a903e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 20 Mar 2013 22:12:16 -0700
Subject: [PATCH 047/330] Insteon::Thermostat Add Hop Tracking

---
 lib/Insteon/Thermostat.pm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 224f660ab..1de662ee3 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -336,18 +336,21 @@ sub _process_message
 	my ($self,$p_setby,%msg) = @_;
 	my $clear_message = 0;
 	if ($msg{command} eq "thermostat_setpoint_cool" && $msg{is_ack}){
+		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermostat] Received ACK of cool setpoint ".
 			"for ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->_cool_sp((hex($msg{extra})/2));
 		$clear_message = 1;
 	}
 	elsif ($msg{command} eq "thermostat_setpoint_heat" && $msg{is_ack}){
+		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermostat] Received ACK of heat setpoint ".
 			"for ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->_heat_sp((hex($msg{extra})/2));
 		$clear_message = 1;
 	}
 	elsif ($$self{_zone_action} eq 'setpoint' && $$self{m_pending_setpoint}) {
+		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		# we got our cool setpoint in auto mode
 		main::print_log("[Insteon::Thermostat] Processing data for $msg{command} with value: $msg{extra}") if $main::Debug{insteon};
 		my $val = (hex $msg{extra})/2;
@@ -564,6 +567,7 @@ sub _process_message {
 	my ($self,$p_setby,%msg) = @_;
 	my $clear_message = 0;
 	if ($msg{command} eq "extended_set_get" && $msg{is_ack}){
+		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
 		main::print_log("[Insteon::Thermo_i2] Extended Set/Get ACK Received for " . $self->get_object_name) if $main::Debug{insteon};
 		if ($$self{_ext_set_get_action} eq 'set'){
@@ -575,6 +579,7 @@ sub _process_message {
 	} 
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_extended}) {
 		if (substr($msg{extra},0,4) eq "0201") {
+			$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 			main::print_log("[Insteon::Thermo_i2] Extended Set/Get Data ".
 				"Received for ". $self->get_object_name) if $main::Debug{insteon};
 			#0 = 2				#14 = Cool SP 
@@ -621,26 +626,31 @@ sub _process_message {
 		}
 	}
 	elsif ($msg{command} eq "status_temp" && !$msg{is_ack}){
+		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2] Received Status Temp Message ".
 			"for ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->hex_short_temp($msg{extra});
 	}
 	elsif ($msg{command} eq "status_mode" && !$msg{is_ack}){
+		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2] Received Status Mode Message ".
 			"for ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->status_mode($msg{extra});
 	}
 	elsif ($msg{command} eq "status_cool" && !$msg{is_ack}){
+		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2] Received Status Cool Message ".
 			"for ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->hex_cool($msg{extra});
 	}
 	elsif ($msg{command} eq "status_humid" && !$msg{is_ack}){
+		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2] Received Status Humid Message ".
 			"for ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->hex_humid($msg{extra});
 	}
 	elsif ($msg{command} eq "status_heat" && !$msg{is_ack}){
+		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2] Received Status Heat Message ".
 			"for ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->hex_heat($msg{extra});

From cd2310897b74720753705656759720f747391cf4 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 21 Mar 2013 20:02:39 -0700
Subject: [PATCH 048/330] Insteon::Thermo_i2 Change to sync_time flag and
 convert time to hex

Set_time is a flay already used in MH, likely for idle time.  Changed flag to sync_time instead.

Also time values needed to be hex encoded.
---
 lib/Insteon/Thermostat.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 1de662ee3..eeb0e5ff0 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -600,7 +600,7 @@ sub _process_message {
 			$self->hex_heat(substr($msg{extra}, 24, 2));			
 			$clear_message = 1;
 			$self->_process_command_stack(%msg);
-			if ($$self{set_time}){
+			if ($$self{sync_time}){
 				#This poll was requested as part of sync_time
 				my $message;
 				my $extra;
@@ -609,7 +609,7 @@ sub _process_message {
 						$time_array[1], $time_array[0]);
 				my $time_str = '';
 				foreach (@req_items){
-					$time_str .= sprintf("%02d", $_);
+					$time_str .= sprintf("%02x", $_);
 				}
 				$extra = $extra . "0202". $time_str . substr($msg{extra}, 12, 18);
 				#This will include the prior CRC16 message, but it will
@@ -617,7 +617,7 @@ sub _process_message {
 				$message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
 				$$message{add_crc16} = 1;
 				$$self{_ext_set_get_action} = 'set';
-				$$self{set_time} = undef;
+				$$self{sync_time} = undef;
 				$self->_send_cmd($message);
 			}
 		} else {
@@ -806,7 +806,7 @@ sub sync_time {
 	#In order to set the time, we need to know the current value of other data
 	#points such as mode and what not becuase we can't just set the time without
 	#setting these variables too.
-	$$self{set_time} = 1;
+	$$self{sync_time} = 1;
 	$self->poll_simple();
 }
 

From 1b55b88c7f2ddc2c80c35ddeee3c5d199dd101e1 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 26 Mar 2013 18:15:20 -0700
Subject: [PATCH 049/330] Insteon::Thermo_i2 Reorganize i2 init routine and
 clean up spacing in i2 package

---
 lib/Insteon/Thermostat.pm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index eeb0e5ff0..70bdcead6 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -470,8 +470,14 @@ our %message_types = (
 sub init {
 	my ($self) = @_;
 	$$self{message_types} = \%message_types;
+	#Set saved state unique to i2 devices
+	$self->restore_data('humid');
 	
-	## Create the broadcast dummy item
+	# Create the broadcast dummy item
+	# This may not belong here.  Maybe this should go into read table A?
+	# Otherwise, users cannot define insteon scenes containing this device.
+	# While rare a thermostat may be set to provide broadcast updates to
+	# another device
 	my $dev_id = $self->device_id();
 	$dev_id =~ /(\w\w)(\w\w)(\w\w)/;
 	$dev_id = "$1.$2.$3";
@@ -505,8 +511,6 @@ sub init {
 			$parent_group->add($$self{$obj});
 		}
 	}
-	#Set saved state unique to i2
-	$self->restore_data('humid');
 
 	#Set child saved states
 	$$self{temp_item}->set_receive($self->get_temp());
@@ -727,10 +731,12 @@ sub hex_cool{
 	my ($self, $hex_cool) = @_;
 	$self->_cool_sp(hex($hex_cool));
 }
+
 sub hex_humid{
 	my ($self, $hex_humid) = @_;
 	$self->_humid(hex($hex_humid));
 }
+
 sub hex_long_temp{
 	my ($self, $hex_temp) = @_;
 	my $temp_cel = (hex($hex_temp)/10);
@@ -749,6 +755,7 @@ sub hex_short_temp{
 sub hex_status{
 	### Not sure about this one yet, was 80 when set to auto but no activity
 }
+
 sub hex_heat{
 	my ($self, $hex_heat) = @_;
 	$self->_heat_sp(hex($hex_heat));	
@@ -769,6 +776,7 @@ Sets system mode to argument: 'off', 'heat', 'cool', 'auto', 'program_heat',
 'program_cool', 'program_auto'.  The 2441TH thermostat does not have program_heat
  or program_cool.
 =cut
+
 sub mode{
 	my ($self, $state) = @_;
 	$state = lc($state);

From 6c555d09a259d0173a9fd3ebefc61b6068fbe77e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 26 Mar 2013 18:16:43 -0700
Subject: [PATCH 050/330] Insteon::Thermo_i2 Move Child Objects to First-Level
 MH Objects

Use eval to create true Top-Level objects with user friendly variable names.  This may be frowned upon in perl programming, but is is already used in a number of places within MH, so it can't be that bad. :-p  As noted in the comments, objects which will be linked to insteon scenes should not be created in this manner.

A big thanks to Gregg in 2007 who posted a comment that led me to this solution.
http://misterhouse.10964.n7.nabble.com/Coding-question-Dynamic-variables-with-strict-refs-td6300.html
---
 lib/Insteon/Thermostat.pm | 59 +++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 70bdcead6..2070bb510 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -490,37 +490,48 @@ sub init {
 	&main::register_object_by_name('$' . $self->get_object_name ."{bcast_item}",$$self{bcast_item});
 	$$self{bcast_item}->{object_name} = '$' . $self->get_object_name ."{bcast_item}";
 	
-	## Create the child objects
-	my @child_objs = ('mode_item', 'fan_item', 'temp_item', 'humidity_item',
-		'setpoint_h_item', 'setpoint_c_item');
-	foreach my $obj (@child_objs) {
-		$$self{$obj} = new Insteon::Thermo_i2_mode() if ($obj eq 'mode_item');
-		$$self{$obj} = new Insteon::Thermo_i2_fan() if ($obj eq 'fan_item');
-		$$self{$obj} = new Insteon::Thermo_i2_temp() if ($obj eq 'temp_item');
-		$$self{$obj} = new Insteon::Thermo_i2_humidity() if ($obj eq 'humidity_item');
-		$$self{$obj} = new Insteon::Thermo_i2_setpoint_h() if ($obj eq 'setpoint_h_item');
-		$$self{$obj} = new Insteon::Thermo_i2_setpoint_c() if ($obj eq 'setpoint_c_item');
-
+	# Define the child objects
+	# These we can create ourselves as they cannot be used in an insteon scene
+	my %child_objs = (
+		mode_item => "new Insteon::Thermo_i2_mode(".$self->get_object_name.")",
+		fan_item => "new Insteon::Thermo_i2_fan(".$self->get_object_name.")",
+		temp_item => "new Insteon::Thermo_i2_temp(".$self->get_object_name.")",
+		humidity_item => "new Insteon::Thermo_i2_humidity(".$self->get_object_name.")",
+		setpoint_h_item => "new Insteon::Thermo_i2_setpoint_h(".$self->get_object_name.")",
+		setpoint_c_item => "new Insteon::Thermo_i2_setpoint_c(".$self->get_object_name.")"
+	);
+
+	#Now create them
+	foreach my $child_type (keys %child_objs) {
+		#Name the Child Object
+		my $child_name = $self->get_object_name . "_" . $child_type;
+		
+		#Define the code to run in eval
+		my $eval_cmd;
+		$eval_cmd = "use vars '$child_name';\n";
+		$eval_cmd .= "$child_name = $child_objs{$child_type};\n";
 		# Register child object with MH
-		&main::register_object_by_name('$' . $self->get_object_name ."{$obj}",$$self{$obj});
-		$$self{$obj}->{object_name} = '$' . $self->get_object_name ."{$obj}";
-		$$self{$obj}{parent} = $self;
+		$eval_cmd .= "&main::register_object_by_name('$child_name',$child_name);\n";
+
+		#Run the eval command
+		package main; 
+			eval($eval_cmd);
+			if ($@) { 
+				::print_log( "[Insteon::Thermo_i2] Error in init eval command:\n $@ \n---\n $eval_cmd"); 
+			}
+		package Insteon::Thermo_i2;
+
+		#Get the newly created child object
+		$$self{$child_type} = ::get_object_by_name($child_name);
+		$$self{$child_type}->{object_name} = "$child_name";
 		
 		#Add child to the same groups as parent
 		foreach my $parent_group (::list_groups_by_object($self,1)){
-			$parent_group->add($$self{$obj});
+			$parent_group->add($$self{$child_type});
 		}
 	}
 
-	#Set child saved states
-	$$self{temp_item}->set_receive($self->get_temp());
-	$$self{setpoint_h_item}->set_receive($self->get_heat_sp());
-	$$self{setpoint_c_item}->set_receive($self->get_cool_sp());
-	$$self{fan_item}->set_receive($self->get_fan_mode());
-	$$self{mode_item}->set_receive($self->get_mode());
-	$$self{humidity_item}->set_receive($$self{humid});
-		
-	#Tie changes in parent item to children
+	#Create tie so that changes in parent update the child
 	$self -> tie_event ('Insteon::Thermo_i2::parent_event(\''.$$self{object_name} . '\', "$state")');
 }
 

From 43ddcdfea5ad2478eeffec67d050be943f88b172 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 26 Mar 2013 18:21:56 -0700
Subject: [PATCH 051/330] Insteon::Thermo_i2 Define Parent and set Initial
 Value in Child Object new Routines

---
 lib/Insteon/Thermostat.pm | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 2070bb510..443fdfed5 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -851,10 +851,12 @@ use strict;
 @Insteon::Thermo_i2_mode::ISA = ('Generic_Item');
 
 sub new {
-	my ($class) = @_;
+	my ($class,$parent) = @_;
 	my $self = new Generic_Item();
 	bless $self, $class;
+	$$self{parent} = $parent;
 	@{$$self{states}} = ('Off', 'Heat', 'Cool', 'Auto', 'Program');
+	$self->set_receive($$self{parent}->get_mode());
 	return $self;
 }
 
@@ -884,10 +886,12 @@ use strict;
 @Insteon::Thermo_i2_fan::ISA = ('Generic_Item');
 
 sub new {
-	my ($class) = @_;
+	my ($class, $parent) = @_;
 	my $self = new Generic_Item();
 	bless $self, $class;
+	$$self{parent} = $parent;
 	@{$$self{states}} = ('Auto', 'On');
+	$self->set_receive($$self{parent}->get_fan_mode());
 	return $self;
 }
 
@@ -910,15 +914,18 @@ sub set_receive {
 	my ($self, $p_state) = @_;
 	$self->SUPER::set($p_state);
 }
+
 package Insteon::Thermo_i2_temp;
 use strict;
 
 @Insteon::Thermo_i2_temp::ISA = ('Generic_Item');
 
 sub new {
-	my ($class) = @_;
+	my ($class, $parent) = @_;
 	my $self = new Generic_Item();
 	bless $self, $class;
+	$$self{parent} = $parent;
+	$self->set_receive($$self{parent}->get_temp());
 	return $self;
 }
 
@@ -932,9 +939,11 @@ use strict;
 @Insteon::Thermo_i2_humidity::ISA = ('Generic_Item');
 
 sub new {
-	my ($class) = @_;
+	my ($class, $parent) = @_;
 	my $self = new Generic_Item();
 	bless $self, $class;
+	$$self{parent} = $parent;
+	$self->set_receive($$self{parent}{humid});
 	return $self;
 }
 
@@ -949,10 +958,12 @@ use strict;
 @Insteon::Thermo_i2_setpoint_h::ISA = ('Generic_Item');
 
 sub new {
-	my ($class) = @_;
+	my ($class, $parent) = @_;
 	my $self = new Generic_Item();
 	bless $self, $class;
+	$$self{parent} = $parent;
 	@{$$self{states}} = ('Cooler' , 'Warmer');
+	$self->set_receive($$self{parent}->get_heat_sp());
 	return $self;
 }
 
@@ -987,10 +998,12 @@ use strict;
 @Insteon::Thermo_i2_setpoint_c::ISA = ('Generic_Item');
 
 sub new {
-	my ($class) = @_;
+	my ($class, $parent) = @_;
 	my $self = new Generic_Item();
 	bless $self, $class;
+	$$self{parent} = $parent;
 	@{$$self{states}} = ('Cooler', 'Warmer');
+	$self->set_receive($$self{parent}->get_cool_sp());	
 	return $self;
 }
 

From dd9501ee4957202913cc77db45c8591597bee112 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 18 Apr 2013 17:18:26 -0700
Subject: [PATCH 052/330] Insteon_Thermo_i2: Remove Complex Code Creating Child
 Objects

The code is just too difficult to try and make work.  Either the child objects have to be stored in a hash, which results in awful looking veriable names that are not user friendly to the basic user.

The removed code made user friendly variable names, but these variables could not be used in other user code because the init code was not eval'd until runtime.
---
 lib/Insteon/Thermostat.pm | 44 ---------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 443fdfed5..d5f1b5992 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -489,50 +489,6 @@ sub init {
 	# Register bcast object with MH
 	&main::register_object_by_name('$' . $self->get_object_name ."{bcast_item}",$$self{bcast_item});
 	$$self{bcast_item}->{object_name} = '$' . $self->get_object_name ."{bcast_item}";
-	
-	# Define the child objects
-	# These we can create ourselves as they cannot be used in an insteon scene
-	my %child_objs = (
-		mode_item => "new Insteon::Thermo_i2_mode(".$self->get_object_name.")",
-		fan_item => "new Insteon::Thermo_i2_fan(".$self->get_object_name.")",
-		temp_item => "new Insteon::Thermo_i2_temp(".$self->get_object_name.")",
-		humidity_item => "new Insteon::Thermo_i2_humidity(".$self->get_object_name.")",
-		setpoint_h_item => "new Insteon::Thermo_i2_setpoint_h(".$self->get_object_name.")",
-		setpoint_c_item => "new Insteon::Thermo_i2_setpoint_c(".$self->get_object_name.")"
-	);
-
-	#Now create them
-	foreach my $child_type (keys %child_objs) {
-		#Name the Child Object
-		my $child_name = $self->get_object_name . "_" . $child_type;
-		
-		#Define the code to run in eval
-		my $eval_cmd;
-		$eval_cmd = "use vars '$child_name';\n";
-		$eval_cmd .= "$child_name = $child_objs{$child_type};\n";
-		# Register child object with MH
-		$eval_cmd .= "&main::register_object_by_name('$child_name',$child_name);\n";
-
-		#Run the eval command
-		package main; 
-			eval($eval_cmd);
-			if ($@) { 
-				::print_log( "[Insteon::Thermo_i2] Error in init eval command:\n $@ \n---\n $eval_cmd"); 
-			}
-		package Insteon::Thermo_i2;
-
-		#Get the newly created child object
-		$$self{$child_type} = ::get_object_by_name($child_name);
-		$$self{$child_type}->{object_name} = "$child_name";
-		
-		#Add child to the same groups as parent
-		foreach my $parent_group (::list_groups_by_object($self,1)){
-			$parent_group->add($$self{$child_type});
-		}
-	}
-
-	#Create tie so that changes in parent update the child
-	$self -> tie_event ('Insteon::Thermo_i2::parent_event(\''.$$self{object_name} . '\', "$state")');
 }
 
 sub sync_links{

From ae540383ee61f8c5dd06cefdf06521cecf4075aa Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 18 Apr 2013 17:21:17 -0700
Subject: [PATCH 053/330] Insteon_thermo_i2: Remove Parent_Event Routine

Not needed without tied children.
---
 lib/Insteon/Thermostat.pm | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index d5f1b5992..5d6533e75 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -503,29 +503,6 @@ sub sync_links{
 	return $self->SUPER::sync_links($audit_mode, $callback, $failure_callback);
 }
 
-sub parent_event {
-	my ($self, $p_state) = @_;
-	$self = ::get_object_by_name($self);
-	if ($p_state eq 'temp_change'){
-		$$self{temp_item}->set_receive($self->get_temp());
-	}
-	elsif ($p_state eq 'heat_setpoint_change'){
-		$$self{setpoint_h_item}->set_receive($self->get_heat_sp());
-	}
-	elsif ($p_state eq 'cool_setpoint_change'){
-		$$self{setpoint_c_item}->set_receive($self->get_cool_sp());
-	}
-	elsif ($p_state eq 'fan_mode_change'){
-		$$self{fan_item}->set_receive($self->get_fan_mode());
-	}
-	elsif ($p_state eq 'mode_change'){
-		$$self{mode_item}->set_receive($self->get_mode());
-	}
-	elsif ($p_state eq 'humid_change'){
-		$$self{humidity_item}->set_receive($$self{humid});
-	}
-}
-
 sub poll_simple{
 	my ($self) = @_;
 	my $extra = "020000000000000000000000000000";

From 6558d86e3a3db751369f0744549d3cb25f74decd Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 18 Apr 2013 17:42:38 -0700
Subject: [PATCH 054/330] Insteon_thermo_i2: Change Name of Child Objects

While designed for i2 devices, the child objects should work with i1 devices as well, except the humidity object which I don't believe exits for i1 devices.
---
 lib/Insteon/Thermostat.pm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 5d6533e75..587adbd5f 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -778,10 +778,10 @@ sub new {
    return $self;
 }
 
-package Insteon::Thermo_i2_mode;
+package Insteon::Thermo_mode;
 use strict;
 
-@Insteon::Thermo_i2_mode::ISA = ('Generic_Item');
+@Insteon::Thermo_mode::ISA = ('Generic_Item');
 
 sub new {
 	my ($class,$parent) = @_;
@@ -813,10 +813,10 @@ sub set_receive {
 	$self->SUPER::set($p_state);
 }
 
-package Insteon::Thermo_i2_fan;
+package Insteon::Thermo_fan;
 use strict;
 
-@Insteon::Thermo_i2_fan::ISA = ('Generic_Item');
+@Insteon::Thermo_fan::ISA = ('Generic_Item');
 
 sub new {
 	my ($class, $parent) = @_;
@@ -848,10 +848,10 @@ sub set_receive {
 	$self->SUPER::set($p_state);
 }
 
-package Insteon::Thermo_i2_temp;
+package Insteon::Thermo_temp;
 use strict;
 
-@Insteon::Thermo_i2_temp::ISA = ('Generic_Item');
+@Insteon::Thermo_temp::ISA = ('Generic_Item');
 
 sub new {
 	my ($class, $parent) = @_;
@@ -866,10 +866,10 @@ sub set_receive {
 	my ($self, $p_state) = @_;
 	$self->SUPER::set($p_state);
 }
-package Insteon::Thermo_i2_humidity;
+package Insteon::Thermo_humidity;
 use strict;
 
-@Insteon::Thermo_i2_humidity::ISA = ('Generic_Item');
+@Insteon::Thermo_humidity::ISA = ('Generic_Item');
 
 sub new {
 	my ($class, $parent) = @_;
@@ -885,10 +885,10 @@ sub set_receive {
 	$self->SUPER::set($p_state);
 }
 
-package Insteon::Thermo_i2_setpoint_h;
+package Insteon::Thermo_setpoint_h;
 use strict;
 
-@Insteon::Thermo_i2_setpoint_h::ISA = ('Generic_Item');
+@Insteon::Thermo_setpoint_h::ISA = ('Generic_Item');
 
 sub new {
 	my ($class, $parent) = @_;
@@ -925,10 +925,10 @@ sub set_receive {
 	$self->SUPER::set($p_state);
 }
 
-package Insteon::Thermo_i2_setpoint_c;
+package Insteon::Thermo_setpoint_c;
 use strict;
 
-@Insteon::Thermo_i2_setpoint_c::ISA = ('Generic_Item');
+@Insteon::Thermo_setpoint_c::ISA = ('Generic_Item');
 
 sub new {
 	my ($class, $parent) = @_;

From ed339a7662a4a57ab96396cfb56282ec837c0977 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 18 Apr 2013 17:45:03 -0700
Subject: [PATCH 055/330] Insteon_thermo_it: Cleanup Example Thermostat Code
 File

Fix to match current code base
---
 code/examples/Insteon_thermostat.pl | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/code/examples/Insteon_thermostat.pl b/code/examples/Insteon_thermostat.pl
index 4f9ad29bf..bd6cf6ce5 100755
--- a/code/examples/Insteon_thermostat.pl
+++ b/code/examples/Insteon_thermostat.pl
@@ -1,13 +1,13 @@
 # Category=HVAC
 
-$v_test_thermostat = new Voice_Cmd("Send Thermostat cmd [ping,poll_mode,mode_off,mode_heat,mode_cool,mode_auto,mode_pgm_heat,mode_pgm_cool,mode_pgm_auto,fan_on,fan_auto,poll_temp,poll_setpoint]");
+$v_test_thermostat = new Voice_Cmd("Send Thermostat cmd [poll_mode,mode_off,mode_heat,mode_cool,mode_auto,mode_pgm_heat,mode_pgm_cool,mode_pgm_auto,fan_on,fan_auto,poll_temp,poll_setpoint]");
 
 # Create the Object in user code:
 #use Insteon_Thermostat;
-#$thermostat = new Insteon_Thermostat($plm,'12.34.56');
+#$thermostat = new Insteon_Thermostat('12.34.56', $plm);
 
 # or in items.mht (read_table_A)
-#IPLT, 12.34.56,, thermostat, HVAC, plm
+#INSTEON_THERMOSTAT, 12.34.56,, thermostat, HVAC
 
 # poll_setpoint also runs poll_mode
 if ($Startup || $Reload) {
@@ -29,9 +29,7 @@
 
 
 if (my $state = said $v_test_thermostat) {
-   if ($state eq 'ping') {
-      $thermostat->ping();
-   }elsif ($state eq 'poll_mode') {
+   if ($state eq 'poll_mode') {
       $thermostat->poll_mode();
    }elsif ($state eq 'poll_temp') {
       $thermostat->poll_temp();

From 1842025592a4a594b89cf55bff64496c00b00d8d Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 18 Apr 2013 17:45:45 -0700
Subject: [PATCH 056/330] Insteon_thermo_i2: Add Example to Thermostat Code
 File for Child Objects

Add example entry into code file to demonstrate how to create child objects that are tied to parent item
---
 code/examples/Insteon_thermostat.pl | 56 ++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/code/examples/Insteon_thermostat.pl b/code/examples/Insteon_thermostat.pl
index bd6cf6ce5..71400fe67 100755
--- a/code/examples/Insteon_thermostat.pl
+++ b/code/examples/Insteon_thermostat.pl
@@ -87,4 +87,58 @@
    $thermostat->heat_setpoint(66);
    $thermostat->cool_setpoint(82);
    $thermostat->poll_setpoint();
-}   
+}
+
+## The examples show how a Generic Item can be Used to Track and Display
+## individual data points in the thermostat.
+
+#Define the Children
+$thermo_temp = new Insteon::Thermo_temp($thermostat);
+$thermo_fan = new Insteon::Thermo_fan($thermostat);
+$thermo_mode = new Insteon::Thermo_mode($thermostat);
+$thermo_humidity = new Insteon::Thermo_humidity($thermostat);
+$thermo_setpoint_h = new Insteon::Thermo_setpoint_h($thermostat);
+$thermo_setpoint_c = new Insteon::Thermo_setpoint_c($thermostat);
+
+#Add the Children to the HVAC Group
+$HVAC->add($thermo_temp);
+$HVAC->add($thermo_fan);
+$HVAC->add($thermo_mode);
+$HVAC->add($thermo_humidity);
+$HVAC->add($thermo_setpoint_h);
+$HVAC->add($thermo_setpoint_c);
+
+if ($Reload){
+	#Create tie so that changes in parent update the child
+	$thermostat -> tie_event ('::thermo_parent_event($object->get_object_name, "$state")');
+	
+	#set Children to initial states
+	$thermo_temp->set_receive($thermostat->get_temp());
+	$thermo_setpoint_h->set_receive($thermostat->get_heat_sp());
+	$thermo_setpoint_c->set_receive($thermostat->get_cool_sp());
+	$thermo_fan->set_receive($thermostat->get_fan_mode());
+	$thermo_mode->set_receive($thermostat->get_mode());
+}
+
+sub thermo_parent_event {
+	my ($self, $p_state) = @_;
+	$self = ::get_object_by_name($self);
+	if ($p_state eq 'temp_change'){
+		$thermo_temp->set_receive($self->get_temp(), $self);
+	}
+	elsif ($p_state eq 'heat_setpoint_change'){
+		$thermo_setpoint_h->set_receive($self->get_heat_sp(), $self);
+	}
+	elsif ($p_state eq 'cool_setpoint_change'){
+		$thermo_setpoint_c->set_receive($self->get_cool_sp(), $self);
+	}
+	elsif ($p_state eq 'fan_mode_change'){
+		$thermo_fan->set_receive($self->get_fan_mode(), $self);
+	}
+	elsif ($p_state eq 'mode_change'){
+		$thermo_mode->set_receive($self->get_mode(), $self);
+	}
+	elsif ($p_state eq 'humid_change'){
+		$thermo_humidity->set_receive($$self{humid}, $self);
+	}
+}

From 80f67ebe548c4b9856d1a5cfb7fdadb573037aaf Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 18 Apr 2013 19:40:25 -0700
Subject: [PATCH 057/330] Insteon_thermo_i2: Fix Comments in Example Code

---
 code/examples/Insteon_thermostat.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/examples/Insteon_thermostat.pl b/code/examples/Insteon_thermostat.pl
index 71400fe67..88408e944 100755
--- a/code/examples/Insteon_thermostat.pl
+++ b/code/examples/Insteon_thermostat.pl
@@ -89,8 +89,10 @@
    $thermostat->poll_setpoint();
 }
 
-## The examples show how a Generic Item can be Used to Track and Display
-## individual data points in the thermostat.
+## The examples show how the defined child objects can be Used to Track and Display
+## individual data points in the thermostat.  Each of the child objects will 
+## display and permit the adjusting (if applicable) of one data point such as
+## fan mode or cool setpoint.
 
 #Define the Children
 $thermo_temp = new Insteon::Thermo_temp($thermostat);

From 220f503a04b215d802b23d90cf6f2ee961dd2b9e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 18 Apr 2013 19:45:25 -0700
Subject: [PATCH 058/330] Insteon_thermo_i2: Remove Complex Tie Example from
 Example User Code

Will add to individual child objects instead
---
 code/examples/Insteon_thermostat.pl | 35 -----------------------------
 1 file changed, 35 deletions(-)

diff --git a/code/examples/Insteon_thermostat.pl b/code/examples/Insteon_thermostat.pl
index 88408e944..5b7e83650 100755
--- a/code/examples/Insteon_thermostat.pl
+++ b/code/examples/Insteon_thermostat.pl
@@ -109,38 +109,3 @@
 $HVAC->add($thermo_humidity);
 $HVAC->add($thermo_setpoint_h);
 $HVAC->add($thermo_setpoint_c);
-
-if ($Reload){
-	#Create tie so that changes in parent update the child
-	$thermostat -> tie_event ('::thermo_parent_event($object->get_object_name, "$state")');
-	
-	#set Children to initial states
-	$thermo_temp->set_receive($thermostat->get_temp());
-	$thermo_setpoint_h->set_receive($thermostat->get_heat_sp());
-	$thermo_setpoint_c->set_receive($thermostat->get_cool_sp());
-	$thermo_fan->set_receive($thermostat->get_fan_mode());
-	$thermo_mode->set_receive($thermostat->get_mode());
-}
-
-sub thermo_parent_event {
-	my ($self, $p_state) = @_;
-	$self = ::get_object_by_name($self);
-	if ($p_state eq 'temp_change'){
-		$thermo_temp->set_receive($self->get_temp(), $self);
-	}
-	elsif ($p_state eq 'heat_setpoint_change'){
-		$thermo_setpoint_h->set_receive($self->get_heat_sp(), $self);
-	}
-	elsif ($p_state eq 'cool_setpoint_change'){
-		$thermo_setpoint_c->set_receive($self->get_cool_sp(), $self);
-	}
-	elsif ($p_state eq 'fan_mode_change'){
-		$thermo_fan->set_receive($self->get_fan_mode(), $self);
-	}
-	elsif ($p_state eq 'mode_change'){
-		$thermo_mode->set_receive($self->get_mode(), $self);
-	}
-	elsif ($p_state eq 'humid_change'){
-		$thermo_humidity->set_receive($$self{humid}, $self);
-	}
-}

From a5d8ef3d2a9eaa61d298f7e54340598056398b9a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 18 Apr 2013 19:55:25 -0700
Subject: [PATCH 059/330] Insteon_thermo_i2: Add Parent Event Routine to Base
 Thermostat Code

parent_event is called by tie_event on state changes in the parent.  The routine updates the child object with the correct state
---
 lib/Insteon/Thermostat.pm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 587adbd5f..f3bd5af1e 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -364,6 +364,29 @@ sub _process_message
 	return $clear_message;
 }
 
+#Used to update the state of child objects
+sub parent_event {
+	my ($self, $p_state) = @_;
+	if ($p_state eq 'mode_change'){
+		$$self{child_mode}->set_receive($self->get_mode());
+	}
+	elsif ($p_state eq 'temp_change'){
+		$$self{child_temp}->set_receive($self->get_temp(), $self);
+	}
+	elsif ($p_state eq 'heat_setpoint_change'){
+		$$self{child_setpoint_h}->set_receive($self->get_heat_sp(), $self);
+	}
+	elsif ($p_state eq 'cool_setpoint_change'){
+		$$self{child_setpoint_c}->set_receive($self->get_cool_sp(), $self);
+	}
+	elsif ($p_state eq 'fan_mode_change'){
+		$$self{child_fan}->set_receive($self->get_fan_mode(), $self);
+	}
+	elsif ($p_state eq 'humid_change'){
+		$$self{child_humidity}->set_receive($$self{humid}, $self);
+	}
+}
+
 # Overload methods we don't use, but would otherwise cause Insteon traffic.
 sub request_status { return 0 }
 

From 1e934f1b7c9ca3dcfe1922a8ba22d3ade4c01f63 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 18 Apr 2013 20:05:25 -0700
Subject: [PATCH 060/330] Insteon_thermo_i2: Add Child Object to Parent Hash
 and Call Tie_Event

The child objects are stored in the parent hash so that the parent can locate the correct child to update it.

tie_events is set on child object creation.
---
 lib/Insteon/Thermostat.pm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index f3bd5af1e..1a5609749 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -812,7 +812,8 @@ sub new {
 	bless $self, $class;
 	$$self{parent} = $parent;
 	@{$$self{states}} = ('Off', 'Heat', 'Cool', 'Auto', 'Program');
-	$self->set_receive($$self{parent}->get_mode());
+	$$self{parent}{child_mode} = $self;
+	$$self{parent} -> tie_event ('$object->parent_event("$state")', "mode_change");
 	return $self;
 }
 
@@ -847,7 +848,8 @@ sub new {
 	bless $self, $class;
 	$$self{parent} = $parent;
 	@{$$self{states}} = ('Auto', 'On');
-	$self->set_receive($$self{parent}->get_fan_mode());
+	$$self{parent}{child_fan} = $self;
+	$$self{parent} -> tie_event ('$object->parent_event("$state")', "fan_mode_change");
 	return $self;
 }
 
@@ -881,7 +883,8 @@ sub new {
 	my $self = new Generic_Item();
 	bless $self, $class;
 	$$self{parent} = $parent;
-	$self->set_receive($$self{parent}->get_temp());
+	$$self{parent}{child_temp} = $self;
+	$$self{parent} -> tie_event ('$object->parent_event("$state")', "temp_change");
 	return $self;
 }
 
@@ -889,6 +892,7 @@ sub set_receive {
 	my ($self, $p_state) = @_;
 	$self->SUPER::set($p_state);
 }
+
 package Insteon::Thermo_humidity;
 use strict;
 
@@ -899,7 +903,8 @@ sub new {
 	my $self = new Generic_Item();
 	bless $self, $class;
 	$$self{parent} = $parent;
-	$self->set_receive($$self{parent}{humid});
+	$$self{parent}{child_humidity} = $self;
+	$$self{parent} -> tie_event ('$object->parent_event("$state")', "humid_change");
 	return $self;
 }
 
@@ -919,7 +924,8 @@ sub new {
 	bless $self, $class;
 	$$self{parent} = $parent;
 	@{$$self{states}} = ('Cooler' , 'Warmer');
-	$self->set_receive($$self{parent}->get_heat_sp());
+	$$self{parent}{child_setpoint_h} = $self;
+	$$self{parent} -> tie_event ('$object->parent_event("$state")', "heat_setpoint_change");
 	return $self;
 }
 
@@ -959,7 +965,8 @@ sub new {
 	bless $self, $class;
 	$$self{parent} = $parent;
 	@{$$self{states}} = ('Cooler', 'Warmer');
-	$self->set_receive($$self{parent}->get_cool_sp());	
+	$$self{parent}{child_setpoint_c} = $self;
+	$$self{parent} -> tie_event ('$object->parent_event("$state")', "cool_setpoint_change");
 	return $self;
 }
 

From b07628aca845de9bbb5332b97a9e4e096a406ad1 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 18 Apr 2013 20:15:25 -0700
Subject: [PATCH 061/330] Insteon: Add Parameter to Allow Per Device Min/Max
 Hop Setting

---
 lib/Insteon/BaseInsteon.pm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 4ec80281f..51a3d5107 100755
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -24,6 +24,7 @@ Special Thanks to:
 	Bruce Winter - MH
 
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+=over 
 =cut
 
 package Insteon::BaseObject;
@@ -155,6 +156,28 @@ sub group
 	return $$self{m_group};
 }
 
+=item C<max_hops($int)>
+
+Sets the maximum number of hops that may be used in a message sent to the device.
+The default and maximum number is 3.  $int is an integer between 0-3.
+=cut
+sub max_hops {
+	my ($self, $hops) = @_;
+	$$self{max_hops} = $hops if $hops;
+	return $$self{max_hops};
+}
+
+=item C<min_hops($int)>
+
+Sets the minimum number of hops that may be used in a message sent to the device.
+The default and minimum number is 0.  $int is an integer between 0-3.
+=cut
+sub min_hops {
+	my ($self, $hops) = @_;
+	$$self{min_hops} = $hops if $hops;
+	return $$self{min_hops};
+}
+
 sub default_hop_count
 {
 	my ($self, $hop_count) = @_;
@@ -170,6 +193,10 @@ sub default_hop_count
 		$high = $_ if ($high < $_);;
 	}
 	$$self{default_hop_count} = $high;
+	$$self{default_hop_count} = $$self{max_hops} if ($$self{max_hops} &&
+		$$self{default_hop_count} > $$self{max_hops});
+	$$self{default_hop_count} = $$self{min_hops} if ($$self{min_hops} &&
+		$$self{default_hop_count} < $$self{min_hops});
         return $$self{default_hop_count};
 }
 
@@ -1872,3 +1899,5 @@ sub is_root
 }
 
 1;
+=back
+=cut

From b93ddb0a4faf167e07a9d1d93f6877f80b7109fd Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 18 Apr 2013 20:15:25 -0700
Subject: [PATCH 062/330] Insteon: Fix Error in Logic Which Caused an
 Unnecessary Increase in Hop Count

---
 lib/Insteon/Message.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index 841553322..f2b87ca18 100755
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -410,7 +410,7 @@ sub _derive_interface_data
 	}
         else
         {
-       		my $hop_count = $self->send_attempts + $self->setby->default_hop_count - 1;
+       		my $hop_count = $self->setby->default_hop_count;
 		$cmd.=$self->setby->device_id();
 		if ($self->command_type =~ /insteon_ext_send/i)
                 {

From 18bf2108595da0cda8f0f672f5d3a8af279652f3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 18 Apr 2013 20:18:25 -0700
Subject: [PATCH 063/330] Insteon: Add Parameter to Alter Send Timeout on a Per
 Device Basis

---
 lib/Insteon/BaseInsteon.pm | 17 +++++++++++++++++
 lib/Insteon/Message.pm     | 27 ++++++++++++++++-----------
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 4ec80281f..64d43f013 100755
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -24,6 +24,7 @@ Special Thanks to:
 	Bruce Winter - MH
 
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+=over
 =cut
 
 package Insteon::BaseObject;
@@ -155,6 +156,20 @@ sub group
 	return $$self{m_group};
 }
 
+=item C<timeout_factor($float)>
+
+Changes the amount of time MH will wait to receive a response from a device before
+resending the message.  The value set will be multiplied by the predefined value
+in MH.  $float can be set to any positive decimal number.  For example using 1.0
+will not change the preset values; 1.1 will increase the time MH waits by 10%; and
+0.9 will force MH to wait for only 90% of the predefined time.
+=cut
+sub timeout_factor {
+	my ($self, $factor) = @_;
+	$$self{timeout_factor} = $factor if $factor;
+	return $$self{timeout_factor};
+}
+
 sub default_hop_count
 {
 	my ($self, $hop_count) = @_;
@@ -1872,3 +1887,5 @@ sub is_root
 }
 
 1;
+=back
+=cut
diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index 841553322..78b8f36a9 100755
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -303,53 +303,58 @@ sub send_timeout
 	my ($self, $ignore) = @_;
         my $hop_count = (ref $self->setby and $self->setby->isa('Insteon::BaseObject')) ?
         			$self->setby->default_hop_count : $self->send_attempts;
+        my $timeout = 1400;
 	if($self->command eq 'peek' || $self->command eq 'set_address_msb')
 	{
-		return 4000;
+		$timeout = 4000;
 	}
-        if ($self->command_type eq 'all_link_send')
+        elsif ($self->command_type eq 'all_link_send')
         {
         	# note, the following was set to 2000 and that was insufficient
-        	return 3000;
+        	$timeout = 3000;
         }
         elsif ($self->command_type eq 'insteon_ext_send')
         {
         	if ($hop_count == 0)
                 {
-                	return   2220;
+                	$timeout = 2220;
                 }
                 elsif ($hop_count == 1)
                 {
-                	return   2690;
+                	$timeout = 2690;
                 }
                 elsif ($hop_count == 2)
                 {
-                	return   3000;
+                	$timeout = 3000;
                 }
                 elsif ($hop_count >= 3)
                 {
-                	return   3170;
+                	$timeout = 3170;
                 }
         }
         else
         {
         	if ($hop_count == 0)
                 {
-                	return   1400;
+                	$timeout = 1400;
                 }
                 elsif ($hop_count == 1)
                 {
-                	return   1700;
+                	$timeout = 1700;
                 }
                 elsif ($hop_count == 2)
                 {
-                	return   1900;
+                	$timeout = 1900;
                 }
                 elsif ($hop_count >= 3)
                 {
-                	return   2000;
+                	$timeout = 2000;
                 }
         }
+        if (ref $self->setby and $self->setby->isa('Insteon::BaseObject')){
+        	$timeout = int($timeout * $self->setby->timeout_factor);
+        }
+        return $timeout;
 }
 
 sub to_string

From 6d30f8bd33048f7246962fce87e19a543b3d0144 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 22 Apr 2013 20:45:49 -0700
Subject: [PATCH 064/330] Insteon_Thermo_i2: Final touches on Thermostat Code

---
 lib/Insteon/Thermostat.pm | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 1a5609749..7b05d2e2d 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -47,6 +47,14 @@ All of the states that may be set:
    fan_mode_change: Fan mode changed
       (call get_fan_mode() to get value).
 
+Child objects which track the states of the thermostat can be created:
+$thermo_temp = new Insteon::Thermo_temp($thermostat);
+$thermo_fan = new Insteon::Thermo_fan($thermostat);
+$thermo_mode = new Insteon::Thermo_mode($thermostat);
+$thermo_humidity = new Insteon::Thermo_humidity($thermostat);
+$thermo_setpoint_h = new Insteon::Thermo_setpoint_h($thermostat);
+$thermo_setpoint_c = new Insteon::Thermo_setpoint_c($thermostat);
+
 see code/examples/Insteon_thermostat.pl for more.
 
 =head1 BUGS
@@ -68,11 +76,9 @@ Kevin Rober Keegan <kevin@krkeegan.com>
 
 =head1 TODO
 
- - Look at possible bugs when starting from factory defaults
-      There seemed to be an issue with the setpoints changing when changing modes until
-      they were set programatically.
- - Test fan modes and associated state_changes
  - Manage aldb - should be able to adjust setpoints based on plm scene. <- may be overkill
+ - Add ability to link devices to the I2 Thermostat groups 1-4
+ - Add ability to link other devices to the broadcast group.
 
 =head1 INHERITS
 
@@ -516,16 +522,23 @@ sub init {
 
 sub sync_links{
 	my ($self, $audit_mode, $callback, $failure_callback) = @_;
-	#Make sure thermostat is set to broadcast changes
-	::print_log("[Insteon::Thermo_i2] (sync_links) Enabling thermostat broadcast setting.") unless $audit_mode;
-	my $extra = "000008000000000000000000000000";
-	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
-	$$self{_ext_set_get_action} = 'set';
-	$self->_send_cmd($message);
+	if !($audit_mode){
+		#Make sure thermostat is set to broadcast changes
+		::print_log("[Insteon::Thermo_i2] (sync_links) Enabling thermostat broadcast setting.") unless $audit_mode;
+		my $extra = "000008000000000000000000000000";
+		my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+		$$self{_ext_set_get_action} = 'set';
+		$self->_send_cmd($message);
+	}
 	# Call the main sync_links code
 	return $self->SUPER::sync_links($audit_mode, $callback, $failure_callback);
 }
 
+=item C<poll_simple()>
+
+Requests the status of all Thermostat data points (temp, fan, mode ...) in a single
+request.  Only available for I2 devices.
+=cut
 sub poll_simple{
 	my ($self) = @_;
 	my $extra = "020000000000000000000000000000";
@@ -775,7 +788,10 @@ sub simple_message {
 	$message = new Insteon::InsteonMessage('insteon_ext_send', $self, $type, $extra);
 	return $message;
 }
+=item C<sync_time()>
 
+Sets the data and time of the thermostat based on the time of the MH server.
+=cut
 sub sync_time {
 	my ($self) = @_;
 	#In order to set the time, we need to know the current value of other data

From 1005109bd1afb9bda622354bf078890205054674 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 22 Apr 2013 21:03:07 -0700
Subject: [PATCH 065/330] Insteon_Thermo_i2: Fix Typo

---
 lib/Insteon/Thermostat.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 7b05d2e2d..3fc90c8d5 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -55,6 +55,8 @@ $thermo_humidity = new Insteon::Thermo_humidity($thermostat);
 $thermo_setpoint_h = new Insteon::Thermo_setpoint_h($thermostat);
 $thermo_setpoint_c = new Insteon::Thermo_setpoint_c($thermostat);
 
+where $thermostat is the parent object to track.
+
 see code/examples/Insteon_thermostat.pl for more.
 
 =head1 BUGS
@@ -522,7 +524,7 @@ sub init {
 
 sub sync_links{
 	my ($self, $audit_mode, $callback, $failure_callback) = @_;
-	if !($audit_mode){
+	if (!$audit_mode){
 		#Make sure thermostat is set to broadcast changes
 		::print_log("[Insteon::Thermo_i2] (sync_links) Enabling thermostat broadcast setting.") unless $audit_mode;
 		my $extra = "000008000000000000000000000000";

From 30547d6be6845cf01dee6a6e8bc62756c520d04f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 27 May 2013 18:56:03 -0700
Subject: [PATCH 066/330] Insteon_Thermostat: Cleanup Instructions, Make Print
 Log More Clear, Force Temperature to a Whole Number

---
 lib/Insteon/Thermostat.pm | 42 +++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 3fc90c8d5..9ada5af49 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -35,7 +35,8 @@ And, you can set the temperature and mode at will...
       $thermostat->cool_setpoint(89);
    }
 
-All of the states that may be set:
+All of the states of the parent object that may be set by MH, you can use tie_event
+to link specific actions to these states:
    temp_change: Inside temperature changed 
       (call get_temp() to get value)
    heat_sp_change: Heat setpoint was changed
@@ -61,11 +62,8 @@ see code/examples/Insteon_thermostat.pl for more.
 
 =head1 BUGS
 
-Initial code for Venstar thermostats, which use Insteon engine version i1, only
-provided basic features.  The new Insteon 2441TH thermostats use the i2cs engine
-and only allow the polling, but not setting, of the thermostat attributes using
-i2 code.  As such, I am unable to test or provide enhancements to certain i1 
-only aspects.
+This code has not been tested on older Venstar thermsotats, however it is believed
+that the basic functionality should work as it did in the old code.
 
 =head1 AUTHOR
 
@@ -74,13 +72,14 @@ Gregg Liming <gregg@limings.net>
 Brian Warren <brian@7811.net>
 
 Enhanced to i2 by:
-Kevin Rober Keegan <kevin@krkeegan.com>
+Kevin Robert Keegan <kevin@krkeegan.com>
 
 =head1 TODO
 
- - Manage aldb - should be able to adjust setpoints based on plm scene. <- may be overkill
- - Add ability to link devices to the I2 Thermostat groups 1-4
- - Add ability to link other devices to the broadcast group.
+ - Enable Linking of the Thermostat as a Responder - The current design of MH 
+   will not create valid links when the thermostat is the responder.  To enable
+   this function, a reorganization of the add_link and update_link code at the
+   BaseObject level needs to be performed.
 
 =head1 INHERITS
 
@@ -613,32 +612,32 @@ sub _process_message {
 	}
 	elsif ($msg{command} eq "status_temp" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		main::print_log("[Insteon::Thermo_i2] Received Status Temp Message ".
-			"for ". $self->get_object_name) if $main::Debug{insteon};	
+		main::print_log("[Insteon::Thermo_i2] Received Temp Change Message ".
+			"from ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->hex_short_temp($msg{extra});
 	}
 	elsif ($msg{command} eq "status_mode" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		main::print_log("[Insteon::Thermo_i2] Received Status Mode Message ".
-			"for ". $self->get_object_name) if $main::Debug{insteon};	
+		main::print_log("[Insteon::Thermo_i2] Received Mode Change Message ".
+			"from ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->status_mode($msg{extra});
 	}
 	elsif ($msg{command} eq "status_cool" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		main::print_log("[Insteon::Thermo_i2] Received Status Cool Message ".
-			"for ". $self->get_object_name) if $main::Debug{insteon};	
+		main::print_log("[Insteon::Thermo_i2] Received Cool Setpoint Change Message ".
+			"from ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->hex_cool($msg{extra});
 	}
 	elsif ($msg{command} eq "status_humid" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		main::print_log("[Insteon::Thermo_i2] Received Status Humid Message ".
-			"for ". $self->get_object_name) if $main::Debug{insteon};	
+		main::print_log("[Insteon::Thermo_i2] Received Humidity Change Message ".
+			"from ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->hex_humid($msg{extra});
 	}
 	elsif ($msg{command} eq "status_heat" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		main::print_log("[Insteon::Thermo_i2] Received Status Heat Message ".
-			"for ". $self->get_object_name) if $main::Debug{insteon};	
+		main::print_log("[Insteon::Thermo_i2] Received Heat Setpoint Change Message ".
+			"from ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->hex_heat($msg{extra});
 	}
 	else {
@@ -724,7 +723,8 @@ sub hex_long_temp{
 	my $temp_cel = (hex($hex_temp)/10);
 	## ATM I am going to assume farenheit b/c that is what I have
 	# in future, can pull setting bit from thermometer
-	$$self{temp} = (($temp_cel*9)/5 +32);
+	# Extra .5 since sprintf doesn't round
+	$$self{temp} = sprintf("%d", (($temp_cel*9)/5 +32 +.5)); 
 	$self->set_receive('temp_change');
 }
 

From 1f42c65a70ea6a305a877fbc491c1e09b90eab51 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 27 May 2013 18:57:55 -0700
Subject: [PATCH 067/330] Insteon_Thermo: Add support for Groups 2-4, Add
 Status Child

Groups 1-4 of the i2 devices report on/off events for cooling, heating, high humidity, and low humidity.  Insteon objects can be linked to these events.  e.g. Turn on a fan when the humidity is high.

In addition, a new status child has been added.  It provides a simple text of the current status of the HVAC system.
---
 lib/Insteon/Thermostat.pm | 186 +++++++++++++++++++++++++++++++++++---
 1 file changed, 175 insertions(+), 11 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 9ada5af49..553a05cca 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -9,10 +9,30 @@ Enables support for an Insteon Thermostat.
 =head1 SYNOPSIS
 
 In user code:
+
 	$thermostat = new Insteon_Thermostat($myPLM, '12.34.56');
+	
+Additional i2 specific objects:
+	
+	$thermostat_heating = new Insteon_Thermostat($myPLM, '12.34.56:02');
+	$thermostat_high_humid = new Insteon_Thermostat($myPLM, '12.34.56:03');
+	$thermostat_low_humid = new Insteon_Thermostat($myPLM, '12.34.56:04');
+	$thermostat_broadcast = new Insteon_Thermostat($myPLM, '12.34.56:EF');
+
+These devices will not have any states, but are only used for linking purposes.
 
 In items.mht:
+
 	INSTEON_THERMOSTAT, 12.34.56, thermostat, HVAC
+	
+Additional i2 specific objects:
+	
+	INSTEON_THERMOSTAT, 12.34.56:02, thermostat_heating, HVAC
+	INSTEON_THERMOSTAT, 12.34.56:03, thermostat_high_humid, HVAC
+	INSTEON_THERMOSTAT, 12.34.56:04, thermostat_low_humid, HVAC
+	INSTEON_THERMOSTAT, 12.34.56:EF, thermostat_broadcast, HVAC
+
+These devices will not have any states, but are only used for linking purposes.
 
 Poll for temperature changes.
 
@@ -47,16 +67,60 @@ to link specific actions to these states:
       (call get_mode() to get value).
    fan_mode_change: Fan mode changed
       (call get_fan_mode() to get value).
-
-Child objects which track the states of the thermostat can be created:
-$thermo_temp = new Insteon::Thermo_temp($thermostat);
-$thermo_fan = new Insteon::Thermo_fan($thermostat);
-$thermo_mode = new Insteon::Thermo_mode($thermostat);
-$thermo_humidity = new Insteon::Thermo_humidity($thermostat);
-$thermo_setpoint_h = new Insteon::Thermo_setpoint_h($thermostat);
-$thermo_setpoint_c = new Insteon::Thermo_setpoint_c($thermostat);
-
-where $thermostat is the parent object to track.
+   status_change: Heating, Cooling, Dehumidifying, or Humidifying change (i2 only)
+      (call get_status() to get status).
+
+I2 Broadcast messages:
+
+If a group EF device is defined, MH will receive broadcast changes from the 
+thermostat.  When enabled, broadcast messages for changes in setpoint, mode,
+temp, and humidity will be sent to MH.  When enabled, there is no reason to 
+poll the thermostat, except for possibly at reboot.  To enable simply define
+the EF group as described above and run sync links.
+
+Broadcast messages are NOT sent when the heater turns on/off.  Broadcast
+message are also NOT sent when the humidity setpoints are exceeded.  Instead,
+you must define the heating, high_humdid, and _low_humid groups and link them
+to MH.  (The base group 01 is the cooling group and should always be linked to
+MH).  When linked, these groups will send on/off commands to MH when these events
+occur.  Alternatively, you can periodically call the poll_simple method to check 
+the status of these attributes.
+
+Linking:
+
+I am not sure how or if the i1 device can be linked to other devices.
+
+I2 devices have 5 controllers, groups 01-04 plus the broadcast group EF.  At the
+moment, MH only supports using the thermostat as a controller of another device.
+To control another device, simply define it as a scene member of the desired 
+thermostat group.  The groups are:
+
+	01 - Cooling - Will send an ON/OFF command when the A/C is turned on/off.
+	02 - Heating - Will send an ON/OFF command when the heater is turned on/off.
+	03 - Humid High - Will send an ON/OFF command when the humidity exceeds the 
+	humid high setpoint.
+	04 - Humid Low - Will send an ON/OFF command when the humidity falls below the 
+	humid low setpoint.
+	EF - Broadcast - Other than MH, I do not know if any other device can 
+	respond to these commands.
+
+Tracking Child Objects:
+
+For both, i1 and i2 devices, optional child objects which track the states of the 
+thermostat can be created in user code:
+	
+   $thermo_temp = new Insteon::Thermo_temp($thermostat);
+   $thermo_fan = new Insteon::Thermo_fan($thermostat);
+   $thermo_mode = new Insteon::Thermo_mode($thermostat);
+   $thermo_setpoint_h = new Insteon::Thermo_setpoint_h($thermostat);
+   $thermo_setpoint_c = new Insteon::Thermo_setpoint_c($thermostat);
+   $thermo_humidity = new Insteon::Thermo_humidity($thermostat);  #Only available on i2 devices
+   $thermo_status = new Insteon::Thermo_status($thermostat);  #Only available on i2 devices
+
+where $thermostat is the parent object to track.  The state of these child objects
+will be the state of the various objects.  This makes the display of the various
+states easier within MH.  The child objects also make it easier to change the 
+various states on the thermostat.
 
 see code/examples/Insteon_thermostat.pl for more.
 
@@ -392,6 +456,9 @@ sub parent_event {
 	elsif ($p_state eq 'humid_change'){
 		$$self{child_humidity}->set_receive($$self{humid}, $self);
 	}
+	elsif ($p_state eq 'status_change'){
+		$$self{child_status}->set_receive($self->get_status(), $self);
+	}
 }
 
 # Overload methods we don't use, but would otherwise cause Insteon traffic.
@@ -501,7 +568,7 @@ sub init {
 	my ($self) = @_;
 	$$self{message_types} = \%message_types;
 	#Set saved state unique to i2 devices
-	$self->restore_data('humid');
+	$self->restore_data('humid', 'cooling', 'heating', 'high_humid', 'low_humid');
 	
 	# Create the broadcast dummy item
 	# This may not belong here.  Maybe this should go into read table A?
@@ -521,6 +588,33 @@ sub init {
 	$$self{bcast_item}->{object_name} = '$' . $self->get_object_name ."{bcast_item}";
 }
 
+sub set {
+	my ($self, $p_state, $p_setby, $p_respond) = @_;
+	my $root = $self->get_root();
+	if (!(ref $p_setby) || !($p_setby->equals($self))) {
+		::print_log("[Insteon::Thermo_i2] Sorry, you cannot control the ".
+			"thermostat in this manner.  Please read the documentation ".
+			"for Insteon::Thermostat for help.");
+		return;
+	}
+	#Update the root object state
+	my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
+	if ($self->group eq '01'){
+		$root->_cooling($link_state);
+	} 
+	elsif ($self->group eq '02') {
+		$root->_heating($link_state);
+	}
+	elsif ($self->group eq '03') {
+		$root->_high_humid($link_state);
+	}
+	elsif ($self->group eq '04') {
+		$root->_low_humid($link_state);
+	}
+	#Update the status of linked devices
+	$self->set_linked_devices($link_state);
+}
+
 sub sync_links{
 	my ($self, $audit_mode, $callback, $failure_callback) = @_;
 	if (!$audit_mode){
@@ -548,6 +642,25 @@ sub poll_simple{
 	$self->_send_cmd($message);
 }
 
+=item C<get_status()>
+
+Returns a text string describing the current status of the thermostat. May include
+a combination of "Heating; Cooling; Dehumidifying; Humidifying; or Off." Only
+available for I2 devices.
+
+=cut
+sub get_status() {
+	my ($self) = @_;
+	my $root = $self->get_root();
+	my $output = "";
+	$output .= "Heating, " if ($$root{heating} eq 'on');
+	$output .= "Cooling, " if ($$root{cooling} eq 'on');
+	$output .= "Dehumidifying, " if ($$root{high_humid} eq 'on');
+	$output .= "Humidifying" if ($$root{low_humid} eq 'on');
+	$output = 'Off' if ($output eq '');
+	return $output;
+}
+
 sub _process_message {
 	my ($self,$p_setby,%msg) = @_;
 	my $clear_message = 0;
@@ -736,6 +849,8 @@ sub hex_short_temp{
 
 sub hex_status{
 	### Not sure about this one yet, was 80 when set to auto but no activity
+	## need to call _cooling, _heating, _high_humid, and _low_humid when 
+	## figured out
 }
 
 sub hex_heat{
@@ -752,6 +867,34 @@ sub _humid {
 	return $$self{humid};
 }
 
+sub _cooling {
+	my ($self,$p_state) = @_;
+	$$self{cooling} = $p_state;
+	$self->set_receive('status_change');
+	return $$self{cooling};
+}
+
+sub _heating {
+	my ($self,$p_state) = @_;
+	$$self{heating} = $p_state;
+	$self->set_receive('status_change');
+	return $$self{heating};
+}
+
+sub _high_humid {
+	my ($self,$p_state) = @_;
+	$$self{high_humid} = $p_state;
+	$self->set_receive('status_change');
+	return $$self{high_humid};
+}
+
+sub _low_humid {
+	my ($self,$p_state) = @_;
+	$$self{low_humid} = $p_state;
+	$self->set_receive('status_change');
+	return $$self{low_humid};
+}
+
 =item C<mode()>
 
 Sets system mode to argument: 'off', 'heat', 'cool', 'auto', 'program_heat', 
@@ -1012,6 +1155,27 @@ sub set_receive {
 	my ($self, $p_state) = @_;
 	$self->SUPER::set($p_state);
 }
+
+package Insteon::Thermo_status;
+use strict;
+
+@Insteon::Thermo_status::ISA = ('Generic_Item');
+
+sub new {
+	my ($class, $parent) = @_;
+	my $self = new Generic_Item();
+	bless $self, $class;
+	$$self{parent} = $parent;
+	$$self{parent}{child_status} = $self;
+	$$self{parent} -> tie_event ('$object->parent_event("$state")', "status_change");
+	return $self;
+}
+
+sub set_receive {
+	my ($self, $p_state) = @_;
+	$self->SUPER::set($p_state);
+}
+
 1;
 =back
 

From e42ae6c90e1f60c08f898738850b6caa1004316f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 27 May 2013 19:00:02 -0700
Subject: [PATCH 068/330] Insteon_Thermostat: Add support for setting the
 high_humidity setpoint

---
 lib/Insteon/Thermostat.pm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 553a05cca..8bee556e0 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -946,6 +946,25 @@ sub sync_time {
 	$self->poll_simple();
 }
 
+=item C<high_humid_setpoint()>
+
+Sets the high humidity setpoint.
+
+=cut
+sub high_humid_setpoint {
+	my ($self, $value) = @_;
+	main::print_log("[Insteon::Thermo_i2] Setting high humid setpoint -> $value") if $main::Debug{insteon};
+	if($value !~ /^\d+$/){
+		main::print_log("[Insteon::Thermostat] ERROR: Setpoint $value not numeric");
+		return;
+	}
+	my $extra = "00000B" . sprintf("%02x", $value);
+	$extra .= '0' x (30 - length $extra);
+	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+	$$self{_ext_set_get_action} = 'set';
+	$self->_send_cmd($message);
+}
+
 package Insteon::Thermo_i2_bcast;
 use strict;
 

From 849fd9de036fcb3b0b2a67d5a1a8d944195622dd Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 1 Jun 2013 15:34:38 -0700
Subject: [PATCH 069/330] Insteon_Thermoi2: Add Support for Humidity Setpoints

---
 lib/Insteon/Thermostat.pm | 66 +++++++++++++++++++++++++++++++++++----
 1 file changed, 60 insertions(+), 6 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 8bee556e0..489ef9a96 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -718,8 +718,27 @@ sub _process_message {
 				$$self{sync_time} = undef;
 				$self->_send_cmd($message);
 			}
-		} else {
-			main::print_log("[Insteon::Thermo_i2] WARN: Corrupt Extended "
+		} 
+		elsif (substr($msg{extra},0,8) eq "00000101") {
+			$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
+			#0 = 00				#14 = Cool SP 
+			#2 = 00				#16 = Heat SP
+			#4 = 01	Response		#18 = RF Offset
+			#6 = 01	Data Set 2		#20 = Energy Saving Setback
+			#8 = humid low			#22 = External TempOffset
+			#10 = humid high		#24 = 1 = Status Report Enabled
+			#12 = firmware			#26 = 1 = External Power On
+							#28 = 1 = Int, 2=Ext Temp
+			main::print_log("[Insteon::Thermo_i2] Humidity setpoints for ".
+				$self->get_object_name . " are High: " .
+				$self->_high_humid(hex(substr($msg{extra}, 8, 2))) .
+				" Low: " . $self->_low_humid(hex(substr($msg{extra}, 10, 2)))
+				) if $main::Debug{insteon};
+			$clear_message = 1;
+			$self->_process_command_stack(%msg);
+		}
+		else {
+			main::print_log("[Insteon::Thermo_i2] WARN: Unknown Extended "
 				."Set/Get Data Received for ". $self->get_object_name) if $main::Debug{insteon};
 		}
 	}
@@ -881,17 +900,20 @@ sub _heating {
 	return $$self{heating};
 }
 
+
 sub _high_humid {
 	my ($self,$p_state) = @_;
-	$$self{high_humid} = $p_state;
-	$self->set_receive('status_change');
+	if ($p_state ne $$self{high_humid}) {
+		$$self{high_humid} = $p_state;
+	}
 	return $$self{high_humid};
 }
 
 sub _low_humid {
 	my ($self,$p_state) = @_;
-	$$self{low_humid} = $p_state;
-	$self->set_receive('status_change');
+	if ($p_state ne $$self{low_humid}) {
+		$$self{low_humid} = $p_state;
+	}
 	return $$self{low_humid};
 }
 
@@ -965,6 +987,38 @@ sub high_humid_setpoint {
 	$self->_send_cmd($message);
 }
 
+=item C<low_humid_setpoint()>
+
+Sets the low humidity setpoint.
+
+=cut
+sub low_humid_setpoint {
+	my ($self, $value) = @_;
+	main::print_log("[Insteon::Thermo_i2] Setting low humid setpoint -> $value") if $main::Debug{insteon};
+	if($value !~ /^\d+$/){
+		main::print_log("[Insteon::Thermostat] ERROR: Setpoint $value not numeric");
+		return;
+	}
+	my $extra = "00000C" . sprintf("%02x", $value);
+	$extra .= '0' x (30 - length $extra);
+	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+	$$self{_ext_set_get_action} = 'set';
+	$self->_send_cmd($message);
+}
+
+=item C<get_humid_setpoints()>
+
+Retreives and prints the current humidity high and low setpoints.  Only available for I2 devices.
+=cut
+sub get_humid_setpoints{
+	my ($self) = @_;
+	my $extra = "00000001";
+	$extra .= '0' x (30 - length $extra);
+	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+	$$self{_ext_set_get_action} = 'get';
+	$self->_send_cmd($message);
+}
+
 package Insteon::Thermo_i2_bcast;
 use strict;
 

From 54b0beb6a69aed48c34c65af34d9f63551edbd7e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 1 Jun 2013 15:45:43 -0700
Subject: [PATCH 070/330] Insteon_Thermoi2: Elevate Broadcast Item to a Full
 Fledged Object

There is a possibility that a user may define a link to the EF group.

If a broadcast object is defined, sync_links will automatically enable the broadcast setting.
---
 lib/Insteon/Thermostat.pm | 37 +++----------------------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 489ef9a96..647fb1f35 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -569,23 +569,6 @@ sub init {
 	$$self{message_types} = \%message_types;
 	#Set saved state unique to i2 devices
 	$self->restore_data('humid', 'cooling', 'heating', 'high_humid', 'low_humid');
-	
-	# Create the broadcast dummy item
-	# This may not belong here.  Maybe this should go into read table A?
-	# Otherwise, users cannot define insteon scenes containing this device.
-	# While rare a thermostat may be set to provide broadcast updates to
-	# another device
-	my $dev_id = $self->device_id();
-	$dev_id =~ /(\w\w)(\w\w)(\w\w)/;
-	$dev_id = "$1.$2.$3";
-	$$self{bcast_item} = new Insteon::Thermo_i2_bcast("$dev_id".':EF');
-
-	# Add bcast object to list of Insteon objects
-	Insteon::add($$self{bcast_item});
-
-	# Register bcast object with MH
-	&main::register_object_by_name('$' . $self->get_object_name ."{bcast_item}",$$self{bcast_item});
-	$$self{bcast_item}->{object_name} = '$' . $self->get_object_name ."{bcast_item}";
 }
 
 sub set {
@@ -617,7 +600,9 @@ sub set {
 
 sub sync_links{
 	my ($self, $audit_mode, $callback, $failure_callback) = @_;
-	if (!$audit_mode){
+	my $dev_id = $self->device_id();
+	my $bcast_obj = Insteon::get_object($self->device_id(), 'EF');
+	if (!$audit_mode && ref $bcast_obj){
 		#Make sure thermostat is set to broadcast changes
 		::print_log("[Insteon::Thermo_i2] (sync_links) Enabling thermostat broadcast setting.") unless $audit_mode;
 		my $extra = "000008000000000000000000000000";
@@ -1019,22 +1004,6 @@ sub get_humid_setpoints{
 	$self->_send_cmd($message);
 }
 
-package Insteon::Thermo_i2_bcast;
-use strict;
-
-@Insteon::Thermo_i2_bcast::ISA = ('Insteon::BaseDevice', 'Insteon::DeviceController');
-
-###This is basically a dummy object, it is designed to allow a link from group
-###EF to be added as part of sync links.  Group EF is the broadcast group used
-###by the 2441th thermostat to announce changes.
-
-sub new {
-   my ($class, $p_deviceid) = @_;
-   my $self = new Insteon::BaseDevice($p_deviceid);
-   bless $self, $class;
-   return $self;
-}
-
 package Insteon::Thermo_mode;
 use strict;
 

From 9aced81c21d2c30803e8c5da920c1b99af9ff2dc Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 1 Jun 2013 18:07:46 -0700
Subject: [PATCH 071/330] Insteon_Thermoi2: Only send Broadcast Request Once

---
 lib/Insteon/Thermostat.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 647fb1f35..4992f0954 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -602,7 +602,7 @@ sub sync_links{
 	my ($self, $audit_mode, $callback, $failure_callback) = @_;
 	my $dev_id = $self->device_id();
 	my $bcast_obj = Insteon::get_object($self->device_id(), 'EF');
-	if (!$audit_mode && ref $bcast_obj){
+	if (!$audit_mode && ref $bcast_obj && $self->is_root){
 		#Make sure thermostat is set to broadcast changes
 		::print_log("[Insteon::Thermo_i2] (sync_links) Enabling thermostat broadcast setting.") unless $audit_mode;
 		my $extra = "000008000000000000000000000000";

From 61102b2e8536f1f3c04517368a902c07765a1923 Mon Sep 17 00:00:00 2001
From: Eloy Paris <peloy@chapus.net>
Date: Mon, 3 Jun 2013 12:26:53 -0400
Subject: [PATCH 072/330] Fix issues with INSTEON lights in web interface

INSTEON lights are treated differently in the web interface versus X10
lights, for example: they get different icons, and cannot be dimmed or
brightened. This patch does the following:

- Use the same light icons for INSTEON lights that are used for X10
lights.

- Allow dimming/brightening of INSTEON lights by clicking on the left
or right side of the icon in the web interface (only dimmable light, of
course).

- Fix a logic error that prevents disabling the button image cache. Ran
into this while creating new icons for my web interface.

- As an experimental "feature", and a small delay to try to give MH a
chance to receive the new state of an INSTEON device changed through the
web interface. This will allow the correct state to be displayed when
the web page renders again. Disabled by default since it's just a hack
(though it works good enough for me).

Comments welcome.
---
 web/bin/button.pl        | 43 ++++++++++++++++++++----------
 web/bin/button_action.pl | 56 +++++++++++++++++++++++++++++++---------
 2 files changed, 73 insertions(+), 26 deletions(-)

diff --git a/web/bin/button.pl b/web/bin/button.pl
index 2d779d090..9654b07b7 100644
--- a/web/bin/button.pl
+++ b/web/bin/button.pl
@@ -1,10 +1,15 @@
+#
+# Create buttons with JPEG images generated on-the-fly using the GD module.
+#
+# For text buttons:  <img src="/bin/button.pl?<text you want>" border="0">
+#     Example: <img src="/bin/button.pl?Close%20Garage%20Door" border="0">
+#
+# For item buttons:  <img src="/bin/button.pl?<item_name>&item&<item_state>" border="0">
+#     Example: <img src="/bin/button.pl?$breakfast_nook_light&item&off" border="0">
+#
 
 $^W = 0;                        # Avoid redefined sub msgs
 
-# Create jpeg buttons on-the-fly with GD module
-# For text buttons:  <img src="/bin/button.pl?text you want" border="0">
-# For item buttons:  <img src="/bin/button.pl?item_name&item&item_state" border="0">
-
 # Authority: anyone
 
 my ($text, $type, $state, $bg_color, $file_name_only) = @ARGV;
@@ -29,10 +34,14 @@
 $image_file =~ s/ /_/g;           # Blanks in file names are nasty
 $image_file = "/cache/$image_file.jpg";
 
-
+# Set to 1 if you'd like to disable the image cache. Normally you should
+# not need to do this because it affects performance (MisterHouse needs
+# to re-generate the button image every time). This is only useful if you
+# are tweaking your button images and need new images re-generated every
+# time the button generation script (this script) is called.
 my $nocache = 0;
-#$nocache = 1;
-if (-e "$config_parms{data_dir}$image_file" or $nocache) {
+
+if (-e "$config_parms{data_dir}$image_file" && !$nocache) {
     return $image_file if $file_name_only;
 #   print "Returning data from: $image_file\n";
     my $data = file_read "$config_parms{data_dir}$image_file";
@@ -41,21 +50,27 @@
 
                                 # Look for an icon
 my ($icon, $light);
+
 if ($type eq 'item') {
     my $object = &get_object_by_name($text);
     ($icon) = &http_get_local_file(&html_find_icon_image($object, 'voice'));
-#   $light = 1 if $text =~ /light/i or $text =~ /lite/i;
-    $light = 1 if $object->isa('X10_Item') and !$object->isa('X10_Appliance');
-    $light = 1 if $object->isa('EIB2_Item');
-}
-else {
-# Uncomment this to put in images into group, category icons.  Seem too small to be useful.
-#   ($icon) = &http_get_local_file(&html_find_icon_image($text, 'text'));
+
+    if ( ($object->isa('X10_Item') and !$object->isa('X10_Appliance') )
+	|| $object->isa('Insteon::BaseLight')
+	|| $object->isa('EIB2_Item')
+	|| $text =~ /light|lite/i) {
+	$light = 1;
+    }
+} else {
+    # Uncomment this to put in images into group, category icons.  Seem too small to be useful.
+    #($icon) = &http_get_local_file(&html_find_icon_image($text, 'text'));
 }
+
 undef $icon if $icon and $icon !~ /.jpg$/i;  # GD does not do gifs :(
 my $image_icon = GD::Image->newFromJpeg($icon) if $icon;
 
 my $image;
+
 if ($image_icon or $type eq 'item') {
 
                        # Template = blank_on/off/unk or blank_light_on/off/dim
diff --git a/web/bin/button_action.pl b/web/bin/button_action.pl
index 4c6fddf78..3d635755c 100644
--- a/web/bin/button_action.pl
+++ b/web/bin/button_action.pl
@@ -10,30 +10,62 @@
 my ($state, $x, $y) = $state_xy =~ /(\S+)\?(\d+),(\d+)/;
 #print "db ln=$list_name, i=$item, s=$state_xy xy=$x,$y\n";
 
-                                # Do not dim the dishwasher :)
-unless (eval qq|$item->isa('X10_Appliance') or $item->isa('Fan_Motor') or $item->isa('Insteon_Device')|) {
-    $state = 'dim'      if $x < 40;   # Left  side of image
-    $state = 'brighten' if $x > 110;  # Right side of image
-}
+my $object = &get_object_by_name($item);
+
+if ($object->isa('X10_Item') && !$object->isa('X10_Appliance') ) {
+    # Do not dim the dishwasher :)
 
-if (eval qq|$item->isa('EIB7_Item')|) { # Motor/drive states are stop/up/down
+    # Dim if clicked on left side of image, brighten if clicked on right
+    # side of image, or use state passed through the button URL if clicked
+    # in the center of the image.
+    if ($x < 40) {
+	$state = 'dim';
+    } elsif ($x > 110) {
+	$state = 'brighten';
+    }
+} elsif ($object->isa('EIB7_Item') ) { # Motor/drive states are stop/up/down
     $state = 'stop';
     $state = 'down' if $x < 40;         # Left  side of image
     $state = 'up' if $x > 110;          # Right side of image
-}
+} elsif ($object->isa('Insteon::DimmableLight') ) {
+    my @states = $object->get_states();
+    my $curr_state = $object->state();
 
-#if (eval qq|$item->isa('Insteon_Device'|) {
-#    $state = "toggle";
-#}
+    # Find the index into @states for the element that corresponds to the
+    # current state.
+    my ($index) = grep { $states[$_] eq $curr_state } 0..$#states;
 
-eval qq|$item->set("$state", 'web')|;
-print "button_action.pl eval error: $@\n" if $@;
+    # Dim if clicked on left side of image, brighten if clicked on right
+    # side of image, or use state passed through the button URL if clicked
+    # in the center of the image.
+    if ($x < 40) {
+	$index-- if ($index); # Can't dim if light is off
+	$state = $states[$index];
+    } elsif ($x > 110) {
+	$index++ if ($index != $#states); # Can't brighten if light is fully on
+	$state = $states[$index];
+    }
+}
+
+$object->set("$state", 'web');
 
 #   print "dbx4a i=$item s=$state\n";
 #   my $object = &get_object_by_name($item);
 #   $state =   $$object{state};
 #   print "dbx4b i=$item s=$state\n";
 
+# Internal state of INSTEON devices does not change immediately after
+# clicking on the button. That is because, unlike X10 devices (for example),
+# an acknowledgement from the INSTEON device needs to be received so MH
+# can change the internal state. If we finish the HTTP transaction before
+# the acknowledge comes back then the resulting HTML page will display the
+# object that was just clicked on in the old state. This delay here prevents
+# this problem at the expense of, well, an extra delay. As this is
+# experimental, and this delay causes MH to pause for the duration of the
+# delay, this is currently disabled by default. But feel free to enable
+# to see if things improve.
+#sleep(1);
 
 my $h = &referer("/bin/list_buttons.pl?$list_name");
+
 return &http_redirect($h);

From b462b10b1de81b66ec38bf34615def709b33d1e5 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 6 Jun 2013 21:12:22 -0700
Subject: [PATCH 073/330] Insteon: Change "initiate linking as controller"
 Group to 00

I was having issues where some sort of corruption within the PLM was causing it to send messages to the 01 group, very annoying.

HouseLinc uses 00, plus the insteon documents seem to envision that 01 is a valid group that could be used for other purposes.

Group 01 links will not be deleted by delete_orphans to prevent causing issues for other users.
---
 lib/Insteon/AllLinkDatabase.pm | 12 ++++++------
 lib/Insteon_PLM.pm             |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 52cdea2c0..de0283a64 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -464,10 +464,10 @@ sub delete_orphan_links
 					}
                                         else
                                         {    # no corresponding PLM link found in items.mht
-						if ($group eq '01') {
-							#ignore manual responder link to PLM group 01 required for I2CS devices
+						if ($group eq '01' || $group eq '00') {
+							#ignore manual responder link to PLM group 01 or 00 required for I2CS devices
 							main::print_log("[Insteon::AllLinkDatabase] DEBUG2 Ignoring orphan responder link from "
-								. $selfname . " to PLM for group 01") if $main::Debug{insteon} >= 2;
+								. $selfname . " to PLM for group 01 or 00") if $main::Debug{insteon} >= 2;
 						}
 						elsif ($audit_mode)
                                                 {
@@ -2398,9 +2398,9 @@ sub delete_orphan_links
 				if (!($link))
                                 {
 					# a reference in the PLM's linktable does not match a scene member target
-					if ($group eq '01') {
-						#ignore manual controller link from PLM group 01 to device required for I2CS devices
-						main::print_log("[Insteon::ALDB_PLM] DEBUG2 Ignoring orphan PLM controller(01) link to "
+					if ($group eq '01' || $group eq '00') {
+						#ignore manual controller link from PLM group 01 or 00 to device required for I2CS devices
+						main::print_log("[Insteon::ALDB_PLM] DEBUG2 Ignoring orphan PLM controller(01 or 00) link to "
 							. $device->get_object_name() ) if $main::Debug{insteon} >= 2;
 					}
 					elsif ($audit_mode)
diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index db50f4a0e..07f674476 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -240,7 +240,7 @@ sub initiate_linking_as_controller
 {
 	my ($self, $group) = @_;
 
-	$group = '01' unless $group;
+	$group = '00' unless $group;
 	# set up the PLM as the responder
 	my $cmd = '01'; # controller code
 	$cmd .= $group; # WARN - must be 2 digits and in hex!!

From e654e93c7c167d5f4efe0fc626683452ca3a4151 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 7 Jun 2013 17:45:25 -0700
Subject: [PATCH 074/330] Insteon_Thermo: Catch Status Request Responses

Catch and process status request responses before processing unique _process_message commands.
---
 lib/Insteon/Thermostat.pm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 4992f0954..251ceb2ff 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -406,7 +406,14 @@ sub _process_message
 {
 	my ($self,$p_setby,%msg) = @_;
 	my $clear_message = 0;
-	if ($msg{command} eq "thermostat_setpoint_cool" && $msg{is_ack}){
+	my $pending_cmd = ($$self{_prior_msg}) ? $$self{_prior_msg}->command : $msg{command};
+	my $ack_setby = (ref $$self{m_status_request_pending}) ? $$self{m_status_request_pending} : $p_setby;
+	if ($msg{is_ack} && $self->_is_info_request($pending_cmd,$ack_setby,%msg)) {
+		$clear_message = 1;
+		$$self{m_status_request_pending} = 0;
+		$self->_process_command_stack(%msg);
+	}
+	elsif ($msg{command} eq "thermostat_setpoint_cool" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermostat] Received ACK of cool setpoint ".
 			"for ". $self->get_object_name) if $main::Debug{insteon};	
@@ -649,7 +656,14 @@ sub get_status() {
 sub _process_message {
 	my ($self,$p_setby,%msg) = @_;
 	my $clear_message = 0;
-	if ($msg{command} eq "extended_set_get" && $msg{is_ack}){
+	my $pending_cmd = ($$self{_prior_msg}) ? $$self{_prior_msg}->command : $msg{command};
+	my $ack_setby = (ref $$self{m_status_request_pending}) ? $$self{m_status_request_pending} : $p_setby;
+	if ($msg{is_ack} && $self->_is_info_request($pending_cmd,$ack_setby,%msg)) {
+		$clear_message = 1;
+		$$self{m_status_request_pending} = 0;
+		$self->_process_command_stack(%msg);
+	}
+	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
 		main::print_log("[Insteon::Thermo_i2] Extended Set/Get ACK Received for " . $self->get_object_name) if $main::Debug{insteon};

From 9a9b53626f3e70df726f0305282a1d0e86add8d0 Mon Sep 17 00:00:00 2001
From: Michael Stovenour <michael@stovenour.net>
Date: Sat, 15 Jun 2013 09:46:42 -0500
Subject: [PATCH 075/330] Modified hop count tracking to use running average
 vs. max

In addition to the running average implementation, this update also
provides a few slight performance optimizations.  One of the primary
advantages to this algorythm is that it does not need to loop over
then entire array for each hop count update.  Also enhanced log_aldb_status
a bit to include the device name.
---
 lib/Insteon/BaseInsteon.pm | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index a0d50044c..924502cbe 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -156,18 +156,24 @@ sub group
 sub default_hop_count
 {
 	my ($self, $hop_count) = @_;
-	unshift(@{$$self{hop_array}}, $$self{default_hop_count}) if (!defined(@{$$self{hop_array}}));
 	if (defined($hop_count)){
 		::print_log("[Insteon::BaseObject] DEBUG3: Adding hop count of " . $hop_count . " to hop_array of "
 			. $self->get_object_name) if $main::Debug{insteon} >= 3;
-		unshift(@{$$self{hop_array}}, $hop_count) 
-	}
-	pop(@{$$self{hop_array}}) if (scalar(@{$$self{hop_array}}) >20);
-	my $high = 0;
-	foreach (@{$$self{hop_array}}){
-		$high = $_ if ($high < $_);;
+		if (!defined(@{$$self{hop_array}})) {
+			unshift(@{$$self{hop_array}}, $$self{default_hop_count});
+			$$self{hop_sum} = $$self{default_hop_count};
+		}
+		#Calculate a simple moving average
+		unshift(@{$$self{hop_array}}, $hop_count); 
+		$$self{hop_sum} += ${$$self{hop_array}}[0];
+		$$self{hop_sum} -= pop(@{$$self{hop_array}}) if (scalar(@{$$self{hop_array}}) >20);
+		$$self{default_hop_count} = int(($$self{hop_sum} / scalar(@{$$self{hop_array}})) + 0.5);
+
+		::print_log("[Insteon::BaseObject] DEBUG4: ".$self->get_object_name
+			."->default_hop_count()=".$$self{default_hop_count}
+			." :: hop_array[]=". join("",@{$$self{hop_array}})) 
+			if $main::Debug{insteon} >= 4;
 	}
-	$$self{default_hop_count} = $high;
         return $$self{default_hop_count};
 }
 
@@ -1239,7 +1245,8 @@ sub scan_link_table
 sub log_aldb_status
 {
 	my ($self) = @_;
-	main::print_log( "     Hop Count: ".$self->default_hop_count());
+	main::print_log( "     Device ID: ".$self->device_id());
+	main::print_log( "     Hop Count: ".$self->default_hop_count()." :: [". join("",@{$$self{hop_array}})."]");
 	main::print_log( "Engine Version: ".$self->engine_version());
 	my $aldb = $self->get_root()->_aldb;
 	if ($aldb)

From 10dd42701633e96f463cddaf3a6490cf9273079c Mon Sep 17 00:00:00 2001
From: Michael Stovenour <michael@stovenour.net>
Date: Wed, 26 Jun 2013 12:11:32 -0500
Subject: [PATCH 076/330] Fix issue #224. WeatherBug - Mixed case city search
 corrections

Removed debug flag override; was unable to effectively set debug from .ini or web interface
Eliminated lowercase conversion of city name
Modified forecast city search API call to use lowercase
Modified forecast city match to ignore case
Added additional debug logging for forecase city match
---
 code/common/weather_weatherbug.pl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/common/weather_weatherbug.pl b/code/common/weather_weatherbug.pl
index 6ec5be5bd..e2013d8f9 100755
--- a/code/common/weather_weatherbug.pl
+++ b/code/common/weather_weatherbug.pl
@@ -45,10 +45,9 @@
 # -----------------------------------------------------------------------
 # noloop=start
 	use Weather_Common;
-	$Debug{weatherbug} =0;
 # Define config parameters
 # add variables for the weatherbug feed
-	my $weatherbug_city=lc($config_parms{weather_weatherbug_city});
+	my $weatherbug_city=$config_parms{weather_weatherbug_city};
 	my $weatherbug_state=lc($config_parms{weather_weatherbug_state});
 	my $weatherbug_country=lc($config_parms{weather_weatherbug_country});
 	my $weatherbug_units= $config_parms{weather_weatherbug_units};
@@ -60,7 +59,7 @@
 # build the url from existing init variables if the values have been left blank
 	$weatherbug_state=uc($config_parms{state}) unless $weatherbug_state;
 	$weatherbug_country=uc($config_parms{country}) unless $weatherbug_country;
-	$weatherbug_city=lc($config_parms{city}) unless $weatherbug_city;
+	$weatherbug_city=$config_parms{city} unless $weatherbug_city;
 	$weatherbug_zipcode= $config_parms{zipcode} unless $weatherbug_zipcode;
 	$weatherbug_latitude= $config_parms{latitude} unless $weatherbug_latitude;
 	$weatherbug_longitude= $config_parms{longitude} unless $weatherbug_longitude;
@@ -84,7 +83,7 @@
 # Define the new process item that fetchs the RSS feed for the location
 	$p_weather_weatherbug_forecast =  new Process_Item(qq{get_url -quiet "$weatherbug_url" "$weatherbug_file"});
 # Need to add a process to search for the citycode
-	$weatherbug_url="http://api.wxbug.net/getLocationsXML.aspx?ACode=".$key."&searchString=".$weatherbug_city;
+	$weatherbug_url="http://api.wxbug.net/getLocationsXML.aspx?ACode=".$key."&searchString=".lc($weatherbug_city);
 	logit("$config_parms{data_dir}/web/weatherbug_debug",$weatherbug_url,13,0) if($Debug{weatherbug});
 # Define the new process item that fetchs the RSS feed for the location
 	$p_weather_weatherbug_citycode =  new Process_Item(qq{get_url -quiet "$weatherbug_url" "$weatherbug_file"});
@@ -425,10 +424,11 @@
 	# There should be a title for forecast in the text for the
 	# city if the fetch was successful
 	$Weather{weatherbug_fcst_valid} = 0; #Set to not valid unless proven
-	my $search_for = "Forecast for ".ucfirst($weatherbug_city);
+	my $search_for = "Forecast for $weatherbug_city";
 	my $title = $channel->first_child_text("title"); 
-	logit("$config_parms{data_dir}/web/weatherbug_debug",$search_for,13,0) if($Debug{weatherbug});
-	if ($title =~ /$search_for/ ) {
+	logit("$config_parms{data_dir}/web/weatherbug_debug","Search for: ".$search_for,13,0) if($Debug{weatherbug});
+	logit("$config_parms{data_dir}/web/weatherbug_debug","WeatherBug returned: $title",13,0) if($Debug{weatherbug});
+	if ($title =~ /$search_for/i ) {
 		$Weather{weatherbug_fcst_valid} = 1;
 	}
 	else {

From 39788ba96b3d63a51b2d8aa219995270169b7e18 Mon Sep 17 00:00:00 2001
From: Michael Stovenour <michael@stovenour.net>
Date: Wed, 26 Jun 2013 20:22:25 -0500
Subject: [PATCH 077/330] Fix issue #227.  Remove weather_aws.pl - serive is
 not longer available

Use weather_weatherbug.pl or internet_weather.pl as an alternative.
---
 code/common/weather_aws.pl | 317 -------------------------------------
 1 file changed, 317 deletions(-)
 delete mode 100644 code/common/weather_aws.pl

diff --git a/code/common/weather_aws.pl b/code/common/weather_aws.pl
deleted file mode 100644
index 606a3b46a..000000000
--- a/code/common/weather_aws.pl
+++ /dev/null
@@ -1,317 +0,0 @@
-# Category=Weather
-
-# $Date$
-# $Revision$
-
-#@ This code will retrieve and parse data from an AWS weather station via
-#@ their website.
-
-#@ Updated: 2008-01-16
-#@ The method for finding the station ID has changed:
-#@ Go to http://www.aws.com/aws_2001/broadcasters/asp/Online.asp and enter your zip code:  ie: 30005
-#@ It then brings up the following page:
-#@ http://weather.weatherbug.com/GA/Alpharetta-weather.html?zcode=z6169
-#@ View Source and search for stat=  (DNWDY is the station ID for my location)
-#@ The full URL that this code uses looks like: http://www.aws.com/full.asp?id=dnwdy
-#@ then add the id to the aws_id config parameter in your mh.ini or
-#@ mh.private.ini:<br><br>
-#@
-#@ aws_id = TMISC
-#@ aws_id = STATION1,STATION2,STATION3
-#@
-#@ As you can see, you can specify multiple stations.  The first station will
-#@ always be tried first.  If data is not available, the remaining stations
-#@ will be tried in order until we find good data.
-#@ <br><br>
-#@ The URL containing the ID of the TMISC AWS station is shown for example:
-#@ <a href="http://www.aws.com/aws_2001/asp/obsForecast.asp?id=TMISC&obs=full">
-#@ http://www.aws.com/aws_2001/asp/obsForecast.asp?id=TMISC&obs=full</a>
-
-=begin comment
-
- weather_aws.pl
- Created by Brian Rudy (brudyNO@SPAMpraecogito.com)
-
- This code will retrieve and parse data from an AWS weather station via
- AWS's website.
-
- Most AWS sites are k-12 schools and non profit organizations like museums.
- Most sites upload their data in real time to AWS whenever a request is
- made via a remote site. Be warned some sites only update their sensor data
- when their internet connection is up (usually during the school day).
-
- If you need real-time data, you should check the 'staleness' of the
- timestamp on the returned data from your selected site to make sure it's
- current and is being updated when you need the data.
-
-
- Revision History
-
- Version 1.3      January 23, 2003
- Bug fixes from Martin Dolphin (with help from Bruce) to support negative
- temperature, windchill and dewpoint values. Updated weather summary for
- status line.
-
- Version 1.2      October 26, 2002
- General code cleanup and compatability enhacements. Support for status_line.pl,
- seamless support for Bruce's weather_monitor.pl and weather_log.pl.
-
- Version 1.1b     October 1, 2002
- Added convert_direction_br as temporary workaround for weather_monitor.pl
- wind direction problem.
-
- Version 1.1      April 13, 2002
- Updated table depth per Ron Wright's suggestion.
-
- Version 1.0      December 13, 2000
- Complete re-write supporting MH 2.36's Weather_Item, and
- Bruce's weather_log.pl, and weather_monitor.pl.
- Added hooks to use as library.
-
- Version 0.2      September 20, 2000
- Updated $AWSWeatherURL to reflect change on AWS's web site.
-
- Version 0.1      September 14, 2000
- Yea, it works!
-
-=cut
-
-use HTML::TableExtract;
-use Weather_Common;
-
-# noloop=start
-my $aws_ids=$config_parms{aws_id};
-$aws_ids='TMISC' unless $aws_ids;
-$aws_ids=~s/\s//g;
-my @AWS_IDs = split(/,/,$aws_ids);
-$p_awsweather_page = new Process_Item;
-my $AWS_ID_index=0;
-&set_aws_index($AWS_ID_index);
-
-my $prev_timestamp;
-my $AWSWeatherURL="http://www.aws.com/full.asp?id=";
-$v_get_aws_weather = new Voice_Cmd('Get AWS weather data');
-my $f_awsweather_html;
-
-# noloop=stop
-
-# These values aren't provided by this code, but leaving them undefined causes
-# problems with logging. Leave them commented out if you have external code to
-# fill them with usefull data.
-#$Weather{TempIndoor}  = 0.00;
-#$Weather{HumidIndoor} = 0.00;
-
-# *** Conditions?, IsRaining?, etc.
-
-# Create trigger
-
-if ($Reload) {
-    &trigger_set("new_minute 5", "run_voice_cmd('Get AWS weather data')", 'NoExpire', 'get aws weather')
-      unless &trigger_get('get aws weather');
-}
-
-# Events
-
-sub set_aws_index {
-	($AWS_ID_index)=@_;
-
-	if ($AWS_ID_index > $#AWS_IDs) {
-		$AWS_ID_index = 0;
-	}
-	my $aws_id=$AWS_IDs[$AWS_ID_index];
-	$f_awsweather_html = "$config_parms{data_dir}/web/${aws_id}.html";
-	$p_awsweather_page->set(qq!get_url -quiet "${AWSWeatherURL}${aws_id}" "$f_awsweather_html"!);
-	return $AWS_ID_index;
-}
-
-if (said $v_get_aws_weather) {
-   if (&net_connect_check) {
-       $v_get_aws_weather->respond("app=weather Retrieving AWS weather...");
-       # always start at the 1st station
-       &set_aws_index(0);
-       # Use start instead of run so we can detect when it is done
-       start $p_awsweather_page;
-   } else {
-       $v_get_aws_weather->respond("I must be connected to the Internet to get weather data.");
-   }
-}
-
-# This would be far more efficient if AWS allowed access to
-# their SQL db. Might be time for a little reverse engineering...
-# *** More like a little XML... (if they have it, otherwise forget them.)
-if (done_now $p_awsweather_page) {
-
-  my $html = file_read $f_awsweather_html;
-  return unless $html;
-
-  if ($html =~ 'Temporarily Unavailable') {
-  	&print_log("weather_aws: info not available for station ".$AWS_IDs[$AWS_ID_index]);
-  	if (&set_aws_index($AWS_ID_index+1)) {
-  		&print_log("weather_aws: moving forward to next station: ".$AWS_IDs[$AWS_ID_index]);
-  		$p_awsweather_page->start;
-  	} else {
-  		&print_log("weather_aws: no more stations to use");
-	}
-	return;
-  }
-
-  # hash used to temporarily store weather info before selective load into %Weather
-  my %w=();
-
-  my $te = new HTML::TableExtract( depth => 2, count => 1, subtables => 1);
-
-  $te->parse($html);
-  my @cell = $te->rows;
-
-  # Timestamp of last sucessful data retrieval from internet node
-  $cell[0][0] =~ m/\s+(\d+)\/(\d+)\/(\d+) - (\d+):(\d+):(\d+) (\w+)/;
-  my $timestamp = "$1$2$3$4$5$6$7";
-  return unless $timestamp and $timestamp ne $prev_timestamp;
-  $prev_timestamp = $timestamp;
-  #print "Timestamp of last sucessfull data retrieval: $1\/$2\/$3 $4:$5:$6 $7\n";
-
-  $cell[1][1] =~ m/\s+(-?\d+).(\d+)/;
-  #print "Current temperature: ", join(".", $1, $2), "°F\n";
-  $w{TempOutdoor} = join(".", $1, $2);
-
-  #$cell[1][2] =~ m/\s+(\d+).(\d+) at\s+(\d+):(\d+)(\D+)\n\s+(\d+).(\d+) at\s+(\d+):(\d+)(\D+)\n/;
-  #print "Min temp: ", join(".", $1, $2), "°F at ", "$3:$4 $5\n";
-  #print "Max temp: ", join(".", $6, $7), "°F at ", "$8:$9 $10\n";
-
-  # Currently no way to determine if increasing or decreasing.
-  # Need to parse image name at the end of this cell to get it.
-  #$cell[1][3] =~ m/\s+(\d+).(\d+)/;
-  #print "Temperature hourly increase/decrease: ", join(".", $1, $2), "\n";
-
-  $cell[2][1] =~ m/\s+(\d+).(\d+)/;
-  #print "Current humidity: ", join(".", $1, $2), "\n";
-  $w{HumidOutdoor} = join(".", $1, $2);
-  $w{HumidOutdoorMeasured}=1; # tell Weather_Common that we directly measured humidity
-
-  #$cell[2][2] =~ m/\s+(\d+).(\d+) at\s+(\d+):(\d+)(\D+)\n\s+(\d+).(\d+) at\s+(\d+):(\d+)(\D+)\n/;
-  #print "Min humidity: ", join(".", $1, $2), "\% at ", "$3:$4 $5\n";
-  #print "Max humidity: ", join(".", $6, $7), "\% at ", "$8:$9 $10\n";
-
-  # Currently no way to determine if increasing or decreasing.
-  # Need to parse image name at the end of this cell to get it.
-  #$cell[2][3] =~ m/\s+(\d+).(\d+)/;
-  #print "Humidity hourly increase/decrease: ", join(".", $1, $2), "\n";
-
-  $cell[3][1] =~ m/(\w+) at\s+(\d+).(\d+)/;
-  #print "Current wind direction: $1, Speed: ", join(".", $2, $3), "\n";
-  #$w{WindAvgDir} = $1;
-  my $newdirection = $1;
-  $w{WindAvgSpeed} = join(".", $2, $3);
-  $w{WindAvgDir} = convert_wind_dir_abbr_to_num($newdirection);
-
-  $cell[3][2] =~ m/\s+(\w+)\s+(\d+).(\d+) at\s+(\d+):(\d+)(\D+)\n/;
-  #print "Max wind direction: $1, Speed: ", join(".", $2, $3), " at $4:$5 $6\n";
-  my $newgustdir = $1;
-  my $newgusttime = "$4:$5 $6";
-  if ($Weather{WindGustTime} ne $newgusttime) {
-    $w{WindGustSpeed} = join(".", $2, $3);
-    $w{WindGustDir} = convert_wind_dir_abbr_to_num($newgustdir);
-    $w{WindGustTime} = $newgusttime;
-  }
-  else {
-    $w{WindGustSpeed} = $w{WindAvgSpeed};
-    $w{WindGustDir} = $w{WindAvgDir};
-  }
-
-  $cell[4][1] =~ m/\s+(\d+).(\d+)/;
-  #print "Current rain: ", join(".", $1, $2), "\n";
-  $w{RainTotal} = join(".", $1, $2) unless $config_parms{aws_ignore_rain};
-
-	# *** Set IsRaining here
-
-
-  # Don't know how to parse this until it rains and we get some data.
-  #$cell[4][2] =~ m/\s+(\d+).(\d+)\s+\"\/h\s+at\s+(\d+):(\d+)(\D+)/
-  #print "Rain max of ", join("." $1, $2), " at ", join(":", $2, $3), $4, "\n" unless $config_parms{aws_ignore_rain};
-
-
-  $cell[4][3] =~ m/\s+(\d+).(\d+)/;
-  #print "Rain hourly increase/decrease: ", join(".", $1, $2), "\n";
-  $w{RainRate} = join(".", $1, $2) unless $config_parms{aws_ignore_rain};
-
-  $cell[5][1] =~ m/\s+(\d+).(\d+)/;
-  #print "Current pressure: ", join(".", $1, $2), "in Hg\n";
-  $w{BaromSea} = join(".", $1, $2);
-  $w{Barom}=convert_sea_barom_to_local_in($w{BaromSea});
-
-  #$cell[5][2] =~ m/\s+(\d+).(\d+) at\s+(\d+):(\d+)(\D+)\n\s+(\d+).(\d+) at\s+(\d+):(\d+)(\D+)\n/;
-  #print "Max pressure: ", join(".", $1, $2), "in Hg at ", "$3:$4 $5\n";
-  #print "Min pressure: ", join(".", $6, $7), "in Hg at ", "$8:$9 $10\n";
-
-  #$cell[5][3] =~ m/\s+(\d+).(\d+)/;
-  #print "Pressure hourly increase/decrease: ", join(".", $1, $2), "\n";
-
-  # *** Set rising/falling
-
-  $cell[6][1] =~ m/\s+(\d+).(\d+)/;
-  #print "Current light: ", join(".", $1, $2), "\%\n";
-  $w{sun_sensor} = join(".", $1, $2);
-
-  # *** Set conditions
-
-  #$cell[6][2] =~ m/\s+(\d+).(\d+) at\s+(\d+):(\d+)(\D+)\n\s+(\d+).(\d+) at\s+(\d+):(\d+)(\D+)\n/;
-  #print "Max light: ", join(".", $1, $2), "\% at ", "$3:$4 $5\n";
-  #print "Min light: ", join(".", $6, $7), "\% at ", "$8:$9 $10\n";
-
-  #$cell[6][3] =~ m/\s+(\d+).(\d+)/;
-  #print "Light hourly increase/decrease: ", join(".", $1, $2), "\n";
-
-  #$cell[7][0] =~ m/\n\s+\w+ \w+\n\n\s+(\d+).(\d+) /;
-  $cell[7][0] =~ m/(-?\d+).(\d+) /;
-  # heat index/wind chill
-  #print "Heat index: ", join(".", $1, $2), "°F\n";
-
-  # wind chill is now calculated by Weather_Common using a modern formula
-  #$w{WindChill} = join(".", $1, $2);
-
-  #$cell[7][1] =~ m/\s\w+ \w+\s+(\d+).(\d+) /;
-  #print "Monthly rain: ", join(".", $1, $2), "in\n";
-
-  $cell[7][2] =~ m/\s\w+ \w+\s+(-?\d+).(\d+) /;
-  #print "Dew point: ", join(".", $1, $2), "°F\n";
-  $w{DewOutdoor} = join(".", $1, $2);
-
-  #$cell[7][3] =~ m/\s\w+ \w+\s+(\d+).(\d+) /;
-  #print "Wet bulb: ", join(".", $1, $2), "°F\n";
-
-  if ($config_parms{weather_uom_temp} eq 'C') {
-  	grep {$w{$_}=convert_f2c($w{$_});} qw(
-  	  TempOutdoor
-  	  DewOutdoor
-  	);
-  }
-  if ($config_parms{weather_uom_baro} eq 'mb') {
-  	grep {$w{$_}=convert_in2mb($w{$_});} qw(
-  	  Barom
-  	  BaromSea
-  	);
-  }
-  if ($config_parms{weather_uom_wind} eq 'kph') {
-  	grep {$w{$_}=convert_mile2km($w{$_});} qw(
-  	  WindGustSpeed
-  	  WindAvgSpeed
-  	);
-  }
-  if ($config_parms{weather_uom_wind} eq 'm/s') {
-  	grep {$w{$_}=convert_mph2mps($w{$_});} qw(
-  	  WindGustSpeed
-  	  WindAvgSpeed
-  	);
-  }
-
-  &populate_internet_weather(\%w, $config_parms{weather_internet_elements_aws});
-  &weather_updated;
-  if ($Debug{weather}) {
-  	foreach my $key (sort(keys(%w))) {
-  		&print_log("weather_aws: $key is ".$w{$key});
-    }
-  }
-  &print_log("weather_aws: finished retrieving weather for station $AWS_IDs[$AWS_ID_index]");
-  $v_get_aws_weather->respond('app=weather connected=0 Weather data retrieved.');
-
-}
\ No newline at end of file

From 235bc5c01e8835e8c5fef9979472e91e1c19668a Mon Sep 17 00:00:00 2001
From: Michael Stovenour <michael@stovenour.net>
Date: Sun, 30 Jun 2013 11:44:28 -0500
Subject: [PATCH 078/330] Updated Insteon state definition for new Insteon
 object model

Moved responsibility for Insteon states out of http_server.pl and
into the Insteon objects themselves. (i.e. Insteon::DimmableLight)
The existing code was not working with the new object model.  This
is an additional fix for Issue #212.

Open Issue:  http_server.pl->button_action() probably needs to
be modified so Insteon lights dim/brighten correctly.  It
doesn't look like is_dimable() was ever implemented for any MH
object.
---
 lib/Insteon.pm          | 3 ---
 lib/Insteon/Lighting.pm | 5 +++++
 lib/http_server.pl      | 4 ----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index eb3b59c47..799f26c3f 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -549,7 +549,6 @@ so that each class can have its own unique set of voice commands.
 sub generate_voice_commands
 {
 
-    my $insteon_menu_states = $main::config_parms{insteon_menu_states} if $main::config_parms{insteon_menu_states};
     &main::print_log("Generating Voice commands for all Insteon objects");
     my $object_string;
     for my $object (&main::list_all_objects) {
@@ -594,8 +593,6 @@ sub generate_voice_commands
            $object_string .= &main::store_object_data($object_name_v, 'Voice_Cmd', 'Insteon', 'Insteon_link_commands');
            push @_insteon_link, $object_name;
         } elsif ($object->isa('Insteon::BaseDevice')) {
-           $states = $insteon_menu_states if $insteon_menu_states
-           	&& ($object->can('is_dimmable') && $object->is_dimmable);
            my $cmd_states = "$states,status,get engine version,scan link table,log links,update onlevel/ramprate"; #,on level,ramp rate";
            $cmd_states .= ",link to interface,unlink with interface" if $object->isa("Insteon::BaseController") || $object->is_controller;
            $object_string .= "$object_name_v  = new Voice_Cmd '$command [$cmd_states]';\n";
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index c7660e965..be9146285 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -216,6 +216,11 @@ sub new
 
 	my $self = new Insteon::BaseLight($p_deviceid,$p_interface);
 	bless $self,$class;
+	
+	if( $main::config_parms{insteon_menu_states}) {
+		push(@{$$self{states}}, split( ',', $main::config_parms{insteon_menu_states}) );
+	}
+	
 	return $self;
 }
 
diff --git a/lib/http_server.pl b/lib/http_server.pl
index 9f44eb88a..4e3ff7e69 100644
--- a/lib/http_server.pl
+++ b/lib/http_server.pl
@@ -2367,9 +2367,7 @@ sub html_item_state {
     my $object_name  = $object->{object_name};
     my $object_name2 = &pretty_object_name($object_name);
     my $isa_X10 = UNIVERSAL::isa($object, 'X10_Item');
-#   my $isa_X10 = $object->isa('X10_Item');  # This will abend if object is not an object
     my $isa_EIB2 = UNIVERSAL::isa($object, 'EIB2_Item');
-    my $isa_insteon = UNIVERSAL::isa($object, 'Insteon_Device');
 
                                 # If not a state item, just list it
     unless ($isa_X10 or UNIVERSAL::isa($object, 'Group') or exists $object->{state} or $object->{states}) {
@@ -2384,9 +2382,7 @@ sub html_item_state {
                                 # If >2 possible states, add a Select pull down form
     my @states;
     @states = @{$object->{states}} if $object->{states};
-#   print "db on=$object_name ix10=$isa_X10 s=@states\n";
     @states = split ',', $config_parms{x10_menu_states} if $isa_X10;
-    @states = split ',', $config_parms{insteon_menu_states} if $isa_insteon;
 
     @states = qw(on off) if UNIVERSAL::isa($object, 'X10_Appliance');
 

From 283432d0320c63f2ea7dc04f9215a8c624352e9c Mon Sep 17 00:00:00 2001
From: Michael Stovenour <michael@stovenour.net>
Date: Sun, 30 Jun 2013 17:26:50 -0500
Subject: [PATCH 079/330] Corrections for setting Insteon device states for web

Flip order of on/off states to match new web object model
Used the set_states() function rather than directly
modifying data from the Generic_Item class.
Eliminated the save/restore of the "states" array.  I'm
not sure what the original pupose was but saving/restoring
prevents users from defining additional states in their ini
file.  Note that the current device "state" is still stored.
---
 lib/Insteon/BaseInsteon.pm | 20 +++++---------------
 lib/Insteon/Lighting.pm    |  6 +++---
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 3ea998f5d..a976953d7 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1756,33 +1756,23 @@ sub restore_string
         {
 		$restore_string .= $self->_aldb->restore_string();
         }
-	if ($$self{states})
-        {
-		my $states = '';
-		foreach my $state (@{$$self{states}})
-                {
-			$states .= '|' if $states;
-			$states .= $state;
-		}
-		$restore_string .= $self->{object_name} . "->restore_states(q~$states~);\n";
-	}
 
 	return $restore_string;
 }
 
 =item C<restore_states()>
 
-Used to reload the persistent states of variables on restart.
+Obsolete / do not use.
+
+Function should remain so that upgrading users will not have issues starting 
+MH from previous versions that referenced this function in the 
+mh_temp.saved_states file.
 
 =cut
 
 sub restore_states
 {
 	my ($self, $states) = @_;
-	if ($states)
-        {
-		@{$$self{states}} = split(/\|/,$states);
-	}
 }
 
 =item C<restore_aldb()>
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index be9146285..5d53fea1e 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -33,8 +33,8 @@ sub new
 
 	my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
 	bless $self,$class;
-        # include very basic states
-        @{$$self{states}} = ('on','off');
+        # include very basic states; off first so web interface up/down works
+        $self->set_states('off','on');
 
 	return $self;
 }
@@ -218,7 +218,7 @@ sub new
 	bless $self,$class;
 	
 	if( $main::config_parms{insteon_menu_states}) {
-		push(@{$$self{states}}, split( ',', $main::config_parms{insteon_menu_states}) );
+		$self->set_states(split( ',', $main::config_parms{insteon_menu_states}));
 	}
 	
 	return $self;

From eadf6e0d3f69ef2c7d297d7ffd252b3b89c9af35 Mon Sep 17 00:00:00 2001
From: Michael Stovenour <michael@stovenour.net>
Date: Mon, 1 Jul 2013 07:57:43 -0500
Subject: [PATCH 080/330] Make sure web icons show 'on' if light state is 100%

---
 web/bin/list_buttons.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/bin/list_buttons.pl b/web/bin/list_buttons.pl
index 7bbc1c533..4f8fe62c9 100644
--- a/web/bin/list_buttons.pl
+++ b/web/bin/list_buttons.pl
@@ -65,6 +65,7 @@
     my $icon;
     if ($Info{module_GD}) {
                                 # Use custom icons if they exist
+        $state = 'on' if $state eq '100%';
         $icon = $state;
         $icon = 'dim' if $state =~ /d+/;
         my $image = "/graphics/light-" . lc $item . "_" . $icon . ".gif";

From e1db05a0a830b6855dc8528d761312b507e759e9 Mon Sep 17 00:00:00 2001
From: Michael Stovenour <michael@stovenour.net>
Date: Mon, 1 Jul 2013 08:40:34 -0500
Subject: [PATCH 081/330] Better set of states for insteon_menu_states given
 new behavior

---
 bin/mh.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/mh.ini b/bin/mh.ini
index 69d51a153..aa65a3df8 100644
--- a/bin/mh.ini
+++ b/bin/mh.ini
@@ -2058,7 +2058,7 @@ eib_errata=2
 
 @ These are the states displayed on the tk and web menus
 @  French: insteon_menu_states=on,off,normal,eco,plus,moins,plus2,moins2,plus3,moins3,+40,-40,5%,30%,60%,100%
-insteon_menu_states=on,off,+40,-40,5%,30%,60%,100%
+insteon_menu_states=off,20%,40%,50%,60%,80%,on
 
 ******************************************************************************
 # Category = Misc
@@ -2451,4 +2451,4 @@ owfs_uom_temp = F
 # - add net parms.  add cm11_serial parm.
 #
 
-#
\ No newline at end of file
+#

From 871d5e7e332eb27567a5d6a15127ebf3780619f2 Mon Sep 17 00:00:00 2001
From: Michael Stovenour <michael@stovenour.net>
Date: Thu, 4 Jul 2013 22:45:35 -0500
Subject: [PATCH 082/330] Fix issue where setting level 100% sets to 0xfe

Changed each instance of this calcualtion to use 5/4 rounding prior
to calling sprintf().  There is some issue between perl data types
and the C sprintf() implementation.  In this case perl will print
255 but sprintf will return fe.  Some instances of this were
previously fixed by adding check logic to force fe or 254 to 100%.
I modified all the instances to be consistent.
---
 lib/Insteon/BaseInsteon.pm | 4 ++--
 lib/Insteon/Lighting.pm    | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index a976953d7..4aaad4330 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -528,7 +528,7 @@ sub derive_message
 	} else {
 		if ($command eq 'on')
 		{
-			$message->extra(sprintf("%02X",$level));
+			$message->extra(sprintf("%02X",int($level+.5)));
 		} else {
 			$message->extra('00');
 		}
@@ -594,7 +594,7 @@ sub _is_info_request
 	my $is_info_request = 0;
 	if ($cmd eq 'status_request') {
 		$is_info_request++;
-		my $ack_on_level = (hex($msg{extra}) >= 254) ? 100 : sprintf("%d", hex($msg{extra}) * 100 / 255);
+		my $ack_on_level = sprintf("%d", int((hex($msg{extra}) * 100 / 255)+.5));
 		&::print_log("[Insteon::BaseObject] received status for " .
 			$self->{object_name} . " with on-level: $ack_on_level%, "
 			. "hops left: $msg{hopsleft}") if $main::Debug{insteon};
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index 5d53fea1e..92d69cf18 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -193,13 +193,7 @@ sub convert_level
 	my $level = 'ff';
 	if (defined ($on_level)) {
 		$on_level =~ s/(\d+)%?/$1/;
-		if ($on_level eq '100') {
-			$level = 'ff';
-		} elsif ($on_level eq '0') {
-			$level = '00';
-		} else {
-			$level = sprintf('%02X',$on_level * 2.55);
-		}
+		$level = sprintf('%02X',int(($on_level * 2.55) + .5));
 	}
 	return $level;
 }

From 313d46edec465d47d692af219d6250bb2a16a080 Mon Sep 17 00:00:00 2001
From: Michael Stovenour <michael@stovenour.net>
Date: Fri, 5 Jul 2013 08:12:59 -0500
Subject: [PATCH 083/330] Make sure web icons show 'off' if light state is 0%

---
 web/bin/list_buttons.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/bin/list_buttons.pl b/web/bin/list_buttons.pl
index 4f8fe62c9..3dedf71f5 100644
--- a/web/bin/list_buttons.pl
+++ b/web/bin/list_buttons.pl
@@ -66,6 +66,7 @@
     if ($Info{module_GD}) {
                                 # Use custom icons if they exist
         $state = 'on' if $state eq '100%';
+        $state = 'off' if $state eq '0%';
         $icon = $state;
         $icon = 'dim' if $state =~ /d+/;
         my $image = "/graphics/light-" . lc $item . "_" . $icon . ".gif";

From d96571b25aa0249b5a3d6d10b5b3e37b497101f8 Mon Sep 17 00:00:00 2001
From: Michael Stovenour <michael@stovenour.net>
Date: Sat, 13 Jul 2013 23:36:06 -0500
Subject: [PATCH 084/330] Fix issue #232:  fix automated version check

Modified to match recent changes to docs/download.pod
Modified to make revision optional. (i.e. 3.0 R1). If revision
is not present then don't print "revision unknown".
Updated syntax to eliminate perl warnings
---
 code/common/mh_release.pl | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/code/common/mh_release.pl b/code/common/mh_release.pl
index 1188c38c8..7e8392446 100644
--- a/code/common/mh_release.pl
+++ b/code/common/mh_release.pl
@@ -33,7 +33,11 @@
 sub parse_version {
 	my ($maj,$min) = $Version =~ /(\d)\.(\d*)/;
 	my ($rev) = $Version =~ /R(\d*)/;
-	return ($maj, $min, $rev);
+	$maj = $Version unless($maj);
+	my $version_str = $maj;
+	$version_str .= ".$min" unless($min eq '');
+	$version_str .= " (revision $rev)" if($rev);
+	return ($maj, $min, $version_str);
 }
 
 sub calc_age {
@@ -57,14 +61,13 @@ sub calc_age {
 
 if (said $v_version) {
 
-	my ($maj,$min,$revision) = &parse_version();
-	$revision = "unknown" unless $revision;
+	my ($maj,$min,$version_str) = &parse_version();
 
 	if (($Save{mhdl_maj} > $maj) or (($Save{mhdl_maj} == $maj) and ($Save{mhdl_min} > $min))) {
-        	respond "app=control I am version $maj.$min (revision $revision) and $Save{mhdl_maj}.$Save{mhdl_min} was released " . &calc_age($Save{mhdl_date}) . '.';
+        	respond("app=control I am version $version_str and $Save{mhdl_maj}.$Save{mhdl_min} was released " . &calc_age($Save{mhdl_date}) . '.');
 	}
 	else {
-        	respond "app=control I am version $maj.$min (revision $revision), released " . &calc_age($Save{mhdl_date}) . '.';
+        	respond("app=control I am version $version_str.");
 	}
 }
 
@@ -74,7 +77,7 @@ sub calc_age {
 
     if (&net_connect_check) {
 	$msg = 'Checking version...';
-	print_log "Retrieving download page";
+	print_log("Retrieving download page");
 	start $p_mhdl_page;
     }
     else {
@@ -86,10 +89,10 @@ sub calc_age {
 
 
 if (done_now $p_mhdl_page) {
-    my @html = file_head($mhdl_file,16);
-    print_log "Download page retrieved";
+    my @html = file_read($mhdl_file);
+    print_log("Download page retrieved");
     foreach(@html) {
-	next unless /^<p>Version (\d+)\.(\d+) released on (.*):/i;
+	next unless /Version (\d+)\.(\d+).*released on (\d+\/\d+\/\d+)/;
 	$Save{mhdl_maj} = $1;
 	$Save{mhdl_min} = $2;
 	$Save{mhdl_date} = $3;
@@ -98,14 +101,13 @@ sub calc_age {
 
 
    if (defined $Save{mhdl_maj} and defined $Save{mhdl_min}) {
-	my ($maj,$min,$revision) = &parse_version();
-	$revision = "unknown" unless $revision;
+	my ($maj,$min,$version_str) = &parse_version();
 	if (($Save{mhdl_maj} > $maj) or (($Save{mhdl_maj} == $maj) and ($Save{mhdl_min} > $min))) {
-	    $v_mhdl_page->respond("important=1 connected=0 app=control I am version $maj.$min (revision $revision) and version $Save{mhdl_maj}.$Save{mhdl_min} was released " . &calc_age($Save{mhdl_date} . '.'));
+	    $v_mhdl_page->respond("important=1 connected=0 app=control I am version $version_str and version $Save{mhdl_maj}.$Save{mhdl_min} was released " . &calc_age($Save{mhdl_date} . '.'));
 	}
 	else {
 		# Voice command is only code to start this process, so check its set_by
-		$v_mhdl_page->respond("connected=0 app=control Version $Save{mhdl_maj}.$Save{mhdl_min} is current.");
+		$v_mhdl_page->respond("connected=0 app=control Version $version_str is current.");
 	}
    }
 

From 5251f28235485a7d35e10b4c24ea1dc74b4af380 Mon Sep 17 00:00:00 2001
From: Ryan Davies <ryan@ryandavies.co.nz>
Date: Thu, 18 Jul 2013 01:11:40 +1200
Subject: [PATCH 085/330] Added Basic Base Google TTS Support

---
 bin/mh.ini        |  6 +++---
 lib/Voice_Text.pm | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/bin/mh.ini b/bin/mh.ini
index aa65a3df8..2e999aaf0 100644
--- a/bin/mh.ini
+++ b/bin/mh.ini
@@ -1085,9 +1085,9 @@ ipaddress_xpl_broadcast =
 @    See the mh/docs/install.html on how to install various speech engines.
 
 
-@ voice_text can be MS, MSV4, MSV5, festival, flite, theta or swift (for the  Cepstral engine on Linux),
-@ viavoice, vv_tts (for IBM's viavoice Outloud), NaturalVoice, NaturalVoiceWine, or
-@ program xyz (for a stand alone xyz program),
+@ voice_text can be MS, MSV4, MSV5, festival, flite, google (for the Google TTS API, requires ffmpeg),
+@ theta or swift (for the  Cepstral engine on Linux), viavoice, vv_tts (for IBM's viavoice Outloud),
+@ NaturalVoice, NaturalVoiceWine, or program xyz (for a stand alone xyz program),
 @ Set to blank to disable.
 @ Use  voice_text = MS on windows for all Microsoft SAPI compatible TTS engines, including AT&T NaturalVoice.
 @ Other parms specify paths to various TTS engines on unix systems.
diff --git a/lib/Voice_Text.pm b/lib/Voice_Text.pm
index 3c91ab04b..bf515a4b1 100644
--- a/lib/Voice_Text.pm
+++ b/lib/Voice_Text.pm
@@ -4,6 +4,8 @@ package Voice_Text;
 # $Revision$
 
 use strict;
+use LWP::UserAgent;
+use LWP::ConnCache;
 
 use vars '$VTxt_version';
 my (@VTxt, $VTxt_stream1, $VTxt_stream2, %VTxt_cards, $VTxt_festival, $VTxt_mac);
@@ -429,6 +431,42 @@ sub speak_text {
 		# 		    exit; # nothing left for the child to do
 	    }
         }
+    }elsif ($speak_engine =~ /google/) {
+        # Speak to tile using the Google TTS Engine
+
+        # Define a basic LWP agent for retrieving the Google MP3
+        my $ua;
+        $ua = LWP::UserAgent->new;
+        $ua->agent("Mozilla/5.0 (X11; Linux; rv:8.0) Gecko/20100101");
+        $ua->env_proxy;
+        $ua->conn_cache(LWP::ConnCache->new());
+        $ua->timeout(10);
+
+        my $random = int rand 1000; # Use random file name so we can talk 2+ at once.
+
+        # If being forced to file, use the filename being forced, otherwise, use a random temp file.
+        my $out_file = ($parms{to_file}) ? $parms{to_file} : "$main::config_parms{data_dir}/mh_temp.google-$random.wav";
+
+        # The temp file to store google's MP3 as
+        my $google_file = "$main::config_parms{data_dir}/mh_temp.google-$random.mp3";
+
+        # Make the request, store the result in the google temp file
+        my $ua_request = HTTP::Request->new('GET' => "http://translate.google.com/translate_tts?tl=en&q=".qq[ $parms{text} ]);
+        my $ua_response = $ua->request($ua_request, $google_file);
+
+        # Log the failure
+        if (!$ua_response->is_success) {
+            print "Failed to contact the Google TTS API.\n";
+            return;
+        }
+
+        # Convert the returned mp3 file to a wav, and clean up the temp file
+        system("ffmpeg", "-loglevel", "panic", "-i", "$google_file", "$out_file");
+        unlink($google_file);
+
+        # Play the wav file, clean up only if we are not being forced to file
+        system($main::config_parms{sound_program}, $out_file) unless $parms{to_file};
+        unlink($out_file) unless $parms{to_file};
     }
     elsif ($speak_pgm) {
         my $fork = 1 unless $parms{to_file} and !$parms{async}; # Must wait for to_file requests, so http requests work

From 46579ca6ab271868719477ae5f7015147282fa9a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 19 Jul 2013 17:11:14 -0700
Subject: [PATCH 086/330] Insteon: Reorganize Structure for Generating Voice
 Commands

Generate_voice_commands in Insteon.pm now calls get_voice_cmds for each object.
get_voice_cmds is written to be inherited and modified by higher level objects
This allows for unique voice commands to be added to objects in their respective class files without messing with the base Insteon.pm file.

This commit merely copied over the voice commands as they existed before with little to no changes in the voice command design.

Fixes hollie/misterhouse#181
---
 lib/Insteon.pm               | 96 +++++++++---------------------------
 lib/Insteon/BaseInsteon.pm   | 88 +++++++++++++++++++++++++++++++++
 lib/Insteon/BaseInterface.pm | 35 +++++++++++++
 lib/Insteon/Lighting.pm      | 55 +++++++++++++++++++++
 4 files changed, 201 insertions(+), 73 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 799f26c3f..5147cc965 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -554,87 +554,37 @@ sub generate_voice_commands
     for my $object (&main::list_all_objects) {
         next unless ref $object;
         next unless $object->isa('Insteon::BaseInterface') or $object->isa('Insteon::BaseObject');
+        
+        #get object name to use as part of variable in voice command
         my $object_name = $object->get_object_name;
-        # ignore the thermostat
-        next if $object->isa('Insteon_Thermostat');
+        my $object_name_v = $object_name . '_v';
+        $object_string .= "use vars '${object_name}_v';\n";
+        
+        #Convert object name into readable voice command words
         my $command = $object_name;
         $command =~ s/^\$//;
         $command =~ tr/_/ /;
-        my $object_name_v = $object_name . '_v';
-        $object_string .= "use vars '${object_name}_v';\n";
-        my $states = 'on,off';
+        
         my $group = ($object->isa('Insteon_PLM')) ? '' : $object->group;
-        if ($object->isa('Insteon::BaseController')) {
-           $states = 'on,off,sync links'; #,resume,enroll,unenroll,manual';
-           my $cmd_states = $states;
-           if ($object->isa('Insteon::InterfaceController')) {
-              $cmd_states .= ',initiate linking as controller,cancel linking';
-           } else {
-              $cmd_states .= ",link to interface,unlink with interface";
-           }
-           if ($object->is_root and !($object->isa('Insteon::InterfaceController'))) {
-              $cmd_states .= ",status,get engine version,scan link table,log links";
-              push @_scannable_link, $object_name;
-           }
-           $object_string .= "$object_name_v  = new Voice_Cmd '$command [$cmd_states]';\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->initiate_linking_as_controller(\"$group\")', 'initiate linking as controller');\n\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->interface()->cancel_linking','cancel linking');\n\n";
-           if ($object->is_root and !($object->isa('Insteon::InterfaceController'))) {
-              $object_string .= "$object_name_v -> tie_event('$object_name->link_to_interface','link to interface');\n\n";
-              $object_string .= "$object_name_v -> tie_event('$object_name->unlink_to_interface','unlink with interface');\n\n";
-              $object_string .= "$object_name_v -> tie_event('$object_name->request_status','status');\n\n";
-              $object_string .= "$object_name_v -> tie_event('$object_name->get_engine_version','get engine version');\n\n";
-              $object_string .= "$object_name_v -> tie_event('$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")','scan link table');\n\n";
-              $object_string .= "$object_name_v -> tie_event('$object_name->log_alllink_table()','log links');\n\n";
-           }
-           $object_string .= "$object_name_v -> tie_event('$object_name->sync_links(0)','sync links');\n\n";
-           $object_string .= "$object_name_v -> tie_items($object_name, 'on');\n\n";
-           $object_string .= "$object_name_v -> tie_items($object_name, 'off');\n\n";
-           $object_string .= &main::store_object_data($object_name_v, 'Voice_Cmd', 'Insteon', 'Insteon_link_commands');
-           push @_insteon_link, $object_name;
-        } elsif ($object->isa('Insteon::BaseDevice')) {
-           my $cmd_states = "$states,status,get engine version,scan link table,log links,update onlevel/ramprate"; #,on level,ramp rate";
-           $cmd_states .= ",link to interface,unlink with interface" if $object->isa("Insteon::BaseController") || $object->is_controller;
-           $object_string .= "$object_name_v  = new Voice_Cmd '$command [$cmd_states]';\n";
-           foreach my $state (split(/,/,$states)) {
-              $object_string .= "$object_name_v -> tie_items($object_name, '$state');\n\n";
-           }
-           $object_string .= "$object_name_v -> tie_event('$object_name->log_alllink_table()','log links');\n\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->request_status','status');\n\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->get_engine_version','get engine version');\n\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->update_local_properties','update onlevel/ramprate');\n\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")','scan link table');\n\n";
-           if ($object->isa("Insteon::BaseController") || $object->is_controller) {
-              $object_string .= "$object_name_v -> tie_event('$object_name->link_to_interface','link to interface');\n\n";
-              $object_string .= "$object_name_v -> tie_event('$object_name->unlink_to_interface','unlink with interface');\n\n";
-           }
-# the remote_set_button_taps provide incorrect/inconsistent results
-#           $object_string .= "$object_name_v -> tie_event('$object_name->remote_set_button_tap(1)','on level');\n\n";
-#           $object_string .= "$object_name_v -> tie_event('$object_name->remote_set_button_tap(2)','ramp rate');\n\n";
-           $object_string .= &main::store_object_data($object_name_v, 'Voice_Cmd', 'Insteon', 'Insteon_item_commands');
-           push @_insteon_device, $object_name if $group eq '01'; # don't allow non-base items to participate
-        } elsif ($object->isa('Insteon_PLM')) {
-           my $cmd_states = "complete linking as responder,initiate linking as controller,cancel linking,delete link with PLM,scan link table,log links,delete orphan links,AUDIT - delete orphan links,scan all device link tables,scan changed device link tables,sync all links,AUDIT - sync all links";
-           $cmd_states .= ",log all device ALDB status";
-           $object_string .= "$object_name_v  = new Voice_Cmd '$command [$cmd_states]';\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->complete_linking_as_responder','complete linking as responder');\n\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->initiate_linking_as_controller','initiate linking as controller');\n\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->initiate_unlinking_as_controller','initiate unlinking');\n\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->cancel_linking','cancel linking');\n\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->log_alllink_table','log links');\n\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")','scan link table');\n\n";
-           $object_string .= "$object_name_v -> tie_event('&Insteon::scan_all_linktables(1)','scan changed device link tables');\n\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->delete_orphan_links','delete orphan links');\n\n";
-           $object_string .= "$object_name_v -> tie_event('$object_name->delete_orphan_links(1)','AUDIT - delete orphan links');\n\n";
-           $object_string .= "$object_name_v -> tie_event('&Insteon::scan_all_linktables','scan all device link tables');\n\n";
-           $object_string .= "$object_name_v -> tie_event('&Insteon::sync_all_links(0)','sync all links');\n\n";
-           $object_string .= "$object_name_v -> tie_event('&Insteon::sync_all_links(1)','AUDIT - sync all links');\n\n";
-           $object_string .= "$object_name_v -> tie_event('&Insteon::log_all_ADLB_status','log all device ALDB status');\n\n";
-           $object_string .= &main::store_object_data($object_name_v, 'Voice_Cmd', 'Insteon', 'Insteon_PLM_commands');
-           push @_insteon_plm, $object_name;
+        
+        #Get list of all voice commands from the object
+        my $voice_cmds = $object->get_voice_cmds();
+        
+        #Initialize the voice command with all of the possible device commands
+        $object_string .= "$object_name_v  = new Voice_Cmd '$command [" 
+            . join(",", sort keys %$voice_cmds) . "]';\n";
+        
+        #Tie the proper routine to each voice command
+        foreach (keys %$voice_cmds) {
+            $object_string .= "$object_name_v -> tie_event('" . $voice_cmds->{$_}
+                . "', '$_');\n\n";
         }
+        
+        #Add this object to the list of Insteon Voice Commands on the Web Interface
+        $object_string .= ::store_object_data($object_name_v, 'Voice_Cmd', 'Insteon', 'Insteon_PLM_commands');
     }
 
+    #Evaluate the resulting object generating string
     package main;
     eval $object_string;
     print "Error in insteon_item_commands: $@\n" if $@;
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 4aaad4330..e8714c40e 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1012,6 +1012,34 @@ sub failure_reason
         return $$self{failure_reason};
 }
 
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my %voice_cmds = (
+        #The Sync Links routine really resides in DeviceController, but that
+        #class seems a little redundant as in practice all devices are controllers
+        #in some sense.  As a result, that class will likely be folded into 
+        #BaseObject/Device at some future date.  In order to avoid a bizarre
+        #inheritance of this routine by higher classes, this command was placed
+        #here
+        'sync links' => $self->get_object_name . '->sync_links(0)'
+    );
+    return \%voice_cmds;
+}
+
 =back
 
 =head2 INI PARAMETERS
@@ -2032,6 +2060,40 @@ sub check_aldb_version
 	}
 }
 
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds},
+        'link to interface' => "$object_name->link_to_interface",
+        'unlink with interface' => "$object_name->unlink_to_interface"
+    );
+    if ($self->is_root){
+        %voice_cmds = (
+            %voice_cmds,
+            'status' => "$object_name->request_status",
+            'get engine version' => "$object_name->get_engine_version",
+            'scan link table' => "$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")",
+            'log links' => "$object_name->log_alllink_table()"
+        )
+    }
+    return \%voice_cmds;
+}
+
 =back
 
 =head2 INI PARAMETERS
@@ -2953,6 +3015,32 @@ sub is_root
    return 0;
 }
 
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my $group = $self->group;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds},
+        'initiate linking as controller' => "$object_name->initiate_linking_as_controller(\"$group\")",
+        'cancel linking' => "$object_name->interface()->cancel_linking"
+    );
+    return \%voice_cmds;
+}
+
 =back
 
 =head2 AUTHOR
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index b2493956a..c12e9bbd6 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -852,6 +852,41 @@ sub _is_duplicate_received {
 	return $is_duplicate;
 }
 
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        'complete linking as responder' => "$object_name->complete_linking_as_responder",
+        'initiate linking as controller' => "$object_name->initiate_linking_as_controller",
+        'initiate unlinking' => "$object_name->initiate_unlinking_as_controller",
+        'cancel linking' => "$object_name->cancel_linking",
+        'log links' => "$object_name->log_alllink_table",
+        'scan link table' => "$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")",
+        'scan changed device link tables' => "Insteon::scan_all_linktables(1)",
+        'delete orphan links' => "$object_name->delete_orphan_links",
+        'AUDIT - delete orphan links' => "$object_name->delete_orphan_links(1)",
+        'scan all device link tables' => "Insteon::scan_all_linktables",
+        'sync all links' => "Insteon::sync_all_links(0)",
+        'AUDIT - sync all links' => "Insteon::sync_all_links(1)",
+        'log all device ALDB status' => "Insteon::log_all_ADLB_status"
+    );
+    return \%voice_cmds;
+}
+
 =back
 
 =head2 INI PARAMETERS
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index 92d69cf18..7ce94da5b 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -60,6 +60,31 @@ sub level
 
 }
 
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds},
+        'on' => "$object_name->set(\"on\")",
+        'off' => "$object_name->set(\"off\")"
+    );
+    return \%voice_cmds;
+}
+
 =back
 
 =head2 AUTHOR
@@ -254,6 +279,36 @@ sub level
 
 }
 
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my $insteon_menu_states = $main::config_parms{insteon_menu_states} if $main::config_parms{insteon_menu_states};
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds},
+        'update onlevel/ramprate' => "$object_name->update_local_properties"
+    );
+    if ($insteon_menu_states){
+        foreach my $state (split(/,/,$insteon_menu_states)) {
+            $voice_cmds{$state} = "$object_name->set(\"$state\")";
+        }
+    }
+    return \%voice_cmds;
+}
+
 =back
 
 =head2 AUTHOR

From 34ac765af43d1c51487e0d11ad8cfc44a46bfe2f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 20 Jul 2013 12:04:01 -0700
Subject: [PATCH 087/330] Insteon: Add Voice Commands to IOLinc

---
 lib/Insteon/IOLinc.pm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/lib/Insteon/IOLinc.pm b/lib/Insteon/IOLinc.pm
index d5186fee7..084a6c5ba 100755
--- a/lib/Insteon/IOLinc.pm
+++ b/lib/Insteon/IOLinc.pm
@@ -455,6 +455,47 @@ sub set_relay_mode
 	return;
 }
 
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds},
+        #Rename status command to note that it will request status of the
+        #relay
+        'on' => "$object_name->set(\"on\")",
+        'off' => "$object_name->set(\"off\")",
+        'status - relay' => "$object_name->request_status",
+        'status - sensor' => "$object_name->request_sensor_status",
+        'print momentary time' => "$object_name->get_momentary_time",
+        'link relay to sensor' => "$object_name->set_relay_linked(1)",
+        'unlink relay from sensor' => "$object_name->set_relay_linked(0)",
+        'reverse sensor output' => "$object_name->set_trigger_reverse(1)",
+        'unreverse sensor output' => "$object_name->set_trigger_reverse(0)",
+        'set relay to latching' => "$object_name->set_relay_mode(\"Latching\")",
+        'set relay to momentary a' => "$object_name->set_relay_mode(\"Momentary_A\")",
+        'set relay to momentary b' => "$object_name->set_relay_mode(\"Momentary_B\")",
+        'set relay to momentary c' => "$object_name->set_relay_mode(\"Momentary_C\")",
+        'print settings to log' => "$object_name->get_operating_flag"
+    );
+    #Remove generic status command
+    delete $voice_cmds{status};
+    return \%voice_cmds;
+}
+
 =back
 
 =head2 AUTHOR

From 5e57ac9f6a2d7df6d9314555d2c3a3162cec9c04 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 20 Jul 2013 12:44:43 -0700
Subject: [PATCH 088/330] Insteon: Add KeyPadLinc Unique Voice Commands

Moved update_flags routine to KeyPadLinc classes
Added unique voice commands
---
 lib/Insteon/AllLinkDatabase.pm |   2 +-
 lib/Insteon/BaseInsteon.pm     |  30 ---------
 lib/Insteon/Lighting.pm        | 112 +++++++++++++++++++++++++++++++++
 3 files changed, 113 insertions(+), 31 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 5c7918641..eed61071a 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -1935,7 +1935,7 @@ sub update_local_properties
 
 =item C<update_flags()>
 
-Used to update the flags of a device.  Called by L<Insteon::BaseDevice::update_flags()|Insteon::BaseInsteon/Insteon::BaseDevice>.
+Used to update the flags of a device.  Called by L<Insteon::KeyPadLinc::update_flags()|Insteon::Lighting/Insteon::KeyPadLinc>.
 
 =cut
 
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index e8714c40e..4b0b7918a 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1953,36 +1953,6 @@ sub update_local_properties
 	}
 }
 
-=item C<update_flags(flags)>
-
-Can be used to set the button layout and light level on a keypadlinc.  Flag 
-options include:
-
-    '0a' - 8 button; backlighting dim
-    '06' - 8 button; backlighting off
-    '02' - 8 button; backlighting normal
-
-    '08' - 6 button; backlighting dim
-    '04' - 6 button; backlighting off
-    '00' - 6 button; backlighting normal
-
-Note: This routine will likely be moved to L<Insteon::KeypadLinc|Insteon::Lighting/Insteon::KeypadLinc> at some point.
-
-=cut
-
-sub update_flags
-{
-	my ($self, $flags) = @_;
-	if (!($self->isa('Insteon::KeyPadLinc') or $self->isa('Insteon::KeyPadLincRelay')))
-        {
-		&::print_log("[Insteon::BaseDevice] Operating flags may only be revised on keypadlincs!");
-		return;
-	}
-	return unless defined $flags;
-
-	$self->_aldb->update_flags($flags) if $self->_aldb;
-}
-
 =item C<engine_version>
 
 Sets or gets the device object engine version.  If setting the engine version, 
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index 7ce94da5b..304631bbd 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -738,6 +738,62 @@ sub set
 
 }
 
+=item C<update_flags(flags)>
+
+Can be used to set the button layout and light level on a keypadlinc.  Flag 
+options include:
+
+    '0a' - 8 button; backlighting dim
+    '06' - 8 button; backlighting off
+    '02' - 8 button; backlighting normal
+
+    '08' - 6 button; backlighting dim
+    '04' - 6 button; backlighting off
+    '00' - 6 button; backlighting normal
+
+=cut
+
+sub update_flags
+{
+    my ($self, $flags) = @_;
+	return unless defined $flags;
+	$self->_aldb->update_flags($flags) if $self->_aldb;
+}
+
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds}
+    );
+    if ($self->is_root){
+        %voice_cmds = (
+            %voice_cmds,
+            'set 8 button - backlight dim' => "$object_name->update_flags(\"0a\")",
+            'set 8 button - backlight off' => "$object_name->update_flags(\"06\")",
+            'set 8 button - backlight normal' => "$object_name->update_flags(\"02\")",
+            'set 6 button - backlight dim' => "$object_name->update_flags(\"08\")",
+            'set 6 button - backlight off' => "$object_name->update_flags(\"04\")",
+            'set 6 button - backlight normal' => "$object_name->update_flags(\"00\")"
+        );
+    }
+    return \%voice_cmds;
+}
+
 =back
 
 =head2 AUTHOR
@@ -853,6 +909,62 @@ sub set
 
 }
 
+=item C<update_flags(flags)>
+
+Can be used to set the button layout and light level on a keypadlinc.  Flag 
+options include:
+
+    '0a' - 8 button; backlighting dim
+    '06' - 8 button; backlighting off
+    '02' - 8 button; backlighting normal
+
+    '08' - 6 button; backlighting dim
+    '04' - 6 button; backlighting off
+    '00' - 6 button; backlighting normal
+
+=cut
+
+sub update_flags
+{
+    my ($self, $flags) = @_;
+    return unless defined $flags;
+	$self->_aldb->update_flags($flags) if $self->_aldb;
+}
+
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds}
+    );
+    if ($self->is_root){
+        %voice_cmds = (
+            %voice_cmds,
+            'set 8 button - backlight dim' => "$object_name->update_flags(\"0a\")",
+            'set 8 button - backlight off' => "$object_name->update_flags(\"06\")",
+            'set 8 button - backlight normal' => "$object_name->update_flags(\"02\")",
+            'set 6 button - backlight dim' => "$object_name->update_flags(\"08\")",
+            'set 6 button - backlight off' => "$object_name->update_flags(\"04\")",
+            'set 6 button - backlight normal' => "$object_name->update_flags(\"00\")"
+        );
+    }
+    return \%voice_cmds;
+}
+
 =back
 
 =head2 AUTHOR

From ecbcaddcc61aac415282691ef6214c8aac0fa440 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 20 Jul 2013 13:01:35 -0700
Subject: [PATCH 089/330] Insteon:  Add Unique Voice Commands to Motion Sensor

---
 lib/Insteon/Security.pm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/lib/Insteon/Security.pm b/lib/Insteon/Security.pm
index 27f7d04f0..0af6cf4b9 100644
--- a/lib/Insteon/Security.pm
+++ b/lib/Insteon/Security.pm
@@ -494,6 +494,36 @@ sub is_responder
    return 0;
 }
 
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds},
+        'enable night only' => "$object_name->enable_night_only(1)",
+        'disable night only' => "$object_name->enable_night_only(0)",
+        'enable on only mode' => "$object_name->enable_on_only(1)",
+        'disable on only mode' => "$object_name->enable_on_only(0)",
+        'enable all motion mode' => "$object_name->enable_all_motion(1)",
+        'disable all motion mode' => "$object_name->enable_all_motion(0)"
+    );
+    return \%voice_cmds;
+}
+
+
 =back
 
 =head2 AUTHOR

From c378df3074698ad91e4272915a75ceadf09195c3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 22 Jul 2013 21:04:10 -0700
Subject: [PATCH 090/330] Insteon: Add Message Tracking Statistics Features

Added a number of functions to track message details.
Added functions to print message statistics to the log
Added functions to reset the message statistics
Added 2 voice commands:
- print message statistics - prints details on all devices to the log
- reset message statistics - resets the message statistics to 0 for all devices
---
 lib/Insteon.pm                 |  52 ++++++++++++
 lib/Insteon/AllLinkDatabase.pm |   4 +-
 lib/Insteon/BaseInsteon.pm     | 149 ++++++++++++++++++++++++++++++++-
 lib/Insteon/BaseInterface.pm   |   3 +
 lib/Insteon/Message.pm         |   4 +
 5 files changed, 209 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 799f26c3f..2d0d5f5a5 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -488,6 +488,58 @@ sub log_all_ADLB_status
 	}
 }
 
+=item C<print_message_logs>
+
+Walks through every Insteon device and prints statistical information about
+its message handling.
+
+=cut
+
+sub print_message_logs
+{
+    my @_log_devices = ();
+	push @_log_devices, Insteon::find_members("Insteon::BaseDevice");
+
+	if (@_log_devices)
+	{
+		foreach my $current_log_device (@_log_devices)
+		{
+			$current_log_device->print_message_log 
+                if $current_log_device->can('print_message_log');
+		}
+		main::print_log("[Insteon::Print_Message_Logs] All devices have completed logging");
+	} else
+	{
+		main::print_log("[Insteon::Print_Message_Logs] WARN: No insteon devices could be found");
+	}
+}
+
+=item C<reset_message_logs>
+
+Walks through every Insteon device and resets the statistical information about
+its message handling.
+
+=cut
+
+sub reset_message_logs
+{
+    my @_log_devices = ();
+    push @_log_devices, Insteon::find_members("Insteon::BaseDevice");
+
+	if (@_log_devices)
+	{
+		foreach my $current_log_device (@_log_devices)
+		{
+			$current_log_device->reset_message_log 
+                if $current_log_device->can('reset_message_log');
+		}
+		main::print_log("[Insteon::Reset_Message_Logs] All devices have been reset");
+	} else
+	{
+		main::print_log("[Insteon::Reset_Message_Logs] WARN: No insteon devices could be found");
+	}
+}
+
 =item C<init()>
 
 Initiates the insteon stack, mostly just sets the trigger. 
diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 5c7918641..98e65338d 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -2146,7 +2146,8 @@ sub on_read_write_aldb
 				. $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
 				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
-			#retry previous address again
+			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
+            #retry previous address again
 			$self->send_read_aldb(sprintf("%04x", hex($$self{_mem_msb} . $$self{_mem_lsb})));
 		} elsif ($$self{_mem_msb} . $$self{_mem_lsb} ne '0000' and 
 				$$self{_mem_msb} . $$self{_mem_lsb} ne substr($msg{extra},6,4)){
@@ -2155,6 +2156,7 @@ sub on_read_write_aldb
 				. $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
 				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
+            $$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
 			#retry previous address again
 			$self->send_read_aldb(sprintf("%04x", hex($$self{_mem_msb} . $$self{_mem_lsb})));
 		}
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 4aaad4330..c1f587e15 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -778,6 +778,7 @@ sub _process_message
 				. $self->get_object_name . " in response to a "
 				. $pending_cmd . " command, but the command code "
 				. $msg{cmd_code} . " is incorrect. Ignorring received message.");
+            $self->corrupt_count_log(1) if $self->can('corrupt_count_log');
 			$p_setby->active_message->no_hop_increase(1);
 		}
 	}
@@ -1147,7 +1148,8 @@ sub new
            $$self{aldb} = new Insteon::ALDB_i1($self);
         }
 
-	$self->restore_data('level');
+	$self->restore_data('level', 'retry_count_log', 'fail_count_log', 
+        'outgoing_count_log', 'incoming_count_log', 'corrupt_count_log');
 
 	$self->initialize();
 	$self->rate(undef);
@@ -1161,6 +1163,11 @@ sub new
 	@{$$self{command_stack}} = ();
 	$$self{_onlevel} = undef;
 	$$self{is_responder} = 1;
+    $$self{retry_count_log} = 0;
+    $$self{fail_count_log} = 0;
+    $$self{outgoing_count_log} = 0;
+    $$self{incoming_count_log} = 0;
+    $$self{corrupt_count_log} = 0;
 
 	return $self;
 }
@@ -1975,7 +1982,145 @@ sub engine_version
 	return $engine_version;
 }
 
-=item C<engine_version>
+=item C<retry_count_log([type]>
+
+Sets or gets the number of message retries that have occured for this device 
+since the last time C<reset_message_log> was called.
+
+If type is set, to any value, will increment retry log by one.
+
+Returns: current retry count.
+
+=cut 
+
+sub retry_count_log
+{
+	my ($self, $retry_count_log) = @_;
+	$$self{retry_count_log} = $retry_count_log if $retry_count_log;
+	return $$self{retry_count_log};
+} 
+
+=item C<fail_count_log([type]>
+
+Sets or gets the number of message failures that have occured for this device 
+since the last time C<reset_message_log> was called.
+
+If type is set, to any value, will increment fail log by one.
+
+Returns: current fail count.
+
+=cut 
+
+sub fail_count_log
+{
+    my ($self, $fail_count_log) = @_;
+	$$self{fail_count_log} = $fail_count_log if $fail_count_log;
+	return $$self{fail_count_log};
+} 
+
+=item C<outgoing_count_log([type]>
+
+Sets or gets the number of outgoing message that have occured for this device 
+since the last time C<reset_message_log> was called.
+
+If type is set, to any value, will increment output count by one.
+
+Returns: current output count.
+
+=cut 
+
+sub outgoing_count_log
+{
+    my ($self, $outgoing_count_log) = @_;
+    $$self{outgoing_count_log} = $outgoing_count_log if $outgoing_count_log;
+	return $$self{outgoing_count_log};
+}
+
+=item C<incoming_count_log([type]>
+
+Sets or gets the number of incoming message that have occured for this device 
+since the last time C<reset_message_log> was called.
+
+If type is set, to any value, will increment incoming count by one.
+
+Returns: current incoming count.
+
+=cut 
+
+sub incoming_count_log
+{
+    my ($self, $incoming_count_log) = @_;
+    $$self{incoming_count_log} = $incoming_count_log if $incoming_count_log;
+    return $$self{incoming_count_log};
+}
+        
+=item C<corrupt_count_log([type]>
+
+Sets or gets the number of currupt message that have arrived from this device 
+since the last time C<reset_message_log> was called.
+
+If type is set, to any value, will increment corrupt count by one.
+
+Returns: current corrupt count.
+
+=cut 
+
+sub corrupt_count_log
+{
+    my ($self, $corrupt_count_log) = @_;
+    $$self{corrupt_count_log} = $corrupt_count_log if $corrupt_count_log;
+    return $$self{corrupt_count_log};
+}
+
+
+=item C<reset_message_log>
+
+Resets the retry, fail, outgoing, incoming, and corrupt message counters.
+
+=cut 
+
+sub reset_message_log
+{
+    my ($self) = @_;
+    $$self{retry_count_log} = 0;
+    $$self{fail_count_log} = 0;
+    $$self{outgoing_count_log} = 0;
+    $$self{incoming_count_log} = 0;
+    $$self{corrupt_count_log} = 0;
+}
+
+=item C<print_message_log>
+
+Prints message statistics for this device to the print log.
+
+=cut 
+
+sub print_message_log
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my $retry_percentage = 0; 
+    $retry_percentage = sprintf("%.2f", ($$self{retry_count_log} / 
+        $$self{outgoing_count_log}) * 100 ) if ($$self{outgoing_count_log} > 0);
+    my $fail_percentage = 0; 
+    $fail_percentage = sprintf("%.2f", ($$self{fail_count_log} / 
+        $$self{outgoing_count_log}) * 100 ) if ($$self{outgoing_count_log} > 0);
+    my $corrupt_percentage = 0; 
+    $corrupt_percentage = sprintf("%.2f", ($$self{corrupt_count_log} / 
+        $$self{incoming_count_log}) * 100 ) if ($$self{outgoing_count_log} > 0);
+    ::print_log("[Insteon::BaseDevice] Message statistics for $object_name:\n"
+    . "Outgoing Count = " . $$self{outgoing_count_log} ."\n"
+    . "   Retry Count = " . $$self{retry_count_log} ."\n"
+    . "       Retry % = " . $retry_percentage . "%\n"
+    . "    Fail Count = " . $$self{fail_count_log} ."\n"
+    . "        Fail % = " . $fail_percentage . "%\n"
+    . "Incoming Count = " . $$self{incoming_count_log} ."\n"
+    . " Corrupt Count = " . $$self{corrupt_count_log} ."\n"
+    . "     Corrupt % = " . $corrupt_percentage. "%\n");
+}
+
+
+=item C<check_aldb_version>
 
 Because of the way MH saves / restores states "after" object creation
 the aldb must be initially created before the engine_version is restored.
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index b2493956a..c779c6656 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -359,6 +359,7 @@ sub process_queue
                                        	. $self->active_message->send_attempts
                 			. ") for " . $self->active_message->to_string()
                                         . " exceeds limit.  Now moving on...") if $main::Debug{insteon};
+                                $self->fail_count_log(1) if $self->can('fail_count_log');
                                 # !!!!!!!!! TO-DO - handle failure timeout ???
                                 my $failed_message = $self->active_message;
                                 # make sure to let the sending object know!!!
@@ -530,6 +531,7 @@ sub on_standard_insteon_received
 		my $object = &Insteon::get_object($msg{source}, $msg{group});
 		if (defined $object)
                 {
+                    $object->incoming_count_log(1) if $object->can('incoming_count_log');
                 	if ($msg{type} ne 'broadcast')
                         {
                 		$msg{command} = $object->message_type($msg{cmd_code});
@@ -690,6 +692,7 @@ sub on_extended_insteon_received
 		my $object = &Insteon::get_object($msg{source}, $msg{group});
 		if (defined $object)
                 {
+                    $object->incoming_count_log(1) if $object->can('incoming_count_log');
                 	if ($msg{type} ne 'broadcast')
                         {
                 		$msg{command} = $object->message_type($msg{cmd_code});
diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index a9c8966b2..12cea5827 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -218,6 +218,7 @@ sub send
                 	&::print_log("[Insteon::BaseMessage] WARN: now resending "
                         	. $self->to_string() . " after " . $self->send_attempts
                         	. " attempts.") if $main::Debug{insteon};
+                        $self->setby->retry_count_log(1) if $self->setby->can('retry_count_log');
                         # revise default hop count to reflect retries
                         if (ref $self->setby && $self->setby->isa('Insteon::BaseObject') 
                         	&& !defined($$self{no_hop_increase}))
@@ -237,6 +238,9 @@ sub send
                 }
 
                 # need to set timeout as a function of retries; also need to alter hop count
+                if ($self->setby->can('outgoing_count_log') && $self->send_attempts <= 0) {
+                    $self->setby->outgoing_count_log(1);
+                }
                 $self->send_attempts($self->send_attempts + 1);
 		$interface->_send_cmd($self, $self->send_timeout);
 		if ($self->callback)

From 0d368c3398f593fd65d0404059fedfe12005f551 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 22 Jul 2013 21:25:37 -0700
Subject: [PATCH 091/330] Insteon: Fix Path Comparison in Windows for
 Update_Docs.pl

If inode==0 then we are probably on windows, so use abs_path to compare the two paths and see if they are the same.

I don't have windows so hopefully this works.

Fixes hollie/misterhouse#234
---
 bin/update_docs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/update_docs b/bin/update_docs
index 2ca9526ce..802edd75c 100755
--- a/bin/update_docs
+++ b/bin/update_docs
@@ -60,6 +60,7 @@ BEGIN {
 use strict;
 use warnings;
 use Pod::Html;
+use Cwd qw(abs_path);
 
 # Get parms from mh.ini
 require 'handy_utilities.pl';
@@ -242,7 +243,8 @@ closedir POD;
 # delete html files from docs dir if out dir is diff and pod exists
 my $docsi = ( stat($docdir) )[1];
 my $outi  = ( stat($outdir) )[1];
-if ( $docsi eq $outi ) {
+if ((($docsi == $outi) && ($outi == 0) && (abs_path($docdir) eq abs_path($outdir))) 
+    || (( $docsi eq $outi ) && ($outi != 0))) {
     print "you should set the html_alias2_docs directory to a place outside"
       . " the mh distribution\n directory.  Otherwise, everytime this script is"
       . " run, you will alter\n your distribution files.";

From 192ac8f1e66e2c228763be79ad17cd3716b85b8f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 23 Jul 2013 15:41:42 -0700
Subject: [PATCH 092/330] Fix additional typos form manual merge

---
 lib/Insteon/BaseInsteon.pm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index da4c1eb9b..dd8473a50 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2985,5 +2985,3 @@ You should have received a copy of the GNU General Public License along with thi
 =cut
 
 1;
-=back
-=cut

From 09c5456d6f5705c9cc7f18f539f8c83f484e05cb Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 23 Jul 2013 15:44:52 -0700
Subject: [PATCH 093/330] Fix additional typos from manual merge

---
 lib/Insteon/BaseInsteon.pm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index fbcd9fb6f..da30b099c 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2998,5 +2998,3 @@ You should have received a copy of the GNU General Public License along with thi
 =cut
 
 1;
-=back
-=cut

From 6bbdcf35edff51bd59c3b48b5119d1054c45c5bb Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 23 Jul 2013 16:35:40 -0700
Subject: [PATCH 094/330] Insteon: Make Sure Timeout Factor Set to 1 on Reboot

---
 lib/Insteon/BaseInsteon.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index dd8473a50..94deed443 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -112,6 +112,7 @@ sub new
 	$$self{_onlevel} = undef;
 	$$self{is_responder} = 1;
         $$self{default_hop_count} = 0;
+	$$self{timeout_factor} = 1.0;
 
 	&Insteon::add($self);
 	return $self;
@@ -203,6 +204,9 @@ resending the message.  The value set will be multiplied by the predefined value
 in MH.  $float can be set to any positive decimal number.  For example using 1.0
 will not change the preset values; 1.1 will increase the time MH waits by 10%; and
 0.9 will force MH to wait for only 90% of the predefined time.
+
+This value is NOT saved on reboot, as such likely should be called in a $Reload loop.
+
 =cut
 
 sub timeout_factor {

From 4835bd9ef572a8abcf04c9a50a9935d6a6ed9053 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 23 Jul 2013 16:37:39 -0700
Subject: [PATCH 095/330] Insteon: Max/Min Hops Setting Not Saved on Reboot

---
 lib/Insteon/BaseInsteon.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index da30b099c..4b998e4f7 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -101,6 +101,8 @@ sub new
 	$self->restore_data('default_hop_count', 'engine_version');
 
 	$self->initialize();
+	$$self{max_hops} = 3;
+	$$self{min_hops} = 0;
 	$$self{level} = undef;
 	$$self{flag} = "0F";
 	$$self{ackMode} = "1";
@@ -200,6 +202,9 @@ sub group
 
 Sets the maximum number of hops that may be used in a message sent to the device.
 The default and maximum number is 3.  $int is an integer between 0-3.
+
+This value is NOT saved on reboot, as such likely should be called in a $Reload loop.
+
 =cut
 
 sub max_hops {
@@ -212,6 +217,9 @@ sub max_hops {
 
 Sets the minimum number of hops that may be used in a message sent to the device.
 The default and minimum number is 0.  $int is an integer between 0-3.
+
+This value is NOT saved on reboot, as such likely should be called in a $Reload loop.
+
 =cut
 
 sub min_hops {

From 4ff51a17545ccb5fa1f94dabbde13b32a3d7a400 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 18:41:37 -0700
Subject: [PATCH 096/330] Better Formatting in Web Interface Print Log

Changed the web interface print log to a monospaced or fix width font and formatting.  This allows the nice formatting that relies on consistent spacing that has been visible in the text based logs, to be viewable online.  I realize that fixed width fonts are not always the prettiest, but I did the best I could.  If anyone has any suggestions for how to make it prettier, I am open to additional changes.

I had to work around one oddity.  The web code converts all \n characters to \n\r when formatting the html.  This is a blind conversion without any regard as to whether the \n character is within a <pre> tag.
---
 lib/http_server.pl | 8 ++++++--
 web/list.css       | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/http_server.pl b/lib/http_server.pl
index 4e3ff7e69..ace04ad86 100644
--- a/lib/http_server.pl
+++ b/lib/http_server.pl
@@ -1247,8 +1247,12 @@ sub html_print_log {
         $h_response .= "<a href=print_log>Refresh Print Log</a>\n";
         my @last_printed = &main::print_log_last($main::config_parms{max_log_entries});
         for my $text (@last_printed) {
-            $text =~ s/\n/\n<br>/g;
-            $h_response .= "<li>$text\n";
+            #This formatting is a little bizarre, but sub html_page blindly 
+            #converts all \n to \n\r apparently to be standards compliant. It 
+            #would be easier to set the white space of list-item to pre, however
+            #the additional newline characters added by html_page look ugly.
+            $text =~ s/\n/<\/pre><\/br>\n<pre>/g;
+            $h_response .= "<li><pre>$text</pre></li>\n";
         }
     }
     else {
diff --git a/web/list.css b/web/list.css
index 5ec3a2f7e..82a49ddca 100644
--- a/web/list.css
+++ b/web/list.css
@@ -7,3 +7,4 @@ A:link { color: blue; }
 A:visited { color: lightblue; }
 A:active { color: brown; } 
 A:hover { color: green; }
+PRE { white-space:pre-wrap; font-family:courier, monospace; display:inline; font-size:10pt;}

From e18e5ad50b34b52d4102b9add7fc94a4d9007f24 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 18:59:37 -0700
Subject: [PATCH 097/330] Insteon_Stats: Fix Print Message Voice Command
 Documentation

---
 lib/Insteon.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 2d0d5f5a5..f88d3e578 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -491,7 +491,9 @@ sub log_all_ADLB_status
 =item C<print_message_logs>
 
 Walks through every Insteon device and prints statistical information about
-its message handling.
+its message handling, as well as a summary average of the entire network.  See 
+L<Insteon::BaseDevice::print_message_log|Insteon::BaseInsteon::BaseDevice::print_message_log> 
+for more detailed information.
 
 =cut
 

From d28a660a17c943ff9d0b69238fa21d830aa0b46e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:00:35 -0700
Subject: [PATCH 098/330] Insteon_Stats: Add a More Extensive Print Message
 Voice Command

Now collects and prints a total average for the entire network.
---
 lib/Insteon.pm | 76 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 74 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index f88d3e578..67fcc48d2 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -504,11 +504,83 @@ sub print_message_logs
 
 	if (@_log_devices)
 	{
+		#Initialize all of the tracking variables
+		my $retry_average = 0;
+    	my $fail_percentage = 0;
+    	my $corrupt_percentage = 0; 
+    	my $dupe_percentage = 0;
+    	my $avg_hops_left = 0;
+    	my $avg_max_hops = 0;
+		my $avg_out_hops = 0;
+    	my $curr_hops_avg = 0;
+    	
+		my $incoming_count_log = 0;
+		my $corrupt_count_log = 0;
+		my $dupe_count_log = 0;
+		my $retry_count_log = 0;
+		my $outgoing_count_log = 0;
+		my $fail_count_log = 0;
+		my $default_hop_count = 0;
+		my $hops_left_count = 0;
+		my $max_hops_count = 0;
+		my $outgoing_hop_count =0;
+
 		foreach my $current_log_device (@_log_devices)
 		{
-			$current_log_device->print_message_log 
-                if $current_log_device->can('print_message_log');
+			#Prints the Individual Message for the Device
+			$current_log_device->print_message_log;
+			
+			#Add values for each device to the master count
+			$incoming_count_log += $current_log_device->incoming_count_log;
+			$corrupt_count_log += $current_log_device->corrupt_count_log;
+			$dupe_count_log += $current_log_device->dupe_count_log;
+			$retry_count_log += $current_log_device->retry_count_log;
+			$outgoing_count_log += $current_log_device->outgoing_count_log;
+			$fail_count_log += $current_log_device->fail_count_log;
+			$default_hop_count += $current_log_device->default_hop_count;
+			$hops_left_count += $current_log_device->hops_left_count;
+			$max_hops_count += $current_log_device->max_hops_count;
+			$outgoing_hop_count += $current_log_device->outgoing_hop_count;
 		}
+		
+		#Calculate the averages
+	    $retry_average = sprintf("%.1f", ($retry_count_log / 
+	        $outgoing_count_log) + 1) if ($outgoing_count_log > 0); 
+	    $fail_percentage = sprintf("%.1f", ($fail_count_log / 
+	        $outgoing_count_log) * 100 ) if ($outgoing_count_log > 0);
+	    $corrupt_percentage = sprintf("%.1f", ($corrupt_count_log / 
+	        $incoming_count_log) * 100 ) if ($incoming_count_log > 0);
+	    $dupe_percentage = sprintf("%.1f", ($dupe_count_log / 
+	        $incoming_count_log) * 100 ) if ($incoming_count_log > 0);
+	    $avg_hops_left = sprintf("%.1f", ($hops_left_count / 
+	        $incoming_count_log)) if ($incoming_count_log > 0);
+	    $avg_max_hops = sprintf("%.1f", ($max_hops_count / 
+	        $incoming_count_log)) if ($incoming_count_log > 0);
+    	$avg_out_hops = sprintf("%.1f", ($outgoing_hop_count / 
+        	$outgoing_count_log)) if ($outgoing_count_log > 0);
+    	$curr_hops_avg = sprintf("%.1f", ($default_hop_count / 
+        	scalar @_log_devices)) if (scalar @_log_devices > 0);
+    	::print_log(
+	        "[Insteon] Average Network Statistics:\n"
+	        . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops\n"
+	        . sprintf("%6s", $incoming_count_log)
+	        . sprintf("%8s", $corrupt_count_log)
+	        . sprintf("%8s", $corrupt_percentage . '%')
+	        . sprintf("%6s", $dupe_count_log)
+	        . sprintf("%8s", $dupe_percentage . '%')
+	        . sprintf("%9s", $avg_hops_left)
+	        . sprintf("%9s", $avg_max_hops)
+	        . sprintf("%9s", $avg_max_hops - $avg_hops_left)
+	        . "\n"
+	        . "   Out    Fail   %Fail Retry AvgSend Avg_Hops CurrHops\n"
+	        . sprintf("%6s", $outgoing_count_log)
+	        . sprintf("%8s", $fail_count_log)
+	        . sprintf("%8s", $fail_percentage . '%')
+	        . sprintf("%6s", $retry_count_log)
+	        . sprintf("%8s", $retry_average)
+	        . sprintf("%9s", $avg_out_hops)
+	        . sprintf("%9s", $curr_hops_avg)
+    	);
 		main::print_log("[Insteon::Print_Message_Logs] All devices have completed logging");
 	} else
 	{

From 9e5f68941c45b21e12f4f56e53a976dfc98e95fa Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:01:55 -0700
Subject: [PATCH 099/330] Insteon_Stats: Add new Saved Message Stats Variables

---
 lib/Insteon/BaseInsteon.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index c1f587e15..2b9eb45b1 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1149,7 +1149,9 @@ sub new
         }
 
 	$self->restore_data('level', 'retry_count_log', 'fail_count_log', 
-        'outgoing_count_log', 'incoming_count_log', 'corrupt_count_log');
+        'outgoing_count_log', 'incoming_count_log', 'corrupt_count_log',
+        'dupe_count_log', 'hops_left_count', 'max_hops_count',
+        'outgoing_hop_count');
 
 	$self->initialize();
 	$self->rate(undef);
@@ -1168,6 +1170,10 @@ sub new
     $$self{outgoing_count_log} = 0;
     $$self{incoming_count_log} = 0;
     $$self{corrupt_count_log} = 0;
+    $$self{dupe_count_log} = 0;
+    $$self{hops_left_count} = 0;
+    $$self{max_hops_count} = 0;
+    $$self{outgoing_hop_count} = 0;
 
 	return $self;
 }

From e60e3097d2d7ba7c8024bc2b4a17453489222ed0 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:02:57 -0700
Subject: [PATCH 100/330] Insteon_Stats: Fix Bug Message Stats Should Increment

---
 lib/Insteon/BaseInsteon.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 2b9eb45b1..11ca3e36f 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2002,7 +2002,7 @@ Returns: current retry count.
 sub retry_count_log
 {
 	my ($self, $retry_count_log) = @_;
-	$$self{retry_count_log} = $retry_count_log if $retry_count_log;
+	$$self{retry_count_log}++ if $retry_count_log;
 	return $$self{retry_count_log};
 } 
 
@@ -2020,7 +2020,7 @@ Returns: current fail count.
 sub fail_count_log
 {
     my ($self, $fail_count_log) = @_;
-	$$self{fail_count_log} = $fail_count_log if $fail_count_log;
+	$$self{fail_count_log}++ if $fail_count_log;
 	return $$self{fail_count_log};
 } 
 
@@ -2056,7 +2056,7 @@ Returns: current incoming count.
 sub incoming_count_log
 {
     my ($self, $incoming_count_log) = @_;
-    $$self{incoming_count_log} = $incoming_count_log if $incoming_count_log;
+    $$self{incoming_count_log}++ if $incoming_count_log;
     return $$self{incoming_count_log};
 }
         

From 47c7e8f9c1edd7b9583547ee70b4ec7001da28a0 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:03:56 -0700
Subject: [PATCH 101/330] Insteon_Stats: Add Routine to Track Outgoing Hop
 Counts

---
 lib/Insteon/BaseInsteon.pm | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 11ca3e36f..0cffd0226 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2038,10 +2038,28 @@ Returns: current output count.
 sub outgoing_count_log
 {
     my ($self, $outgoing_count_log) = @_;
-    $$self{outgoing_count_log} = $outgoing_count_log if $outgoing_count_log;
+    $$self{outgoing_count_log}++ if $outgoing_count_log;
 	return $$self{outgoing_count_log};
 }
 
+=item C<outgoing_hop_count([type]>
+
+Sets or gets the number of hops that have been used in all outgoing messages
+since the last time C<reset_message_log> was called.
+
+If type is set, to any value, will increment output count by that value.
+
+Returns: current hop count.
+
+=cut 
+
+sub outgoing_hop_count
+{
+    my ($self, $outgoing_hop_count) = @_;
+    $$self{outgoing_hop_count} += $outgoing_hop_count if $outgoing_hop_count;
+	return $$self{outgoing_hop_count};
+}
+
 =item C<incoming_count_log([type]>
 
 Sets or gets the number of incoming message that have occured for this device 

From a42eca82629f0aa33d369e1b86b6c98d50222b92 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:04:55 -0700
Subject: [PATCH 102/330] Insteon_Stats: Add Routines to Track Duplicate
 Messages, Max Hops, and Hops Left

---
 lib/Insteon/BaseInsteon.pm | 56 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 0cffd0226..4c435ce75 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2092,10 +2092,64 @@ Returns: current corrupt count.
 sub corrupt_count_log
 {
     my ($self, $corrupt_count_log) = @_;
-    $$self{corrupt_count_log} = $corrupt_count_log if $corrupt_count_log;
+    $$self{corrupt_count_log}++ if $corrupt_count_log;
     return $$self{corrupt_count_log};
 }
 
+=item C<dupe_count_log([type]>
+
+Sets or gets the number of duplicate message that have arrived from this device 
+since the last time C<reset_message_log> was called.
+
+If type is set, to any value, will increment corrupt count by one.
+
+Returns: current duplicate count.
+
+=cut 
+
+sub dupe_count_log
+{
+    my ($self, $dupe_count_log) = @_;
+    $$self{dupe_count_log}++ if $dupe_count_log;
+    return $$self{dupe_count_log};
+}
+
+=item C<hops_left_count([type]>
+
+Sets or gets the number of hops_left for messages that arrive from this device 
+since the last time C<reset_message_log> was called.
+
+If type is set, to any value, will increment corrupt count by one.
+
+Returns: current hops_left count.
+
+=cut 
+
+sub hops_left_count
+{
+    my ($self, $hops_left_count) = @_;
+    $$self{hops_left_count} += $hops_left_count if $hops_left_count;
+    return $$self{hops_left_count};
+}
+
+=item C<max_hops_count([type]>
+
+Sets or gets the number of max_hops for messages that arrive from this device 
+since the last time C<reset_message_log> was called.
+
+If type is set, to any value, will increment corrupt count by one.
+
+Returns: current duplicate count.
+
+=cut 
+
+sub max_hops_count
+{
+    my ($self, $max_hops_count) = @_;
+    $$self{max_hops_count} += $max_hops_count if $max_hops_count;
+    return $$self{max_hops_count};
+}
+
 
 =item C<reset_message_log>
 

From aa6ea1a4f8177814359bf87de73c7e5d50c7a97e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:05:41 -0700
Subject: [PATCH 103/330] Insteon_Stats: Add Better Documentation of Print
 Message Log

---
 lib/Insteon/BaseInsteon.pm | 87 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 86 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 4c435ce75..47db239cf 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2165,11 +2165,96 @@ sub reset_message_log
     $$self{outgoing_count_log} = 0;
     $$self{incoming_count_log} = 0;
     $$self{corrupt_count_log} = 0;
+    $$self{dupe_count_log} = 0;
+    $$self{hops_left_count} = 0;
+    $$self{max_hops_count} = 0;
+    $$self{outgoing_hop_count} = 0;
 }
 
 =item C<print_message_log>
 
-Prints message statistics for this device to the print log.
+Prints message statistics for this device to the print log.  The output contains:
+
+=back
+
+=over8
+
+=item * 
+
+In - The number of incoming messages received
+
+=item * 
+
+Corrupt - The number of incoming corrupt messages received
+
+=item * 
+
+%Corrpt - Of the incoming messages received, the percentage that were 
+corrupt
+
+=item *
+
+Dupe - The number of duplicate messages that have been received from this 
+device.
+
+=item *
+
+%Dupe - The percentage of duplilicate incoming messages received.
+
+=item *
+
+Hops_Left - The average hops left in the messages received from this device.
+
+=item *
+
+Max_Hops - The average maximum hops in the messages received from this device.
+
+=item *
+
+Act_Hops - Max_Hops - Hops_Left, this is the average number of hops that have
+been required for a message sent from the device to reach MisterHouse.
+
+=item * 
+
+Out - The number of unique outgoing messages, without retries, sent. 
+
+=item * 
+
+Fail - The number times that all retries were exhausted without a successful
+delivery of a message.
+
+=item * 
+
+%Fail - Of the outgoing messages sent, the percentage that failed.
+
+=item * 
+
+Retry - The number of retry attempts that have been made to deliver a message. 
+Ideally this is 0, but Sends/Msg is a better indication of this parameter.
+
+=item * 
+
+AvgSend - The average number of send attempts that must be made in order to 
+successfully deliver a message.  Ideally this would be 1.0.  
+
+NOTE: If the number of retries exceeds the value set in the configuration file 
+for Insteon_retry_count, MisterHouse will abandon sending the message.  As a 
+result, as this number approaches Insteon_retry_count it becomes a less accurate 
+representation of the number of retries needed to reach a device.
+
+=item *
+
+Avg_Hops - The average number of hops that have been used by MisterHouse when
+sending messages to this device.
+
+=item *
+
+Hop_Count - The current hop count being used by MH.  This count is dynamically
+controlled by MH and is not reset by calling C<reset_message_log>
+
+=back
+
+=over
 
 =cut 
 

From 85d0f6b9f4af054e8cbc5dfd1af6ca83a405e08f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:06:26 -0700
Subject: [PATCH 104/330] Insteon_Stats: Beautify the Print Message Log Output

---
 lib/Insteon/BaseInsteon.pm | 54 +++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 47db239cf..e7adee13e 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2262,24 +2262,48 @@ sub print_message_log
 {
     my ($self) = @_;
     my $object_name = $self->get_object_name;
-    my $retry_percentage = 0; 
-    $retry_percentage = sprintf("%.2f", ($$self{retry_count_log} / 
-        $$self{outgoing_count_log}) * 100 ) if ($$self{outgoing_count_log} > 0);
+    my $retry_average = 0; 
+    $retry_average = sprintf("%.1f", ($$self{retry_count_log} / 
+        $$self{outgoing_count_log}) + 1) if ($$self{outgoing_count_log} > 0);
     my $fail_percentage = 0; 
-    $fail_percentage = sprintf("%.2f", ($$self{fail_count_log} / 
+    $fail_percentage = sprintf("%.1f", ($$self{fail_count_log} / 
         $$self{outgoing_count_log}) * 100 ) if ($$self{outgoing_count_log} > 0);
     my $corrupt_percentage = 0; 
-    $corrupt_percentage = sprintf("%.2f", ($$self{corrupt_count_log} / 
-        $$self{incoming_count_log}) * 100 ) if ($$self{outgoing_count_log} > 0);
-    ::print_log("[Insteon::BaseDevice] Message statistics for $object_name:\n"
-    . "Outgoing Count = " . $$self{outgoing_count_log} ."\n"
-    . "   Retry Count = " . $$self{retry_count_log} ."\n"
-    . "       Retry % = " . $retry_percentage . "%\n"
-    . "    Fail Count = " . $$self{fail_count_log} ."\n"
-    . "        Fail % = " . $fail_percentage . "%\n"
-    . "Incoming Count = " . $$self{incoming_count_log} ."\n"
-    . " Corrupt Count = " . $$self{corrupt_count_log} ."\n"
-    . "     Corrupt % = " . $corrupt_percentage. "%\n");
+    $corrupt_percentage = sprintf("%.1f", ($$self{corrupt_count_log} / 
+        $$self{incoming_count_log}) * 100 ) if ($$self{incoming_count_log} > 0);
+    my $dupe_percentage = 0; 
+    $dupe_percentage = sprintf("%.1f", ($$self{dupe_count_log} / 
+        $$self{incoming_count_log}) * 100 ) if ($$self{incoming_count_log} > 0);
+    my $avg_hops_left = 0; 
+    $avg_hops_left = sprintf("%.1f", ($$self{hops_left_count} / 
+        $$self{incoming_count_log})) if ($$self{incoming_count_log} > 0);
+    my $avg_max_hops = 0; 
+    $avg_max_hops = sprintf("%.1f", ($$self{max_hops_count} / 
+        $$self{incoming_count_log})) if ($$self{incoming_count_log} > 0);
+    my $avg_out_hops = 0;
+    $avg_out_hops = sprintf("%.1f", ($$self{outgoing_hop_count} / 
+        $$self{outgoing_count_log})) if ($$self{outgoing_count_log} > 0);
+    ::print_log(
+        "[Insteon::BaseDevice] Message statistics for $object_name:\n"
+        . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops\n"
+        . sprintf("%6s", $$self{incoming_count_log})
+        . sprintf("%8s", $$self{corrupt_count_log})
+        . sprintf("%8s", $corrupt_percentage . '%')
+        . sprintf("%6s", $$self{dupe_count_log})
+        . sprintf("%8s", $dupe_percentage . '%')
+        . sprintf("%9s", $avg_hops_left)
+        . sprintf("%9s", $avg_max_hops)
+        . sprintf("%9s", $avg_max_hops - $avg_hops_left)
+        . "\n"
+        . "   Out    Fail   %Fail Retry AvgSend Avg_Hops CurrHops\n"
+        . sprintf("%6s", $$self{outgoing_count_log})
+        . sprintf("%8s", $$self{fail_count_log})
+        . sprintf("%8s", $fail_percentage . '%')
+        . sprintf("%6s", $$self{retry_count_log})
+        . sprintf("%8s", $retry_average)
+        . sprintf("%9s", $avg_out_hops)
+        . sprintf("%9s", $self->default_hop_count)
+    );
 }
 
 

From 9a964f85a097e90851e2f1c32813c545b21e1826 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:07:19 -0700
Subject: [PATCH 105/330] Insteon_Stats: Fix Bug in Call to Fail_Count

---
 lib/Insteon/BaseInterface.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index c779c6656..a377c103f 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -359,13 +359,14 @@ sub process_queue
                                        	. $self->active_message->send_attempts
                 			. ") for " . $self->active_message->to_string()
                                         . " exceeds limit.  Now moving on...") if $main::Debug{insteon};
-                                $self->fail_count_log(1) if $self->can('fail_count_log');
                                 # !!!!!!!!! TO-DO - handle failure timeout ???
                                 my $failed_message = $self->active_message;
                                 # make sure to let the sending object know!!!
 				if (defined($failed_message->setby) and $failed_message->setby->can('is_acknowledged'))
 				{
                                        	$failed_message->setby->is_acknowledged(0);
+                                       	$failed_message->setby->fail_count_log(1) 
+                                       		if $failed_message->setby->can('fail_count_log');
 				}
 				else
 				{

From 172ab16274debe9d8cf40b9a64443b180c44ba22 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:08:45 -0700
Subject: [PATCH 106/330] Insteon_Stats: Add Calls to Max_Hops and Hops_Left

---
 lib/Insteon/BaseInterface.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index a377c103f..9d344aa91 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -532,6 +532,8 @@ sub on_standard_insteon_received
 		my $object = &Insteon::get_object($msg{source}, $msg{group});
 		if (defined $object)
                 {
+                	$object->max_hops_count($msg{maxhops}) if $object->can('max_hops_count');
+                	$object->hops_left_count($msg{hopsleft}) if $object->can('hops_left_count');
                     $object->incoming_count_log(1) if $object->can('incoming_count_log');
                 	if ($msg{type} ne 'broadcast')
                         {
@@ -693,6 +695,8 @@ sub on_extended_insteon_received
 		my $object = &Insteon::get_object($msg{source}, $msg{group});
 		if (defined $object)
                 {
+                	$object->max_hops_count($msg{maxhops}) if $object->can('max_hops_count');
+                	$object->hops_left_count($msg{hopsleft}) if $object->can('hops_left_count');
                     $object->incoming_count_log(1) if $object->can('incoming_count_log');
                 	if ($msg{type} ne 'broadcast')
                         {

From 1753671eac599572cad689b2f8e1305da3fd46ca Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:09:51 -0700
Subject: [PATCH 107/330] Insteon: Save Setby Object in On_Standard_Received

Save the object so we can use it in print_log messages
---
 lib/Insteon/BaseInterface.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 9d344aa91..20e47f57f 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -578,6 +578,7 @@ sub on_standard_insteon_received
                                         }
                                         elsif ($msg{type} eq 'cleanup')
                                         {
+                                        	my $setby_object = $object;
                                                 $object = &Insteon::get_object('000000', $msg{extra});
                                                 if ($object)
                                                 {
@@ -586,7 +587,7 @@ sub on_standard_insteon_received
 							# Don't clear active message as ACK is only one of many
 							if (($msg{extra} == $self->active_message->setby->group)){
                                                                 &main::print_log("[Insteon::BaseInterface] DEBUG3: Cleanup message received for scene "
-                                                                	. $object->get_object_name . " from source " . uc($msg{source}))
+                                                                	. $object->get_object_name . " from " . $setby_object->get_object_name)
                                                                 	if $main::Debug{insteon} >= 3;
 							} elsif ($self->active_message->command_type eq 'all_link_direct_cleanup' &&
 								lc($self->active_message->setby->device_id) eq $msg{source}) 
@@ -596,7 +597,7 @@ sub on_standard_insteon_received
 							}
 							else {
 								&main::print_log("[Insteon::BaseInterface] DEBUG3: Cleanup message received from "
-								. $msg{source} . " for scene "
+								. $setby_object->get_object_name . " for scene "
 								. $object->get_object_name . ", but group in recent message " 
 								. $msg{extra}. " did not match group in "
 								. "prior sent message group " . $self->active_message->setby->group) 
@@ -609,7 +610,7 @@ sub on_standard_insteon_received
                                                 else
                                                 {
                                                 	&main::print_log("[Insteon::BaseInterface] ERROR: received cleanup message from "
-                                                             . $msg{source} . "that does not correspond to a valid PLM group. Corrupted message is assumed "
+                                                             . $setby_object->get_object_name . "that does not correspond to a valid PLM group. Corrupted message is assumed "
                                                              . "and will be skipped! Was group " . $msg{extra});
                                                 }
                                         }

From 396cf2a4fac8cc3a63a839dc1d3ae8e2caec1cd0 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:11:07 -0700
Subject: [PATCH 108/330] Insteon_Stats:  Add Call to Corrupt Log Count

---
 lib/Insteon/BaseInterface.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 20e47f57f..16bf32588 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -612,6 +612,7 @@ sub on_standard_insteon_received
                                                 	&main::print_log("[Insteon::BaseInterface] ERROR: received cleanup message from "
                                                              . $setby_object->get_object_name . "that does not correspond to a valid PLM group. Corrupted message is assumed "
                                                              . "and will be skipped! Was group " . $msg{extra});
+                                                    $setby_object->corrupt_count_log(1) if $setby_object->can('corrupt_count_log');
                                                 }
                                         }
                                         else #not direct or cleanup
@@ -620,6 +621,7 @@ sub on_standard_insteon_received
                                                 	. $object->get_object_name . " but unable to process $msg{type} message type."
                                                         . " IGNORING received message!!");
                                                 $self->active_message->no_hop_increase(1);
+                                                $object->corrupt_count_log(1) if $object->can('corrupt_count_log');
                                         }
                         	}
                                 else #does not correspond to current active message

From 069252a418089b280e1094ec42e2f3a227875a46 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:11:45 -0700
Subject: [PATCH 109/330] Insteon_Stats: Track Hops in Duplicate Messages

They still provide some detail on how long messages take to arrive.

There may be one issue in that this may catch subsequent deliveries of the same message with a lower hops_left count.  Such as when the message is delivered on the 2nd and 3rd hop.  But at the same time, sometimes the messages that should take longer to arrive, as they have used more hops, somehow arrive first, so this may be a wash.  In the end, the best way to avoid this problem is to use proper hop counts.
---
 lib/Insteon/BaseInterface.pm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 16bf32588..e37ebc0ca 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -853,7 +853,16 @@ sub _is_duplicate_received {
 		#Make a nicer name
 		my $source = $msg{source};
 		my $object = &Insteon::get_object($msg{source}, $msg{group});
-		$source = $object->get_object_name() if (defined $object);
+		if (defined $object) {
+			$source = $object->get_object_name();
+			$object->dupe_count_log(1) if $object->can('dupe_count_log');
+			$object->max_hops_count($msg{maxhops}) if $object->can('max_hops_count');
+        	$object->hops_left_count($msg{hopsleft}) if $object->can('hops_left_count');
+            $object->incoming_count_log(1) if $object->can('incoming_count_log');
+            #This message still provides a data point on how many hops it is 
+            #taking for messages to arrive.
+            $object->default_hop_count($msg{maxhops}-$msg{hopsleft}) if $object->can('default_hop_count');
+		};
 		::print_log("[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
 			. $message_data . ", from $source.") if $main::Debug{insteon};
 	} else {

From 9c275d2653a79197439332b2b4a3b9bda9c505e8 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 24 Jul 2013 19:15:45 -0700
Subject: [PATCH 110/330] Insteon_Stats: Add Calls to Outgoing_Count and
 Hop_Count

---
 lib/Insteon/Message.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index 12cea5827..089334efa 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -238,8 +238,10 @@ sub send
                 }
 
                 # need to set timeout as a function of retries; also need to alter hop count
-                if ($self->setby->can('outgoing_count_log') && $self->send_attempts <= 0) {
-                    $self->setby->outgoing_count_log(1);
+                if ($self->send_attempts <= 0) {
+                    $self->setby->outgoing_count_log(1) if $self->setby->can('outgoing_count_log');
+                    $self->setby->outgoing_hop_count($self->setby->default_hop_count)
+                    	if $self->setby->can('outgoing_hop_count');
                 }
                 $self->send_attempts($self->send_attempts + 1);
 		$interface->_send_cmd($self, $self->send_timeout);

From d21f1f5fe515a731d2cd3f29e2c443865d07c9e3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 25 Jul 2013 20:29:25 -0700
Subject: [PATCH 111/330] Insteon_Stats: Cleanup Print All Messages to Ignore
 Non-Root and Non-Responders

---
 lib/Insteon.pm | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 67fcc48d2..0d8a6b7c8 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -495,6 +495,21 @@ its message handling, as well as a summary average of the entire network.  See
 L<Insteon::BaseDevice::print_message_log|Insteon::BaseInsteon::BaseDevice::print_message_log> 
 for more detailed information.
 
+This command adds the following extra data points:
+
+=back
+
+=over8
+
+=item * 
+
+PLM_Error - The number of messages which have arrived at the PLM which cannot
+be associated with any know device.
+
+=back
+
+=over
+
 =cut
 
 sub print_message_logs
@@ -524,9 +539,16 @@ sub print_message_logs
 		my $hops_left_count = 0;
 		my $max_hops_count = 0;
 		my $outgoing_hop_count =0;
+		
+		my $device_count = 0;
 
 		foreach my $current_log_device (@_log_devices)
 		{
+			#Skip non-root items
+			next unless $current_log_device->is_root;
+			
+			$device_count++;
+			
 			#Prints the Individual Message for the Device
 			$current_log_device->print_message_log;
 			
@@ -559,7 +581,7 @@ sub print_message_logs
     	$avg_out_hops = sprintf("%.1f", ($outgoing_hop_count / 
         	$outgoing_count_log)) if ($outgoing_count_log > 0);
     	$curr_hops_avg = sprintf("%.1f", ($default_hop_count / 
-        	scalar @_log_devices)) if (scalar @_log_devices > 0);
+        	$device_count)) if ($device_count > 0);
     	::print_log(
 	        "[Insteon] Average Network Statistics:\n"
 	        . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops\n"

From 1c82694a761db44f1aab2444369b62dfbcfb7604 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 25 Jul 2013 20:32:32 -0700
Subject: [PATCH 112/330] Insteon_Stats: Add Routine to Track Errors From
 Undefined Devices

---
 lib/Insteon.pm               |  4 +++-
 lib/Insteon/BaseInterface.pm |  1 +
 lib/Insteon_PLM.pm           | 34 +++++++++++++++++++++++++++++++++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 0d8a6b7c8..c240addae 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -584,7 +584,7 @@ sub print_message_logs
         	$device_count)) if ($device_count > 0);
     	::print_log(
 	        "[Insteon] Average Network Statistics:\n"
-	        . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops\n"
+	        . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops PLM_Error\n"
 	        . sprintf("%6s", $incoming_count_log)
 	        . sprintf("%8s", $corrupt_count_log)
 	        . sprintf("%8s", $corrupt_percentage . '%')
@@ -593,6 +593,7 @@ sub print_message_logs
 	        . sprintf("%9s", $avg_hops_left)
 	        . sprintf("%9s", $avg_max_hops)
 	        . sprintf("%9s", $avg_max_hops - $avg_hops_left)
+	        . sprintf("%10s", &Insteon::active_interface->corrupt_count_log)
 	        . "\n"
 	        . "   Out    Fail   %Fail Retry AvgSend Avg_Hops CurrHops\n"
 	        . sprintf("%6s", $outgoing_count_log)
@@ -620,6 +621,7 @@ its message handling.
 sub reset_message_logs
 {
     my @_log_devices = ();
+    &Insteon::active_interface->reset_message_log;
     push @_log_devices, Insteon::find_members("Insteon::BaseDevice");
 
 	if (@_log_devices)
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index e37ebc0ca..8b9a9d7e3 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -657,6 +657,7 @@ sub on_standard_insteon_received
                 else 
                 {
          		&::print_log("[Insteon::BaseInterface] Warn! Unable to locate object for source: $msg{source} and group: $msg{group}");
+         		$self->corrupt_count_log(1);
 		}
 		# treat the message as legitimate even if an object match did not occur
 	}
diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index 90e670463..563e04c44 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -99,7 +99,8 @@ sub new {
 	$$self{last_command} = '';
 	$$self{_prior_data_fragment} = '';
    bless $self, $class;
-   $self->restore_data('debug');
+   $self->restore_data('debug', 'corrupt_count_log');
+   $$self{corrupt_count_log} = 0;
    $$self{aldb} = new Insteon::ALDB_PLM($self);
 
    &Insteon::add($self);
@@ -118,6 +119,37 @@ sub new {
    return $self;
 }
 
+=item C<corrupt_count_log([type]>
+
+Sets or gets the number of corrupt message that have arrived that could not be
+associated with any device since the last time C<reset_message_log> was called.
+These are generally instances in which the from device ID is corrupt.
+
+If type is set, to any value, will increment corrupt count by one.
+
+Returns: current corrupt count.
+
+=cut 
+
+sub corrupt_count_log
+{
+    my ($self, $corrupt_count_log) = @_;
+    $$self{corrupt_count_log}++ if $corrupt_count_log;
+    return $$self{corrupt_count_log};
+}
+
+=item C<reset_message_log>
+
+Resets the retry, fail, outgoing, incoming, and corrupt message counters.
+
+=cut 
+
+sub reset_message_log
+{
+    my ($self) = @_;
+    $$self{corrupt_count_log} = 0;
+}
+
 =item C<restore_string()>
 
 This is called by mh on exit to save the cached ALDB of a device to persistant data.

From 67e55924464d6693b497b11c1535d9a708871261 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 25 Jul 2013 20:34:45 -0700
Subject: [PATCH 113/330] Insteon Stats: Only Track Stats for Root Devices Add
 More Calls to Stat Trackers

---
 lib/Insteon/BaseInsteon.pm   | 12 ++++++++++++
 lib/Insteon/BaseInterface.pm |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index e7adee13e..8a85eaaab 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -880,6 +880,7 @@ sub _process_message
 		} else {
 			main::print_log("[Insteon::BaseObject] Ignoring unsupported command from " 
 				. $self->{object_name}) if $main::Debug{insteon};
+			$self->corrupt_count_log(1) if $self->can('corrupt_count_log');
                 }
 	}
 	return $clear_message;
@@ -2002,6 +2003,7 @@ Returns: current retry count.
 sub retry_count_log
 {
 	my ($self, $retry_count_log) = @_;
+	$self = $self->get_root;
 	$$self{retry_count_log}++ if $retry_count_log;
 	return $$self{retry_count_log};
 } 
@@ -2020,6 +2022,7 @@ Returns: current fail count.
 sub fail_count_log
 {
     my ($self, $fail_count_log) = @_;
+    $self = $self->get_root;
 	$$self{fail_count_log}++ if $fail_count_log;
 	return $$self{fail_count_log};
 } 
@@ -2038,6 +2041,7 @@ Returns: current output count.
 sub outgoing_count_log
 {
     my ($self, $outgoing_count_log) = @_;
+    $self = $self->get_root;
     $$self{outgoing_count_log}++ if $outgoing_count_log;
 	return $$self{outgoing_count_log};
 }
@@ -2056,6 +2060,7 @@ Returns: current hop count.
 sub outgoing_hop_count
 {
     my ($self, $outgoing_hop_count) = @_;
+    $self = $self->get_root;
     $$self{outgoing_hop_count} += $outgoing_hop_count if $outgoing_hop_count;
 	return $$self{outgoing_hop_count};
 }
@@ -2074,6 +2079,7 @@ Returns: current incoming count.
 sub incoming_count_log
 {
     my ($self, $incoming_count_log) = @_;
+    $self = $self->get_root;
     $$self{incoming_count_log}++ if $incoming_count_log;
     return $$self{incoming_count_log};
 }
@@ -2092,6 +2098,7 @@ Returns: current corrupt count.
 sub corrupt_count_log
 {
     my ($self, $corrupt_count_log) = @_;
+    $self = $self->get_root;
     $$self{corrupt_count_log}++ if $corrupt_count_log;
     return $$self{corrupt_count_log};
 }
@@ -2110,6 +2117,7 @@ Returns: current duplicate count.
 sub dupe_count_log
 {
     my ($self, $dupe_count_log) = @_;
+    $self = $self->get_root;
     $$self{dupe_count_log}++ if $dupe_count_log;
     return $$self{dupe_count_log};
 }
@@ -2128,6 +2136,7 @@ Returns: current hops_left count.
 sub hops_left_count
 {
     my ($self, $hops_left_count) = @_;
+    $self = $self->get_root;
     $$self{hops_left_count} += $hops_left_count if $hops_left_count;
     return $$self{hops_left_count};
 }
@@ -2146,6 +2155,7 @@ Returns: current duplicate count.
 sub max_hops_count
 {
     my ($self, $max_hops_count) = @_;
+    $self = $self->get_root;
     $$self{max_hops_count} += $max_hops_count if $max_hops_count;
     return $$self{max_hops_count};
 }
@@ -2160,6 +2170,7 @@ Resets the retry, fail, outgoing, incoming, and corrupt message counters.
 sub reset_message_log
 {
     my ($self) = @_;
+    $self = $self->get_root;
     $$self{retry_count_log} = 0;
     $$self{fail_count_log} = 0;
     $$self{outgoing_count_log} = 0;
@@ -2261,6 +2272,7 @@ controlled by MH and is not reset by calling C<reset_message_log>
 sub print_message_log
 {
     my ($self) = @_;
+    $self = $self->get_root;
     my $object_name = $self->get_object_name;
     my $retry_average = 0; 
     $retry_average = sprintf("%.1f", ($$self{retry_count_log} / 
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 8b9a9d7e3..7beb0fc3e 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -574,6 +574,8 @@ sub on_standard_insteon_received
                                                 	&main::print_log("[Insteon::BaseInterface] WARN: deviceid of "
                                                 		. "active message != received message source ("
                                                         	. $object->get_object_name() . "). IGNORING received message!!");
+                                                        #These generally seem to be duplicate messages
+                                                        $object->dupe_count_log(1) if $object->can('dupe_count_log');
                                                 }
                                         }
                                         elsif ($msg{type} eq 'cleanup')

From a20c3a97483ef66d88d5af79e6b6ba2985fda65e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 25 Jul 2013 20:40:40 -0700
Subject: [PATCH 114/330] Insteon_Diags: Add Function to Call Test Read for All
 Devices

---
 lib/Insteon.pm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 799f26c3f..efc5104fb 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -179,6 +179,44 @@ my (@_insteon_plm,@_insteon_device,@_insteon_link,@_scannable_link,$_scan_cnt,$_
 my $init_complete;
 my (@_scan_devices,@_scan_device_failures,$current_scan_device);
 my (@_sync_devices,@_sync_device_failures,$current_sync_device);
+my ($_test_count, @_test_devices);
+
+=item C<test_read_all([count)>
+
+Walks through every Insteon device and performs a test_read on it as many times as defined by 
+count.  See L<Insteon::BaseDevice::test_read|Insteon::BaseInsteon::BaseDevice::test_read> 
+for a more detailed description of test_read.
+
+=cut
+
+sub test_read_all
+{
+	my ($p_count) = @_;
+	if (defined $p_count){
+		$_test_count = $p_count; 
+		push @_test_devices, Insteon::find_members("Insteon::BaseDevice");
+		main::print_log("[Insteon::Test Read All Devices] Test Read All Devices $p_count times");
+	};	
+
+	if (@_test_devices)
+	{
+		my $current_test_device;
+		my $not_found = 1;
+		my $complete_callback = '&Insteon::test_read_all()';
+		while ($not_found){
+			$current_test_device = pop @_test_devices;
+			next unless $current_test_device->is_root();
+			next unless $current_test_device->is_responder();
+			$not_found = 0;
+		}
+		if (ref $current_test_device && $current_test_device->can('test_read')){
+			$current_test_device->test_read($_test_count, $complete_callback);
+		}
+	} else
+	{
+		main::print_log("[Insteon::Test Read All Devices] Complete");
+	}
+}
 
 =item C<scan_all_linktables()>
 

From 2b638739ed2a4ff6f93d8ba658e1a6eaaf8f6de2 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 25 Jul 2013 20:41:33 -0700
Subject: [PATCH 115/330] Insteon_Diags: Add Function to Ping All Devices

---
 lib/Insteon.pm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index efc5104fb..4c98dbbba 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -453,7 +453,36 @@ sub _get_next_linksync_failure
 
 }
 
+=item C<ping_all([count)>
 
+Walks through every Insteon device and pings it as many times as defined by 
+count.  See L<Insteon::BaseDevice::ping|Insteon::BaseInsteon::BaseDevice::ping> 
+for a more detailed description of ping.
+
+=cut
+
+sub ping_all
+{
+	my ($p_count) = @_;
+	my @_ping_devices = ();
+	push @_ping_devices, Insteon::find_members("Insteon::BaseDevice");
+
+	if (@_ping_devices)
+	{
+		main::print_log("[Insteon::Ping All Devices] Ping All Devices $p_count times");
+		foreach my $current_ping_device (@_ping_devices)
+		{
+			next unless $current_ping_device->is_root();
+			next unless $current_ping_device->is_responder(); 
+			$current_ping_device->ping($p_count)
+                		if $current_ping_device->can('ping');
+		}
+		main::print_log("[Insteon::Ping All Devices] Ping All Complete");
+	} else
+	{
+		main::print_log("[Insteon::Ping All Devices] WARN: No insteon devices could be found");
+	}
+}
 
 =item C<log_all_ADLB_status()>
 

From 487dd802bb29e1119062524c360add35865b6c93 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 25 Jul 2013 20:43:47 -0700
Subject: [PATCH 116/330] Insteon_Diags: Add Ability to Read One ALDB Entry
 Only

---
 lib/Insteon/AllLinkDatabase.pm | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 5c7918641..3eaae2294 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -1590,7 +1590,8 @@ sub _on_peek
 				$$self{_mem_action} = 'aldb_flag';
 				# if the device is responding to the peek, then init the link table
 				#   if at the very start of a scan
-				if (lc $$self{_mem_msb} eq '0f' and lc $$self{_mem_lsb} eq 'f8')
+				if (lc $$self{_mem_msb} eq '0f' and lc $$self{_mem_lsb} eq 'f8'
+					&& !$$self{_mem_only_one})
                                 {
 					# reinit the aldb hash as there will be a new one
 					$$self{aldb} = undef;
@@ -1635,7 +1636,12 @@ sub _on_peek
 				$$self{pending_aldb}{inuse} = ($flag & 0x80) ? 1 : 0;
 				$$self{pending_aldb}{is_controller} = ($flag & 0x40) ? 1 : 0;
 				$$self{pending_aldb}{highwater} = ($flag & 0x02) ? 1 : 0;
-				if (!($$self{pending_aldb}{highwater}))
+                        	if ($$self{_mem_only_one} && !($$self{pending_aldb}{highwater})){
+                        		::print_log("[Insteon::ALDB_i1] You need to create a link on this device before running test_read");
+                        		$$self{_mem_only_one} = 0;
+                        		$$self{device}->test_read();
+                        	}
+				elsif (!($$self{pending_aldb}{highwater}))
                                 {
 					# since this is the last unused memory location, then add it to the empty list
 					$self->add_empty_address($$self{_mem_msb} . $$self{_mem_lsb});
@@ -1836,8 +1842,12 @@ sub _on_peek
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
                                         . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
 				$$self{pending_aldb}{data3} = $msg{extra};
-				# check the previous record if highwater is set
-				if ($$self{pending_aldb}{highwater})
+
+                        	if ($$self{_mem_only_one}){
+                        		$$self{_mem_only_one} = 0;
+                        		$$self{device}->test_read();
+                        	}
+				elsif ($$self{pending_aldb}{highwater})
                                 {
 					if ($$self{pending_aldb}{inuse})
                                         {
@@ -2158,6 +2168,10 @@ sub on_read_write_aldb
 			#retry previous address again
 			$self->send_read_aldb(sprintf("%04x", hex($$self{_mem_msb} . $$self{_mem_lsb})));
 		}
+		elsif ($$self{_mem_only_one}){
+                	$$self{_mem_only_one} = 0;
+        		$$self{device}->test_read();
+        	}
 		else
 		{
 			# init the link table if at the very start of a scan

From dfc54aa080cbc122c19e24dfaac031cb37d50d87 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 25 Jul 2013 20:44:42 -0700
Subject: [PATCH 117/330] Insteon_Diags: Add Function to Repetitively Read One
 ALDB Entry

---
 lib/Insteon/BaseInsteon.pm | 63 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 4aaad4330..418fc546f 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1955,6 +1955,69 @@ sub update_flags
 	$self->_aldb->update_flags($flags) if $self->_aldb;
 }
 
+=item C<test_read([count])>
+
+Simulates a read of a link address from the device.  Repeats this process as many
+times as defined by count.  This routine is meant to be used as a diagnostic tool.
+It is similar to scan_link_table, however, if a failure occurs, this process will
+continue with the next iteration.  Scan link table will stop as soon as a single
+failure occurs.
+
+This is also similar to the C<ping> test, however, rather than simply requesting
+an ACK, this requests a full set of data equivalent to a link entry.  Similar to
+C<ping> this should be used with C<print_message_log> to diagnose issues and try
+different settings.
+
+Note: This routine can create a lot of traffic if count is set very high.  Try
+setting it to 5 first and working your way up.
+
+=cut
+
+sub test_read
+{
+	my ($self, $p_count, $complete_callback) = @_;
+	$$self{test_read_count} = $p_count if (defined ($p_count));
+	$$self{test_callback} = $complete_callback if (defined ($complete_callback));
+	if ($$self{test_read_count}){
+		&::print_log("[Insteon::BaseDevice] " . $self->get_object_name 
+			. " - Test Read " . $$self{test_read_count} . " iterations left");
+	        my $aldb = $self->get_root()->_aldb;
+	        if ($aldb)
+	        {
+			$$aldb{_mem_activity} = 'scan';
+			$$aldb{_mem_only_one} = 1;
+			$$aldb{_failure_callback} = $self->get_object_name 
+				. '->test_read()';
+			if($aldb->isa('Insteon::ALDB_i1')) {
+				$aldb->_peek('0FF8');
+			} else {
+				#Prevents duplicate commands in queue error
+				#Also allows for better identification of 
+				#sequential dupe incoming messages
+				my $odd = $$self{test_read_count} % 2;
+				if ($odd){
+					$aldb->send_read_aldb('0fff');
+				} else {
+					$aldb->send_read_aldb('0ff7');
+				}
+			}
+		}
+		$$self{test_read_count}--;
+	} else {
+		&::print_log("[Insteon::BaseDevice] Test Read Complete for " 
+			. $self->get_object_name);	
+		if (defined $$self{test_callback}){
+			$complete_callback = $$self{test_callback};
+			package main;
+			eval ($complete_callback);
+			&::print_log("[Insteon::BaseDevice] error in test_read callback: " . $@)
+				if $@ and $main::Debug{insteon};
+			package Insteon::BaseDevice;
+			delete $$self{test_callback};
+		}
+	}
+}
+
 =item C<engine_version>
 
 Sets or gets the device object engine version.  If setting the engine version, 

From 625f0e67c7beb4540221e1cf1b0dca5ad45e6d2a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 25 Jul 2013 20:45:12 -0700
Subject: [PATCH 118/330] Insteon_Diags: Fix Ping Function to Send Repeated
 Ping Messages

---
 lib/Insteon/BaseInsteon.pm | 64 +++++++++++++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 8 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 418fc546f..5860e083e 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -747,6 +747,17 @@ sub _process_message
                         		$clear_message = 0;
                         	}
 			}
+			elsif ($pending_cmd eq 'ping'){
+				$corrupt_cmd = 1 if ($msg{cmd_code} ne $self->message_type_hex($pending_cmd));
+				$corrupt_cmd = 1 if ($msg{extra} ne sprintf ("%02d", $$self{ping_count}));
+				if (!$corrupt_cmd){
+					$self->_process_command_stack(%msg);
+					&::print_log("[Insteon::BaseObject] received ping acknowledgement from " . $self->{object_name})
+						if $main::Debug{insteon};
+					$self->ping();
+					$clear_message = 1;
+				}
+			}
 			else
                         {
 				if (($pending_cmd eq 'do_read_ee') && 
@@ -911,6 +922,7 @@ sub _process_command_stack
                                 or $message->command eq 'set_operating_flags'
                                 or $message->command eq 'get_operating_flags'
                                 or $message->command eq 'read_write_aldb'
+                                or $message->command eq 'ping'
                                 )
                         {
 				$$self{awaiting_ack} = 1;
@@ -1084,7 +1096,7 @@ our %message_types = (
    linking_mode => 0x09,
    unlinking_mode => 0x0A,
    get_engine_version => 0x0D,
-   ping => 0x10,
+   ping => 0x0F,
    on_fast => 0x12,
    off_fast => 0x14,
    start_manual_change => 0x17,
@@ -1713,18 +1725,54 @@ sub _get_engine_version_failure
 	}
 }
 
-=item C<ping()>
+=item C<ping([count])>
 
-Sends a ping command to the device.
+Sends the number of ping messages defined by count.  A ping message is a basic 
+message that simply asks the device to respond with an ACKnowledgement.  For
+i1 devices this will send a standard length command, for i2 and i2cs devices
+this will send an extended ping command.  In both cases, the device responds
+back with a standard length ACKnowledgement only.
 
-=cut 
+Much like the ping command in IP networks, this command is useful for testing the
+connectivity of a device on your network.  You likely want to use this in 
+conjunction with the C<print_message_log> routine.  For example, you can use 
+this to compare the message stats for a device when changing settings in 
+MisterHouse.
+
+Parameters:
+	count = the number of pings to send.
+
+Returns: Nothing.
+
+=cut
 
 sub ping
 {
-	my ($self) = @_;
-        my $message = new Insteon::InsteonMessage('insteon_send', $self, 'ping');
-        $self->_send_cmd($message);
-#	$self->_send_cmd('command' => 'ping');
+	my ($self, $p_count) = @_;
+	$$self{ping_count} = $p_count if defined($p_count);
+	if ($$self{ping_count}) {
+		$$self{ping_count}--;
+		my $message;
+		my $extra = sprintf("%02d", $$self{ping_count});
+		if (uc($self->engine_version) eq 'I1'){
+	    	$message = new Insteon::InsteonMessage('insteon_send', $self, 
+	    		'ping', $extra);
+		}
+		else {
+			my $extra = $extra . '0' x 28;
+			$message = new Insteon::InsteonMessage('insteon_ext_send', $self, 
+				'ping', $extra);
+		}
+		::print_log("[Insteon::BaseDevice] Sending ping request to " 
+			. $self->get_object_name . " " . $$self{ping_count} 
+			. " more ping requests queued.");
+		$message->failure_callback($self->get_object_name . '->ping()');
+		$self->_send_cmd($message);
+	}
+	else {
+		::print_log("[Insteon::BaseDevice] Completed ping queue for " 
+			. $self->get_object_name);
+	}
 }
 
 =item C<set_led_status()>

From 433181a58a96df2140a11947f7309570f950ab8a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 26 Jul 2013 17:33:00 -0700
Subject: [PATCH 119/330] Insteon_Diagnostics: Change Name of Routine to
 Stress_Test add One Pass Option

---
 lib/Insteon.pm                 | 65 ++++++++++++++++++++--------------
 lib/Insteon/AllLinkDatabase.pm | 22 ++++++------
 lib/Insteon/BaseInsteon.pm     | 30 ++++++++--------
 3 files changed, 65 insertions(+), 52 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 4c98dbbba..b88ee0212 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -179,42 +179,55 @@ my (@_insteon_plm,@_insteon_device,@_insteon_link,@_scannable_link,$_scan_cnt,$_
 my $init_complete;
 my (@_scan_devices,@_scan_device_failures,$current_scan_device);
 my (@_sync_devices,@_sync_device_failures,$current_sync_device);
-my ($_test_count, @_test_devices);
+my ($_stress_test_count, $_stress_test_one_pass, @_stress_test_devices);
 
-=item C<test_read_all([count)>
+=item C<stress_test_all(count, [is_one_pass])>
 
-Walks through every Insteon device and performs a test_read on it as many times as defined by 
-count.  See L<Insteon::BaseDevice::test_read|Insteon::BaseInsteon::BaseDevice::test_read> 
-for a more detailed description of test_read.
+Sequentially goes through every Insteon device and performs a stress_test on it.  
+See L<Insteon::BaseDevice::stress_test|Insteon::BaseInsteon::BaseDevice::stress_test> 
+for a more detailed description of stress_test.
+
+Parameters:
+	Count: defines the number of stress_tests to perform on each device.
+	is_one_pass: if true, all stress_tests will be performed on a device
+		before proceeding to the next device. if false, the routine 
+		loops through all devices performing one stress_test on each 
+		device before moving on to the next device.
 
 =cut
 
-sub test_read_all
+sub stress_test_all
 {
-	my ($p_count) = @_;
+	my ($p_count, $is_one_pass) = @_;
 	if (defined $p_count){
-		$_test_count = $p_count; 
-		push @_test_devices, Insteon::find_members("Insteon::BaseDevice");
-		main::print_log("[Insteon::Test Read All Devices] Test Read All Devices $p_count times");
+		$_stress_test_count = $p_count; 
+		$_stress_test_one_pass = $is_one_pass;
+		push @_stress_test_devices, Insteon::find_members("Insteon::BaseDevice");
+		main::print_log("[Insteon::Stress Test All Devices] Stress Testing All Devices $p_count times");
 	};	
-
-	if (@_test_devices)
-	{
-		my $current_test_device;
-		my $not_found = 1;
-		my $complete_callback = '&Insteon::test_read_all()';
-		while ($not_found){
-			$current_test_device = pop @_test_devices;
-			next unless $current_test_device->is_root();
-			next unless $current_test_device->is_responder();
-			$not_found = 0;
+	if (!@_stress_test_devices) {
+		#Iteration may be complete, start over from the beginning
+		$_stress_test_count = ($_stress_test_one_pass) ? 0 : $_stress_test_count--; 
+		push @_stress_test_devices, Insteon::find_members("Insteon::BaseDevice");
+	}
+	if ($_stress_test_count > 0){
+		my $current_stress_test_device;
+		my $complete_callback = '&Insteon::stress_test_all()';
+		while (@_stress_test_devices){
+			$current_stress_test_device = pop @_stress_test_devices;
+			next unless $current_stress_test_device->is_root();
+			next unless $current_stress_test_device->is_responder();
+			last;
 		}
-		if (ref $current_test_device && $current_test_device->can('test_read')){
-			$current_test_device->test_read($_test_count, $complete_callback);
+		my $run_count = ($_stress_test_one_pass) ? $_stress_test_count : 1;
+		if (ref $current_stress_test_device && $current_stress_test_device->can('stress_test')){
+			$current_stress_test_device->stress_test($run_count, $complete_callback);
 		}
-	} else
-	{
-		main::print_log("[Insteon::Test Read All Devices] Complete");
+	} 
+	else {
+		$_stress_test_one_pass = 0;
+		@_stress_test_devices = undef;
+		main::print_log("[Insteon::Stress Test All Devices] Complete");
 	}
 }
 
diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 3eaae2294..3f6bb5769 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -1591,7 +1591,7 @@ sub _on_peek
 				# if the device is responding to the peek, then init the link table
 				#   if at the very start of a scan
 				if (lc $$self{_mem_msb} eq '0f' and lc $$self{_mem_lsb} eq 'f8'
-					&& !$$self{_mem_only_one})
+					&& !$$self{_stress_test_act})
                                 {
 					# reinit the aldb hash as there will be a new one
 					$$self{aldb} = undef;
@@ -1636,10 +1636,10 @@ sub _on_peek
 				$$self{pending_aldb}{inuse} = ($flag & 0x80) ? 1 : 0;
 				$$self{pending_aldb}{is_controller} = ($flag & 0x40) ? 1 : 0;
 				$$self{pending_aldb}{highwater} = ($flag & 0x02) ? 1 : 0;
-                        	if ($$self{_mem_only_one} && !($$self{pending_aldb}{highwater})){
-                        		::print_log("[Insteon::ALDB_i1] You need to create a link on this device before running test_read");
-                        		$$self{_mem_only_one} = 0;
-                        		$$self{device}->test_read();
+                        	if ($$self{_stress_test_act} && !($$self{pending_aldb}{highwater})){
+                        		::print_log("[Insteon::ALDB_i1] You need to create a link on this device before running stress_test");
+                        		$$self{_stress_test_act} = 0;
+                        		$$self{device}->stress_test();
                         	}
 				elsif (!($$self{pending_aldb}{highwater}))
                                 {
@@ -1843,9 +1843,9 @@ sub _on_peek
                                         . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
 				$$self{pending_aldb}{data3} = $msg{extra};
 
-                        	if ($$self{_mem_only_one}){
-                        		$$self{_mem_only_one} = 0;
-                        		$$self{device}->test_read();
+                        	if ($$self{_stress_test_act}){
+                        		$$self{_stress_test_act} = 0;
+                        		$$self{device}->stress_test();
                         	}
 				elsif ($$self{pending_aldb}{highwater})
                                 {
@@ -2168,9 +2168,9 @@ sub on_read_write_aldb
 			#retry previous address again
 			$self->send_read_aldb(sprintf("%04x", hex($$self{_mem_msb} . $$self{_mem_lsb})));
 		}
-		elsif ($$self{_mem_only_one}){
-                	$$self{_mem_only_one} = 0;
-        		$$self{device}->test_read();
+		elsif ($$self{_stress_test_act}){
+                	$$self{_stress_test_act} = 0;
+        		$$self{device}->stress_test();
         	}
 		else
 		{
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 5860e083e..b0fd51b79 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2003,7 +2003,7 @@ sub update_flags
 	$self->_aldb->update_flags($flags) if $self->_aldb;
 }
 
-=item C<test_read([count])>
+=item C<stress_test(count)>
 
 Simulates a read of a link address from the device.  Repeats this process as many
 times as defined by count.  This routine is meant to be used as a diagnostic tool.
@@ -2021,28 +2021,28 @@ setting it to 5 first and working your way up.
 
 =cut
 
-sub test_read
+sub stress_test
 {
 	my ($self, $p_count, $complete_callback) = @_;
-	$$self{test_read_count} = $p_count if (defined ($p_count));
-	$$self{test_callback} = $complete_callback if (defined ($complete_callback));
-	if ($$self{test_read_count}){
+	$$self{stress_test_count} = $p_count if (defined ($p_count));
+	$$self{stress_test_callback} = $complete_callback if (defined ($complete_callback));
+	if ($$self{stress_test_count}){
 		&::print_log("[Insteon::BaseDevice] " . $self->get_object_name 
-			. " - Test Read " . $$self{test_read_count} . " iterations left");
+			. " - Stress Test " . $$self{stress_test_count} . " iterations left");
 	        my $aldb = $self->get_root()->_aldb;
 	        if ($aldb)
 	        {
 			$$aldb{_mem_activity} = 'scan';
-			$$aldb{_mem_only_one} = 1;
+			$$aldb{_stress_test_act} = 1;
 			$$aldb{_failure_callback} = $self->get_object_name 
-				. '->test_read()';
+				. '->stress_test()';
 			if($aldb->isa('Insteon::ALDB_i1')) {
 				$aldb->_peek('0FF8');
 			} else {
 				#Prevents duplicate commands in queue error
 				#Also allows for better identification of 
 				#sequential dupe incoming messages
-				my $odd = $$self{test_read_count} % 2;
+				my $odd = $$self{stress_test_count} % 2;
 				if ($odd){
 					$aldb->send_read_aldb('0fff');
 				} else {
@@ -2050,18 +2050,18 @@ sub test_read
 				}
 			}
 		}
-		$$self{test_read_count}--;
+		$$self{stress_test_count}--;
 	} else {
-		&::print_log("[Insteon::BaseDevice] Test Read Complete for " 
+		&::print_log("[Insteon::BaseDevice] Stress Test Complete for " 
 			. $self->get_object_name);	
-		if (defined $$self{test_callback}){
-			$complete_callback = $$self{test_callback};
+		if (defined $$self{stress_test_callback}){
+			$complete_callback = $$self{stress_test_callback};
 			package main;
 			eval ($complete_callback);
-			&::print_log("[Insteon::BaseDevice] error in test_read callback: " . $@)
+			&::print_log("[Insteon::BaseDevice] error in stress_test callback: " . $@)
 				if $@ and $main::Debug{insteon};
 			package Insteon::BaseDevice;
-			delete $$self{test_callback};
+			delete $$self{stress_test_callback};
 		}
 	}
 }

From 6ffcfbcb4f2752164412f3ee02c55fdcc1ace9ce Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 27 Jul 2013 09:47:12 -0700
Subject: [PATCH 120/330] Insteon_Diags: Clear ALBD Memory Pointer

---
 lib/Insteon/AllLinkDatabase.pm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 3f6bb5769..0f939cbeb 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -1638,6 +1638,8 @@ sub _on_peek
 				$$self{pending_aldb}{highwater} = ($flag & 0x02) ? 1 : 0;
                         	if ($$self{_stress_test_act} && !($$self{pending_aldb}{highwater})){
                         		::print_log("[Insteon::ALDB_i1] You need to create a link on this device before running stress_test");
+                        		$$self{_mem_activity} = undef;
+                        		$$self{_mem_action} = undef;
                         		$$self{_stress_test_act} = 0;
                         		$$self{device}->stress_test();
                         	}
@@ -1845,6 +1847,8 @@ sub _on_peek
 
                         	if ($$self{_stress_test_act}){
                         		$$self{_stress_test_act} = 0;
+                        		$$self{_mem_activity} = undef;
+                        		$$self{_mem_action} = undef;
                         		$$self{device}->stress_test();
                         	}
 				elsif ($$self{pending_aldb}{highwater})
@@ -1917,9 +1921,11 @@ sub _on_peek
                         $message->failure_callback($$self{_failure_callback});
                         $self->_send_cmd($message);
 		}
-#
-#			&::print_log("AllLinkDataBase: peek for " . $self->{object_name}
-#		. " is " . $msg{extra}) if $main::Debug{insteon};
+		else {
+		::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name 
+			. ": unhandled _mem_action=".$$self{_mem_action})
+			if $main::Debug{insteon};
+		}
 	}
 }
 
@@ -2169,6 +2175,8 @@ sub on_read_write_aldb
 			$self->send_read_aldb(sprintf("%04x", hex($$self{_mem_msb} . $$self{_mem_lsb})));
 		}
 		elsif ($$self{_stress_test_act}){
+			$$self{_mem_activity} = undef;
+                        $$self{_mem_action} = undef;
                 	$$self{_stress_test_act} = 0;
         		$$self{device}->stress_test();
         	}

From e8d4c33c0229afb5d8cb58cad7f6a62466848db7 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 29 Jul 2013 19:48:47 -0700
Subject: [PATCH 121/330] Insteon_Diags: Process Ping_All Command on Devices
 Sequentially

Finish processing each device before proceeding onto the next device.
---
 lib/Insteon.pm             | 26 ++++++++++++++++----------
 lib/Insteon/BaseInsteon.pm | 12 +++++++++++-
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index b88ee0212..719e66d08 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -180,6 +180,7 @@ my $init_complete;
 my (@_scan_devices,@_scan_device_failures,$current_scan_device);
 my (@_sync_devices,@_sync_device_failures,$current_sync_device);
 my ($_stress_test_count, $_stress_test_one_pass, @_stress_test_devices);
+my ($_ping_count, @_ping_devices);
 
 =item C<stress_test_all(count, [is_one_pass])>
 
@@ -202,6 +203,7 @@ sub stress_test_all
 	if (defined $p_count){
 		$_stress_test_count = $p_count; 
 		$_stress_test_one_pass = $is_one_pass;
+		@_stress_test_devices = undef; 
 		push @_stress_test_devices, Insteon::find_members("Insteon::BaseDevice");
 		main::print_log("[Insteon::Stress Test All Devices] Stress Testing All Devices $p_count times");
 	};	
@@ -226,7 +228,6 @@ sub stress_test_all
 	} 
 	else {
 		$_stress_test_one_pass = 0;
-		@_stress_test_devices = undef;
 		main::print_log("[Insteon::Stress Test All Devices] Complete");
 	}
 }
@@ -477,23 +478,28 @@ for a more detailed description of ping.
 sub ping_all
 {
 	my ($p_count) = @_;
-	my @_ping_devices = ();
-	push @_ping_devices, Insteon::find_members("Insteon::BaseDevice");
-
+	if (defined $p_count){
+		$_ping_count = $p_count;
+		@_ping_devices = ();
+		push @_ping_devices, Insteon::find_members("Insteon::BaseDevice");
+		main::print_log("[Insteon::Ping All Devices] Ping All Devices $p_count times");
+	}
 	if (@_ping_devices)
 	{
-		main::print_log("[Insteon::Ping All Devices] Ping All Devices $p_count times");
-		foreach my $current_ping_device (@_ping_devices)
+		my $current_ping_device;
+		while(@_ping_devices)
 		{
+			$current_ping_device = pop @_ping_devices;
 			next unless $current_ping_device->is_root();
 			next unless $current_ping_device->is_responder(); 
-			$current_ping_device->ping($p_count)
-                		if $current_ping_device->can('ping');
+			last;
 		}
-		main::print_log("[Insteon::Ping All Devices] Ping All Complete");
+		$current_ping_device->ping($_ping_count, '&Insteon::ping_all()')
+                		if $current_ping_device->can('ping');
 	} else
 	{
-		main::print_log("[Insteon::Ping All Devices] WARN: No insteon devices could be found");
+		$_ping_count = 0;
+		main::print_log("[Insteon::Ping All Devices] Ping All Complete");
 	}
 }
 
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index b0fd51b79..fe28d7ffb 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1748,8 +1748,9 @@ Returns: Nothing.
 
 sub ping
 {
-	my ($self, $p_count) = @_;
+	my ($self, $p_count, $p_callback) = @_;
 	$$self{ping_count} = $p_count if defined($p_count);
+	$$self{ping_callback} = $p_callback if defined($p_callback);
 	if ($$self{ping_count}) {
 		$$self{ping_count}--;
 		my $message;
@@ -1772,6 +1773,15 @@ sub ping
 	else {
 		::print_log("[Insteon::BaseDevice] Completed ping queue for " 
 			. $self->get_object_name);
+		if (defined $$self{ping_callback}){
+			my $complete_callback = $$self{ping_callback};
+			package main;
+			eval ($complete_callback);
+			&::print_log("[Insteon::BaseDevice] error in ping callback: " . $@)
+				if $@ and $main::Debug{insteon};
+			package Insteon::BaseDevice;
+			delete $$self{ping_callback};
+		}
 	}
 }
 

From aaaf542f6abc933e8f60778b341e9f143b515df4 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 29 Jul 2013 19:54:43 -0700
Subject: [PATCH 122/330] Insteon_Stats: Change Name of Routine to
 Message_Stats

Much more user friendly and descriptice name.
---
 lib/Insteon.pm             | 30 +++++++++++++++---------------
 lib/Insteon/BaseInsteon.pm | 28 ++++++++++++++--------------
 lib/Insteon_PLM.pm         |  6 +++---
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index c240addae..bf2ca0931 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -488,11 +488,11 @@ sub log_all_ADLB_status
 	}
 }
 
-=item C<print_message_logs>
+=item C<print_all_message_stats>
 
 Walks through every Insteon device and prints statistical information about
 its message handling, as well as a summary average of the entire network.  See 
-L<Insteon::BaseDevice::print_message_log|Insteon::BaseInsteon::BaseDevice::print_message_log> 
+L<Insteon::BaseDevice::print_message_stats|Insteon::BaseInsteon::BaseDevice::print_message_stats> 
 for more detailed information.
 
 This command adds the following extra data points:
@@ -503,7 +503,7 @@ This command adds the following extra data points:
 
 =item * 
 
-PLM_Error - The number of messages which have arrived at the PLM which cannot
+Unk_Error - The number of messages which have arrived at the PLM which cannot
 be associated with any know device.
 
 =back
@@ -512,7 +512,7 @@ be associated with any know device.
 
 =cut
 
-sub print_message_logs
+sub print_all_message_stats
 {
     my @_log_devices = ();
 	push @_log_devices, Insteon::find_members("Insteon::BaseDevice");
@@ -550,7 +550,7 @@ sub print_message_logs
 			$device_count++;
 			
 			#Prints the Individual Message for the Device
-			$current_log_device->print_message_log;
+			$current_log_device->print_message_stats;
 			
 			#Add values for each device to the master count
 			$incoming_count_log += $current_log_device->incoming_count_log;
@@ -584,7 +584,7 @@ sub print_message_logs
         	$device_count)) if ($device_count > 0);
     	::print_log(
 	        "[Insteon] Average Network Statistics:\n"
-	        . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops PLM_Error\n"
+	        . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops Unk_Error\n"
 	        . sprintf("%6s", $incoming_count_log)
 	        . sprintf("%8s", $corrupt_count_log)
 	        . sprintf("%8s", $corrupt_percentage . '%')
@@ -604,37 +604,37 @@ sub print_message_logs
 	        . sprintf("%9s", $avg_out_hops)
 	        . sprintf("%9s", $curr_hops_avg)
     	);
-		main::print_log("[Insteon::Print_Message_Logs] All devices have completed logging");
+		main::print_log("[Insteon::Print_All_Message_Stats] All devices have completed logging");
 	} else
 	{
-		main::print_log("[Insteon::Print_Message_Logs] WARN: No insteon devices could be found");
+		main::print_log("[Insteon::Print_All_Message_Stats] WARN: No insteon devices could be found");
 	}
 }
 
-=item C<reset_message_logs>
+=item C<reset_all_message_stats>
 
 Walks through every Insteon device and resets the statistical information about
 its message handling.
 
 =cut
 
-sub reset_message_logs
+sub reset_all_message_stats
 {
     my @_log_devices = ();
-    &Insteon::active_interface->reset_message_log;
+    &Insteon::active_interface->reset_message_stats;
     push @_log_devices, Insteon::find_members("Insteon::BaseDevice");
 
 	if (@_log_devices)
 	{
 		foreach my $current_log_device (@_log_devices)
 		{
-			$current_log_device->reset_message_log 
-                if $current_log_device->can('reset_message_log');
+			$current_log_device->reset_message_stats 
+                if $current_log_device->can('reset_message_stats');
 		}
-		main::print_log("[Insteon::Reset_Message_Logs] All devices have been reset");
+		main::print_log("[Insteon::Reset_All_Message_Stats] All devices have been reset");
 	} else
 	{
-		main::print_log("[Insteon::Reset_Message_Logs] WARN: No insteon devices could be found");
+		main::print_log("[Insteon::Reset_All_Message_Stats] WARN: No insteon devices could be found");
 	}
 }
 
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 8a85eaaab..d431e9e54 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1992,7 +1992,7 @@ sub engine_version
 =item C<retry_count_log([type]>
 
 Sets or gets the number of message retries that have occured for this device 
-since the last time C<reset_message_log> was called.
+since the last time C<reset_message_stats> was called.
 
 If type is set, to any value, will increment retry log by one.
 
@@ -2011,7 +2011,7 @@ sub retry_count_log
 =item C<fail_count_log([type]>
 
 Sets or gets the number of message failures that have occured for this device 
-since the last time C<reset_message_log> was called.
+since the last time C<reset_message_stats> was called.
 
 If type is set, to any value, will increment fail log by one.
 
@@ -2030,7 +2030,7 @@ sub fail_count_log
 =item C<outgoing_count_log([type]>
 
 Sets or gets the number of outgoing message that have occured for this device 
-since the last time C<reset_message_log> was called.
+since the last time C<reset_message_stats> was called.
 
 If type is set, to any value, will increment output count by one.
 
@@ -2049,7 +2049,7 @@ sub outgoing_count_log
 =item C<outgoing_hop_count([type]>
 
 Sets or gets the number of hops that have been used in all outgoing messages
-since the last time C<reset_message_log> was called.
+since the last time C<reset_message_stats> was called.
 
 If type is set, to any value, will increment output count by that value.
 
@@ -2068,7 +2068,7 @@ sub outgoing_hop_count
 =item C<incoming_count_log([type]>
 
 Sets or gets the number of incoming message that have occured for this device 
-since the last time C<reset_message_log> was called.
+since the last time C<reset_message_stats> was called.
 
 If type is set, to any value, will increment incoming count by one.
 
@@ -2087,7 +2087,7 @@ sub incoming_count_log
 =item C<corrupt_count_log([type]>
 
 Sets or gets the number of currupt message that have arrived from this device 
-since the last time C<reset_message_log> was called.
+since the last time C<reset_message_stats> was called.
 
 If type is set, to any value, will increment corrupt count by one.
 
@@ -2106,7 +2106,7 @@ sub corrupt_count_log
 =item C<dupe_count_log([type]>
 
 Sets or gets the number of duplicate message that have arrived from this device 
-since the last time C<reset_message_log> was called.
+since the last time C<reset_message_stats> was called.
 
 If type is set, to any value, will increment corrupt count by one.
 
@@ -2125,7 +2125,7 @@ sub dupe_count_log
 =item C<hops_left_count([type]>
 
 Sets or gets the number of hops_left for messages that arrive from this device 
-since the last time C<reset_message_log> was called.
+since the last time C<reset_message_stats> was called.
 
 If type is set, to any value, will increment corrupt count by one.
 
@@ -2144,7 +2144,7 @@ sub hops_left_count
 =item C<max_hops_count([type]>
 
 Sets or gets the number of max_hops for messages that arrive from this device 
-since the last time C<reset_message_log> was called.
+since the last time C<reset_message_stats> was called.
 
 If type is set, to any value, will increment corrupt count by one.
 
@@ -2161,13 +2161,13 @@ sub max_hops_count
 }
 
 
-=item C<reset_message_log>
+=item C<reset_message_stats>
 
 Resets the retry, fail, outgoing, incoming, and corrupt message counters.
 
 =cut 
 
-sub reset_message_log
+sub reset_message_stats
 {
     my ($self) = @_;
     $self = $self->get_root;
@@ -2182,7 +2182,7 @@ sub reset_message_log
     $$self{outgoing_hop_count} = 0;
 }
 
-=item C<print_message_log>
+=item C<print_message_stats>
 
 Prints message statistics for this device to the print log.  The output contains:
 
@@ -2261,7 +2261,7 @@ sending messages to this device.
 =item *
 
 Hop_Count - The current hop count being used by MH.  This count is dynamically
-controlled by MH and is not reset by calling C<reset_message_log>
+controlled by MH and is not reset by calling C<reset_message_stats>
 
 =back
 
@@ -2269,7 +2269,7 @@ controlled by MH and is not reset by calling C<reset_message_log>
 
 =cut 
 
-sub print_message_log
+sub print_message_stats
 {
     my ($self) = @_;
     $self = $self->get_root;
diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index 563e04c44..ad7bd8e3b 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -122,7 +122,7 @@ sub new {
 =item C<corrupt_count_log([type]>
 
 Sets or gets the number of corrupt message that have arrived that could not be
-associated with any device since the last time C<reset_message_log> was called.
+associated with any device since the last time C<reset_message_stats> was called.
 These are generally instances in which the from device ID is corrupt.
 
 If type is set, to any value, will increment corrupt count by one.
@@ -138,13 +138,13 @@ sub corrupt_count_log
     return $$self{corrupt_count_log};
 }
 
-=item C<reset_message_log>
+=item C<reset_message_stats>
 
 Resets the retry, fail, outgoing, incoming, and corrupt message counters.
 
 =cut 
 
-sub reset_message_log
+sub reset_message_stats
 {
     my ($self) = @_;
     $$self{corrupt_count_log} = 0;

From 1a6b8bacb6604652a08ef8820eef54e4bc2b6b6a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 29 Jul 2013 20:58:37 -0700
Subject: [PATCH 123/330] Insteon_Diags: Remove all Old References to Ping
 Timer

Get rid of old devcat type entries and related ping timer that is no longer used
---
 lib/Insteon/BaseInsteon.pm   | 26 +-------------------------
 lib/Insteon/BaseInterface.pm |  4 ----
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index fe28d7ffb..14c44a53f 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -130,12 +130,6 @@ sub initialize
 	$$self{m_write} = 1;
 	$$self{m_is_locally_set} = 0;
 	# persist local, simple attribs
-
-        # do we really need to ping the devices anymore for a devcat?
-	$$self{ping_timer} = new Timer();
-	$$self{ping_timerTime} = 300;
-#	$$self{ping_timer}->set($$self{ping_timerTime} + (rand() * $$self{ping_timerTime}), $self)
-#		unless $self->group eq '01' and defined $self->devcat;
 }
 
 =item C<interface([interface])>
@@ -282,14 +276,7 @@ sub set
 		delete $$self{set_timer};
 	}
 
-	# did the queue timer go off?
-	if (ref $p_setby and $p_setby eq $$self{ping_timer}) {
-		if (! (defined($$self{devcat}))) {
-			$self->ping();
-			# set the timer again in case nothing occurs
-			$$self{ping_timer}->set($$self{ping_timerTime} + (rand() * $$self{ping_timerTime}), $self);
-		}
-	} elsif ($self->_is_valid_state($p_state)) {
+	if ($self->_is_valid_state($p_state)) {
 		# always reset the is_locally_set property unless set_by is the device
 		$$self{m_is_locally_set} = 0 unless ref $p_setby and $p_setby eq $self;
 
@@ -847,8 +834,6 @@ sub _process_message
 	} elsif ($msg{type} eq 'broadcast') {
 		$self->devcat($msg{devcat});
 		&::print_log("[Insteon::BaseObject] device category: $msg{devcat} received for " . $self->{object_name});
-		# stop ping timer now that we have a devcat; possibly may want to change this behavior to allow recurring pings
-		$$self{ping_timer}->stop();
 	} else {
 		## TO-DO: make sure that the state passed by command is something that is reasonable to set
 		$p_state = $msg{command};
@@ -1190,10 +1175,6 @@ sub initialize
 	$$self{m_write} = 1;
 	$$self{m_is_locally_set} = 0;
 	# persist local, simple attribs
-
-        # do we really need to ping the devices anymore for a devcat?
-	$$self{ping_timer} = new Timer();
-	$$self{ping_timerTime} = 300;
 }
 
 =item C<rate([rate])>
@@ -2224,8 +2205,6 @@ sub new
 	# note that $p_deviceid will be 00.00.00:<groupnum> if the link uses the interface as the controller
 	my $self = {};
 	bless $self,$class;
-# don't apply ping timer to this class
-#	$$self{ping_timer}->stop();
 	return $self;
 }
 
@@ -2563,9 +2542,6 @@ sub set
            $p_setby->{set_by} eq $self);
 	return -1 if &main::check_for_tied_filters($self, $p_state);
 
-	# prevent setby internal Insteon_Device timers
-	return -1 if $p_setby eq $$self{ping_timer};
-
 	my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
 
 	$self->set_linked_devices($link_state);
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index b2493956a..6b0d64761 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -71,10 +71,6 @@ sub poll_all
                                 $insteon_device->get_engine_version();
                			$insteon_device->request_status();
             		}
-               		if ($insteon_device->devcat) {
-              		 # reset devcat so as to trigger any device specific properties
-               			$insteon_device->devcat($insteon_device->devcat);
-            		}
          	}
          }
       }

From 6585c92ad904e05adbf0e40897677f82bb08b624 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 29 Jul 2013 21:02:35 -0700
Subject: [PATCH 124/330] Insteon_Diags: Restore Devcat Support, Add Support
 for Firmware

Reintroduced method to request devcat that was previously called ping and overwritten by a real ping command.  New method to request devcat is called get_devcat().

- Once devcat is obtained, it is saved through reboots and can be retreived with devcat() routine
- Now also saves firmware which can be retrieved with firmware() routine

We do not currently use the devcat values, but I could certainly see using it in the future.
---
 lib/Insteon/BaseInsteon.pm | 46 ++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 14c44a53f..c600b752a 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -833,7 +833,9 @@ sub _process_message
 		}
 	} elsif ($msg{type} eq 'broadcast') {
 		$self->devcat($msg{devcat});
-		&::print_log("[Insteon::BaseObject] device category: $msg{devcat} received for " . $self->{object_name});
+		$self->firmware($msg{firmware});
+		&::print_log("[Insteon::BaseObject] device category: $msg{devcat}"
+			. " firmware: $msg{firmware} received for " . $self->{object_name});
 	} else {
 		## TO-DO: make sure that the state passed by command is something that is reasonable to set
 		$p_state = $msg{command};
@@ -901,6 +903,7 @@ sub _process_command_stack
                         	or $message->command eq 'poke'
                         	or $message->command eq 'status_request'
                                 or $message->command eq 'get_engine_version'
+                                or $message->command eq 'id_request'
                                 or $message->command eq 'do_read_ee'
                                 or $message->command eq 'set_address_msb'
                                 or $message->command eq 'sensor_status'
@@ -1082,6 +1085,7 @@ our %message_types = (
    unlinking_mode => 0x0A,
    get_engine_version => 0x0D,
    ping => 0x0F,
+   id_request => 0x10,
    on_fast => 0x12,
    off_fast => 0x14,
    start_manual_change => 0x17,
@@ -1144,7 +1148,10 @@ sub new
            $$self{aldb} = new Insteon::ALDB_i1($self);
         }
 
-	$self->restore_data('level');
+	$self->restore_data('devcat', 'firmware', 'level', 'retry_count_log', 'fail_count_log', 
+        'outgoing_count_log', 'incoming_count_log', 'corrupt_count_log',
+        'dupe_count_log', 'hops_left_count', 'max_hops_count',
+        'outgoing_hop_count');
 
 	$self->initialize();
 	$self->rate(undef);
@@ -1831,7 +1838,8 @@ sub restore_aldb
 
 =item C<devcat()>
 
-NOT USED - Sets and returns the device category of a device.  No longer used.
+Sets and returns the device category of a device.  Devcat can be requested by
+calling C<get_devcat()>.
 
 =cut
 
@@ -1841,14 +1849,38 @@ sub devcat
 	if ($devcat)
         {
 		$$self{devcat} = $devcat;
-		if (($$self{devcat} =~ /^01\w\w/) or ($$self{devcat} =~ /^02\w\w/) && !($self->states))
-                {
-			$self->states( 'on,off' );
-		}
 	}
 	return $$self{devcat};
 }
 
+=item C<get_devcat()>
+
+Requests the device category for the device.  The returned value can be obtained
+by calling C<devcat()>.
+
+=cut
+
+sub get_devcat
+{
+	my ($self) = @_;
+        my $message = new Insteon::InsteonMessage('insteon_send', $self, 'id_request');
+        $self->_send_cmd($message);
+}
+
+=item C<firmwarre()>
+
+Sets and returns the device's firmware version.  Value can be obtained from the 
+device by calling C<get_devcat()>.
+
+=cut
+
+sub firmware
+{
+	my ($self, $firmware) = @_;
+	$$self{firmware} = $firmware if (defined $firmware);
+	return $$self{firmware};
+}
+
 =item C<states()>
 
 Sets and returns the available states for a device.

From dee488bbdd79329f9e43eeee5caaf817d056ed40 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 29 Jul 2013 21:11:13 -0700
Subject: [PATCH 125/330] Insteon_Diags: Fix Dumb Typo

---
 lib/Insteon/BaseInsteon.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index c600b752a..76f381b08 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1867,7 +1867,7 @@ sub get_devcat
         $self->_send_cmd($message);
 }
 
-=item C<firmwarre()>
+=item C<firmware()>
 
 Sets and returns the device's firmware version.  Value can be obtained from the 
 device by calling C<get_devcat()>.

From cc64f873fd79cc0aac2dbe81116ea2a20a1ce695 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 30 Jul 2013 19:06:18 -0700
Subject: [PATCH 126/330] Insteon: Relocate local_onlevel, local_ramprate, and
 update_local_properties

Moved to the more appropriate DimmableLight class
---
 lib/Insteon/BaseInsteon.pm | 57 --------------------------------------
 lib/Insteon/Lighting.pm    | 54 ++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 545c0fc87..ff8e00599 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1887,42 +1887,6 @@ sub states
 
 }
 
-=item C<local_onlevel(level)>
-
-Sets and returns the local onlevel for the device in MH only. Level is a 
-percentage from 0%-100%
-
-=cut
-
-sub local_onlevel
-{
-	my ($self, $p_onlevel) = @_;
-	if (defined $p_onlevel)
-        {
-		my ($onlevel) = $p_onlevel =~ /(\d+)%?/;
-		$$self{_onlevel} = $onlevel;
-	}
-	return $$self{_onlevel};
-}
-
-=item C<local_ramprate(rate)>
-
-Sets and returns the local ramp rate for the device in MH only. Rate is a time
-between .1 and 540 seconds.  Only 32 rate steps exist, to MH will pick a time
-equal to of the closest below this time.
-
-=cut
-
-sub local_ramprate
-{
-	my ($self, $p_ramprate) = @_;
-	if (defined $p_ramprate) {
-		$$self{_ramprate} = &Insteon::DimmableLight::convert_ramp($p_ramprate);
-	}
-	return $$self{_ramprate};
-
-}
-
 =item C<delete_orphan_links(audit_mode)>
 
 Reviews the cached version of all of the ALDBs and based on this review removes
@@ -1959,27 +1923,6 @@ sub log_alllink_table
         $self->_aldb->log_alllink_table if $self->_aldb;
 }
 
-=item C<update_local_properties()>
-
-Pushes the values set in C<local_onlevel()> and C<local_ramprate()> to the device.
-The device will only reread these values when it is power-cycled.  This can be
-done by pulling the air-gap for 4 seconds or unplugging the device.
-
-=cut
-
-sub update_local_properties
-{
-	my ($self) = @_;
-	if ($self->isa('Insteon::DimmableLight'))
-        {
-        	$self->_aldb->update_local_properties() if $self->_aldb;
-	}
-        else
-        {
-		&::print_log("[Insteon::BaseDevice] update_local_properties may only be applied to dimmable devices!");
-	}
-}
-
 =item C<update_flags(flags)>
 
 Can be used to set the button layout and light level on a keypadlinc.  Flag 
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index 92d69cf18..ca20c0322 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -218,6 +218,60 @@ sub new
 	return $self;
 }
 
+=item C<local_onlevel(level)>
+
+Sets and returns the local onlevel for the device in MH only. Level is a 
+percentage from 0%-100%.
+
+This setting can be pushed to the device using C<update_local_properties>.
+
+=cut
+
+sub local_onlevel
+{
+	my ($self, $p_onlevel) = @_;
+	if (defined $p_onlevel)
+        {
+		my ($onlevel) = $p_onlevel =~ /(\d+)%?/;
+		$$self{_onlevel} = $onlevel;
+	}
+	return $$self{_onlevel};
+}
+
+=item C<local_ramprate(rate)>
+
+Sets and returns the local ramp rate for the device in MH only. Rate is a time
+between .1 and 540 seconds.  Only 32 rate steps exist, to MH will pick a time
+equal to of the closest below this time.
+
+This setting can be pushed to the device using C<update_local_properties>.
+
+=cut
+
+sub local_ramprate
+{
+	my ($self, $p_ramprate) = @_;
+	if (defined $p_ramprate) {
+		$$self{_ramprate} = &Insteon::DimmableLight::convert_ramp($p_ramprate);
+	}
+	return $$self{_ramprate};
+
+}
+
+=item C<update_local_properties()>
+
+Pushes the values set in C<local_onlevel()> and C<local_ramprate()> to the device.
+The device will only reread these values when it is power-cycled.  This can be
+done by pulling the air-gap for 4 seconds or unplugging the device.
+
+=cut
+
+sub update_local_properties
+{
+	my ($self) = @_;
+       	$self->_aldb->update_local_properties() if $self->_aldb;
+}
+
 =item C<level(p_level)>
 
 Takes the p_level, and stores it as a numeric level in memory.  If the p_level 

From d5b2e4c83152bb80f76822a070bf0274b4c9657f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 30 Jul 2013 19:13:27 -0700
Subject: [PATCH 127/330] Insteon: Supplement update_local_properties to handle
 I2 devices

- Added necessary messages.
- Relocated definition of extended_get_set to BaseObject as multiple objects use this
- Added some better descriptions of the functions
---
 lib/Insteon/BaseInsteon.pm |  1 +
 lib/Insteon/Controller.pm  |  3 +--
 lib/Insteon/IOLinc.pm      |  6 ------
 lib/Insteon/Lighting.pm    | 36 ++++++++++++++++++++++++++++++++++--
 lib/Insteon/Security.pm    |  6 ------
 5 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index ff8e00599..5f5959a89 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1156,6 +1156,7 @@ our %message_types = (
    peek => 0x2b,
    peek_internal => 0x2c,
    poke_internal => 0x2d,
+   extended_set_get => 0x2e,
    read_write_aldb => 0x2f,
 );
 
diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index 573439dc9..20b081bcb 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -59,8 +59,7 @@ use Insteon::BaseInsteon;
 my %message_types = (
 	%Insteon::BaseDevice::message_types,
 	bright => 0x15,
-	dim => 0x16,
-	extended_set_get => 0x2e
+	dim => 0x16
 );
 
 =item C<new()>
diff --git a/lib/Insteon/IOLinc.pm b/lib/Insteon/IOLinc.pm
index d5186fee7..3e0b44bff 100755
--- a/lib/Insteon/IOLinc.pm
+++ b/lib/Insteon/IOLinc.pm
@@ -122,11 +122,6 @@ my %operating_flags = (
    'momentary_c_off' => '15',
 );
 
-my %message_types = (
-	%Insteon::BaseDevice::message_types,
-	extended_set_get => 0x2e
-);
-
 =item C<new()>
 
 Instantiates a new object.
@@ -138,7 +133,6 @@ sub new
 	my ($class, $p_deviceid, $p_interface) = @_;
 	my $self = new Insteon::BaseDevice($p_deviceid, $p_interface);
 	$$self{operating_flags} = \%operating_flags;
-	$$self{message_types} = \%message_types;
 	bless $self, $class;
 	$self->restore_data('momentary_time');
 	$$self{momentary_timer} = new Timer;
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index ca20c0322..a273ae971 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -225,6 +225,10 @@ percentage from 0%-100%.
 
 This setting can be pushed to the device using C<update_local_properties>.
 
+Parameters: level [0-100]
+
+Returns: [0-100]
+
 =cut
 
 sub local_onlevel
@@ -246,6 +250,10 @@ equal to of the closest below this time.
 
 This setting can be pushed to the device using C<update_local_properties>.
 
+Parameters: rate = ramp rate [.1s - 540s] see C<convert_ramp> for valid values
+
+Returns: hexadecimal representation of the ramprate.
+
 =cut
 
 sub local_ramprate
@@ -261,23 +269,47 @@ sub local_ramprate
 =item C<update_local_properties()>
 
 Pushes the values set in C<local_onlevel()> and C<local_ramprate()> to the device.
+
+I1 Devices:
+
 The device will only reread these values when it is power-cycled.  This can be
 done by pulling the air-gap for 4 seconds or unplugging the device.
 
+I2 & I2CS Devices
+
+The device will immediately read and update the values.
+
 =cut
 
 sub update_local_properties
 {
 	my ($self) = @_;
-       	$self->_aldb->update_local_properties() if $self->_aldb;
+	if ($self->engine_version eq 'I1'){
+       		$self->_aldb->update_local_properties() if $self->_aldb;
+	}
+	else {
+		#Queue Ramp Rate First
+		my $extra = '000005' . $self->local_ramprate();
+		$extra .= '0' x (30 - length $extra);
+		my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+		$self->_send_cmd($message);
+		
+		#Now queue on level
+		$extra = '000006' . ::Insteon::DimmableLight::convert_level($self->local_onlevel());
+		$extra .= '0' x (30 - length $extra);
+		$message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+		$self->_send_cmd($message);
+	}
 }
 
 =item C<level(p_level)>
 
-Takes the p_level, and stores it as a numeric level in memory.  If the p_level 
+Stores and returns the objects current on_level as a percentage. If p_level 
 is ON and the device has a defined local_onlevel, the local_onlevel is stored 
 as the numeric level in memory.
 
+Returns [0-100]
+
 =cut
 
 sub level
diff --git a/lib/Insteon/Security.pm b/lib/Insteon/Security.pm
index 27f7d04f0..6f69695ff 100644
--- a/lib/Insteon/Security.pm
+++ b/lib/Insteon/Security.pm
@@ -110,11 +110,6 @@ use Insteon::BaseInsteon;
 
 @Insteon::MotionSensor::ISA = ('Insteon::DeviceController','Insteon::BaseDevice');
 
-my %message_types = (
-	%Insteon::BaseDevice::message_types,
-	extended_set_get => 0x2e
-);
-
 =item C<new()>
 
 Instantiates a new object.
@@ -126,7 +121,6 @@ sub new
 	my ($class,$p_deviceid,$p_interface) = @_;
 
 	my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
-	$$self{message_types} = \%message_types;
 	if ($self->is_root){ 
 		$self->restore_data('query_timer', 'last_query_time');
 		$$self{queue_timer} = new Timer;

From 02ee1f22a2e30b26581a2a2e9f3df7b5126eead5 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 30 Jul 2013 20:42:55 -0700
Subject: [PATCH 128/330] Insteon: Move update_flags, Condense KeypadLinc
 Classes, Add I2 Support to update_flags

- Update flags belongs in the Keypadlinc class as it only works on these devices
- Condensed the set routine from Keypadlinc and KeypadlincRelay into Keypadlinc
- Added I2 support to update_flags
- - In order to support the old version of update_flags, the manner in which the routine works is a little odd as users have to pass a hexadecimal flag to the routine.  This could obviously be changed or supplemented in the future.
---
 lib/Insteon/BaseInsteon.pm |  30 -----------
 lib/Insteon/Lighting.pm    | 108 +++++++++++++++++++++----------------
 2 files changed, 61 insertions(+), 77 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 5f5959a89..33bf97d77 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1924,36 +1924,6 @@ sub log_alllink_table
         $self->_aldb->log_alllink_table if $self->_aldb;
 }
 
-=item C<update_flags(flags)>
-
-Can be used to set the button layout and light level on a keypadlinc.  Flag 
-options include:
-
-    '0a' - 8 button; backlighting dim
-    '06' - 8 button; backlighting off
-    '02' - 8 button; backlighting normal
-
-    '08' - 6 button; backlighting dim
-    '04' - 6 button; backlighting off
-    '00' - 6 button; backlighting normal
-
-Note: This routine will likely be moved to L<Insteon::KeypadLinc|Insteon::Lighting/Insteon::KeypadLinc> at some point.
-
-=cut
-
-sub update_flags
-{
-	my ($self, $flags) = @_;
-	if (!($self->isa('Insteon::KeyPadLinc') or $self->isa('Insteon::KeyPadLincRelay')))
-        {
-		&::print_log("[Insteon::BaseDevice] Operating flags may only be revised on keypadlincs!");
-		return;
-	}
-	return unless defined $flags;
-
-	$self->_aldb->update_flags($flags) if $self->_aldb;
-}
-
 =item C<engine_version>
 
 Sets or gets the device object engine version.  If setting the engine version, 
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index a273ae971..0a91dea56 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -712,6 +712,21 @@ use Insteon::BaseInsteon;
 
 @Insteon::KeyPadLincRelay::ISA = ('Insteon::BaseLight','Insteon::DeviceController');
 
+my %operating_flags = (
+   'program_lock_on' => '00',
+   'program_lock_off' => '01',
+   'led_on_during_tx' => '02',
+   'led_off_during_tx' => '03',
+   'resume_dim_on' => '04',
+   'resume_dim_off' => '05',
+   '8_key_mode' => '06',
+   '6_key_mode' => '07',
+   'led_off' => '08',
+   'led_enabled' => '09',
+   'key_beep_enabled' => '0a',
+   'key_beep_off' => '0b'
+);
+
 =item C<new()>
 
 Instantiates a new object.
@@ -762,6 +777,7 @@ sub set
 	}
 	else
 	{
+		$link_state = $p_state if $self->can('level');
 		return $self->Insteon::DeviceController::set($link_state, $p_setby, $p_respond);
 	}
 
@@ -769,6 +785,50 @@ sub set
 
 }
 
+=item C<update_flags(flags)>
+
+Can be used to set the button layout and light level on a keypadlinc.  Flag 
+options include:
+
+    '0a' - 8 button; backlighting dim
+    '06' - 8 button; backlighting off
+    '02' - 8 button; backlighting normal
+
+    '08' - 6 button; backlighting dim
+    '04' - 6 button; backlighting off
+    '00' - 6 button; backlighting normal
+
+=cut
+
+sub update_flags
+{
+	my ($self, $flags) = @_;
+	return unless defined $flags;
+	if ($self->engine_version ne 'I1') {
+		$self->_aldb->update_flags($flags) if $self->_aldb;
+	}
+	else {
+		if ($flags & 0x02) {
+			$self->set_operating_flags('8_key_mode');
+		} 
+		else {
+			$self->set_operating_flags('6_key_mode');	
+		}
+		if ($flags & 0x04) {
+			$self->set_operating_flags('led_off');
+		}
+		else {
+			$self->set_operating_flags('led_enabled');	
+		}
+		if ($flags & 0x08) {
+			$self->set_operating_flags('resume_dim_on');
+		}
+		else {
+			$self->set_operating_flags('resume_dim_off');
+		}
+	}
+}
+
 =back
 
 =head2 AUTHOR
@@ -822,7 +882,7 @@ package Insteon::KeyPadLinc;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::KeyPadLinc::ISA = ('Insteon::DimmableLight','Insteon::DeviceController');
+@Insteon::KeyPadLinc::ISA = ('Insteon::KeyPadLincRelay', 'Insteon::DimmableLight','Insteon::DeviceController');
 
 =item C<new()>
 
@@ -833,57 +893,11 @@ Instantiates a new object.
 sub new
 {
 	my ($class,$p_deviceid,$p_interface) = @_;
-
 	my $self = new Insteon::DimmableLight($p_deviceid,$p_interface);
 	bless $self,$class;
 	return $self;
 }
 
-=item C<set(state[,setby,response])>
-
-Handles setting and receiving states from the device and specifically its 
-subordinate buttons.
-
-NOTE: This could be merged somehow with the set() function in 
-C<Insteon::KeyPadLincRelay>
-
-=cut
-
-sub set
-{
-	my ($self, $p_state, $p_setby, $p_respond) = @_;
-
-	if (!($self->is_root))
-	{
-		my $rslt_code = $self->Insteon::BaseController::set($p_state, $p_setby, $p_respond);
-		return $rslt_code if $rslt_code;
-
-		my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
-
-		if (ref $p_setby and $p_setby->isa('Insteon::BaseDevice'))
-		{
-			$self->Insteon::BaseObject::set($p_state, $p_setby, $p_respond);
-		}
-		elsif (ref $$self{surrogate} && ($$self{surrogate}->isa('Insteon::InterfaceController')))
-		{
-			$$self{surrogate}->set($link_state, $p_setby, $p_respond)
-				unless ref $p_setby and $p_setby eq $self;
-		}
-		else
-		{
-			&::print_log("[Insteon::KeyPadLinc] You may not directly attempt to set a keypadlinc's button "
-				. "unless you have defined a reverse link with the \"surrogate\" keyword");
-		}
-	}
-	else
-	{
-		return $self->Insteon::DeviceController::set($p_state, $p_setby, $p_respond);
-	}
-
-	return 0;
-
-}
-
 =back
 
 =head2 AUTHOR

From a853372623d0b4f0bf2b58944001a0fcec2f4672 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 30 Jul 2013 21:23:21 -0700
Subject: [PATCH 129/330] Insteon: Fix Typos in Update_Flags Routine

---
 lib/Insteon/BaseInsteon.pm |  2 +-
 lib/Insteon/Lighting.pm    | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 33bf97d77..5fc64a860 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -545,7 +545,7 @@ sub derive_message
 	if (!(defined $p_extra)) {
 		if ($command eq 'on')
 		{
-			if ($self->isa('Insteon::BaseDevice') && defined $self->local_onlevel) {
+			if ($self->can('local_onlevel') && defined $self->local_onlevel) {
 				$level = 2.55 * $self->local_onlevel;
 				$command = 'on_fast';
 			} else {
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index 0a91dea56..7945ea105 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -712,7 +712,7 @@ use Insteon::BaseInsteon;
 
 @Insteon::KeyPadLincRelay::ISA = ('Insteon::BaseLight','Insteon::DeviceController');
 
-my %operating_flags = (
+our %operating_flags = (
    'program_lock_on' => '00',
    'program_lock_off' => '01',
    'led_on_during_tx' => '02',
@@ -736,8 +736,8 @@ Instantiates a new object.
 sub new
 {
 	my ($class,$p_deviceid,$p_interface) = @_;
-
 	my $self = new Insteon::BaseLight($p_deviceid,$p_interface);
+	$$self{operating_flags} = \%operating_flags;
 	bless $self,$class;
 	return $self;
 }
@@ -809,22 +809,22 @@ sub update_flags
 	}
 	else {
 		if ($flags & 0x02) {
-			$self->set_operating_flags('8_key_mode');
+			$self->set_operating_flag('8_key_mode');
 		} 
 		else {
-			$self->set_operating_flags('6_key_mode');	
+			$self->set_operating_flag('6_key_mode');	
 		}
 		if ($flags & 0x04) {
-			$self->set_operating_flags('led_off');
+			$self->set_operating_flag('led_off');
 		}
 		else {
-			$self->set_operating_flags('led_enabled');	
+			$self->set_operating_flag('led_enabled');	
 		}
 		if ($flags & 0x08) {
-			$self->set_operating_flags('resume_dim_on');
+			$self->set_operating_flag('resume_dim_on');
 		}
 		else {
-			$self->set_operating_flags('resume_dim_off');
+			$self->set_operating_flag('resume_dim_off');
 		}
 	}
 }
@@ -894,6 +894,7 @@ sub new
 {
 	my ($class,$p_deviceid,$p_interface) = @_;
 	my $self = new Insteon::DimmableLight($p_deviceid,$p_interface);
+	$$self{operating_flags} = \%Insteon::KeyPadLincRelay::operating_flags;
 	bless $self,$class;
 	return $self;
 }

From 3abcc1474ce7ce4ed924362e0397ad6e243c736d Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 30 Jul 2013 22:58:30 -0700
Subject: [PATCH 130/330] Insteon: Fix Typo in Update_Flags Logic

---
 lib/Insteon/Lighting.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index 7945ea105..bcf81794e 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -804,7 +804,7 @@ sub update_flags
 {
 	my ($self, $flags) = @_;
 	return unless defined $flags;
-	if ($self->engine_version ne 'I1') {
+	if ($self->engine_version eq 'I1') {
 		$self->_aldb->update_flags($flags) if $self->_aldb;
 	}
 	else {

From 7173c3ae963aa9aab3e436ef3f0062a4cb8b9be8 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 31 Jul 2013 16:48:15 -0700
Subject: [PATCH 131/330] Insteon_Data3: Change Default Data3 value for I2CS
 devices

This may fix issue hollie/misterhouse#176
---
 lib/Insteon/AllLinkDatabase.pm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index eed61071a..8321d9c22 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -1025,13 +1025,15 @@ sub add_link
 	}
 	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
 	# check whether the link already exists
-	my $subaddress = ($link_parms{data3}) ? $link_parms{data3} : '00';
+	# for I2CS devices the default data3 should be 01 no 00
+	my $data3_default = ($$insteon_object->engine_version eq 'I2CS') ? '01' : '00';
+	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : $data3_default;
 	# get the address via lookup into the hash
 	my $key = lc $device_id . $group . $is_controller;
 	# append the device "sub-address" (e.g., a non-root button on a keypadlinc) if it exists
-	if (!($subaddress eq '00' or $subaddress eq '01'))
+	if (!($data3 eq '00' or $data3 eq '01'))
         {
-		$key .= $subaddress;
+		$key .= $data3;
 	}
 	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
 		## Check whether ALDB is in sync
@@ -1094,7 +1096,7 @@ sub add_link
 				$data1 = &Insteon::DimmableLight::convert_level($on_level);
 				$data2 = ($$self{device}->isa('Insteon::DimmableLight')) ? &Insteon::DimmableLight::convert_ramp($ramp_rate) : '00';
 			}
-			my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
+			#data3 is defined above
 			$$self{_mem_activity} = 'add';
 			$self->_write_link($address, $device_id, $group, $is_controller, $data1, $data2, $data3);
 			# TO-DO: ensure that pop'd address is restored back to queue if the transaction fails
@@ -1147,7 +1149,9 @@ sub update_link
 		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate") if $main::Debug{insteon};
 	my $data1 = &Insteon::DimmableLight::convert_level($on_level);
 	my $data2 = ($$self{device}->isa('Insteon::DimmableLight')) ? &Insteon::DimmableLight::convert_ramp($ramp_rate) : '00';
-	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
+	# for I2CS devices the default data3 should be 01 no 00
+	my $data3_default = ($$insteon_object->engine_version eq 'I2CS') ? '01' : '00';
+	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : $data3_default;
 	my $deviceid = $insteon_object->device_id;
 	my $subaddress = $data3;
 	# get the address via lookup into the hash

From a8c060e4e7b9ddd4d0e0f824f47ef4c6eb540ccb Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 5 Aug 2013 18:45:40 -0700
Subject: [PATCH 132/330] Insteon_Voice_Cmds: Add On/Off Command to PLM Scene
 Controller

Fix Bug found by Bill Dripps
---
 lib/Insteon/BaseInsteon.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 4b0b7918a..c0e5d0ef9 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -3005,6 +3005,8 @@ sub get_voice_cmds
     my $group = $self->group;
     my %voice_cmds = (
         %{$self->SUPER::get_voice_cmds},
+	'on' => "$object_name->set(\"on\")",
+	'off' => "$object_name->set(\"off\")",
         'initiate linking as controller' => "$object_name->initiate_linking_as_controller(\"$group\")",
         'cancel linking' => "$object_name->interface()->cancel_linking"
     );

From 298002344f7a798cdc6ef8b74cc5353ba40d5622 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 7 Aug 2013 17:33:00 -0700
Subject: [PATCH 133/330] Do Not Move Tabbed 'Add' Entries in User Code to
 Global Declaration

Misterhouse merges all of the User Code files into a single file at runtime.  When merging the files, MisterHouse moves certain commands and declarations to the top of the merged file.  The purpose is to allow these "global records" to be defined early on, to avoid errors.  They include variable instantiaions and other routines.

In order to avoid moving lines which are meant to be part of a subroutine or logical statement, MisterHouse will only move theabove "global records" if they occur at the start of a line.  The thought being that coders practicing even the most basic level of standard formatting will indent statements inside of logical routines or subroutines.

The one exception to this rule is the add statement. This is generally used to add an item to a group, but a few other items have add functions as well, notably the Process_Item.

For some reason, MisterHouse will allow anywhere from 0-3 whitespaces to proceed the add statement while still considering it to be a "global record"

This is somewhat logical in that tabs are usually at least 4 spaces.  But it is unclear why this exception only applies to add functions, and not to the other functions as well.

Eitherway, a white space in perl is defined as [\ \t\r\n\f].  [\r\n\f] are unnecessary, since they would be interpreted as a newline.  The problem arose by including [\t].  In so doing, MisterHouse was moving add functions which were tabbed in 3 times.

By changing this to simply [\ ] the code at least does what the author originally intended it to do.  I think the odds that this change would cause an error for any currently existing user code files is small, but there is some remote possibility that it might.

Personally, I think the spacing should be removed entirely, but I am hesitant to change a function that is so fundamental to MisterHouse.
---
 bin/mh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/mh b/bin/mh
index 897c75c0d..8ad7f76b6 100755
--- a/bin/mh
+++ b/bin/mh
@@ -4963,8 +4963,8 @@ sub read_user_code {
                 $record =~ /->\s*hidden/   or
                 $record =~  /^\s*set_(authority|icon|info|order|fp_location)\s/ or
                 $record =~ /->\s*set_(authority|icon|info|order|fp_location)/   or
-                $record =~ /^\s{0,3}\S+\s*->\s*add[\s\(]/ or
-                $record =~ /^\s{0,3}add\s/) {
+                $record =~ /^\ {0,3}\S+\s*->\s*add[\s\(]/ or
+                $record =~ /^\ {0,3}add\s/) {
                 $noloop_statement_flag = 1 unless $pod_flag; # Allow for multi-record statements
             }
 

From b96eeee084cedde14c9ec38ef91ac236872c60b9 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 9 Aug 2013 16:07:13 -0700
Subject: [PATCH 134/330] Insteon_Stats:  Add Voice Commands

---
 lib/Insteon/BaseInsteon.pm   | 2 ++
 lib/Insteon/BaseInterface.pm | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 5593de262..ea17ae646 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2457,6 +2457,8 @@ sub get_voice_cmds
             'status' => "$object_name->request_status",
             'get engine version' => "$object_name->get_engine_version",
             'scan link table' => "$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")",
+            'print message stats' => "$object_name->print_message_stats",
+            'reset message stats' => "$object_name->reset_message_stats",
             'log links' => "$object_name->log_alllink_table()"
         )
     }
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 10f3ad6ef..79519a1f2 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -905,6 +905,8 @@ sub get_voice_cmds
         'scan all device link tables' => "Insteon::scan_all_linktables",
         'sync all links' => "Insteon::sync_all_links(0)",
         'AUDIT - sync all links' => "Insteon::sync_all_links(1)",
+        'print all message stats' => "Insteon::print_all_message_stats",
+        'reset all message stats' => "Insteon::reset_all_message_stats",
         'log all device ALDB status' => "Insteon::log_all_ADLB_status"
     );
     return \%voice_cmds;

From a8821e8df0a501f848ec1d43eeac347fbe998770 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 9 Aug 2013 16:48:10 -0700
Subject: [PATCH 135/330] Insteon_Diags: Add voice commands and POD notes

---
 lib/Insteon.pm               | 65 ++++++++++++++++++++++++++++++------
 lib/Insteon/BaseInsteon.pm   |  2 ++
 lib/Insteon/BaseInterface.pm |  2 ++
 3 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index e8598ebb5..fab4d6363 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -107,6 +107,25 @@ See the workflow described in C<Delete Orphan Links>.
 Same as C<Sync All Links> but prints what it would do to the log, without doing
 anything else.
 
+=item C<print all message stats>
+
+Prints the message stats for all devices plus a summary of the entire network
+stats.
+
+=item C<reset all message stats>
+
+Resets all the message stats for all devices including the Unk_Error stat.
+
+=item C<stress test All devices>
+
+Performs a 5 count stress test on all devices on the network.  See the description
+of what a stress test is under the device voice commands.
+
+=item C<ping test All devices>
+
+Performs a 5 count ping test on all devices on the network.  See the description
+of what a ping test is under the device voice commands.
+
 =item C<Log All Device ALDB Status>
 
 Logs some details about each device to the log.  See C<log_all_ADLB_status()>
@@ -117,55 +136,79 @@ Logs some details about each device to the log.  See C<log_all_ADLB_status()>
 
 =over
 
-=item on
+=item C<on>
 
 Turns the device on.
 
-=item off
+=item C<off>
 
 Turns the device off.
 
-=item Sync Links
+=item C<Sync Links>
 
 Similar to C<Sync All Links> above, but this will only add links that are related
 to this device.  Useful when adding a new device.
 
-=item Link to Interface
+=item C<Link to Interface>
 
 Will create the controller/responder links between the device and the PLM.
 
-=item Unlink with Interface
+=item C<Unlink with Interface>
 
 Will delete the controller/responder links between the device and the PLM.  
 Useful if you are removing a device from your network.
 
-=item Status
+=item C<Status>
 
 Requests the status of the device.
 
-=item Get Engine Version
+=item C<Get Engine Version>
 
 Requests the engine version of the device.  Generally you would not need to call
 this, but every now and then it is needed when a new device is installed.
 
-=item Scan Link Table
+=item C<Scan Link Table>
 
 This will scan and output to the log only the link table of this device.
 
-=item Log Links
+=item C<Log Links>
 
 Will output to the log only the link table of this device.
 
-=item Initiate Linking as Controller
+=item C<Initiate Linking as Controller>
 
 Generally only available for PLM Scenes.  This places the PLM in linking mode
 and adds any device which the set button is pressed for 4 seconds as a responder
 to this scene.  Generally not needed.
 
-=item Cancel Linking
+=item C<Cancel Linking>
 
 Cancels the above linking session without creating a link.
 
+=item C<Run Stress Test>
+
+Simulates a read of a 5 link addresses from the device.  This routine is meant to 
+be used as a diagnostic tool.
+
+This is also similar to the C<ping> test, however, rather than simply requesting
+an ACK, this requests a full set of data equivalent to a link entry.  Similar to
+C<ping> this should be used with C<print_message_log> to diagnose issues and try
+different settings.
+
+=item C<Run Ping Test>
+
+Sends 5 ping messages to the device.  A ping message is a basic 
+message that simply asks the device to respond with an ACKnowledgement.  For
+i1 devices this will send a standard length command, for i2 and i2cs devices
+this will send an extended ping command.  In both cases, the device responds
+back with a standard length ACKnowledgement only.
+
+Much like the ping command in IP networks, this command is useful for testing the
+connectivity of a device on your network.  You likely want to use this in 
+conjunction with the C<print_message_log> routine.  For example, you can use 
+this to compare the message stats for a device when changing settings in 
+MisterHouse.
+
 =back
 
 =head2 METHODS
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index ecf4ad278..b92df149e 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2534,6 +2534,8 @@ sub get_voice_cmds
             'scan link table' => "$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")",
             'print message stats' => "$object_name->print_message_stats",
             'reset message stats' => "$object_name->reset_message_stats",
+            'run stress test' => "$object_name->stress_test(5)",
+            'run ping test' => "$object_name->ping(5)",
             'log links' => "$object_name->log_alllink_table()"
         )
     }
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 30b00de14..e562aa763 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -903,6 +903,8 @@ sub get_voice_cmds
         'AUDIT - sync all links' => "Insteon::sync_all_links(1)",
         'print all message stats' => "Insteon::print_all_message_stats",
         'reset all message stats' => "Insteon::reset_all_message_stats",
+        'stress test ALL devices' => "Insteon::stress_test_all(5,1)",
+        'ping test ALL devices' => "Insteon::ping_all(5)",
         'log all device ALDB status' => "Insteon::log_all_ADLB_status"
     );
     return \%voice_cmds;

From b94b81b977e84341d88f80f5af9fba79a8f63e94 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 9 Aug 2013 16:53:52 -0700
Subject: [PATCH 136/330] Insteon_Diags:  Add a few more POD notes

---
 lib/Insteon.pm | 93 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 92 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index fab4d6363..fa01d60d6 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -110,7 +110,9 @@ anything else.
 =item C<print all message stats>
 
 Prints the message stats for all devices plus a summary of the entire network
-stats.
+stats.  For full details on what is contained in this printout please see
+the description for the C<print message stats> voice command under the device
+heading below.
 
 =item C<reset all message stats>
 
@@ -209,6 +211,95 @@ conjunction with the C<print_message_log> routine.  For example, you can use
 this to compare the message stats for a device when changing settings in 
 MisterHouse.
 
+=item C<Print Message Stats>
+
+Prints message statistics for this device to the print log.  
+
+=back
+
+=over8
+
+=item * 
+
+In - The number of incoming messages received
+
+=item * 
+
+Corrupt - The number of incoming corrupt messages received
+
+=item * 
+
+%Corrpt - Of the incoming messages received, the percentage that were 
+corrupt
+
+=item *
+
+Dupe - The number of duplicate messages that have been received from this 
+device.
+
+=item *
+
+%Dupe - The percentage of duplilicate incoming messages received.
+
+=item *
+
+Hops_Left - The average hops left in the messages received from this device.
+
+=item *
+
+Max_Hops - The average maximum hops in the messages received from this device.
+
+=item *
+
+Act_Hops - Max_Hops - Hops_Left, this is the average number of hops that have
+been required for a message sent from the device to reach MisterHouse.
+
+=item * 
+
+Out - The number of unique outgoing messages, without retries, sent. 
+
+=item * 
+
+Fail - The number times that all retries were exhausted without a successful
+delivery of a message.
+
+=item * 
+
+%Fail - Of the outgoing messages sent, the percentage that failed.
+
+=item * 
+
+Retry - The number of retry attempts that have been made to deliver a message. 
+Ideally this is 0, but Sends/Msg is a better indication of this parameter.
+
+=item * 
+
+AvgSend - The average number of send attempts that must be made in order to 
+successfully deliver a message.  Ideally this would be 1.0.  
+
+NOTE: If the number of retries exceeds the value set in the configuration file 
+for Insteon_retry_count, MisterHouse will abandon sending the message.  As a 
+result, as this number approaches Insteon_retry_count it becomes a less accurate 
+representation of the number of retries needed to reach a device.
+
+=item *
+
+Avg_Hops - The average number of hops that have been used by MisterHouse when
+sending messages to this device.
+
+=item *
+
+Hop_Count - The current hop count being used by MH.  This count is dynamically
+controlled by MH and is not reset by calling C<reset_message_stats>
+
+=back
+
+=over
+
+=item C<Reset Message Stats>
+
+Resets the message stats back to 0 for this device.
+
 =back
 
 =head2 METHODS

From 2d998fdac221a0fef954627ba164eef54ec0a602 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 12 Aug 2013 19:20:04 -0700
Subject: [PATCH 137/330] Insteon_Diags: Make Sure Setby is an Object

Fix bug identified by @JaredF
---
 lib/Insteon/Message.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index 31d48510a..70ea818f3 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -218,11 +218,11 @@ sub send
                 	&::print_log("[Insteon::BaseMessage] WARN: now resending "
                         	. $self->to_string() . " after " . $self->send_attempts
                         	. " attempts.") if $main::Debug{insteon};
-                        $self->setby->retry_count_log(1) if $self->setby->can('retry_count_log');
                         # revise default hop count to reflect retries
                         if (ref $self->setby && $self->setby->isa('Insteon::BaseObject') 
                         	&& !defined($$self{no_hop_increase}))
                         {
+                        	$self->setby->retry_count_log(1) if $self->setby->can('retry_count_log');
                         	if ($self->setby->default_hop_count < 3)
                                 {
                                 	$self->setby->default_hop_count($self->setby->default_hop_count + 1);
@@ -238,7 +238,7 @@ sub send
                 }
 
                 # need to set timeout as a function of retries; also need to alter hop count
-                if ($self->send_attempts <= 0) {
+                if ($self->send_attempts <= 0 && ref $self->setby) {
                     $self->setby->outgoing_count_log(1) if $self->setby->can('outgoing_count_log');
                     $self->setby->outgoing_hop_count($self->setby->default_hop_count)
                     	if $self->setby->can('outgoing_hop_count');

From ce0b2a85f44c12d9c10438e4247ef47be11e591e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 27 Aug 2013 17:33:00 -0700
Subject: [PATCH 138/330] Insteon_Thermo: Convert i2 Entries to i2CS

Some of the older thermostat devices including the 2441v venstar device were i2 devices but do not support the newer thermostat code.

As such the distinction between the old and new devices is not i1 vs i2 but rather i2CS or not i2CS.
---
 lib/Insteon.pm            |  6 ++--
 lib/Insteon/Thermostat.pm | 72 +++++++++++++++++++--------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 166d5e61a..4cd68c02f 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -565,11 +565,11 @@ sub check_thermo_versions
 	foreach my $thermo_device (@thermo_devices)
 	{
 		if ($thermo_device->isa('Insteon::Thermostat') && 
-			$thermo_device->_aldb->aldb_version() eq "I2"){
+			$thermo_device->_aldb->aldb_version() eq "I2CS"){
 			main::print_log("[Insteon] DEBUG4 Setting thermostat "
-				. $thermo_device->get_object_name() . " to i2") 
+				. $thermo_device->get_object_name() . " to i2CS") 
 			if ($main::Debug{insteon} >= 4);
-			bless $thermo_device, 'Insteon::Thermo_i2';
+			bless $thermo_device, 'Insteon::Thermo_i2CS';
 			$thermo_device->init();
 		}
 		elsif ($thermo_device->isa('Insteon::Thermostat')
diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 251ceb2ff..5ed8c940c 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -12,7 +12,7 @@ In user code:
 
 	$thermostat = new Insteon_Thermostat($myPLM, '12.34.56');
 	
-Additional i2 specific objects:
+Additional i2CS specific objects:
 	
 	$thermostat_heating = new Insteon_Thermostat($myPLM, '12.34.56:02');
 	$thermostat_high_humid = new Insteon_Thermostat($myPLM, '12.34.56:03');
@@ -25,7 +25,7 @@ In items.mht:
 
 	INSTEON_THERMOSTAT, 12.34.56, thermostat, HVAC
 	
-Additional i2 specific objects:
+Additional i2CS specific objects:
 	
 	INSTEON_THERMOSTAT, 12.34.56:02, thermostat_heating, HVAC
 	INSTEON_THERMOSTAT, 12.34.56:03, thermostat_high_humid, HVAC
@@ -67,10 +67,10 @@ to link specific actions to these states:
       (call get_mode() to get value).
    fan_mode_change: Fan mode changed
       (call get_fan_mode() to get value).
-   status_change: Heating, Cooling, Dehumidifying, or Humidifying change (i2 only)
+   status_change: Heating, Cooling, Dehumidifying, or Humidifying change (i2CS only)
       (call get_status() to get status).
 
-I2 Broadcast messages:
+I2CS Broadcast messages:
 
 If a group EF device is defined, MH will receive broadcast changes from the 
 thermostat.  When enabled, broadcast messages for changes in setpoint, mode,
@@ -90,7 +90,7 @@ Linking:
 
 I am not sure how or if the i1 device can be linked to other devices.
 
-I2 devices have 5 controllers, groups 01-04 plus the broadcast group EF.  At the
+I2CS devices have 5 controllers, groups 01-04 plus the broadcast group EF.  At the
 moment, MH only supports using the thermostat as a controller of another device.
 To control another device, simply define it as a scene member of the desired 
 thermostat group.  The groups are:
@@ -106,7 +106,7 @@ thermostat group.  The groups are:
 
 Tracking Child Objects:
 
-For both, i1 and i2 devices, optional child objects which track the states of the 
+For both, i1 and i2CS devices, optional child objects which track the states of the 
 thermostat can be created in user code:
 	
    $thermo_temp = new Insteon::Thermo_temp($thermostat);
@@ -114,8 +114,8 @@ thermostat can be created in user code:
    $thermo_mode = new Insteon::Thermo_mode($thermostat);
    $thermo_setpoint_h = new Insteon::Thermo_setpoint_h($thermostat);
    $thermo_setpoint_c = new Insteon::Thermo_setpoint_c($thermostat);
-   $thermo_humidity = new Insteon::Thermo_humidity($thermostat);  #Only available on i2 devices
-   $thermo_status = new Insteon::Thermo_status($thermostat);  #Only available on i2 devices
+   $thermo_humidity = new Insteon::Thermo_humidity($thermostat);  #Only available on i2CS devices
+   $thermo_status = new Insteon::Thermo_status($thermostat);  #Only available on i2CS devices
 
 where $thermostat is the parent object to track.  The state of these child objects
 will be the state of the various objects.  This makes the display of the various
@@ -135,7 +135,7 @@ Initial Code by:
 Gregg Liming <gregg@limings.net>
 Brian Warren <brian@7811.net>
 
-Enhanced to i2 by:
+Enhanced to i2CS by:
 Kevin Robert Keegan <kevin@krkeegan.com>
 
 =head1 TODO
@@ -349,7 +349,7 @@ sub _mode() {
 
 =item C<get_mode()>
 
-Returns the last mode returned by C<poll_mode()>  I2 devices will report auto for both auto and program_auto. 
+Returns the last mode returned by C<poll_mode()>  I2CS devices will report auto for both auto and program_auto. 
 =cut
 sub get_mode() {
    my ($self) = @_;
@@ -556,10 +556,10 @@ sub simple_message {
 	return $message;
 }
 
-package Insteon::Thermo_i2;
+package Insteon::Thermo_i2CS;
 use strict;
 
-@Insteon::Thermo_i2::ISA = ('Insteon::Thermostat');
+@Insteon::Thermo_i2CS::ISA = ('Insteon::Thermostat');
 
 our %message_types = (
 	%Insteon::Thermostat::message_types,
@@ -574,7 +574,7 @@ our %message_types = (
 sub init {
 	my ($self) = @_;
 	$$self{message_types} = \%message_types;
-	#Set saved state unique to i2 devices
+	#Set saved state unique to i2CS devices
 	$self->restore_data('humid', 'cooling', 'heating', 'high_humid', 'low_humid');
 }
 
@@ -582,7 +582,7 @@ sub set {
 	my ($self, $p_state, $p_setby, $p_respond) = @_;
 	my $root = $self->get_root();
 	if (!(ref $p_setby) || !($p_setby->equals($self))) {
-		::print_log("[Insteon::Thermo_i2] Sorry, you cannot control the ".
+		::print_log("[Insteon::Thermo_i2CS] Sorry, you cannot control the ".
 			"thermostat in this manner.  Please read the documentation ".
 			"for Insteon::Thermostat for help.");
 		return;
@@ -611,7 +611,7 @@ sub sync_links{
 	my $bcast_obj = Insteon::get_object($self->device_id(), 'EF');
 	if (!$audit_mode && ref $bcast_obj && $self->is_root){
 		#Make sure thermostat is set to broadcast changes
-		::print_log("[Insteon::Thermo_i2] (sync_links) Enabling thermostat broadcast setting.") unless $audit_mode;
+		::print_log("[Insteon::Thermo_i2CS] (sync_links) Enabling thermostat broadcast setting.") unless $audit_mode;
 		my $extra = "000008000000000000000000000000";
 		my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
 		$$self{_ext_set_get_action} = 'set';
@@ -624,7 +624,7 @@ sub sync_links{
 =item C<poll_simple()>
 
 Requests the status of all Thermostat data points (temp, fan, mode ...) in a single
-request.  Only available for I2 devices.
+request.  Only available for I2CS devices.
 =cut
 sub poll_simple{
 	my ($self) = @_;
@@ -638,7 +638,7 @@ sub poll_simple{
 
 Returns a text string describing the current status of the thermostat. May include
 a combination of "Heating; Cooling; Dehumidifying; Humidifying; or Off." Only
-available for I2 devices.
+available for I2CS devices.
 
 =cut
 sub get_status() {
@@ -666,9 +666,9 @@ sub _process_message {
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
-		main::print_log("[Insteon::Thermo_i2] Extended Set/Get ACK Received for " . $self->get_object_name) if $main::Debug{insteon};
+		main::print_log("[Insteon::Thermo_i2CS] Extended Set/Get ACK Received for " . $self->get_object_name) if $main::Debug{insteon};
 		if ($$self{_ext_set_get_action} eq 'set'){
-			main::print_log("[Insteon::Thermo_i2] Clearing active message") if $main::Debug{insteon};
+			main::print_log("[Insteon::Thermo_i2CS] Clearing active message") if $main::Debug{insteon};
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
 			$self->_process_command_stack(%msg);	
@@ -677,7 +677,7 @@ sub _process_message {
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_extended}) {
 		if (substr($msg{extra},0,4) eq "0201") {
 			$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-			main::print_log("[Insteon::Thermo_i2] Extended Set/Get Data ".
+			main::print_log("[Insteon::Thermo_i2CS] Extended Set/Get Data ".
 				"Received for ". $self->get_object_name) if $main::Debug{insteon};
 			#0 = 2				#14 = Cool SP 
 			#2 = 1				#16 = humidity
@@ -728,7 +728,7 @@ sub _process_message {
 			#10 = humid high		#24 = 1 = Status Report Enabled
 			#12 = firmware			#26 = 1 = External Power On
 							#28 = 1 = Int, 2=Ext Temp
-			main::print_log("[Insteon::Thermo_i2] Humidity setpoints for ".
+			main::print_log("[Insteon::Thermo_i2CS] Humidity setpoints for ".
 				$self->get_object_name . " are High: " .
 				$self->_high_humid(hex(substr($msg{extra}, 8, 2))) .
 				" Low: " . $self->_low_humid(hex(substr($msg{extra}, 10, 2)))
@@ -737,37 +737,37 @@ sub _process_message {
 			$self->_process_command_stack(%msg);
 		}
 		else {
-			main::print_log("[Insteon::Thermo_i2] WARN: Unknown Extended "
+			main::print_log("[Insteon::Thermo_i2CS] WARN: Unknown Extended "
 				."Set/Get Data Received for ". $self->get_object_name) if $main::Debug{insteon};
 		}
 	}
 	elsif ($msg{command} eq "status_temp" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		main::print_log("[Insteon::Thermo_i2] Received Temp Change Message ".
+		main::print_log("[Insteon::Thermo_i2CS] Received Temp Change Message ".
 			"from ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->hex_short_temp($msg{extra});
 	}
 	elsif ($msg{command} eq "status_mode" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		main::print_log("[Insteon::Thermo_i2] Received Mode Change Message ".
+		main::print_log("[Insteon::Thermo_i2CS] Received Mode Change Message ".
 			"from ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->status_mode($msg{extra});
 	}
 	elsif ($msg{command} eq "status_cool" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		main::print_log("[Insteon::Thermo_i2] Received Cool Setpoint Change Message ".
+		main::print_log("[Insteon::Thermo_i2CS] Received Cool Setpoint Change Message ".
 			"from ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->hex_cool($msg{extra});
 	}
 	elsif ($msg{command} eq "status_humid" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		main::print_log("[Insteon::Thermo_i2] Received Humidity Change Message ".
+		main::print_log("[Insteon::Thermo_i2CS] Received Humidity Change Message ".
 			"from ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->hex_humid($msg{extra});
 	}
 	elsif ($msg{command} eq "status_heat" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		main::print_log("[Insteon::Thermo_i2] Received Heat Setpoint Change Message ".
+		main::print_log("[Insteon::Thermo_i2CS] Received Heat Setpoint Change Message ".
 			"from ". $self->get_object_name) if $main::Debug{insteon};	
 		$self->hex_heat($msg{extra});
 	}
@@ -782,7 +782,7 @@ sub _is_info_request {
 	my $is_info_request;
 	if ($cmd eq 'thermostat_control' && $$self{_control_action} eq "mode") {
 		my $val = $msg{extra};
-		main::print_log("[Insteon::Thermo_i2] Processing is_info_request for $cmd with value: $val") if $main::Debug{insteon}; 
+		main::print_log("[Insteon::Thermo_i2CS] Processing is_info_request for $cmd with value: $val") if $main::Debug{insteon}; 
 		if ($val eq '09') {
 			$self->_mode('Off');
 		} elsif ($val eq '04') {
@@ -797,7 +797,7 @@ sub _is_info_request {
 		$$self{_control_action} = undef;
 		$is_info_request = 1;
 	}
-	else #This was not a thermo_i2 info_request
+	else #This was not a thermo_i2CS info_request
 	{
 		#Check if this was a generic info_request
 		$is_info_request = $self->SUPER::_is_info_request($cmd, $ack_setby, %msg);
@@ -974,7 +974,7 @@ Sets the high humidity setpoint.
 =cut
 sub high_humid_setpoint {
 	my ($self, $value) = @_;
-	main::print_log("[Insteon::Thermo_i2] Setting high humid setpoint -> $value") if $main::Debug{insteon};
+	main::print_log("[Insteon::Thermo_i2CS] Setting high humid setpoint -> $value") if $main::Debug{insteon};
 	if($value !~ /^\d+$/){
 		main::print_log("[Insteon::Thermostat] ERROR: Setpoint $value not numeric");
 		return;
@@ -993,7 +993,7 @@ Sets the low humidity setpoint.
 =cut
 sub low_humid_setpoint {
 	my ($self, $value) = @_;
-	main::print_log("[Insteon::Thermo_i2] Setting low humid setpoint -> $value") if $main::Debug{insteon};
+	main::print_log("[Insteon::Thermo_i2CS] Setting low humid setpoint -> $value") if $main::Debug{insteon};
 	if($value !~ /^\d+$/){
 		main::print_log("[Insteon::Thermostat] ERROR: Setpoint $value not numeric");
 		return;
@@ -1007,7 +1007,7 @@ sub low_humid_setpoint {
 
 =item C<get_humid_setpoints()>
 
-Retreives and prints the current humidity high and low setpoints.  Only available for I2 devices.
+Retreives and prints the current humidity high and low setpoints.  Only available for I2CS devices.
 =cut
 sub get_humid_setpoints{
 	my ($self) = @_;
@@ -1043,7 +1043,7 @@ sub set {
 		}
 	}
 	if ($found_state){
-		::print_log("[Insteon::Thermo_i2] Received set mode request to "
+		::print_log("[Insteon::Thermo_i2CS] Received set mode request to "
 			. $p_state . " for device " . $self->get_object_name);
 		$$self{parent}->mode($p_state);
 	}
@@ -1079,7 +1079,7 @@ sub set {
 		}
 	}
 	if ($found_state){
-		::print_log("[Insteon::Thermo_i2] Received set fan to "
+		::print_log("[Insteon::Thermo_i2CS] Received set fan to "
 			. $p_state . " for device " . $self->get_object_name);
 		$$self{parent}->fan($p_state);
 	}
@@ -1155,7 +1155,7 @@ sub set {
 		}
 	}
 	if ($found_state){
-		::print_log("[Insteon::Thermo_i2] Received request to set heat setpoint "
+		::print_log("[Insteon::Thermo_i2CS] Received request to set heat setpoint "
 			. $p_state . " for device " . $self->get_object_name);
 		if (lc($p_state) eq 'cooler'){
 			$$self{parent}->heat_setpoint($$self{parent}->get_heat_sp - 1);
@@ -1196,7 +1196,7 @@ sub set {
 		}
 	}
 	if ($found_state){
-		::print_log("[Insteon::Thermo_i2] Received request to set cool setpoint "
+		::print_log("[Insteon::Thermo_i2CS] Received request to set cool setpoint "
 			. $p_state . " for device " . $self->get_object_name);
 		if (lc($p_state) eq 'cooler'){
 			$$self{parent}->cool_setpoint($$self{parent}->get_cool_sp - 1);

From cd001a4e2c6849ba1445b1f3b902601413bb2b17 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 27 Aug 2013 17:38:00 -0700
Subject: [PATCH 139/330] Insteon_Thermo: Check Engine Version of Root Device
 not ALDB Version

The ALDB can only be i1 or i2, need to be checking the engine version instead.
---
 lib/Insteon.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 4cd68c02f..c97b2cdee 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -558,24 +558,23 @@ sub check_all_aldb_versions
 
 sub check_thermo_versions
 {
-	#main::print_log("[Insteon] DEBUG4 Checking thermostat versions") if ($main::Debug{insteon} >= 4);
+	main::print_log("[Insteon] DEBUG4 Initializing thermostat versions") if ($main::Debug{insteon} >= 4);
 
 	my @thermo_devices = ();
 	push @thermo_devices, Insteon::find_members("Insteon::Thermostat");
 	foreach my $thermo_device (@thermo_devices)
 	{
 		if ($thermo_device->isa('Insteon::Thermostat') && 
-			$thermo_device->_aldb->aldb_version() eq "I2CS"){
+			$thermo_device->get_root()->engine_version eq "I2CS"){
 			main::print_log("[Insteon] DEBUG4 Setting thermostat "
 				. $thermo_device->get_object_name() . " to i2CS") 
 			if ($main::Debug{insteon} >= 4);
 			bless $thermo_device, 'Insteon::Thermo_i2CS';
 			$thermo_device->init();
 		}
-		elsif ($thermo_device->isa('Insteon::Thermostat')
-			&& $thermo_device->_aldb->aldb_version() eq "I1"){
+		else {
 			main::print_log("[Insteon] DEBUG4 Setting thermostat "
-				. $thermo_device->get_object_name() . " to i2") 
+				. $thermo_device->get_object_name() . " to i1") 
 			if ($main::Debug{insteon} >= 4);
 			bless $thermo_device, 'Insteon::Thermo_i1';
 		}

From e1d45644d76d721b67fc1196d7f430722fc65e7b Mon Sep 17 00:00:00 2001
From: surge919 <tomvaldes@Tom-Valdess-MacBook-Pro.local>
Date: Fri, 30 Aug 2013 09:53:46 -0400
Subject: [PATCH 140/330] Sends Notification messages to NMA - Notify My
 Android

---
 code/common/nma_notification.pl | 53 +++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 code/common/nma_notification.pl

diff --git a/code/common/nma_notification.pl b/code/common/nma_notification.pl
new file mode 100644
index 000000000..144161f31
--- /dev/null
+++ b/code/common/nma_notification.pl
@@ -0,0 +1,53 @@
+# Category=Home_Network
+#
+#@ Sends Notification messages to NMA - Notify My Android
+
+# The following config parameters should be in mh.private.ini or mh.ini
+#
+# nma_api_key=<api key>                    (API Key from NotifyMyAndroid)
+
+use LWP::UserAgent;
+
+# noloop=start
+my $nma_api_key = $config_parms{nma_api_key};
+# noloop=stop
+
+
+#Tell MH to call our routine each time something is spoken
+&Speak_pre_add_hook(\&nma_notify,1) if $Reload;
+
+# Notify the on startup / restart
+if ($Startup) {
+        print_log("System Restarted, Notifying NMA -- using api key: ", $nma_api_key );
+        nma_notify_b("$nma_api_key", "Misterhouse has been restarted");
+}
+
+sub nma_notify() {
+        my %parms = @_;
+        print "NMA message sent";
+        print "----------------";
+        nma_notify_b("$nma_api_key", "$parms{text}");
+        return;
+}
+
+sub nma_notify_b{
+        my ($nma_api_key, $text) = @_;
+
+        print "NMA message sent";
+
+        # syntax to send a message from a browser or curl -- ie: for testing
+        # https://www.notifymyandroid.com/publicapi/notify?apikey=<api key>&application=<application name>&event=<event name>&description=<description>&priority=0
+
+        # NMA allows you to print to 3 lines
+        # I prefer printing to the main line which is listed as application in the below url.  This works great fot GTV since the event pops up over whatever you are watching
+        my $url = 'https://www.notifymyandroid.com/publicapi/notify?apikey='.$nma_api_key.'&application='.$text.'&event=&description=&priority=0';
+
+        # If you prefer the main line to list MisterHouse and have your event appear on the second line, uncomment the following line and comment out the line above this
+        #  my $url = 'https://www.notifymyandroid.com/publicapi/notify?apikey='.$nma_api_key.'&application=MisterHouse&event='.$text.'&description=&priority=0';
+
+        # Change spaces to HTML space codes
+        $url  =~ s/ /%20/g;
+        my $ua = new LWP::UserAgent;
+        my $req = new HTTP::Request GET => $url;
+        my $res = $ua->request($req);
+}

From 7ea6d0aa0c6a59f9ca590fadbce683467abbffb1 Mon Sep 17 00:00:00 2001
From: root <root@avalanche.(none)>
Date: Sun, 22 Sep 2013 23:38:25 -0400
Subject: [PATCH 141/330] First creation of SCENE_SIMPLE, tested and working

---
 bin/mh              |  4 ++++
 lib/read_table_A.pl | 55 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/bin/mh b/bin/mh
index 897c75c0d..b4b078c70 100755
--- a/bin/mh
+++ b/bin/mh
@@ -4775,6 +4775,10 @@ sub read_table_files {
                 print "Error in &read_table_$format: $@\n" if $@;
             }
         }
+        if (defined(&{"read_table_finish_$format"})) {
+                print TABLE_OUT eval "&read_table_finish_$format()";
+                print "Error in &read_table_finish_$format: $@\n" if $@;
+        }
         close TABLE_IN;
         close TABLE_OUT;
         if ($format =~/xml/) { $/="\n"; }
diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index 93ca9a499..29688fe2b 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -14,7 +14,7 @@
 
 #print_log "Using read_table_A.pl";
 
-my (%groups, %objects, %packages, %addresses);
+my (%groups, %objects, %packages, %addresses, %scenes);
 
 sub read_table_init_A {
                                 # reset known groups
@@ -23,6 +23,7 @@ sub read_table_init_A {
 	%objects=();
 	%packages=();
         %addresses=();
+        %scenes=();
 }
 
 sub read_table_A {
@@ -992,6 +993,17 @@ sub read_table_A {
         }
         $object = '';
     }
+    elsif($type eq "SCENE_SIMPLE") {
+	#SCENE_SIMPLE, scene_name, scene_member, controller?, responder?, onlevel, ramprate
+        my ($scene_member, $scene_controller, $scene_responder, $on_level, $ramp_rate);
+        ($name, $scene_member, $scene_controller, $scene_responder, $on_level, $ramp_rate) = @item_info;
+        if( ! $packages{Scene}++ ) {   # first time for this object type?
+            $code .= "use Scene;\n";
+        }
+	$scenes{$name}{$scene_member}="$scene_controller,$scene_responder,$on_level,$ramp_rate";
+        $code .= sprintf "#SCENE_SIMPLE: \$%-35s -> add(\$%s);\n", $name, $scene_member;
+	$object = '';
+    }
     elsif ($type eq "PHILIPS_HUE"){
     	($address, $name, $grouplist, @other) = @item_info;
     	$other = join ', ', (map {"'$_'"} @other); # Quote data
@@ -1047,6 +1059,47 @@ sub read_table_A {
     return $code;
 }
 
+sub read_table_finish_A {
+    my ($code, $scene, $scene_member, %scene_data, $member_data);
+    foreach $scene (sort keys %scenes) {
+        $code .= "\n#SCENE DEFINITION: $scene\n";
+        #my $object = &get_object_by_name($scene);
+        #if(defined($object) and $object->isa("Insteon::InterfaceController")) { #Doesn't work because object technically doesn't exist yet. Is it even necessary to limit to ICONTROLLER's?
+#        print "\n\nOBJECT: $objects{$scene}\n\n\n";
+        if($objects{$scene}) {
+            $scenes{$scene}{$scene}="1,0"; #Make the INSTEON_ICONTROLLER a controller too
+        }
+        #Loop through the hash and find all controller->responder combinations that make sense.
+        my %scenememberlist=%{$scenes{$scene}}; #Make a hash copy so we can iterate through the hash inside another iteration of the same hash. Is there a better way?
+        while (($scene_member, $member_data) = each($scenes{$scene})) {
+            my ($scene_controller, $scene_responder) = split(',', $member_data);
+
+            if (($objects{$scene_member}) and ($scene_controller)) {
+                while (my($scene2_member, $member2_data) = each(%scenememberlist)) {
+                    my ($scene2_controller, $scene2_responder, $on_level, $ramp_rate) = split(',', $member2_data);
+
+                    if (($objects{$scene2_member}) and ($scene2_responder) and ($scene_member ne $scene2_member)) {
+                        if ($on_level) {
+                            if ($ramp_rate) {
+                                $code .= sprintf "\$%-35s -> add(\$%s,'%s','%s');\n",
+                                    $scene_member, $scene2_member, $on_level, $ramp_rate;
+                        } else {
+                                $code .= sprintf "\$%-35s -> add(\$%s,'%s');\n", $scene_member, $scene2_member, $on_level;
+                            }
+                        } else {
+                            $code .= sprintf "\$%-35s -> add(\$%s);\n", $scene_member, $scene2_member;
+                        }
+                    }
+                }
+
+            } else {
+                print "\nThere is no object called $scene_member defined.  Ignoring SCENE_SIMPLE entry.\n" unless $objects{$scene_member};
+            }
+        }
+    }
+    return $code;
+}
+
 1;
 
 #

From 9d8050fd62e05113bd704b13cad910bbcc8c25e4 Mon Sep 17 00:00:00 2001
From: Steve Switzer <steve@switzerny.org>
Date: Mon, 23 Sep 2013 00:05:46 -0400
Subject: [PATCH 142/330] Add some clarity to the I2CS device is not linked
 error message, teling us WHICH device.

---
 lib/Insteon/BaseInsteon.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index b92df149e..7e857a6d3 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1802,7 +1802,7 @@ sub _get_engine_version_failure
 	if($failure_reason eq 'NAK')
 	{
 		#assume I2CS because no other device will NAK this command
-		main::print_log("[Insteon::BaseDevice] WARN: I2CS device is not "
+		main::print_log("[Insteon::BaseDevice] WARN: I2CS device (" . $self->get_object_name . ") is not "
 			."linked; Please use 'link to interface' voice command");
 		$self->engine_version('I2CS');
 	}

From 9992f80e42b41e87f315f8c780735bcee46d562f Mon Sep 17 00:00:00 2001
From: Steve Switzer <steve@switzerny.org>
Date: Mon, 23 Sep 2013 00:34:01 -0400
Subject: [PATCH 143/330] Allow MH to have a master volume that controls the
 relative volume of each speak or play event.

---
 code/common/mh_sound.pl | 105 +++++++++++++++++++++++-----------------
 1 file changed, 60 insertions(+), 45 deletions(-)

diff --git a/code/common/mh_sound.pl b/code/common/mh_sound.pl
index 8304c0f75..c6a33e735 100644
--- a/code/common/mh_sound.pl
+++ b/code/common/mh_sound.pl
@@ -19,12 +19,17 @@
 $mh_volume         = new Generic_Item;
 $mh_speakers       = new Generic_Item;
 $mh_speakers_timer = new Timer;
-$Info{Volume_Control} = 'Command Line' if $Reload and $config_parms{volume_get_cmd} and $config_parms{volume_set_cmd};
+$Info{Volume_Control} = 'Command Line' if $Reload and $config_parms{volume_master_get_cmd} and $config_parms{volume_master_set_cmd};
 
 
                                 # Allow for default volume control. Reset on startup.
 
-&set_volume3($mh_volume->{state}) if $Startup and defined $mh_volume->{state}; #noloop
+&set_volume_master_wrapper($mh_volume->{state}) if $Startup and defined $mh_volume->{state}; #noloop
+&set_volume_wav($config_parms{volume_wav_default_volume}) if $Startup and defined $config_parms{volume_wav_default_volume}; #noloop
+
+if (defined($state = state_now $mh_volume) and $state ne '') {
+	&set_volume_master_wrapper($state);
+}
 
 $Tk_objects{sliders}{volume} = &tk_scalebar(\$mh_volume, 0, 'Volume') if $MW and $Reload and $Run_Members{mh_sound};
 
@@ -66,9 +71,15 @@ sub put_volume_back {
 
 	# MSv5 has nothing to do with the mixer
 
-    if (defined $volume_previous and ($Voice_Text::VTxt_version ne 'msv5' or $wav_did_it)) {
-    	print_log("Putting volume back to $volume_previous");
-	set_volume2($volume_previous);
+    if (defined $config_parms{volume_wav_default_volume} and ($Voice_Text::VTxt_version ne 'msv5' or $wav_did_it)) {
+    	print_log("Putting wav volume back to $config_parms{volume_wav_default_volume}");
+	&set_volume_wav($config_parms{volume_wav_default_volume});
+
+	if ($volume_master_changed) {
+            $volume_master_changed=0;
+            &set_volume_master_wrapper($mh_volume->{state});
+        }
+
     }
 
 }
@@ -77,6 +88,7 @@ sub put_volume_back {
 if (!$is_speaking_flag and $is_speaking) {
 #   print_log 'Speakers on';
     $is_speaking_flag = 1;
+    print_log "Setting speakers ON";
     set $mh_speakers ON;
                                 # The following has no effect :(
 #   &Voice_Cmd::deactivate if $OS_win; # So mh does not listen to itself
@@ -84,7 +96,7 @@ sub put_volume_back {
 if ($is_speaking_flag and !$is_speaking) {
    # *** v5 has nothing to do with the mixer
 
-   print_log "Speakers off, volume reset to $volume_previous" if defined $volume_previous and $Voice_Text::VTxt_version ne 'msv5';
+   print_log "Speakers off, volume reset to $volume_wav_previous" if defined $volume_wav_previous and $Voice_Text::VTxt_version ne 'msv5';
    &put_volume_back();
 
 }
@@ -105,7 +117,18 @@ sub put_volume_back {
 
 $Tk_objects{volume_status}->configure(-value => $mh_volume->{state}) if $Tk_objects{volume_status} and (state_now $mh_volume);
 
-sub set_volume3 {
+
+sub set_volume_master {
+    my ($volume) = @_;
+
+    if ($Info{Volume_Control} eq 'Command Line') {
+	my $volume_cmd=$config_parms{volume_master_set_cmd};
+        print_log eval qq("$volume_cmd");
+        my $r = system eval qq("$volume_cmd");
+    }
+}
+
+sub set_volume_master_wrapper {
     my $state = shift;
     if (!$Info{Volume_Control}) {
         print_log "Volume control not enabled";
@@ -116,32 +139,45 @@ sub set_volume3 {
         set $mh_volume 100;
     }
     else {
-        print_log "Setting mixer volume to $state";
-        set_volume2($state);
+        print_log "Setting master volume to $state";
+        &set_volume_master($state);
     }
     $Tk_objects{volume_status}->configure(-value => $state) if $Tk_objects{volume_status};
 
 }
 
-
-if (defined($state = state_now $mh_volume) and $state ne '') {
-	&set_volume3($state);
+sub set_volume_wav {
+    my ($volume) = @_;
+    my $volume_wav_previous;
+    if ($Info{Volume_Control} eq 'Command Line') {
+        print_log "$config_parms{volume_wav_get_cmd}";
+        $volume_wav_previous = `$config_parms{volume_wav_get_cmd}`;
+        chomp $volume_wav_previous;
+	my $volume_cmd=$config_parms{volume_wav_set_cmd};
+        print_log eval qq("$volume_cmd");
+        my $r = system eval qq("$volume_cmd");
+    }
+    print_log "Previous wav volume was $volume_wav_previous";
+    #return $volume_wav_previous;
 }
+
                                 # Set hooks so set_volume is called whenever speak or play is called
-&Speak_pre_add_hook(\&set_volume) if $Reload;
-&Play_pre_add_hook (\&set_volume) if $Reload;
+&Speak_pre_add_hook(\&set_volume_pre_hook) if $Reload;
+&Play_pre_add_hook (\&set_volume_pre_hook) if $Reload;
 
 #noloop=start
-my $volume_previous;
+my $volume_master_changed=0;
+my $volume_wav_previous;
 #noloop=stop
-sub set_volume {
+sub set_volume_pre_hook {
+    print_log "FUNCTION: set_volume_pre_hook";
     return if $is_speaking and $Voice_Text::VTxt_version ne 'msv5';     # Speaking volume wins over play volume (unless using MSv5!)
     return unless $Info{Volume_Control}; # Verify we have a volume control module installed
     my %parms = @_;
                                 # msv5 changes volume with xml tags in lib/Voice_Text.pm
     return if $parms{text} and $Voice_Text::VTxt_version eq 'msv5';
 
-    undef $volume_previous;
+    undef $volume_wav_previous;
     my $volume = $parms{volume};
 
 	# *** Oops the following line is wrong--mh_volume is linked to mixer
@@ -157,41 +193,20 @@ sub set_volume {
 
 
     if ($parms{time} or ($parms{text} and $Voice_Text::VTxt_version ne 'msv5')) {
-        print_log "Setting mixer volume to $volume";
+        print_log "Setting wav volume to $volume";
 	$volume = 100 if $volume > 100;
 
-        $volume_previous = set_volume2($volume);
+        $volume_wav_previous = &set_volume_wav($volume);
 
-    }
-}
+	if($parms{mhvolume}) {
+		$volume_master_changed=1;
+		&set_volume_master_wrapper($parms{mhvolume});
+	}
 
-sub set_volume2 {
-    my ($volume) = @_;
-    my $volume_previous;
-    if ($Info{Volume_Control} eq 'Command Line') {
-        $volume_previous = `$config_parms{volume_get_cmd}`;
-        chomp $volume_previous;
-        my $r = system eval qq("$config_parms{volume_set_cmd} $volume");
     }
-    elsif ($Info{Volume_Control} eq 'Win32::Sound' and !$config_parms{sound_volume_skip}            ) {
-
-	# *** nothing here to pull volume level from Windows! Will leave at this volume until next sound
-	# hack here (should actually work pretty well since mh_sound is sync'ed to volume now.)
+}
 
-	$volume_previous = $mh_volume->{state};
 
-        $volume = int 255 * $volume / 100;   # (0->100 =>  0->255)
-        $volume = $volume + ($volume << 16); # Hack to fix a bug in Win32::Sound::Volume
-        &Win32::Sound::Volume($volume);
-    }
-    elsif ($Info{Volume_Control} eq 'Audio::Mixer') {
-        my @vol = Audio::Mixer::get_cval('vol');
-        $volume_previous = ($vol[0] + $vol[1]) / 2;
-#       Audio::Mixer::set_cval('vol', $volume);
-        Audio::Mixer::set_cval('spkr', $volume);
-    }
-    return $volume_previous;
-}
 
                                 # Allow for a pre-speak/play wav file
 &Speak_pre_add_hook(\&sound_pre_speak) if $Reload and $config_parms{sound_pre_speak};

From 428bf6905ea8c7bf6531a3f2f166f54460a6f023 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 26 Sep 2013 17:32:00 -0700
Subject: [PATCH 144/330] Allow for State of 0

Fixes two things:
- Allows for a State of 0 to be recorded in the state log
- Allows for a State of 0 to be displyed through the web interface rather than N/A

Both issues arise from the use of conditional statements such as:
```
if($state){...}
```
rather than using
```
if(defined($state)){...}
```
As a result a state of 0 was always ignored.
---
 lib/Generic_Item.pm | 2 +-
 lib/http_server.pl  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Generic_Item.pm b/lib/Generic_Item.pm
index 4896a6966..acf58f291 100644
--- a/lib/Generic_Item.pm
+++ b/lib/Generic_Item.pm
@@ -1059,7 +1059,7 @@ sub set_state_log {
     $target = '' unless defined $target;
     unshift(@{$$self{state_log}}, "$main::Time_Date $state set_by=$set_by_name"
       . (($target)?"target=$target":''))
-      if $state or (ref $self) eq 'Voice_Cmd';
+      if defined($state) or (ref $self) eq 'Voice_Cmd';
     pop @{$$self{state_log}} if $$self{state_log} and @{$$self{state_log}}
       > $main::config_parms{max_state_log_entries};
 
diff --git a/lib/http_server.pl b/lib/http_server.pl
index ace04ad86..a81e5cd63 100644
--- a/lib/http_server.pl
+++ b/lib/http_server.pl
@@ -2381,7 +2381,7 @@ sub html_item_state {
     my $filename     = $object->{filename};
     my $state_now    = $object->{state};
     my $html;
-    $state_now = '' unless $state_now; # Avoid -w uninitialized value msg
+    $state_now = '' unless defined($state_now); # Avoid -w uninitialized value msg
 
                                 # If >2 possible states, add a Select pull down form
     my @states;
@@ -2407,7 +2407,7 @@ sub html_item_state {
     if (my $h_icon = &html_find_icon_image($object, $object_type)) {
         $html .= qq[<img src="$h_icon" alt="$object_name" border="0"></a>];
     }
-    elsif ($state_now) {
+    elsif ($state_now ne '') {
 	my $temp = $state_now;
 	$temp = substr($temp, 0, 8) . '..' if length $temp > 8;
 	$html .= $temp . '</a>&nbsp';

From 1590563c743139b1df7deb56ec81d1f6c8ad0a07 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 26 Sep 2013 17:42:00 -0700
Subject: [PATCH 145/330] Insteon: Pass Message Clearing Decision to
 on_read_write_aldb

on_read_write_aldb now returns a 1/0 corresponding to whether the current message should be cleared.

When a bad message arrived, on_read_write_aldb attempted to requeue the message that was currently pending.  However, _process_message did not clear the pending message until after this routine was run.  As a result, a new message was not queued because it was duplicative, but then the current message was cleared.  This resulted in stalling the message queue.

Fixes bug #258
---
 lib/Insteon/AllLinkDatabase.pm | 18 ++++++++++++------
 lib/Insteon/BaseInsteon.pm     | 21 ++++-----------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index ec74ce24c..d76a44222 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -2127,7 +2127,7 @@ Called as part of any process to read or write to a device's ALDB.
 sub on_read_write_aldb
 {
 	my ($self, %msg) = @_;
-
+	my $clear_message = 1; #Default Action is to Clear the Current Message
 	&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 		. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
 		. lc $msg{extra} . " for _mem_activity=".$$self{_mem_activity}
@@ -2135,6 +2135,8 @@ sub on_read_write_aldb
 
 	if ($$self{_mem_action} eq 'aldb_i2read')
 	{
+		#This is an ACK. Will be followed by a Link Data message, so don't clear
+		$clear_message = 0;
 		#Only move to the next state if the received message is a device ack
 		#if the ack is dropped the retransmission logic will resend the request
 		if($msg{is_ack}) {
@@ -2156,6 +2158,7 @@ sub on_read_write_aldb
 			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received duplicate ack. Ignoring.")
 				if  $main::Debug{insteon} >= 3;
+				$clear_message = 0;
 		} elsif(length($msg{extra})<30)
 		{
 			&::print_log("[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed: "
@@ -2163,8 +2166,9 @@ sub on_read_write_aldb
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
 				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
 			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
-            #retry previous address again
-			$self->send_read_aldb(sprintf("%04x", hex($$self{_mem_msb} . $$self{_mem_lsb})));
+			#can't clear message, if valid message doesn't arrive
+			#resend logic will kick in
+			$clear_message = 0;
 		} elsif ($$self{_mem_msb} . $$self{_mem_lsb} ne '0000' and 
 				$$self{_mem_msb} . $$self{_mem_lsb} ne substr($msg{extra},6,4)){
 			::print_log("[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed, "
@@ -2172,9 +2176,10 @@ sub on_read_write_aldb
 				. $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
 				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
-            $$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
-			#retry previous address again
-			$self->send_read_aldb(sprintf("%04x", hex($$self{_mem_msb} . $$self{_mem_lsb})));
+			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
+			#can't clear message, if valid message doesn't arrive
+			#resend logic will kick in
+			$clear_message = 0;
 		}
 		elsif ($$self{_stress_test_act}){
 			$$self{_mem_activity} = undef;
@@ -2369,6 +2374,7 @@ sub on_read_write_aldb
 			. ": unhandled _mem_action=".$$self{_mem_action})
 			if $main::Debug{insteon};
 	}
+	return $clear_message;
 }
 
 sub _write_link
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index b92df149e..ff9571682 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -776,14 +776,8 @@ sub _process_message
 			}
 			elsif ($pending_cmd eq 'read_write_aldb') {
                         	if ($msg{cmd_code} eq $self->message_type_hex($pending_cmd)) {
-					if ($self->_aldb && $self->_aldb->{_mem_action} ne 'aldb_i2writeack'){
-						#This is an ACK. Will be followed by a Link Data message
-						$clear_message = 0;
-						$self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
-					} else {
-						$self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
-						$self->_process_command_stack(%msg);
-					}
+					$clear_message = $self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
+					$self->_process_command_stack(%msg) if ($clear_message);
                         	} else {
                         		$corrupt_cmd = 1;
                         		$clear_message = 0;
@@ -877,15 +871,8 @@ sub _process_message
 		$self->request_status($self);
 	} elsif ($msg{command} eq 'read_write_aldb') {
 		if ($self->_aldb){
-			if ($self->_aldb->{_mem_action} eq 'aldb_i2readack'){
-				#If aldb_i2readack is set then this is good
-				$clear_message = 1;
-				$self->_aldb->on_read_write_aldb(%msg);
-				$self->_process_command_stack(%msg);
-			} else {
-				#This is an out of sequence message
-				$self->_aldb->on_read_write_aldb(%msg);
-			}
+			$clear_message = $self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
+			$self->_process_command_stack(%msg) if($clear_message);
 		}
 	} elsif ($msg{type} eq 'broadcast') {
 		$self->devcat($msg{devcat});

From 211592bdb8127cdaebb84c2e3fb41967b57855e0 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 27 Sep 2013 17:34:00 -0700
Subject: [PATCH 146/330] Insteon: Don't Clear Queue on Unhandled Mem_Action

Missed one instance in which the queued message should not be cleared.
Should not be cleared on an unhandled mem action either.

Further Fix to #258
---
 lib/Insteon/AllLinkDatabase.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index d76a44222..d67e0944b 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -2373,6 +2373,7 @@ sub on_read_write_aldb
 		main::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name 
 			. ": unhandled _mem_action=".$$self{_mem_action})
 			if $main::Debug{insteon};
+		$clear_message = 0;
 	}
 	return $clear_message;
 }

From 59def92cb020f78ae7000e27b1f881131da4cc9b Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Sun, 29 Sep 2013 00:29:14 -0400
Subject: [PATCH 147/330] rename to SCENE_BUILD and performed some code cleanup

---
 lib/read_table_A.pl | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index 29688fe2b..165dd708c 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -993,15 +993,14 @@ sub read_table_A {
         }
         $object = '';
     }
-    elsif($type eq "SCENE_SIMPLE") {
-	#SCENE_SIMPLE, scene_name, scene_member, controller?, responder?, onlevel, ramprate
+    elsif($type eq "SCENE_BUILD") {
+	#SCENE_BUILD, scene_name, scene_member, controller?, responder?, onlevel, ramprate
         my ($scene_member, $scene_controller, $scene_responder, $on_level, $ramp_rate);
         ($name, $scene_member, $scene_controller, $scene_responder, $on_level, $ramp_rate) = @item_info;
         if( ! $packages{Scene}++ ) {   # first time for this object type?
             $code .= "use Scene;\n";
         }
-	$scenes{$name}{$scene_member}="$scene_controller,$scene_responder,$on_level,$ramp_rate";
-        $code .= sprintf "#SCENE_SIMPLE: \$%-35s -> add(\$%s);\n", $name, $scene_member;
+	$scenes{$name}{$scene_member} = "$scene_controller,$scene_responder,$on_level,$ramp_rate";
 	$object = '';
     }
     elsif ($type eq "PHILIPS_HUE"){
@@ -1062,15 +1061,20 @@ sub read_table_A {
 sub read_table_finish_A {
     my ($code, $scene, $scene_member, %scene_data, $member_data);
     foreach $scene (sort keys %scenes) {
-        $code .= "\n#SCENE DEFINITION: $scene\n";
+        $code .= "\n#SCENE_BUILD Definition for scene: $scene\n";
+
+        #Doesn't work because object technically doesn't exist yet. Is it even necessary to limit to ICONTROLLER's?
         #my $object = &get_object_by_name($scene);
-        #if(defined($object) and $object->isa("Insteon::InterfaceController")) { #Doesn't work because object technically doesn't exist yet. Is it even necessary to limit to ICONTROLLER's?
-#        print "\n\nOBJECT: $objects{$scene}\n\n\n";
+        #if(defined($object) and $object->isa("Insteon::InterfaceController")) {
+
         if($objects{$scene}) {
-            $scenes{$scene}{$scene}="1,0"; #Make the INSTEON_ICONTROLLER a controller too
+            #Since an INSTEON_ICONTROLLER exists with the same name as the scene, make it a controller of the scene, too.
+            $scenes{$scene}{$scene}="1,0";
         }
+        #Make a hash copy so we can iterate through the hash inside another iteration of the same hash. Is there a better way?
+        my %scenememberlist=%{$scenes{$scene}};
+
         #Loop through the hash and find all controller->responder combinations that make sense.
-        my %scenememberlist=%{$scenes{$scene}}; #Make a hash copy so we can iterate through the hash inside another iteration of the same hash. Is there a better way?
         while (($scene_member, $member_data) = each($scenes{$scene})) {
             my ($scene_controller, $scene_responder) = split(',', $member_data);
 
@@ -1093,7 +1097,7 @@ sub read_table_finish_A {
                 }
 
             } else {
-                print "\nThere is no object called $scene_member defined.  Ignoring SCENE_SIMPLE entry.\n" unless $objects{$scene_member};
+                print "\nThere is no object called $scene_member defined.  Ignoring SCENE_BUILD entry.\n" unless $objects{$scene_member};
             }
         }
     }

From f5a70fa8faa2a8c72172be83ce7024f3bba02d78 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Mon, 30 Sep 2013 01:27:22 -0400
Subject: [PATCH 148/330] Add PA zone type of 'object', clean up code, enhance
 to allow for mixed zone types, tested X10, xPL, xAP, object and wdio. xPL and
 xAP were only tested to send to the designated IP address - verified with
 netcat on target computer.

---
 code/common/pa_control.pl |  53 +++---
 lib/PAobj.pm              | 358 ++++++++++++++++++++++++--------------
 lib/read_table_A.pl       |  92 +++++-----
 3 files changed, 305 insertions(+), 198 deletions(-)

diff --git a/code/common/pa_control.pl b/code/common/pa_control.pl
index 514d2348b..fa35a6eb7 100644
--- a/code/common/pa_control.pl
+++ b/code/common/pa_control.pl
@@ -13,20 +13,20 @@
 	Centralized control of various PA zone types.
 
 Author:
-	Steve Switzer
+	Steve Switzer (Pmatis)
 	steve@switzerny.org
 
 License:
 	This free software is licensed under the terms of the GNU public license.
 
 Requires:
-        PAobj.pm from the lib directory
-        pa.mht, or other mht file listing all of your PA zones. See end of file for ezample
+	PAobj.pm from the lib directory
+	pa.mht, or other mht file listing all of your PA zones. See end of file for ezample
 
 Special Thanks to:
 	Bruce Winter - MH
 	Jason Sharpee - Example Perl Modules to "steal",learn from. :)
-        Ross Towbin - Providing me with code snippets for "setting weeder with more than 8 ports"
+	Ross Towbin - Providing me with code snippets for "setting weeder with more than 8 ports"
 
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 =cut
@@ -34,15 +34,11 @@
 use PAobj;
 
 #noloop=start
-my $pa_port	= $config_parms{pa_port};
 my $pa_delay	= $config_parms{pa_delay};
-my $pa_type	= $config_parms{pa_type};
 my $pa_timer	= $config_parms{pa_timer};
-$pa_port	= 'weeder'	unless $pa_port;
 $pa_delay	= 0.5		unless $pa_delay;
-$pa_type	= 'wdio'	unless $pa_type;
 $pa_timer	= 60		unless $pa_timer;
-$pactrl = new PAobj($pa_type,$pa_port);
+$pactrl = new PAobj();
 $pactrl->set_delay($pa_delay);
 $v_pa_test = new Voice_Cmd('test pa');
 $v_pa_speakers = new Voice_Cmd('speakers [on,off]');
@@ -58,8 +54,8 @@
 if (said $v_pa_test) {
     my $state = $v_pa_test->{state};
     $v_pa_test->respond('app=pa Testing PA...');
-    #speak "nolog=1 rooms=all mode=unmuted volume=100 Hello. This is a PA system test.";
-    speak "nolog=1 rooms=downstairs mode=unmuted volume=100 Hi!";
+    speak "nolog=1 rooms=all mode=unmuted volume=80 Hello. This is a PA system test.";
+    #speak "nolog=1 rooms=downstairs mode=unmuted volume=100 Hi!";
 }
 
 # turn all speakers on/off
@@ -84,15 +80,16 @@ sub pa_control_stub {
     return if $mode eq 'mute' or $mode eq 'offline';
 
     my $rooms = $parms{rooms};
-    print "pa_stub db: rooms=$rooms, mode=$mode\n" if $Debug{pa};
-    my $results = $pactrl->set($rooms,ON,$mode);
-    print "PA set results: $results\n" if $Debug{pa};
+    print "PA: control_stub: rooms=$rooms, mode=$mode\n" if $Debug{pa};
+    my $results = $pactrl->set($rooms,ON,$mode,%parms);
+    print "PA: control_stub set results: $results\n" if $Debug{pa};
     set $pa_speaker_timer $pa_timer if $results;
 }
 
           #Turn off speakers when MH says it's done speaking/playing
 if (state_now $mh_speakers eq OFF) {
     unset $pa_speaker_timer;
+    print "PA: Turning speakers off\n" if $Debug{pa};
     $pactrl->set('allspeakers',OFF,'normal');
 }
 
@@ -100,9 +97,8 @@ sub pa_control_stub {
 $pa_speaker_timer = new Timer;
 set $pa_speaker_timer 60 if state_now $mh_speakers eq ON;
 if (expired $pa_speaker_timer) {
-#print "Timer expired\n";
+    print "PA: Timer expired.\n" if $Debug{pa};
     set $mh_speakers OFF;
-    #$pactrl->set('allspeakers',OFF,'normal');
 }
 
 =begin comment
@@ -111,18 +107,25 @@ sub pa_control_stub {
 Example pa.mht file:
 
 #
-# Type    Address   Name           Groups               Serial Name          Other
+#Type Address	Name			Groups               		Serial   Other
 #
-
-PA,	AA,	kitchen,	all|default|mainfloor,		weeder, wdio
-PA,	AB,	server,		all|basement,			weeder, wdio
-PA,	AG,	master,		all|default|upstairs,		weeder, wdio
+PA,	AA,		kitchen,		all|default|mainfloor,		weeder, wdio
+PA,	AB,		server,		all|basement,			weeder, wdio
+PA,	AG,		master,		all|default|upstairs,		weeder2, wdio_old
+PA,	B12,		garage,		all|outside,				, X10
+PA,	objname,	living,		all|mainfloor,				, object
+PA,	192.168.0.1,family,		all|mainfloor,				, xap
+PA,	192.168.0.2,dining,		all|mainfloor,				, xpl
 
 
 Type:        "PA", constant. This must be there.
 
-Address:     2 characters. First character is the weeder address, the second is the pin
-             if the command to turn on the pin you want is: BHC, then the Address is: BC
+Address:     Address or Object name.
+             If Other is "object", then this should be an object name that can accept an ON or OFF
+             For Weeder, 2 characters. First character is the weeder address, the second is the pin
+               if the command to turn on the pin you want is: BHC, then the Address is: BC
+             For X10, the X10 address of the (likely) relay device.
+             For xAP and xPL, use the IP address or hostname of the target device.
 
 Name:        Give a name to the pa zone, usually the room name. You use these in the
              speak and play commands with rooms=.
@@ -135,11 +138,11 @@ sub pa_control_stub {
              rooms= parm. If no rooms are specified, all zones in the "default" group will be
              used.
 
-Serial Name: The name of the serial port that you use for communcating to the IO device.
+Serial:      The name of the serial port that you use for communcating to the IO device.
              The default is "weeder". Note that this can be changed with an INI parm.
 
 Other:       Optional. Sets the type of PA control. Defaults to 'wdio'. Available options are:
-             wdio,wdio_old,X10
+             wdio,wdio_old,X10,xpl,xap,object
 
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 =cut
diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index 2c230ae2e..34299cc86 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -5,7 +5,6 @@
 Example initialization:
 
   use PAobj;
-  $paobj = new PAobj('wdio','weeder');
 
 Enable pa_control.pl using "Common code activation" in the IA5 interface
 to activate an instance of this PA code.
@@ -43,18 +42,11 @@ sub last_char
 
 sub new
 {
-    my ($class,$pa_type,$pa_port) = @_;
+    my ($class) = @_;
     my $self={};
 
     bless $self,$class;
 
-    $pa_type = 'wdio' unless $pa_type;
-    $pa_port = 'weeder' unless $pa_port;
-
-    $$self{pa_type} = $pa_type;
-    $$self{pa_type_init} = 0;
-
-    $$self{pa_port} = $pa_port;
     $$self{pa_delay} = 0.5;
 
     return $self;
@@ -63,63 +55,84 @@ sub new
 sub init {
     my ($self) = @_;
     %pa_zone_types=();
-    my $ref = &::get_object_by_name("pa_allspeakers");
-    if (!$ref) {
+    my $ref2 = &::get_object_by_name("pa_allspeakers");
+    if (!$ref2) {
         &::print_log("\n\nWARNING! PA Zones were not found! Your *.mht file probably doesn't list the PA zones correctly.\n\n");
         return 0;
     }
     $self->check_group('default');
 
-#    my @speakers = $self->get_speakers('allspeakers');
-#    for my $room (@speakers) {
-#        my $paobjname = "pa_$room";
-#        my $ref = &::get_object_by_name($paobjname);
-#        my $pa_zone_type = $pa_zone_type_by_zone{$paobjname};
-#        print "db INIT room=$room, zonetype=$pa_zone_type\n";
-#        $pa_zone_types{$pa_zone_type}++ unless $pa_zone_types{$$ref{pa_type}};
-#    }
-
+    my @speakers = $self->get_speakers('allspeakers');
+    my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl);
 
-    if ($$self{pa_type} =~ /^wdio/i) {
-        $self->init_weeder();
+    for my $room (@speakers) {
+        my $ref = &::get_object_by_name("pa_$room");
+        my $type = $ref->get_type();
+        print "PAObj: init: room=$room\n";
+        print "PAObj: init: room=$room, zonetype=$type\n";
+        $pa_zone_types{$type}++ unless $pa_zone_types{$type};
+        
+        if($type eq 'wdio') {
+            push(@speakers_wdio,$room);
+        }
+        if($type eq 'x10') {
+            push(@speakers_x10,$room);
+        }
+        if($type eq 'xap') {
+            push(@speakers_xap,$room);
+        }
+        if($type eq 'xpl') {
+            push(@speakers_xpl,$room);
+        }
+        if($type eq 'object') {
+            push(@speakers_obj,$room);
+        }
+    }
+    
+    print "PAObj: speakers_wdio: $#speakers_wdio\n" if $main::Debug{pa};
+    print "PAObj: speakers_x10: $#speakers_x10\n" if $main::Debug{pa};
+    print "PAObj: speakers_xap: $#speakers_xap\n" if $main::Debug{pa};
+    print "PAObj: speakers_xpl: $#speakers_xpl\n" if $main::Debug{pa};
+    print "PAObj: speakers_obj: $#speakers_obj\n" if $main::Debug{pa};
+
+    if ($#speakers_wdio > -1) {
+        $self->init_weeder(@speakers_wdio);
         return 0 unless %pa_weeder_max_port;
-    } elsif (lc $$self{pa_type} eq 'x10') {
-        print "x10 PA type initialized...\n" if $main::Debug{pa};
-    } elsif (lc $$self{pa_type} eq 'xap') {
-        print "xAP PA type initialized...\n" if $main::Debug{pa};
-    } elsif (lc $$self{pa_type} eq 'xpl') {
-	print "xPL PA type initialized...\n" if $main::Debug{pa};
-    } else {
-        &::print_log("\n\nWARNING! Unrecognized PA type of \"$$self{pa_type}\". PA code probably will not work.\n\n");
-        return 0;
+    }
+    if ($pa_zone_types{'x10'}) {
+        print "PAObj: x10 PA type initialized...\n" if $main::Debug{pa};
+    }
+    if ($pa_zone_types{'xap'}) {
+        print "PAObj: xAP PA type initialized...\n" if $main::Debug{pa};
+    }
+    if ($pa_zone_types{'xpl'}) {
+        print "PAObj: xPL PA type initialized...\n" if $main::Debug{pa};
     }
     return 1;
 }
 
 sub init_weeder
 {
-    my ($self) = @_;
+    my ($self,@speakers) = @_;
     my (%weeder_ref,%weeder_max);
-    my @speakers = $self->get_speakers('allspeakers');
     undef %pa_weeder_max_port;
     for my $room (@speakers) {
-        print "db init PA Room loaded: $room\n" if $main::Debug{pa};
-	my $ref = &::get_object_by_name("pa_$room");
+        print "PAObj: init PA Room loaded: $room\n" if $main::Debug{pa};
+        my $ref = &::get_object_by_name('pa_' . $room . '_obj');
         $ref->{state} = 'off';
-        print "db pa type: $$self{pa_type}\n" if $main::Debug{pa};
         my ($card,$id);
         ($card,$id) = $ref->{id_by_state}{'on'} =~ /^D?(.)H(.)/s;
 
         $weeder_ref{$card} = '' unless $weeder_ref{$card};
         $weeder_ref{$card} .= $id;
-        print "db init card: $card, id: $id, Room: $room, List: $weeder_ref{$card}\n" if $main::Debug{pa};
+        print "PAObj: init card: $card, id: $id, Room: $room, List: $weeder_ref{$card}\n" if $main::Debug{pa};
     }
 
     for my $card ('A' .. 'P','a' .. 'p') {
         if ($weeder_ref{$card}) {
             my $data = $weeder_ref{$card};
             $weeder_max{$card}=$self->last_char($data);
-            print "\ndb init weeder board=$card, ports=$data, max port=" . $weeder_max{$card} . "\n" if $main::Debug{pa};
+            print "\nPAObj: init weeder board=$card, ports=$data, max port=" . $weeder_max{$card} . "\n" if $main::Debug{pa};
         }
     }
     %pa_weeder_max_port = %weeder_max;
@@ -127,101 +140,147 @@ sub init_weeder
 
 sub set
 {
-    my ($self,$rooms,$state,$mode) = @_;
+    my ($self,$rooms,$state,$mode,%voiceparms) = @_;
     my $results = 0;
-    print "db: pa_type: $$self{pa_type}, delay: $$self{pa_delay}\n" if $main::Debug{pa};
-
-    print "pa db: set,mode: " . $mode . "\n" if $main::Debug{pa};
-    print "pa db: set,rooms: " . $rooms . "\n" if $main::Debug{pa};
+    print "PAObj: delay: $$self{pa_delay}\n" if $main::Debug{pa};
+    print "PAObj: set,mode: " . $mode . "\n" if $main::Debug{pa};
+    print "PAObj: set,rooms: " . $rooms . "\n" if $main::Debug{pa};
 
     my @speakers = $self->get_speakers($rooms);
     @speakers = $self->get_speakers('') if $#speakers == -1;
     @speakers = $self->get_speakers_speakable($mode,@speakers);
-    $results = $self->set_weeder($state,@speakers) if substr(lc $$self{pa_type}, 0, 4) eq 'wdio';
-    $results = $self->set_x10($state,@speakers) if lc $$self{pa_type} eq 'x10';
-#    $results = $self->set_xap($state,@speakers) if lc $$self{pa_type} eq 'xap';
-#    $results = $self->set_xpl($state,@speakers) if lc $$self{pa_type} eq 'xpl';
+
+    my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl);
+
+    for my $room (@speakers) {
+        my $ref = &::get_object_by_name("pa_$room");
+        my $type = lc $ref->get_type();
+        if($type eq 'wdio' || $type eq 'wdio_old') {
+            print "PAObj: speakers_wdio: Adding $room\n" if $main::Debug{pa};
+            push(@speakers_wdio,$room);
+        }
+        if($type eq 'x10') {
+            print "PAObj: speakers_x10: Adding $room\n" if $main::Debug{pa};
+            push(@speakers_x10,$room);
+        }
+        if($type eq 'xap') {
+            print "PAObj: speakers_xap: Adding $room\n" if $main::Debug{pa};
+            push(@speakers_xap,$room) if $state eq 'on'; #Only need to send if speech is starting
+        }
+        if($type eq 'xpl') {
+            print "PAObj: speakers_xpl: Adding $room\n" if $main::Debug{pa};
+            push(@speakers_xpl,$room) if $state eq 'on'; #Only need to send if speech is starting
+        }
+        if($type eq 'object') {
+            print "PAObj: speakers_object: Adding $room\n" if $main::Debug{pa};
+            push(@speakers_obj,$room);
+        }
+    }
+    
+    print "PAObj: speakers_wdio: $#speakers_wdio\n" if $main::Debug{pa};
+    print "PAObj: speakers_x10: $#speakers_x10\n" if $main::Debug{pa};
+    print "PAObj: speakers_xap: $#speakers_xap\n" if $main::Debug{pa};
+    print "PAObj: speakers_xpl: $#speakers_xpl\n" if $main::Debug{pa};
+    print "PAObj: speakers_obj: $#speakers_obj\n" if $main::Debug{pa};
+    
+    #TODO: Properly handle $results across multiple types
+    #TODO: Break up the wdio zones based on serial port, in case there are more than one.
+    $results = $self->set_weeder($state,'weeder',@speakers_wdio) 			if $#speakers_wdio > -1;
+    $results = $self->set_x10($state,@speakers_x10) 			if $#speakers_x10 > -1;
+    $results = $self->set_xap($state,\@speakers_xap,\%voiceparms) 	if $#speakers_xap > -1;	
+    $results = $self->set_xpl($state,\@speakers_xpl,\%voiceparms) 	if $#speakers_xpl > -1;
+    $results = $self->set_obj($state,@speakers_obj) 			if $#speakers_obj > -1;
+
     select undef, undef, undef, $$self{pa_delay} if $results;
 
     return $results;
 }
 
-sub set_x10
+sub set_obj
 {
     my ($self,$state,@speakers) = @_;
-    my $x10_list;
-    my $pa_x10_hc;
-
     for my $room (@speakers) {
-	my $ref = &::get_object_by_name("pa_$room");
+        print "PAObj: set_obj: " . $room . " / " . $state . "\n" if $main::Debug{pa};
+        my $ref = &::get_object_by_name("pa_$room");
         if ($ref) {
-	   $ref->{state} = $state;
-           my ($id) = $ref->{x10_id};
-           print "db pa set_x10 id: $id, Room: $room\n" if $main::Debug{pa};
-           $pa_x10_hc = substr($id,1,1) unless $pa_x10_hc;
-           $x10_list .= substr($id,1,2);
-    	}
+            $ref->set($state);
+        }
     }
+}
 
-    $self->print_speaker_states() if $main::Debug{pa};
-    $x10_list = 'X' . $x10_list . $pa_x10_hc;
-    $x10_list .= ($state eq 'on') ? 'J':'K';
-    print "db pa x10 cmd: $x10_list\n" if $main::Debug{pa};
+sub set_x10
+{
+    my ($self,$state,@speakers) = @_;
+    my ($x10_list,$pa_x10_hc,$ref,$refobj);
+
+    for my $room (@speakers) {
+        print "PAObj: set_x10: " . $room . " / " . $state . "\n" if $main::Debug{pa};
+        $ref = &::get_object_by_name('pa_'.$room);
+        $refobj = &::get_object_by_name('pa_'.$room.'_obj');
+        if ($refobj && $ref) {
+            my ($id) = $ref->get_address();
+            print "PAObj: set_x10 ID: $id, State: $state, Room: $room\n" if $main::Debug{pa};
+            $refobj->set($state);
+        }
+    }
 }
 
 sub set_xap {
-    my ($self,$rooms,$mode,%voiceparms) = @_;
-    my @speakers = $self->get_speakers($rooms);
-    @speakers = $self->get_speakers('') if $#speakers == -1;
-    @speakers = $self->get_speakers_speakable($mode, @speakers);
+    my ($self,$state,$param1,$param2) = @_;
+    my @speakers = @$param1;
+    my %voiceparms = %$param2;
+    return unless $#speakers > -1;
     for my $room (@speakers) {
-        my $ref = &::get_object_by_name("paxap_$room");
+        print "PAObj: set_xap: " . $room . " / " . $state . "\n" if $main::Debug{pa};
+        my $ref = &::get_object_by_name('pa_'.$room.'_obj');
         if ($ref) {
-            $ref->send_message($ref->target_address, $ref->class_name => {say => $voiceparms{text}, voice => $voiceparms{voice} });
-            print "db pa xap cmd: $ref->{object_name} is sending voice text: $voiceparms{text}\n" if $main::Debug{pa};
+            $ref->send_message($ref->target_address, $ref->class_name => {say => $voiceparms{text}, volume => $voiceparms{volume}, mode => $voiceparms{mode}, voice => $voiceparms{voice} });
+            print "PAObj: xap cmd: $ref->{object_name} is sending voice text: $voiceparms{text}\n" if $main::Debug{pa};
         } else {
-            print "unable to locate object: paxap_$room\n" if $main::Debug{pa};
+            print "PAObj: Unable to locate object for: pa_$room\n" if $main::Debug{pa};
         }
     }
 }
 
 sub set_xpl {
-    my ($self,$rooms,$mode,%voiceparms) = @_;
-    my @speakers = $self->get_speakers($rooms);
-    @speakers = $self->get_speakers('') if $#speakers == -1;
-    @speakers = $self->get_speakers_speakable($mode, @speakers);
+    my ($self,$state,$param1,$param2) = @_;
+    my @speakers = @$param1;
+    my %voiceparms = %$param2;
+    return unless $#speakers > -1;
     for my $room (@speakers) {
-	my $ref = &::get_object_by_name("paxpl_$room");
-	if ($ref) {
-            my $max_length = $::config_parms{"paxpl_$room" . "_maxlength"};
+        print "PAObj: set_xpl: " . $room . " / " . $state . "\n" if $main::Debug{pa};
+        my $ref = &::get_object_by_name('pa_'.$room.'_obj');
+        if ($ref) {
+            my $max_length = $::config_parms{"pa_$room" . "_maxlength"};
             $max_length = 0 unless $max_length;
             my $text = $voiceparms{text};
             if ($max_length) {
                $text = substr($text, 0, $max_length) if $max_length < length($text);
             }
-	    $ref->send_cmnd($ref->class_name => {speech => $text, voice => $voiceparms{voice} });
-            print "db pa xpl cmd: $ref->{object_name} is sending voice text: $voiceparms{text}\n" if $main::Debug{pa};
-	} else {
-	    print "unable to locate object: paxpl_$room\n" if $main::Debug{pa};
-	}
+            $ref->send_cmnd($ref->class_name => {speech => $text, voice => $voiceparms{voice}, volume => $voiceparms{volume}, mode => $voiceparms{mode} });
+            print "PAObj: set_xpl: $ref->{object_name} is sending voice text: $voiceparms{text}\n" if $main::Debug{pa};
+        } else {
+            print "PAObj: Unable to locate object for: pa_$room\n" if $main::Debug{pa};
+        }
     }
 }
 
 sub set_weeder
 {
-    my ($self,$state,@speakers) = @_;
+    my ($self,$state,$weeder_port,@speakers) = @_;
     my %weeder_ref;
     my $weeder_command='';
     my $command='';
     for my $room (@speakers) {
-	my $ref = &::get_object_by_name("pa_$room");
-	if ($ref) {
+        print "PAObj: set_weeder: " . $room . " / " . $state . "\n" if $main::Debug{pa};
+        my $ref = &::get_object_by_name('pa_'.$room.'_obj');
+        if ($ref) {
             $ref->{state} = $state;
             my ($card,$id) = $ref->{id_by_state}{'on'} =~ /^D?(.)H(.)/s;
             $weeder_ref{$card}='' unless $weeder_ref{$card};
             $weeder_ref{$card} .= $id;
-            print "card: $card, id: $id, Room: $room\n" if $main::Debug{pa};
-	}
+            print "PAObj: card: $card, id: $id, Room: $room\n" if $main::Debug{pa};
+        }
     }
 
     $self->print_speaker_states() if $main::Debug{pa};
@@ -234,10 +293,10 @@ sub set_weeder
             $weeder_command .= "$command\\r" if $command;
         }
     }
-    return 0 unless $command;
-    print "sending $weeder_command to the weeder card(s)\n" if $main::Debug{pa};
+    return 0 unless $weeder_command;
+    print "PAObj: Sending $weeder_command to the weeder card(s)\n" if $main::Debug{pa};
     $weeder_command =~ s/\\r/\r/g;
-    &Serial_Item::send_serial_data($$self{pa_port}, $weeder_command) if $main::Serial_Ports{$$self{pa_port}}{object};
+    &Serial_Item::send_serial_data($weeder_port, $weeder_command) if $main::Serial_Ports{$weeder_port}{object};
     return 1;
 }
 
@@ -255,7 +314,7 @@ sub get_weeder_string
 
     for $bit ('A' .. $pa_weeder_max_port{$card}) {
         $id = $card . 'L' . $bit;
-        $id = "D$id" if $$self{pa_type} eq 'wdio_old';
+        $id = "D$id" if $$self{pa_type} eq 'wdio_old'; #TODO: Find way to implement this with new code
         my $ref = &Device_Item::item_by_id($id);
         if ($ref) {
             $state = $ref->{state};
@@ -265,7 +324,7 @@ sub get_weeder_string
         }
 
         $bit_flag = ($state eq 'on') ? 1 : 0;                # get 0 or 1
-        print "db get_weeder_string card: $card, bit=$bit state=$bit_flag\n" if $main::Debug{pa};
+        print "PAObj: get_weeder_string card: $card, bit=$bit state=$bit_flag\n" if $main::Debug{pa};
         $byte_code += ($bit_flag << $bit_counter);        # get bit in byte position
 
         if ($bit_counter++ >= 3) {
@@ -275,13 +334,13 @@ sub get_weeder_string
         }
     }
 
-    # we have to do this again -- in case we don't have bits on a byte boundry
+    # we have to do this again -- in case we don't have bits on a byte boundary
     if ($bit_counter > 0) {
         # pre-pend our string with the new value
         $weeder_code = $decimal_to_hex{$byte_code} . $weeder_code;
     }
 
-    if ($$self{pa_type} eq 'wdio_old') {
+    if ($$self{pa_type} eq 'wdio_old') { #TODO: Find way to implement this with new code
         $card = "D$card";
         $weeder_code = 'h' . $weeder_code;
     }
@@ -293,7 +352,7 @@ sub get_speakers
     my ($self,$rooms) = @_;
     my @pazones;
 
-    print "pa db: get_speakers,rooms: " . $rooms . "\n" if $main::Debug{pa};
+    print "PAObj: get_speakers,rooms: " . $rooms . "\n" if $main::Debug{pa};
     if ($::mh_speakers->{rooms}) {
         $rooms = $::mh_speakers->{rooms};
         $::mh_speakers->{rooms} = '';
@@ -305,28 +364,22 @@ sub get_speakers
         no strict 'refs';
         my $ref = &::get_object_by_name("pa_$room");
         if ($ref) {
-            print "pa db: name=$ref->{object_name}\n" if $main::Debug{pa};
+            print "PAObj: name=$ref->{object_name}\n" if $main::Debug{pa};
             if (UNIVERSAL::isa($ref,'Group')) {
-                print "pa db: It's a group!\n" if $main::Debug{pa};
+                print "PAObj: It's a group!\n" if $main::Debug{pa};
                 for my $grouproom ($ref->list) {
                     $grouproom = $grouproom->get_object_name;
                     $grouproom =~ s/^\$pa_//;
-		    $grouproom =~ s/^\$paxpl_//;
-		    $grouproom =~ s/^\$paxap_//;
-                    print "pa db:  - member: $grouproom\n" if $main::Debug{pa};
+                    $grouproom =~ s/^\$paxpl_//;
+                    $grouproom =~ s/^\$paxap_//;
+                    print "PAObj:  - member: $grouproom\n" if $main::Debug{pa};
                     push(@pazones, $grouproom);
                 }
             } else {
                 push(@pazones, $room);
             }
-	} elsif (lc $$self{pa_type} eq 'xpl') {
-	    $ref = &::get_object_by_name("paxpl_$room");
-	    push(@pazones, $room) if $ref;
-	} elsif (lc $$self{pa_type} eq 'xap') {
-            $ref = &::get_object_by_name("paxap_$room");
-	    push(@pazones, $room) if $ref;
         } else {
-            &::print_log("WARNING: PA zone of '$room' not found!");
+            &::print_log("PAObj: WARNING: PA zone of '$room' not found!");
         }
     }
     return @pazones;
@@ -335,13 +388,13 @@ sub get_speakers
 sub check_group
 {
     my ($self,$group) = @_;
-    print "db check group=$group\n" if $main::Debug{pa};
+    print "PAObj: check group=$group\n" if $main::Debug{pa};
     my $ref = &::get_object_by_name("pa_$group");
     if (!$ref) {print "Error! Group does not exist: $group\n"; return;}
     my @list = $ref->list;
-    print "db check group=$group, list=$#list\n" if $main::Debug{pa};
+    print "PAObj: check group=$group, list=$#list\n" if $main::Debug{pa};
     if ($#list == -1) {
-        print "db check populating group: $group!\n" if $main::Debug{pa};
+        print "PAObj: check populating group: $group!\n" if $main::Debug{pa};
         for my $room ($self->get_speakers('allspeakers')) {
             my $ref2 = &::get_object_by_name("pa_$room");
             $ref->add($ref2);
@@ -358,17 +411,14 @@ sub get_speakers_speakable
     return @pazones if $mode eq 'mute' or $mode eq 'offline';
 
     for my $room (@zones) {
-	my $ref = &::get_object_by_name("pa_$room");
-	$ref = &::get_object_by_name("paxpl_$room") if lc $$self{pa_type} eq 'xpl';
-	$ref = &::get_object_by_name("paxap_$room") if !$ref and $$self{pa_type} eq 'xap';
-        print "pa db: ref=$ref\n" if $main::Debug{pa};
-        print "pa db: name=$ref->{object_name}\n" if $main::Debug{pa};
+        my $ref = &::get_object_by_name("pa_$room");
+        print "PAObj: speakable: name=$ref->{object_name}\n" if $main::Debug{pa};
         if ($ref->{sleeping} == 0) {
             $ref->{mode} = 'normal' unless $ref->{mode};
             my $gss_mode = $ref->{mode};
             if ($gss_mode ne 'sleeping' && ($gss_mode eq 'normal' || $mode eq 'unmuted')) {
                 push(@pazones,$room);
-                print "pa db: pushing $room into pazones array:$#pazones\n" if $main::Debug{pa};
+                print "PAObj: speakable: Pushing $room into pazones array:$#pazones\n" if $main::Debug{pa};
             }
         }
     }
@@ -388,20 +438,76 @@ sub print_speaker_states
     my ($ref,$room);
     for my $speaker (@speakers) {
         $ref = &::get_object_by_name("pa_$speaker");
-	$ref = &::get_object_by_name("paxpl_$speaker") if !$ref and $$self{pa_type} eq 'xpl';
-	$ref = &::get_object_by_name("paxap_$speaker") if !$ref and $$self{pa_type} eq 'xap';
         $room = $ref->{object_name};
-	if ($$self{pa_type} eq 'xpl') {
-	   $room =~ s/^\$paxpl_//;
-	} elsif ($$self{pa_type} eq 'xap') {
-	   $room =~ s/^\$paxap_//;
-	} else {
-           $room =~ s/^\$pa_//;
-	}
-        print "db name=$room, state=$ref->{state}\n" if $main::Debug{pa};
+        $room =~ s/^\$pa_//;
+        print "PAObj: name=$room, state=$ref->{state}\n" if $main::Debug{pa};
     }
 }
 
+package PAobj_zone;
+
+@PAobj_zone::ISA = ('Generic_Item');
+
+sub last_char
+{
+    my ($self,$string) = @_;
+    my @chars=split(//, $string);
+    return((sort @chars)[-1]);
+}
+
+#Type Address	Name			Groups               		Serial   Other
+sub new
+{
+    my ($class,$paz_address,$paz_name,$paz_groups,$paz_serial,$paz_other) = @_;
+    my $self={};
+
+    bless $self,$class;
+
+    $$self{name}		= $paz_name;
+    $$self{address}	= $paz_address;
+    $$self{groups}	= $paz_groups;
+    $$self{serial}	= $paz_serial;
+    $$self{other}		= $paz_other;
+
+    return $self;
+}
+
+sub init
+{
+    my ($self) = @_;
+}
+
+sub get_address
+{
+    my ($self) = @_;
+    return $$self{address};
+}
+
+sub get_name
+{
+    my ($self) = @_;
+    return $$self{name};
+}
+
+sub get_groups
+{
+    my ($self) = @_;
+    return $$self{groups};
+}
+
+sub get_serial
+{
+    my ($self) = @_;
+    return $$self{serial};
+}
+
+sub get_type
+{
+    my ($self) = @_;
+    return $$self{other};
+}
+
+
 1;
 
 
diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index 93ca9a499..0d197677e 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -22,7 +22,7 @@ sub read_table_init_A {
 	%groups=();
 	%objects=();
 	%packages=();
-        %addresses=();
+      %addresses=();
 }
 
 sub read_table_A {
@@ -517,65 +517,63 @@ sub read_table_A {
     }
    elsif ($type eq "PA") {
         require 'PAobj.pm';
-        my $pa_type;
-        ($address, $name, $grouplist, $other, $pa_type, @other) = @item_info;
-        # $other is being used as the serial name
+        my ($pa_type, $serial);
+        ($address, $name, $grouplist, $serial, $pa_type, @other) = @item_info;
         $pa_type = 'wdio' unless $pa_type;
 
         if( ! $packages{PAobj}++ ) {   # first time for this object type?
             $code .= "my (%pa_weeder_max_port,%pa_zone_types,%pa_zone_type_by_zone);\n";
         }
 
-#       if ($config_parms{pa_type} ne $pa_type) {
-        if(1==0) {
-            print "ERROR! INI parm \"pa_type\"=$main::config_parms{pa_type}, but PA item $name is a type of $pa_type. Skipping PA zone.\n - r=$record\n";
-            return;
-        } else {
-#           $name = "pa_$name";
-
-            $grouplist = "|$grouplist|allspeakers";
-            $grouplist =~ s/\|\|/\|/g;
-            $grouplist =~ s/\|/\|pa_/g;
-            $grouplist =~ s/^\|//;
-            $grouplist .= '|hidden';
+        $code .= sprintf "\n\$%-35s = new PAobj_zone('%s','%s','%s','%s','%s');\n","pa_$name", $address, $name, $grouplist, $serial, $pa_type;
+        $name = "pa_$name";
 
-            if ($pa_type =~ /^wdio/i) {
-                $name = "pa_$name";
-                   # AHB / ALB  or DBH / DBL
-                $address =~ s/^(\S)(\S)$/$1H$2/;# if $pa_type eq 'wdio';
-                $address = "D$address" if $pa_type eq 'wdio_old';
-#                $address =~ s/^(\S)(\S)$/DBH$2/ if $pa_type eq 'wdio_old';
-                $code .= sprintf "\n\$%-35s = new Serial_Item('%s','on','%s');\n",$name,$address,$other;
-#                $code .= sprintf "\n\$\$%s{pa_type} = '%s';\n",$name,$pa_type;
+        $grouplist = "|$grouplist|allspeakers";
+        $grouplist =~ s/\|\|/\|/g;
+        $grouplist =~ s/\|/\|pa_/g;
+        $grouplist =~ s/^\|//;
+        $grouplist .= '|hidden';
 
-#                $code .= sprintf "\$pa_zone_types{%s}++ unless \$pa_zone_types{%s};\n",$pa_type,$pa_type;
-#                $code .= sprintf "\$pa_zone_type_by_zone{%s} = '%s';\n",$name,$pa_type;
+        if ($pa_type =~ /^wdio/i) {
+               # AHB / ALB  or DBH / DBL
+            $address =~ s/^(\S)(\S)$/$1H$2/;# if $pa_type eq 'wdio';
+            $address = "D$address" if $pa_type eq 'wdio_old';
+            $code .= sprintf "\$%-35s = new Serial_Item('%s','on','%s');\n",$name.'_obj',$address,$serial;
 
-                $address =~ s/^(\S{1,2})H(\S)$/$1L$2/;
-#                $address =~ s/^(\S)H(\S)$/$1L$2/ if $pa_type eq 'wdio';
-#                $address =~ s/^D(\S)H(\S)$/D$1L$2/ if $pa_type eq 'wdio_old';
-                $code .= sprintf "\$%-35s -> add ('%s','off');\n",$name,$address;
+            $address =~ s/^(\S{1,2})H(\S)$/$1L$2/;
+            $code .= sprintf "\$%-35s -> add ('%s','off');\n",$name.'_obj',$address;
 
-                $object = '';
-            } elsif (lc $pa_type eq 'x10') {
-                $name = "pa_$name";
-                $other = join ', ', (map {"'$_'"} @other); # Quote data
-                $object = "X10_Appliance('$address', $other)";
-            } elsif (lc $pa_type eq 'xap') {
-                $name = "paxap_$name";
-                $code .= sprintf "\n\$%-35s = new xAP_Item('%s');\n",$name,$address;
-                $code .= sprintf "\$%-35s -> target_address('%s');\n",$name,$address;
-                $code .= sprintf "\$%-35s -> class_name('%s');\n",$name,$other;
-            } elsif (lc $pa_type eq 'xpl') {
-                $name = "paxpl_$name";
-                $code .= sprintf "\n\$%-35s = new xPL_Item('%s');\n",$name,$address;
-                $code .= sprintf "\$%-35s -> target_address('%s');\n",$name,$address;
-                $code .= sprintf "\$%-35s -> class_name('%s');\n",$name,$other;
+            $object = '';
+        } elsif (lc $pa_type eq 'object') {
+            if($name =~ /^pa_pa_/i) {
+                print "\nObject name \"$name\" starts with \"pa_\". This will cause conflicts. Ignoring entry";
             } else {
-                print "\nUnrecognized .mht entry for PA: $record\n";
-                return;
+                $code .= sprintf "\$%-35s -> tie_items(\$%s,'off','off');\n",$name,$address;
+                $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n",$name,$address;
             }
+        } elsif (lc $pa_type eq 'x10') {
+            $other = join ', ', (map {"'$_'"} @other); # Quote data
+            $code .= sprintf "\$%-35s = new X10_Appliance('%s','%s');\n",$name.'_obj',$address, $serial;
+            $code .= sprintf "\$%-35s -> hidden(1);\n", $name.'_obj';
+            $code .= sprintf "\$%-35s -> tie_items(\$%s,'off','off');\n",$name,$name.'_obj';
+            $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n",$name,$name.'_obj';
+        } elsif (lc $pa_type eq 'xap') {
+            $code .= sprintf "\$%-35s = new xAP_Item('%s');\n",$name.'_obj',$address;
+            $code .= sprintf "\$%-35s -> hidden(1);\n", $name.'_obj';
+            $code .= sprintf "\$%-35s -> target_address('%s');\n",$name.'_obj',$address;
+            $code .= sprintf "\$%-35s -> class_name('%s');\n",$name.'_obj',$serial;
+            $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n",$name,$name.'_obj';
+        } elsif (lc $pa_type eq 'xpl') {
+            $code .= sprintf "\$%-35s = new xPL_Item('%s');\n",$name.'_obj',$address;
+            $code .= sprintf "\$%-35s -> hidden(1);\n", $name.'_obj';
+            $code .= sprintf "\$%-35s -> target_address('%s');\n",$name.'_obj',$address;
+            $code .= sprintf "\$%-35s -> class_name('%s');\n",$name.'_obj',$serial;
+            $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n",$name,$name.'_obj';
+        } else {
+            print "\nUnrecognized .mht entry for PA: $record\n";
+            return;
         }
+
     }
     elsif($type =~ /^EIB/) {
         ($address, $name, $grouplist, @other) = @item_info;

From 539e194b0823c725d3088389e4c53da6e1d9397d Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Mon, 30 Sep 2013 01:47:53 -0400
Subject: [PATCH 149/330] Clarify usage of zones of type object.

---
 code/common/pa_control.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/common/pa_control.pl b/code/common/pa_control.pl
index fa35a6eb7..3e9129813 100644
--- a/code/common/pa_control.pl
+++ b/code/common/pa_control.pl
@@ -126,6 +126,8 @@ sub pa_control_stub {
                if the command to turn on the pin you want is: BHC, then the Address is: BC
              For X10, the X10 address of the (likely) relay device.
              For xAP and xPL, use the IP address or hostname of the target device.
+             For "object", use the name of the object (without the $). You may use anything that
+               responds ON and OFF set commands. Tested with and Insteon device.
 
 Name:        Give a name to the pa zone, usually the room name. You use these in the
              speak and play commands with rooms=.

From 8243c11e7ddccf95743783a0078107e47b213299 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 30 Sep 2013 17:34:00 -0700
Subject: [PATCH 150/330] Insteon: Check if Code Can do Engine_Version Before
 Calling It

Fix bad typos in coding.  Not sure why I was attempting to dereferrence an object.
Don't call engine_version on PLM object
---
 lib/Insteon/AllLinkDatabase.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 8321d9c22..8712366a9 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -1026,7 +1026,10 @@ sub add_link
 	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
 	# check whether the link already exists
 	# for I2CS devices the default data3 should be 01 no 00
-	my $data3_default = ($$insteon_object->engine_version eq 'I2CS') ? '01' : '00';
+	my $data3_default = '00';
+	if ($insteon_object->can('engine_version') && $insteon_object->engine_version eq 'I2CS') {
+		$data3_default = '01';
+	}
 	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : $data3_default;
 	# get the address via lookup into the hash
 	my $key = lc $device_id . $group . $is_controller;
@@ -1150,7 +1153,10 @@ sub update_link
 	my $data1 = &Insteon::DimmableLight::convert_level($on_level);
 	my $data2 = ($$self{device}->isa('Insteon::DimmableLight')) ? &Insteon::DimmableLight::convert_ramp($ramp_rate) : '00';
 	# for I2CS devices the default data3 should be 01 no 00
-	my $data3_default = ($$insteon_object->engine_version eq 'I2CS') ? '01' : '00';
+	my $data3_default = '00';
+	if ($insteon_object->can('engine_version') && $insteon_object->engine_version eq 'I2CS') {
+		$data3_default = '01';
+	}
 	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : $data3_default;
 	my $deviceid = $insteon_object->device_id;
 	my $subaddress = $data3;

From c23ab978376337c01c7a59931af9c75ca0751ab5 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Tue, 1 Oct 2013 22:58:25 -0400
Subject: [PATCH 151/330] Imporove logging and add debug levels.

---
 code/common/pa_control.pl |   3 +-
 lib/PAobj.pm              | 107 ++++++++++++++++++--------------------
 2 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/code/common/pa_control.pl b/code/common/pa_control.pl
index 3e9129813..bff9da14b 100644
--- a/code/common/pa_control.pl
+++ b/code/common/pa_control.pl
@@ -63,6 +63,7 @@
     my $state = $v_pa_speakers->{state};
     $v_pa_speakers->respond("app=pa Turning speakers $state...");
     $state = ($state eq 'on') ? ON : OFF;
+    print "PA: Turning speakers $state\n" if $Debug{pa};
     $pactrl->set('allspeakers',$state,'unmuted');
 }
 
@@ -82,7 +83,7 @@ sub pa_control_stub {
     my $rooms = $parms{rooms};
     print "PA: control_stub: rooms=$rooms, mode=$mode\n" if $Debug{pa};
     my $results = $pactrl->set($rooms,ON,$mode,%parms);
-    print "PA: control_stub set results: $results\n" if $Debug{pa};
+    print "PA: control_stub set results: $results\n" if $Debug{pa} >=2;
     set $pa_speaker_timer $pa_timer if $results;
 }
 
diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index 34299cc86..e0d96cbd9 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -57,7 +57,7 @@ sub init {
     %pa_zone_types=();
     my $ref2 = &::get_object_by_name("pa_allspeakers");
     if (!$ref2) {
-        &::print_log("\n\nWARNING! PA Zones were not found! Your *.mht file probably doesn't list the PA zones correctly.\n\n");
+        print("\n\nWARNING! PA Zones were not found! Your *.mht file probably doesn't list the PA zones correctly.\n\n");
         return 0;
     }
     $self->check_group('default');
@@ -68,8 +68,7 @@ sub init {
     for my $room (@speakers) {
         my $ref = &::get_object_by_name("pa_$room");
         my $type = $ref->get_type();
-        print "PAObj: init: room=$room\n";
-        print "PAObj: init: room=$room, zonetype=$type\n";
+        &::print_log("PAObj: init: room=$room, zonetype=$type");
         $pa_zone_types{$type}++ unless $pa_zone_types{$type};
         
         if($type eq 'wdio') {
@@ -89,24 +88,24 @@ sub init {
         }
     }
     
-    print "PAObj: speakers_wdio: $#speakers_wdio\n" if $main::Debug{pa};
-    print "PAObj: speakers_x10: $#speakers_x10\n" if $main::Debug{pa};
-    print "PAObj: speakers_xap: $#speakers_xap\n" if $main::Debug{pa};
-    print "PAObj: speakers_xpl: $#speakers_xpl\n" if $main::Debug{pa};
-    print "PAObj: speakers_obj: $#speakers_obj\n" if $main::Debug{pa};
+    &::print_log("PAObj: speakers_wdio: $#speakers_wdio") if $main::Debug{pa} || $#speakers_wdio gt -1;
+    &::print_log("PAObj: speakers_x10: $#speakers_x10") if $main::Debug{pa} || $#speakers_x10 gt -1;
+    &::print_log("PAObj: speakers_xap: $#speakers_xap") if $main::Debug{pa} || $#speakers_xap gt -1;
+    &::print_log("PAObj: speakers_xpl: $#speakers_xpl") if $main::Debug{pa} || $#speakers_xpl gt -1;
+    &::print_log("PAObj: speakers_obj: $#speakers_obj") if $main::Debug{pa} || $#speakers_obj gt -1;
 
     if ($#speakers_wdio > -1) {
         $self->init_weeder(@speakers_wdio);
         return 0 unless %pa_weeder_max_port;
     }
     if ($pa_zone_types{'x10'}) {
-        print "PAObj: x10 PA type initialized...\n" if $main::Debug{pa};
+        &::print_log("PAObj: x10 PA type initialized...") if $main::Debug{pa};
     }
     if ($pa_zone_types{'xap'}) {
-        print "PAObj: xAP PA type initialized...\n" if $main::Debug{pa};
+        &::print_log("PAObj: xAP PA type initialized...") if $main::Debug{pa};
     }
     if ($pa_zone_types{'xpl'}) {
-        print "PAObj: xPL PA type initialized...\n" if $main::Debug{pa};
+        &::print_log("PAObj: xPL PA type initialized...") if $main::Debug{pa};
     }
     return 1;
 }
@@ -117,7 +116,7 @@ sub init_weeder
     my (%weeder_ref,%weeder_max);
     undef %pa_weeder_max_port;
     for my $room (@speakers) {
-        print "PAObj: init PA Room loaded: $room\n" if $main::Debug{pa};
+        &::print_log("PAObj: init PA Room loaded: $room") if $main::Debug{pa};
         my $ref = &::get_object_by_name('pa_' . $room . '_obj');
         $ref->{state} = 'off';
         my ($card,$id);
@@ -125,14 +124,14 @@ sub init_weeder
 
         $weeder_ref{$card} = '' unless $weeder_ref{$card};
         $weeder_ref{$card} .= $id;
-        print "PAObj: init card: $card, id: $id, Room: $room, List: $weeder_ref{$card}\n" if $main::Debug{pa};
+        &::print_log("PAObj: init card: $card, id: $id, Room: $room, List: $weeder_ref{$card}") if $main::Debug{pa};
     }
 
     for my $card ('A' .. 'P','a' .. 'p') {
         if ($weeder_ref{$card}) {
             my $data = $weeder_ref{$card};
             $weeder_max{$card}=$self->last_char($data);
-            print "\nPAObj: init weeder board=$card, ports=$data, max port=" . $weeder_max{$card} . "\n" if $main::Debug{pa};
+            &::print_log("PAObj: init weeder board=$card, ports=$data, max port=" . $weeder_max{$card}) if $main::Debug{pa};
         }
     }
     %pa_weeder_max_port = %weeder_max;
@@ -142,13 +141,14 @@ sub set
 {
     my ($self,$rooms,$state,$mode,%voiceparms) = @_;
     my $results = 0;
-    print "PAObj: delay: $$self{pa_delay}\n" if $main::Debug{pa};
-    print "PAObj: set,mode: " . $mode . "\n" if $main::Debug{pa};
-    print "PAObj: set,rooms: " . $rooms . "\n" if $main::Debug{pa};
+    &::print_log("PAObj: delay: $$self{pa_delay}\n") if $main::Debug{pa} >=3;
+    &::print_log("PAObj: set,mode: " . $mode . ",rooms: " . $rooms) if $main::Debug{pa} >=3;
 
     my @speakers = $self->get_speakers($rooms);
     @speakers = $self->get_speakers('') if $#speakers == -1;
+    &::print_log("PAObj: Proposed rooms: ".join(', ', @speakers)) if $main::Debug{pa} >=2;
     @speakers = $self->get_speakers_speakable($mode,@speakers);
+    &::print_log("PAObj: Will speak in rooms: ".join(', ', @speakers)) if $main::Debug{pa};
 
     my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl);
 
@@ -156,32 +156,32 @@ sub set
         my $ref = &::get_object_by_name("pa_$room");
         my $type = lc $ref->get_type();
         if($type eq 'wdio' || $type eq 'wdio_old') {
-            print "PAObj: speakers_wdio: Adding $room\n" if $main::Debug{pa};
+            &::print_log("PAObj: speakers_wdio: Adding $room") if $main::Debug{pa} >=3;
             push(@speakers_wdio,$room);
         }
         if($type eq 'x10') {
-            print "PAObj: speakers_x10: Adding $room\n" if $main::Debug{pa};
+            &::print_log("PAObj: speakers_x10: Adding $room") if $main::Debug{pa} >=3;
             push(@speakers_x10,$room);
         }
         if($type eq 'xap') {
-            print "PAObj: speakers_xap: Adding $room\n" if $main::Debug{pa};
+            &::print_log("PAObj: speakers_xap: Adding $room") if $main::Debug{pa} >=3;
             push(@speakers_xap,$room) if $state eq 'on'; #Only need to send if speech is starting
         }
         if($type eq 'xpl') {
-            print "PAObj: speakers_xpl: Adding $room\n" if $main::Debug{pa};
+            &::print_log("PAObj: speakers_xpl: Adding $room") if $main::Debug{pa} >=3;
             push(@speakers_xpl,$room) if $state eq 'on'; #Only need to send if speech is starting
         }
         if($type eq 'object') {
-            print "PAObj: speakers_object: Adding $room\n" if $main::Debug{pa};
+            &::print_log("PAObj: speakers_object: Adding $room") if $main::Debug{pa} >=3;
             push(@speakers_obj,$room);
         }
     }
     
-    print "PAObj: speakers_wdio: $#speakers_wdio\n" if $main::Debug{pa};
-    print "PAObj: speakers_x10: $#speakers_x10\n" if $main::Debug{pa};
-    print "PAObj: speakers_xap: $#speakers_xap\n" if $main::Debug{pa};
-    print "PAObj: speakers_xpl: $#speakers_xpl\n" if $main::Debug{pa};
-    print "PAObj: speakers_obj: $#speakers_obj\n" if $main::Debug{pa};
+    &::print_log("PAObj: speakers_wdio: $#speakers_wdio") if $main::Debug{pa}  >=2 || $#speakers_wdio gt -1;
+    &::print_log("PAObj: speakers_x10: $#speakers_x10") if $main::Debug{pa}  >=2 || $#speakers_x10 gt -1;
+    &::print_log("PAObj: speakers_xap: $#speakers_xap") if $main::Debug{pa}  >=2 || $#speakers_xap gt -1;
+    &::print_log("PAObj: speakers_xpl: $#speakers_xpl") if $main::Debug{pa}  >=2 || $#speakers_xpl gt -1;
+    &::print_log("PAObj: speakers_obj: $#speakers_obj") if $main::Debug{pa}  >=2 || $#speakers_obj gt -1;
     
     #TODO: Properly handle $results across multiple types
     #TODO: Break up the wdio zones based on serial port, in case there are more than one.
@@ -200,7 +200,7 @@ sub set_obj
 {
     my ($self,$state,@speakers) = @_;
     for my $room (@speakers) {
-        print "PAObj: set_obj: " . $room . " / " . $state . "\n" if $main::Debug{pa};
+        &::print_log("PAObj: set_obj: " . $room . " / " . $state) if $main::Debug{pa} >=2;
         my $ref = &::get_object_by_name("pa_$room");
         if ($ref) {
             $ref->set($state);
@@ -214,12 +214,12 @@ sub set_x10
     my ($x10_list,$pa_x10_hc,$ref,$refobj);
 
     for my $room (@speakers) {
-        print "PAObj: set_x10: " . $room . " / " . $state . "\n" if $main::Debug{pa};
+        &::print_log("PAObj: set_x10: " . $room . " / " . $state) if $main::Debug{pa} >=3;
         $ref = &::get_object_by_name('pa_'.$room);
         $refobj = &::get_object_by_name('pa_'.$room.'_obj');
         if ($refobj && $ref) {
             my ($id) = $ref->get_address();
-            print "PAObj: set_x10 ID: $id, State: $state, Room: $room\n" if $main::Debug{pa};
+            &::print_log("PAObj: set_x10 ID: $id, State: $state, Room: $room") if $main::Debug{pa} >=2;
             $refobj->set($state);
         }
     }
@@ -231,13 +231,13 @@ sub set_xap {
     my %voiceparms = %$param2;
     return unless $#speakers > -1;
     for my $room (@speakers) {
-        print "PAObj: set_xap: " . $room . " / " . $state . "\n" if $main::Debug{pa};
+        &::print_log("PAObj: set_xap: " . $room . " / " . $state) if $main::Debug{pa} >=3;
         my $ref = &::get_object_by_name('pa_'.$room.'_obj');
         if ($ref) {
             $ref->send_message($ref->target_address, $ref->class_name => {say => $voiceparms{text}, volume => $voiceparms{volume}, mode => $voiceparms{mode}, voice => $voiceparms{voice} });
-            print "PAObj: xap cmd: $ref->{object_name} is sending voice text: $voiceparms{text}\n" if $main::Debug{pa};
+            &::print_log("PAObj: xap cmd: $ref->{object_name} is sending voice text: $voiceparms{text}") if $main::Debug{pa};
         } else {
-            print "PAObj: Unable to locate object for: pa_$room\n" if $main::Debug{pa};
+            &::print_log("PAObj: Unable to locate object for: pa_$room");
         }
     }
 }
@@ -248,7 +248,7 @@ sub set_xpl {
     my %voiceparms = %$param2;
     return unless $#speakers > -1;
     for my $room (@speakers) {
-        print "PAObj: set_xpl: " . $room . " / " . $state . "\n" if $main::Debug{pa};
+        &::print_log("PAObj: set_xpl: " . $room . " / " . $state) if $main::Debug{pa} >=3;
         my $ref = &::get_object_by_name('pa_'.$room.'_obj');
         if ($ref) {
             my $max_length = $::config_parms{"pa_$room" . "_maxlength"};
@@ -258,9 +258,9 @@ sub set_xpl {
                $text = substr($text, 0, $max_length) if $max_length < length($text);
             }
             $ref->send_cmnd($ref->class_name => {speech => $text, voice => $voiceparms{voice}, volume => $voiceparms{volume}, mode => $voiceparms{mode} });
-            print "PAObj: set_xpl: $ref->{object_name} is sending voice text: $voiceparms{text}\n" if $main::Debug{pa};
+            &::print_log("PAObj: set_xpl: $ref->{object_name} is sending voice text: $voiceparms{text}") if $main::Debug{pa};
         } else {
-            print "PAObj: Unable to locate object for: pa_$room\n" if $main::Debug{pa};
+            &::print_log("PAObj: Unable to locate object for: pa_$room");
         }
     }
 }
@@ -272,18 +272,18 @@ sub set_weeder
     my $weeder_command='';
     my $command='';
     for my $room (@speakers) {
-        print "PAObj: set_weeder: " . $room . " / " . $state . "\n" if $main::Debug{pa};
+        &::print_log("PAObj: set_weeder: " . $room . " / " . $state) if $main::Debug{pa} >=3;
         my $ref = &::get_object_by_name('pa_'.$room.'_obj');
         if ($ref) {
             $ref->{state} = $state;
             my ($card,$id) = $ref->{id_by_state}{'on'} =~ /^D?(.)H(.)/s;
             $weeder_ref{$card}='' unless $weeder_ref{$card};
             $weeder_ref{$card} .= $id;
-            print "PAObj: card: $card, id: $id, Room: $room\n" if $main::Debug{pa};
+            &::print_log("PAObj: card: $card, id: $id, Room: $room") if $main::Debug{pa} >=2;
         }
     }
 
-    $self->print_speaker_states() if $main::Debug{pa};
+    $self->print_speaker_states() if $main::Debug{pa} >=3;
 
     for my $card ('A' .. 'P','a' .. 'p') {
         if ($weeder_ref{$card}) {
@@ -294,7 +294,7 @@ sub set_weeder
         }
     }
     return 0 unless $weeder_command;
-    print "PAObj: Sending $weeder_command to the weeder card(s)\n" if $main::Debug{pa};
+    &::print_log("PAObj: Sending $weeder_command to the weeder card(s)") if $main::Debug{pa};
     $weeder_command =~ s/\\r/\r/g;
     &Serial_Item::send_serial_data($weeder_port, $weeder_command) if $main::Serial_Ports{$weeder_port}{object};
     return 1;
@@ -303,7 +303,6 @@ sub set_weeder
 sub get_weeder_string
 {
     my ($self,$card,$data) = @_;
-
     my $bit_counter=0;
     my ($bit_flag,$state,$ref,$bit,$byte_code,$weeder_code,$id);
 
@@ -324,7 +323,7 @@ sub get_weeder_string
         }
 
         $bit_flag = ($state eq 'on') ? 1 : 0;                # get 0 or 1
-        print "PAObj: get_weeder_string card: $card, bit=$bit state=$bit_flag\n" if $main::Debug{pa};
+        &::print_log("PAObj: get_weeder_string card: $card, bit=$bit state=$bit_flag") if $main::Debug{pa} >=2;
         $byte_code += ($bit_flag << $bit_counter);        # get bit in byte position
 
         if ($bit_counter++ >= 3) {
@@ -352,7 +351,7 @@ sub get_speakers
     my ($self,$rooms) = @_;
     my @pazones;
 
-    print "PAObj: get_speakers,rooms: " . $rooms . "\n" if $main::Debug{pa};
+    &::print_log("PAObj: get_speakers,rooms: " . $rooms) if $main::Debug{pa} >=2;
     if ($::mh_speakers->{rooms}) {
         $rooms = $::mh_speakers->{rooms};
         $::mh_speakers->{rooms} = '';
@@ -364,15 +363,15 @@ sub get_speakers
         no strict 'refs';
         my $ref = &::get_object_by_name("pa_$room");
         if ($ref) {
-            print "PAObj: name=$ref->{object_name}\n" if $main::Debug{pa};
+            &::print_log("PAObj: name=$ref->{object_name}") if $main::Debug{pa};
             if (UNIVERSAL::isa($ref,'Group')) {
-                print "PAObj: It's a group!\n" if $main::Debug{pa};
+                &::print_log("PAObj: It's a group!") if $main::Debug{pa} >=2;
                 for my $grouproom ($ref->list) {
                     $grouproom = $grouproom->get_object_name;
                     $grouproom =~ s/^\$pa_//;
                     $grouproom =~ s/^\$paxpl_//;
                     $grouproom =~ s/^\$paxap_//;
-                    print "PAObj:  - member: $grouproom\n" if $main::Debug{pa};
+                    &::print_log("PAObj:  - member: $grouproom\n") if $main::Debug{pa} >=2;
                     push(@pazones, $grouproom);
                 }
             } else {
@@ -388,13 +387,13 @@ sub get_speakers
 sub check_group
 {
     my ($self,$group) = @_;
-    print "PAObj: check group=$group\n" if $main::Debug{pa};
+    &::print_log("PAObj: check group=$group") if $main::Debug{pa} >=2;
     my $ref = &::get_object_by_name("pa_$group");
-    if (!$ref) {print "Error! Group does not exist: $group\n"; return;}
+    if (!$ref) {&::print_log("PAObj: check group: Error! Group does not exist: $group"); return;}
     my @list = $ref->list;
-    print "PAObj: check group=$group, list=$#list\n" if $main::Debug{pa};
+    &::print_log("PAObj: check group=$group, list=$#list") if $main::Debug{pa} >=2;
     if ($#list == -1) {
-        print "PAObj: check populating group: $group!\n" if $main::Debug{pa};
+        &::print_log("PAObj: check populating group: $group!") if $main::Debug{pa};
         for my $room ($self->get_speakers('allspeakers')) {
             my $ref2 = &::get_object_by_name("pa_$room");
             $ref->add($ref2);
@@ -412,13 +411,13 @@ sub get_speakers_speakable
 
     for my $room (@zones) {
         my $ref = &::get_object_by_name("pa_$room");
-        print "PAObj: speakable: name=$ref->{object_name}\n" if $main::Debug{pa};
+        &::print_log("PAObj: speakable: name=$ref->{object_name}") if $main::Debug{pa} >=3;
         if ($ref->{sleeping} == 0) {
             $ref->{mode} = 'normal' unless $ref->{mode};
             my $gss_mode = $ref->{mode};
             if ($gss_mode ne 'sleeping' && ($gss_mode eq 'normal' || $mode eq 'unmuted')) {
                 push(@pazones,$room);
-                print "PAObj: speakable: Pushing $room into pazones array:$#pazones\n" if $main::Debug{pa};
+                &::print_log("PAObj: speakable: Pushing $room into pazones array:$#pazones") if $main::Debug{pa} >=2;
             }
         }
     }
@@ -440,7 +439,7 @@ sub print_speaker_states
         $ref = &::get_object_by_name("pa_$speaker");
         $room = $ref->{object_name};
         $room =~ s/^\$pa_//;
-        print "PAObj: name=$room, state=$ref->{state}\n" if $main::Debug{pa};
+        &::print_log("PAObj: name=$room, state=$ref->{state}") if $main::Debug{pa};
     }
 }
 
@@ -507,10 +506,8 @@ sub get_type
     return $$self{other};
 }
 
-
 1;
 
-
 =back
 
 =head2 INI PARAMETERS

From ce1c31dd1886e85e2e815a6d738ddd83260e3eca Mon Sep 17 00:00:00 2001
From: hplato <hplato@gmail.com>
Date: Wed, 2 Oct 2013 19:28:08 -0600
Subject: [PATCH 152/330] initial commit

---
 bin/get_areacodes.pl          |   38 +
 bin/mythnotify                |   33 +
 bin/mythnotify.pl             |   33 +
 bin/skypecheck                |   43 +
 bin/skypecheck.bat            |    2 +
 lib/CID_Announce.pm           |  137 +-
 lib/CID_Lookup.pm             |  111 +-
 lib/Caller_ID.pm              |   99 +-
 lib/Event_Logger.pm           |  407 ++++++
 lib/Telephony_Interface.pm    |    8 +-
 lib/handy_net_utilities.pl    |   60 +-
 lib/imap_utils.pl             |  134 +-
 lib/site/DateTime/TimeZone.pm |  126 +-
 lib/vsDB.pm                   | 2228 +++++++++++++++++----------------
 lib/vsLock.pm                 | 1223 +++++++++---------
 web/bin/button_hp.pl          |  209 ++++
 web/bin/button_sensor.pl      |  174 +++
 web/bin/icon_panic.pl         |   16 +
 web/bin/phone_in.pl           |    7 +-
 web/bin/statuspanel.pl        |   64 +
 web/graphics/icons/pcomm2.png |  Bin 578 -> 579 bytes
 web/newclock/index.shtml      |  257 ++++
 web/newclock/maps/0.jpg       |  Bin 0 -> 26868 bytes
 web/newclock/maps/1.jpg       |  Bin 0 -> 26715 bytes
 web/newclock/maps/10.jpg      |  Bin 0 -> 25296 bytes
 web/newclock/maps/11.jpg      |  Bin 0 -> 25023 bytes
 web/newclock/maps/12.jpg      |  Bin 0 -> 24888 bytes
 web/newclock/maps/13.jpg      |  Bin 0 -> 25047 bytes
 web/newclock/maps/14.jpg      |  Bin 0 -> 25186 bytes
 web/newclock/maps/15.jpg      |  Bin 0 -> 25475 bytes
 web/newclock/maps/16.jpg      |  Bin 0 -> 25745 bytes
 web/newclock/maps/17.jpg      |  Bin 0 -> 25806 bytes
 web/newclock/maps/18.jpg      |  Bin 0 -> 27276 bytes
 web/newclock/maps/19.jpg      |  Bin 0 -> 25866 bytes
 web/newclock/maps/2.jpg       |  Bin 0 -> 26446 bytes
 web/newclock/maps/20.jpg      |  Bin 0 -> 25868 bytes
 web/newclock/maps/21.jpg      |  Bin 0 -> 26140 bytes
 web/newclock/maps/22.jpg      |  Bin 0 -> 26614 bytes
 web/newclock/maps/23.jpg      |  Bin 0 -> 26723 bytes
 web/newclock/maps/3.jpg       |  Bin 0 -> 26311 bytes
 web/newclock/maps/4.jpg       |  Bin 0 -> 26272 bytes
 web/newclock/maps/5.jpg       |  Bin 0 -> 26246 bytes
 web/newclock/maps/6.jpg       |  Bin 0 -> 26379 bytes
 web/newclock/maps/7.jpg       |  Bin 0 -> 26289 bytes
 web/newclock/maps/8.jpg       |  Bin 0 -> 26058 bytes
 web/newclock/maps/9.jpg       |  Bin 0 -> 25652 bytes
 web/newclock/numbers/text.gif |  Bin 712 -> 1448 bytes
 47 files changed, 3385 insertions(+), 2024 deletions(-)
 create mode 100755 bin/get_areacodes.pl
 create mode 100755 bin/mythnotify
 create mode 100644 bin/mythnotify.pl
 create mode 100755 bin/skypecheck
 create mode 100755 bin/skypecheck.bat
 create mode 100755 lib/Event_Logger.pm
 create mode 100644 web/bin/button_hp.pl
 create mode 100644 web/bin/button_sensor.pl
 create mode 100644 web/bin/icon_panic.pl
 create mode 100644 web/bin/statuspanel.pl
 create mode 100644 web/newclock/index.shtml
 create mode 100644 web/newclock/maps/0.jpg
 create mode 100644 web/newclock/maps/1.jpg
 create mode 100644 web/newclock/maps/10.jpg
 create mode 100644 web/newclock/maps/11.jpg
 create mode 100644 web/newclock/maps/12.jpg
 create mode 100644 web/newclock/maps/13.jpg
 create mode 100644 web/newclock/maps/14.jpg
 create mode 100644 web/newclock/maps/15.jpg
 create mode 100644 web/newclock/maps/16.jpg
 create mode 100644 web/newclock/maps/17.jpg
 create mode 100644 web/newclock/maps/18.jpg
 create mode 100644 web/newclock/maps/19.jpg
 create mode 100644 web/newclock/maps/2.jpg
 create mode 100644 web/newclock/maps/20.jpg
 create mode 100644 web/newclock/maps/21.jpg
 create mode 100644 web/newclock/maps/22.jpg
 create mode 100644 web/newclock/maps/23.jpg
 create mode 100644 web/newclock/maps/3.jpg
 create mode 100644 web/newclock/maps/4.jpg
 create mode 100644 web/newclock/maps/5.jpg
 create mode 100644 web/newclock/maps/6.jpg
 create mode 100644 web/newclock/maps/7.jpg
 create mode 100644 web/newclock/maps/8.jpg
 create mode 100644 web/newclock/maps/9.jpg

diff --git a/bin/get_areacodes.pl b/bin/get_areacodes.pl
new file mode 100755
index 000000000..df7ee44a8
--- /dev/null
+++ b/bin/get_areacodes.pl
@@ -0,0 +1,38 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+use HTML::TableExtract;
+use LWP::Simple;
+
+use Time::Local;
+
+my $url = "http://www-cse.ucsd.edu/users/bsy/area.html";
+my $html = get($url);
+my $table = HTML::TableExtract->new;
+my $row;
+print "# Downloaded from $url\n";
+print "# On ". (localtime) . "\n";
+print "#\n";
+$table->parse($html);
+# Table parsed, extract the data.
+ foreach $row ($table->rows) {
+    next unless @$row[0] =~ m/^[\-|\d]/;
+    my $ac = @$row[0];
+    my $prov = @$row[1];
+    my $tz = @$row[2]; 
+    my $description = @$row[3];
+    $description =~ s/^\s+//g;
+    if ($description =~ m/^canada\:/ig) {
+	$description =~ s/^canada\:\s+//i;
+	$description =~ s/\(.*\)$//;
+	$description =~ s/^.+\:\s+//; #remove additional province details
+	$description =~ s/[\-\-|\;].*//;
+	#my $place;
+	#($place) = $description =~ /\:(.*)\(.*\)$/i; #get rid of the end stuff
+	print "$ac $prov $tz $description\n";
+	#print "\t\t$place\n";
+    } else {
+    print "$ac $prov $tz $description\n";
+    }
+#    print join(',', @$row), "\n";
+ }
diff --git a/bin/mythnotify b/bin/mythnotify
new file mode 100755
index 000000000..3c1e8f6bf
--- /dev/null
+++ b/bin/mythnotify
@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+
+use IO::Socket;
+use Getopt::Long;
+
+$MH_ADDRESS = '192.168.0.51';
+$MH_PORT = '5252';
+$username = 'mythtv_mh';
+$password = 'mythtv_mh';
+
+GetOptions("h" => \$help, "c=s" => \$chanid, "s=s" => \$starttime, "e=s" => \$endtime, "t=s" => \$title, "st=s" => \$subtitle, "d=s" => \$description );
+
+
+# Try to create a TCP socket to Misterhouse to establish communications with MisterHouse.
+$remote = IO::Socket::INET->new(Proto => "tcp", PeerAddr => "$MH_ADDRESS", PeerPort => "$MH_PORT",)
+	or die "cannot connect to misterhouse on port $MH_PORT at $MH_ADDRESS";
+
+# Do a simple login to Misterhouse.  Not really needed if you are behind a firewall but just in case you are not
+# it is included.  Keep in mind this is all plain text so if you are worried about that you should be aware.
+print $remote "Login: $username\n";
+print $remote "Secret: $password\n";
+
+print $remote "chanid: $chanid\n";
+print $remote "starttime: $starttime\n";
+print $remote "endtime: $endtime\n";
+print $remote "title: $title\n";
+print $remote "subtitle: $subtitle\n";
+print $remote "description: $description\n";
+print $remote ":done:\n";
+ 
+close($remote);
+
+system qq [echo $chanid,$starttime,$endtime,$title,$subtitle,$description >> /tmp/mynotify.txt];
diff --git a/bin/mythnotify.pl b/bin/mythnotify.pl
new file mode 100644
index 000000000..3c1e8f6bf
--- /dev/null
+++ b/bin/mythnotify.pl
@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+
+use IO::Socket;
+use Getopt::Long;
+
+$MH_ADDRESS = '192.168.0.51';
+$MH_PORT = '5252';
+$username = 'mythtv_mh';
+$password = 'mythtv_mh';
+
+GetOptions("h" => \$help, "c=s" => \$chanid, "s=s" => \$starttime, "e=s" => \$endtime, "t=s" => \$title, "st=s" => \$subtitle, "d=s" => \$description );
+
+
+# Try to create a TCP socket to Misterhouse to establish communications with MisterHouse.
+$remote = IO::Socket::INET->new(Proto => "tcp", PeerAddr => "$MH_ADDRESS", PeerPort => "$MH_PORT",)
+	or die "cannot connect to misterhouse on port $MH_PORT at $MH_ADDRESS";
+
+# Do a simple login to Misterhouse.  Not really needed if you are behind a firewall but just in case you are not
+# it is included.  Keep in mind this is all plain text so if you are worried about that you should be aware.
+print $remote "Login: $username\n";
+print $remote "Secret: $password\n";
+
+print $remote "chanid: $chanid\n";
+print $remote "starttime: $starttime\n";
+print $remote "endtime: $endtime\n";
+print $remote "title: $title\n";
+print $remote "subtitle: $subtitle\n";
+print $remote "description: $description\n";
+print $remote ":done:\n";
+ 
+close($remote);
+
+system qq [echo $chanid,$starttime,$endtime,$title,$subtitle,$description >> /tmp/mynotify.txt];
diff --git a/bin/skypecheck b/bin/skypecheck
new file mode 100755
index 000000000..a6014bd38
--- /dev/null
+++ b/bin/skypecheck
@@ -0,0 +1,43 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+
+use XML::Simple;
+use LWP::Simple;
+use LWP::UserAgent;
+
+my $status_url="http://mystatus.skype.com/";
+
+my $progname = "skype check";
+my $progver  = "v1.0 2009-11-20";
+my $DB = 0;
+my $help;
+
+unless ($ARGV[0]) {
+    &help;
+} else {
+
+    my @accounts = split /,/,$ARGV[0];
+
+    foreach my $account (@accounts) {
+        my $ua = new LWP::UserAgent;
+        my $req = new HTTP::Request GET => $status_url . "$account" . ".txt";
+        my $results = $ua->request($req);
+        my $data;
+        if (!($results->is_success)) {
+            $data = "Error:" . $results->status_line;
+            } else {
+            $data = $results->content . ":";
+        }
+        print "$account:" . $data ."\n";
+        
+    }
+}
+
+sub help {
+    print "$progname $progver \n";
+    print "usage: $0 skypename[,skypename,skypename]\n\n";
+    print "Reads skypename status from mystatus.skype.com\n";
+    print "requires account to have \'allow my status to be viewed on the web\' preference\n";
+}
\ No newline at end of file
diff --git a/bin/skypecheck.bat b/bin/skypecheck.bat
new file mode 100755
index 000000000..6d14b1aed
--- /dev/null
+++ b/bin/skypecheck.bat
@@ -0,0 +1,2 @@
+@mh -run skypecheck %1 %2 %3
+@rem perl -S skypecheck %1 %2 %3
diff --git a/lib/CID_Announce.pm b/lib/CID_Announce.pm
index 3d39cb555..fd4d42de7 100644
--- a/lib/CID_Announce.pm
+++ b/lib/CID_Announce.pm
@@ -1,51 +1,61 @@
-=head1 B<CID_Announce>
+use strict;
 
-=head2 SYNOPSIS
+# $Revision: 1117 $
+# $Date: 2007-06-04 09:22:13 -0600 (Mon, 04 Jun 2007) $
 
-Example initialization:
+=begin comment
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 
-  use CID_Announce;
-  $cid = new CID_Announce($telephony_driver,'Call from $name $snumber.');
+File:
+	CID_Announce.pm
 
-Constructor Parameters:
+Description:
+	Announces a call.  CID with category of 'reject' will not be announced.
 
-   ex. $x = new CID_Announce($y,$z);
-   $x              - Reference to the class
-   $y              - Telephony driver reference
-   $z              - Format for speaking
-        Following variables are substitued in ""
-        $name,$first,$middle,$last,$number,$fnumber
-        (formated),$snumber(speakable),$type,$category,$city,
-        $state,$time,$areacode,$prefix,$suffix,$soundfile
+Author:
+	Jason Sharpee
+	jason@sharpee.com
 
-Input states:
+License:
+	This free software is licensed under the terms of the GNU public license.
 
-  "cid"           - Caller ID event
-  "ring"          - Ring event 'to pass along to other consumers of this object'
+Usage:
 
-Output states:
+	Example initialization:
 
-  "cid"  - Caller ID event
-  "ring" - Ring event 'to pass along to other consumers of this object'
+		use CID_Announce;
+		$cid = new CID_Announce($telephony_driver,'Call from $name $snumber.');
 
-=head2 DESCRIPTION
+	Constructor Parameters:
+		ex. $x = new CID_Announce($y,$z);
+		$x		- Reference to the class
+		$y		- Telephony driver reference
+		$z		- Format for speaking
+				Following variables are substitued in ""
+				$name,$first,$middle,$last,$number,$fnumber
+ 				(formated),$snumber(speakable),$type,$category,$city,
+				$state,$time,$areacode,$prefix,$suffix,$soundfile
 
-Announces a call.  CID with category of 'reject' will not be announced.
+	Input states:
+		"cid"	        - Caller ID event
+		"ring"     	- Ring event 'to pass along to other consumers of this object'
 
-=head2 INHERITS
+	Output states:
+		"cid"	        - Caller ID event
+		"ring"     	- Ring event 'to pass along to other consumers of this object'
 
-B<Telephony_Item>
+	For example see g_phone.pl
 
-=head2 METHODS
+Bugs:
+	There isnt a whole lot of error handling currently present in this version.  Drop me
+	an email if you are seeing something odd.
 
-=over
+Special Thanks to:
+	Bruce Winter - MH
 
-=item B<UnDoc>
 
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 =cut
-
-use strict;
-
 package CID_Announce;
 
 @CID_Announce::ISA = ('Telephony_Item');
@@ -75,7 +85,7 @@ sub new
 sub add
 {
 	my ($self, $p_telephony) = @_;
-#	print "CID ADD $p_telephony";
+	print "CID ADD $p_telephony" if $main::Debug{callerid};
 	$p_telephony->tie_items($self,'cid') if defined $p_telephony;
 }
 
@@ -128,7 +138,7 @@ sub announce
 	my ($self,$p_telephony,$p_speak_format,$p_local_area_code) = @_;
 
 	my $response=$self->parse_format($p_telephony,$p_speak_format,$p_local_area_code);
-#	print "CID Announce $response,$p_telephony,$p_speak_format";
+	print "CID Announce $response,$p_telephony,$p_speak_format\n" if $main::Debug{callerid};
     return if $response =~ /MESSAGE WAITING/; # Don't announce message waiting data
     return if $response =~ /\-MSG OFF\-/;
 	if ($response=~ /\.wav$/) {
@@ -181,16 +191,19 @@ sub parse_format
 	my $areac = $areacodes[0];
 	$number =~ s/^$areac//;
 
-    print "CID_nnounce data: type=$type name=$name number=$number\n" if $main::Debug{phone};
+    print "CID_Announce data: local_area=$areac type=$type name=$name number=$number\n" if $main::Debug{phone};
 
 	if ($p_telephony->isa('CID_Lookup')) {
 #		print "CID ISA";
 		$areacode = $p_telephony->areacode();
 		$fnumber = $p_telephony->formated_number();
 		$snumber = $p_telephony->speakable_number();
-		$fnumber =~ s/^$areac//g;
+# really remove all area codes as we'll speak them later
+#		$fnumber =~ s/^$areac//g;
 		$areac =~ s/([0-9])/$1 /g;
-		$snumber =~ s/^$areac//g;
+#		$snumber =~ s/^$areac//g;
+		$fnumber =~ s/^\d\d\d//g;
+		$snumber =~ s/^\d\s\d\s\d\s//g;
 
 		# Make other vars available
 		$address = $p_telephony->address();
@@ -208,15 +221,32 @@ sub parse_format
 		$category = $p_telephony->category();
 #   		$format1  = "$first $middle $last";
     		$format1  = $name;
+		$format1  = $snumber if $name eq 'unknown';
     		$format1  = $snumber if $name =~ 'UNKNOWN CALLER';
     		$format1  = "Unknown" if $type eq 'unknown' and !$snumber;
     		$format1  = $snumber unless $format1 =~ /\S/;
+print "CID_Announce: areacodes[0]=$areacodes[0] areacode=$areacode prefix=$prefix snumber=$snumber fnumber=$fnumber city=$city state=$state\n";
     		if ($areacodes[0] ne $areacode) {
-        		$format1 .= " in $city" if $city =~ /\S/ and
+print "CID_Announce: Area codes do not match. city=$city state=$state config_parms{city}=$::config_parms{city} config_parms{state}=$::config_parms{state}\n";
+			my $outarea;
+			my $ac_speak = $areacode;
+			$ac_speak =~ s/(\d)/$1 /g;
+        		$outarea = " from ";
+			$outarea .= "$city," if $city =~ /\S/ and
           			(lc $city ne lc $::config_parms{city} or lc $state ne lc $::config_parms{state});
-			$format1 =~ s/\s*$//;
-        		$format1 .= ", $state"  if $state and lc $state ne lc $::config_parms{state} and lc $state ne lc $city;
+			#$outarea =~ s/\s*$//;
+        		$outarea .= "$state"  if $state and lc $state ne lc $::config_parms{state} and lc $state ne lc $city and $state ne "--";
+			if ($outarea eq " from ") {
+				if ($areacode) {
+				$outarea = " from area code $ac_speak";
+				} else {
+				$outarea = " from unknown area code";
+				}
+			}
+print "CID_Announce: outarea=[$outarea]\n";
+			$format1 .= $outarea;
 	    	}
+		$format1  = "TollFree number" if $prefix eq "800" or $prefix eq "866" or $prefix eq "888";
 	}
 
 
@@ -229,39 +259,10 @@ sub parse_format
 	{
 		$speak_string = $soundfile;
 	}
-#	print "CID PARSE $speak_string";
+	print "CID PARSE $speak_string\n" if $main::Debug{callerid};
 	return $speak_string;
 
 }
 
 
 1;
-
-
-=back
-
-=head2 INI PARAMETERS
-
-NONE
-
-=head2 AUTHOR
-
-Jason Sharpee
-jason@sharpee.com
-
-Special Thanks to:
-Bruce Winter - MH
-
-=head2 SEE ALSO
-
-For example see g_phone.pl
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
diff --git a/lib/CID_Lookup.pm b/lib/CID_Lookup.pm
index a2e383da0..a2d6aad29 100644
--- a/lib/CID_Lookup.pm
+++ b/lib/CID_Lookup.pm
@@ -1,45 +1,54 @@
-=head1 B<CID_Lookup>
-
-=head2 SYNOPSIS
-
-Example initialization:
+use strict;
+=begin comment
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 
-  use CID_Lookup;
-  $cid = new CID_Lookup($telephony_driver);
+File:
+	CID_Lookup.pm
 
-Constructor Parameters:
+Description:
+	Translates a caller name and number to more information based on file data
 
-  $x = new CID_lookup($y);
-  $x - Reference to the class
-  $y - Telephony driver reference
+Author:
+	Jason Sharpee
+	jason@sharpee.com
 
-Input states:
+License:
+	This free software is licensed under the terms of the GNU public license.
 
-  "cid"           - Caller ID event
-  "ring"          - Ring event 'to pass along to other consumers of this object'
+Usage:
 
-Output states:
+	Example initialization:
 
-  "cid"           - Caller ID event
-  "ring"          - Ring event 'to pass along to other consumers of this object'
+		use CID_Lookup;
+		$cid = new CID_Lookup($telephony_driver);
 
-=head2 DESCRIPTION
+	Constructor Parameters:
+		ex. $x = new CID_lookup($y);
+		$x		- Reference to the class
+		$y		- Telephony driver reference
 
-Translates a caller name and number to more information based on file data
+	Input states:
+		"cid"	        - Caller ID event
+		"ring"     	- Ring event 'to pass along to other consumers of this object'
 
-=head2 INHERITS
+	Output states:
+		"cid"	        - Caller ID event
+		"ring"     	- Ring event 'to pass along to other consumers of this object'
 
-B<Telephony_Item>
+	For example see g_phone.pl
 
-=head2 METHODS
+Bugs:
+	There isnt a whole lot of error handling currently present in this version.  Drop me
+	an email if you are seeing something odd.
 
-=over
+Special Thanks to:
+	Bruce Winter - MH
+	Tim Doyle - New Area Code format
+	Clive Freeman
 
-=item B<UnDoc>
 
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 =cut
-
-use strict;
 package CID_Lookup;
 
 @CID_Lookup::ISA = ('Telephony_Item');
@@ -265,14 +274,14 @@ sub parse_name
 	my $l_middle;
 
 	#first determine if "Last, First" or not (possibly company instead)
-#	&::print_log("CID H in loop :$p_name:");
+	&::print_log("CID H in loop :$p_name:") if $main::Debug{callerid};
 	if ($p_name =~ /,/g)
 	{
-#		&::print_log("CID L in loop :$p_name:");
+		&::print_log("CID L in loop :$p_name:") if $main::Debug{callerid};
 		#put a space after a comma for scrunched CID names.
 		$p_name=~ s/,(\S)/, $1/g;
 		$self->cid_name($p_name);
-#		&::print_log("CID J in loop :$p_name:");
+		&::print_log("CID J in loop :$p_name:") if $main::Debug{callerid};
 
 		($l_last,$l_first,$l_middle) = split(' ',$p_name);
 		$l_last =~ s/,//g; # remove commas
@@ -438,6 +447,7 @@ sub lookup_areacode
 
 	my ($areacode,$state,$city,$timeoffset);
 	my (%state_by_abbrv,$state_abbrv,$state_name);
+print "CID_Lookup: looking up state names in $p_state_file";
 	open (STATENAME, $p_state_file) or print "\nError, could not find the state file $p_state_file\n";
 	while (<STATENAME>)
 	{
@@ -449,17 +459,18 @@ sub lookup_areacode
 
 	close STATENAME;
 
+print "\nCID_Lookup: looking up area codes for $::config_parms{country} in $p_area_code_file\n";
 	open (AREACODE, $p_area_code_file) or print "\nError, could not find the area code file $p_area_code_file\n";
 
 	while (<AREACODE>)
 	{
 		next if /^\#/;
-		if ($::config_parms{country} =~ /US|CANADA/i)
+		if ($::config_parms{country} =~ /US|CANADA|CA/i)
 		{
+			$_ =~ s/\(.*\)$//; #remove end junk
 			# Delete descriptors like (Southern) Texas ... too much to speak
 		        $_ =~ s/\(.+?\)//;
 			#406 All parts of Montana
-#			&::print_log("Line ". $_);
 			#Old Format code
 #			($areacode, $state) = $_ =~ /(\d\d\d) All parts of (.+)/;
 #			($areacode, $city, $state) = $_ =~ /(\d\d\d)(.*), *(.+)/ unless $state;
@@ -472,10 +483,11 @@ sub lookup_areacode
 			if ($city =~ /.*,.*/) {
 				($city) = $city =~ /(.*),.*/;
 			}
-
+			$city =~ s/^\s+|\s+$//g; #remove leading/trailing whitespace
+			$city =~ s/[\-\-|\;].*//; #remove stuff after --, ;
 			next unless $city;
 
-#			&::print_log($self->areacode() . ", $areacode, $city, $state");
+print "CID_Lookup: \$self->areacode=" .$self->areacode() . ", areacode=$areacode, city=$city, state=$state, \n";
  			next unless $city;
 			if ($areacode eq $self->areacode())
 			{
@@ -502,7 +514,7 @@ sub lookup_areacode
 
 			$city =~ s/   .+$//;
 			$state=$city;
-            print "Checking: areacode=$areacode city=$city\n" if $::config_parms{debug} eq 'phone';
+            print "Checking: areacode=$areacode city=$city\n" if $main::Debug{phone};
 			next unless $city;
 			if ($self->number() =~ /^$areacode/) {
 				$self->city($city);
@@ -534,34 +546,3 @@ sub lookup_areacode
 }
 
 1;
-
-=back
-
-=head2 INI PARAMETERS
-
-NONE
-
-=head2 AUTHOR
-
-Jason Sharpee
-jason@sharpee.com
-
-Special Thanks to:
-Bruce Winter - MH
-Tim Doyle - New Area Code format
-Clive Freeman
-
-=head2 SEE ALSO
-
-For example see g_phone.pl
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
diff --git a/lib/Caller_ID.pm b/lib/Caller_ID.pm
index 6dadcd386..16674b5d1 100644
--- a/lib/Caller_ID.pm
+++ b/lib/Caller_ID.pm
@@ -1,38 +1,18 @@
-=head1 B<Caller_ID>
-
-=head2 SYNOPSIS
-
-None
-
-=head2 DESCRIPTION
-
-NONE
-
-=head2 INHERITS
-
-NONE
-
-=head2 METHODS
-
-=over
-
-=item B<UnDoc>
-
-=cut
-
 package Caller_ID;
 use strict;
 
-use vars '%name_by_number', '%reject_name_by_number', '%state_by_areacode', '%wav_by_number', '%group_by_number';
+use vars '%name_by_number', '%reject_name_by_number', '%city_by_areacode', '%state_by_areacode', '%wav_by_number', '%group_by_number';
 my ($my_areacode, @my_areacodes, $my_state);
 my $caller_file_2 = 1;
 my $caller_id_debug = 0;
+$caller_id_debug = 1 if $main::Debug{callerid};
 
+print "Caller ID debugging enabled" if $caller_id_debug;
 
 sub make_speakable {
     my($data, $format,$local_area_code_language) = @_;
 
-=cut
+=cut begin
 
 format=1: Weeder CID data looks like this:
 I03/18 22:05 507-288-1030 WINTER BRUCE LA
@@ -90,7 +70,7 @@ Format=4   NetCallerID (http://ugotcall.com/nci.htm)
 ###DATE06191942...NMBR...NAME-UNKNOWN CALLER-+++
 
 
-=cut
+=cut end
 
 
 # Switch name strings so first last, not last first.
@@ -101,6 +81,8 @@ Format=4   NetCallerID (http://ugotcall.com/nci.htm)
 # Last First M
 # Last M First
 
+print "CallerID DBG: data=[$data] format=$format\n";
+
     if ($format == 2) {
         ($date)   = $data =~ /DATE *= *(\S+)/s;
         ($time)   = $data =~ /TIME *= *(\S+)/s;
@@ -108,7 +90,8 @@ Format=4   NetCallerID (http://ugotcall.com/nci.htm)
         ($number) = $data =~ /NMBR *= *(\S+)/s;
 
 #       ($name)   = $data =~ /NAME *= *(.+)/s;
-        ($name)   = $data =~ /NAME *= *([^\n]+)/s;
+#       ($name)   = $data =~ /NAME *= *([^\n]+)/s;
+        ($name)   = $data =~ /NAME *= *(.+)\sNMBR/s; #HPC name is between NAME = & NMBR
 
         ($number) = $data =~ /FM:(\S+)/s unless $number;
         ($numberTo) = $data =~ /TO:(\S+)/s;
@@ -116,8 +99,9 @@ Format=4   NetCallerID (http://ugotcall.com/nci.htm)
         print "phone number=$number numberTo=$numberTo name=$name\n" if $caller_id_debug;
 
         $name = substr($name, 0, 15);
-#       $name = 'Unavailable' if $name =~ /^O$/; # Jay's & Chaz's exceptions
-        $name = 'Out of Area' if $name =~ /^O$/; # Jay's & Chaz's exceptions
+       $name = 'Unavailable' if $name =~ /^O$/; # Jay's & Chaz's exceptions
+#       $name = 'Out of Area' if $name =~ /^O$/; # Jay's & Chaz's exceptions
+##        $name = '' if $name =~ /^O$/; # No name announce number.
         $name = 'Private'     if $name =~ /^P$/; # Chaz's exception
         $name = 'Pay'         if $name =~ /^TEL PUBLIC BELL$/; # Chaz's exception
         ($last, $first, $middle) = split(/[\s,]+/, $name, 3);
@@ -262,10 +246,9 @@ sub read_areacode_list {
 
     my %parms = @_;
 
-#   &main::print_log("Reading area code table ... ");
-#   print "Reading area code table ... ";
+   &main::print_log("Reading area code table ... ");
 
-    my ($area_code_file, %city_by_areacode, $city, $state, $areacode, $areacode_cnt);
+    my ($area_code_file, $city, $state, $areacode, $areacode_cnt,$timeoffset);
     if ($parms{area_code_file}) {
         open (AREACODE, $parms{area_code_file}) or
             print "\nError, could not find the area code file $parms{area_code_file}: $!\n";
@@ -273,19 +256,34 @@ sub read_areacode_list {
         while (<AREACODE>) {
             next if /^\#/;
             $areacode_cnt++;
-            $_ =~ s/\(.+?\)//;      # Delete descriptors like (Southern) Texas ... too much to speak
-                                #406 All parts of Montana
 
-            ($areacode, $state) = $_ =~ /(\d\d\d) All parts of (.+)/;
-            ($areacode, $city, $state) = $_ =~ /(\d\d\d)(.*), *(.+)/ unless $state;
-            next unless $city;
+#            $_ =~ s/\(.+?\)//;      # Delete descriptors like (Southern) Texas ... too much to speak
+#                                #406 All parts of Montana
+#
+#            ($areacode, $state) = $_ =~ /(\d\d\d) All parts of (.+)/;
+#            ($areacode, $city, $state) = $_ =~ /(\d\d\d)(.*), *(.+)/ unless $state;
+
+             $_ =~ s/\(.*\)$//; #remove end junk
+             # Delete descriptors like (Southern) Texas ... too much to speak
+             $_ =~ s/\(.+?\)//;
+             ($areacode,$state,$timeoffset,$city) = $_ =~ /(\S*)\s*(\S*)\s*(\S*)\s*(.*)/;
+
+             if ($city =~ /.*:.*/) {
+                     ($city) = $city =~ /.*:(.*)/;
+             }
+             if ($city =~ /.*,.*/) {
+                     ($city) = $city =~ /(.*),.*/;
+             }
+             $city =~ s/^\s+|\s+$//g; #remove leading/trailing whitespace
+             $city =~ s/[\-\-|\;].*//; #remove stuff after --, ;
+             next unless $city;
+
             $city_by_areacode{$areacode}  = $city;
             $state_by_areacode{$areacode} = $state;
 #       print "db code=$areacode state=$state city=$city\n";
         }
         close AREACODE;
-#   &main::print_log("read in $areacode_cnt area codes from $parms{area_code_file}");
-        print "Read $areacode_cnt codes from $parms{area_code_file}\n" if $caller_id_debug;
+   &main::print_log("Read in $areacode_cnt area codes from $parms{area_code_file}");
     }
 
     # If in-state, store city name instead of state name.
@@ -456,28 +454,3 @@ sub read_callerid_list {
 #
 
 1;
-
-=back
-
-=head2 INI PARAMETERS
-
-NONE
-
-=head2 AUTHOR
-
-UNK
-
-=head2 SEE ALSO
-
-NONE
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
diff --git a/lib/Event_Logger.pm b/lib/Event_Logger.pm
new file mode 100755
index 000000000..2a5ea017e
--- /dev/null
+++ b/lib/Event_Logger.pm
@@ -0,0 +1,407 @@
+package Event_Logger;
+
+use strict;
+ 
+@Event_Logger::ISA = ('Generic_Item');
+
+sub new {
+   my ($class,$method) = @_;
+   my $self={};
+   bless $self,$class;
+   @{$$self{_active_IDs}} = ();
+   $$self{event} = ();
+   $$self{_current_ID} = 0;
+   $$self{icalname} = "MisterHouse autogenerated";
+   $$self{enabled} = 1;
+# object data
+#	array of active "ID's" (events in memory that haven't ended)
+#	ID of the most current event
+#	filename
+#	method and ical name
+#	hash {event}{$ID}
+#		=> {summary}
+#		=> {start}
+#		=> {end}
+   return $self;
+}
+
+
+sub event_start() {
+# create a new event and make it active
+
+  my ($self, $summary) = @_;
+
+  if ($$self{enabled}) {
+
+    $$self{_current_ID}++;
+    my $id = $$self{_current_ID};
+    my ($now_time) = $main::Time_Date;
+    push @{$$self{_active_IDs}}, $id;
+#print "aid2=@{$$self{_active_IDs}}, id=$id\n";
+    $summary = "none" if ($summary eq "");
+    $$self{event}{$id}{summary} = $summary;
+    $$self{event}{$id}{start} = $now_time;
+
+#  print "start, [$$self{event}{$id}{summary}][$$self{event}{$id}{start}]\n";
+    return $id;
+
+  } else {
+    return -1; #event_logging is disabled
+  }
+}
+ 
+sub event_end {
+# close an active event and flush it to a file
+
+  my ($self, $id) = @_;
+  my $found = 0;
+
+  if ($$self{enabled}) {
+     if ($id) {
+        my $count;
+        for my $item (@{$$self{_active_IDs}}) {
+#print "it=$item, id=$id\n";
+           $count++;
+           if ($item == $id) {
+           splice (@{$$self{_active_IDs}}, $count,1 );
+           $found = 1;
+           }
+         }
+      } else {
+	   $id = pop @{$$self{_active_IDs}};
+           $found = 1 if $id;
+     }
+
+     if ($found) {
+        my ($now_time) = $main::Time_Date;
+        $$self{event}{$id}{end} = $now_time;
+#  print "end, [id=$id][$$self{event}{$id}{summary}][$$self{event}{$id}{start}][$$self{event}{$id}{end}]\n";  
+        $self->_write_event($id);
+     } else {
+        print "cannot find id $id!\n";
+     }
+     return $found; 
+   } else {
+     return -1; #disabled
+   }
+}
+
+sub active_ids {
+# returns array of active events (ie events that have not ended)
+  my ($self) = @_;
+
+  return \@{$$self{_active_IDs}}; #doesn't return array?
+}
+
+sub current_id {
+#returns the last used id number
+  my ($self) = @_;
+
+  return $$self{_current_ID};
+}
+
+sub get_filename {
+
+  my ($self) = @_;
+  my $filepath = $main::config_parms{data_dir};
+  $filepath = $main::config_parms{ical_data_dir} if $main::config_parms{ical_data_dir};
+  my $file = $$self{object_name};
+  $file =~ s/^\$//;
+  my $fname =  $filepath . "/eventlog_" . $file . ".data";
+  return $fname;
+}
+
+sub in_event {
+
+   my ($self,$epoch_seconds) = @_;
+   my $fname = $self->get_filename;
+
+   if (open ELFILE, "$fname") {
+     my @data = <ELFILE>;
+     close ELFILE;
+     foreach my $line (@data) {
+
+       my ($start,$end,$entry) = split /\t/,$line;
+#print "db in_event start= " . &main::my_str2time($start) . " sec= $epoch_seconds end= ". &main::my_str2time($end) . "\n";
+       return 1 if ((&main::my_str2time($start) <= $epoch_seconds) and 
+		    (&main::my_str2time($end) >= $epoch_seconds));
+     }
+   } else {
+     print "problem opening data file $fname\n";
+   }
+  # check if in memory...
+    
+    return 0;
+}
+ 
+sub first_event {
+
+   my ($self) = @_;
+   my ($self) = @_;
+   my $fname = $self->get_filename;
+print "reading firest_event $fname...\n";
+  if (open ICFILE, "$fname") {
+     my @data = <ICFILE>;
+     close ICFILE;
+     my $last = shift (@data);
+     my ($start,$end,$entry) = split /\t/,$last;
+     return &main::my_str2time($start);
+
+  } else {
+
+     my $current_id = $self->current_id;
+     if (defined $$self{event}{$current_id}{start}) {
+
+	return &main::my_str2time($$self{event}{$current_id}{start})
+     }
+   }
+   return 0;
+}
+ 
+sub last_event {
+
+   my ($self) = @_;
+   my $fname = $self->get_filename;
+print "reading last_event $fname...\n";
+  if (open ICFILE, "$fname") {
+     my @data = <ICFILE>;
+     close ICFILE;
+     my $last = pop (@data);
+     my ($start,$end,$entry) = split /\t/,$last;
+     return &main::my_str2time($end);
+
+  } else {
+     return 0;
+  }
+}
+
+sub enable_logging {
+
+   my ($self) = @_;
+   $$self{enabled} = 1;
+}
+
+sub disable_logging {
+
+   my ($self) = @_;
+   $$self{enabled} = 0;
+}
+
+#sub log_object {
+#
+# ideally for any object to enable logging
+
+# $target = new Generic_item;
+# $target_logger = new Event_Logger;
+#
+# $target_logger->log_object($target, start => 'on', end => 'off');
+#
+#  my ($self, $target, %hash) = @_;
+# this would be useful a tie method that would specify start, end and summary conditions
+# ie $item->tie_interface($object, "start => open, end => closed, summary => \"garage door event\");
+# }
+
+sub _write_event {
+# writes closed events to log
+
+  my ($self, $id) = @_;
+  my $fname = $self->get_filename;
+print "writing to $fname...\n";
+  if (open ICFILE, ">>$fname") {
+     #format: start<tab>end<tab>summary
+     print  "[id=$id][$$self{event}{$id}{start}][$$self{event}{$id}{end}][$$self{event}{$id}{summary}]\n";
+     print ICFILE "$$self{event}{$id}{start}\t$$self{event}{$id}{end}\t$$self{event}{$id}{summary}\n";
+     close (ICFILE);
+  } else {
+     print "error opening $fname for write!\n";
+     print "abandoning cal entry $id\n";
+  }
+
+} 
+
+#-----------------
+# Event_Logger display methods
+
+sub generate_ical_file {
+# creates an ical formatted .ics file on the webserver for import into external clients, phpicalendar, etc...
+
+  my ($self, $file, $start, $end) = @_;
+  my $filepath = $main::Pgm_Root . "/web";
+  #my $filepath ="/usr/local/mh/web";
+  $filepath = $main::config_parms{ical_publish_dir} if $main::config_parms{ical_publish_dir};
+  $file = $$self{object_name} if (!$file);
+  $file =~ s/^\$//;
+  my $fname = $filepath . "/" . $file . ".ics";
+  my $retcode;
+
+  if (open (ICDATA, ">$fname")) {
+    print ICDATA $self->generate_ical_data($start,$end);
+    close (ICDATA);
+    $retcode = 1;
+  } else {
+    print "cannot open $fname for writing!";
+    $retcode = 0;
+  }
+ return $retcode
+}
+
+sub generate_ical_data {
+# returnes a generated ical formatted string of events between start and end
+# if start & end ommitted, then entire range is returned (TODO)
+
+use Date::ICal; #included in MH
+use Data::ICal; #included in MH
+use Data::ICal::Entry::Event; #new Dep
+
+  my ($self, $start, $end) = @_;
+  my $filepath = $main::config_parms{data_dir};
+  $filepath = $main::config_parms{ical_data_dir} if $main::config_parms{ical_data_dir};
+  my $file = $$self{object_name};
+  $file =~ s/^\$//;
+  my $fname =  $filepath . "/eventlog_" . $file . ".data";
+  my $calendar = new Data::ICal;
+  $calendar->add_properties(
+           method      => $$self{method},
+	  # name        => $$self{name},
+  );
+ 
+  my $event = Data::ICal::Entry::Event->new();
+
+  if ( -e $fname ) {
+    if (open ICFILE, "$fname") {
+     foreach my $line (<ICFILE>) {
+        my ($start,$end,$summary) = split /\t/,$line;
+	#start,end not implemented yet
+        my ($start1,$end1);
+        $start1 = &main::my_str2time($start);
+        $end1 = &main::my_str2time($end);
+        $event->add_properties(
+ 	   summary     => $summary,
+ 	   #description => "FreeFormText.\\nMore FreeFormText.\\n\\n",
+ 	   #dtstart     => Date::ICal->new( epoch => time )->ical,
+ 	   dtstart     => Date::ICal->new( epoch => $start1 )->ical,
+ 	   dtend       => Date::ICal->new( epoch => $end1 )->ical,
+ 	   dtstamp     => Date::ICal->new( epoch => time )->ical,
+ 	   #class       => "PUBLIC",
+ 	   #organizer   => "MAILTO:foo\@bar",
+ 	   #location    => "Phone call",
+ 	   #priority    => 5,
+ 	   #transp      => "OPAQUE",
+ 	   #sequence    => 0,
+ 	   #uid         => "123",
+	   );
+        $calendar->add_entry($event);
+      }
+     close (ICFILE);
+    } else {
+     print "error opening $fname for read\n";
+    }
+   }
+  
+
+   foreach my $id (@{$$self{_active_IDs}}) {
+        my ($start1,$end1);
+        my $start = $$self{event}{$id}{start};
+        $start1 = &main::my_str2time($start);
+        $event->add_properties(
+ 	   summary     => $$self{event}{$id}{summary},
+ 	   #description => "FreeFormText.\\nMore FreeFormText.\\n\\n",
+ 	   #dtstart     => Date::ICal->new( epoch => time )->ical,
+ 	   dtstart     => Date::ICal->new( epoch => $start1 )->ical,
+ 	   dtend       => Date::ICal->new( epoch => time )->ical,
+ 	   dtstamp     => Date::ICal->new( epoch => time )->ical,
+ 	   #class       => "PUBLIC",
+ 	   #organizer   => "MAILTO:foo\@bar",
+ 	   #location    => "Phone call",
+ 	   #priority    => 5,
+ 	   #transp      => "OPAQUE",
+ 	   #sequence    => 0,
+ 	   #uid         => "123",
+	   );
+       $calendar->add_entry($event);
+   }
+ 
+  return $calendar->as_string;
+
+}
+
+sub generate_graph_file {
+# creates an ical formatted .ics file on the webserver for import into external clients, phpicalendar, etc...
+
+  my ($self, $file, $start, $end, $step) = @_;
+  my $filepath = $main::Pgm_Root . "/web";
+  #my $filepath ="/usr/local/mh/web";
+  $filepath = $main::config_parms{ical_publish_dir} if $main::config_parms{ical_publish_dir};
+  $file = $$self{object_name} if (!$file);
+  $file =~ s/^\$//;
+  my $fname = $filepath . "/" . $file . ".gif";
+  my $retcode;
+
+  ##if (open (ELIMG, ">$fname")) {
+  ##   binmode ELIMG;
+  ##   print ELIMG $self->generate_graph_data($start,$end,$step);
+  ##   close ELIMG;
+  ##   $retcode = 1;
+  ##} else {
+  ##  print "cannot open $fname for writing!";
+  ##  $retcode = 0;
+  ##}
+$self->generate_graph_data($start,$end,$step);
+ return $retcode
+}
+
+
+sub generate_graph_data {
+# returnes a generated ical formatted string of events between start and end
+# if start & end ommitted, then entire range is returned (TODO)
+
+  use GD::Graph; #new dep
+  use GD::Graph::lines; #new dep
+  my ($self, $start, $end, $step) = @_;
+ 
+  my $height = 400;
+  my $width = 300;
+ 
+  $start = $self->first_event if !$start;
+  $end   = $self->last_event if !$end;
+  $step  = 300 if !$step; #default to 5 minutes
+  my @graph_data_time;
+  my @graph_data_status;
+  my @graph_data;
+
+print "db:start=$start,end=$end,step=$step\n"; 
+
+  my $count = 0;
+  for (my $index = $start; $index <= $end; $index=$index+$step) {
+# $data{$index} = $object->in_event($index);
+#    @graph_data[0]->[$count] = &main::time_date_stamp(14,$index);
+#    @graph_data[1]->[$count] = $self->in_event($index);
+    @graph_data_time[$count] = &main::time_date_stamp(14,$index);
+#    my $temp = $self->in_event($index); #get graphing working first...
+    my $temp_rnd = rand() * 100;
+    my $temp = 0;
+    $temp = 1 if ($temp_rnd > 80);
+    @graph_data_status[$count] = $temp;
+print "db:count=$count, index=$index end=$end" . &main::time_date_stamp(14,$index) . " $temp\n";
+    $count++;
+  }
+
+  @graph_data = (\@graph_data_time,\@graph_data_status); 
+  print @graph_data_time,@graph_data_status;
+
+  my $graph = GD::Graph::lines->new($height,$width);
+  $graph->set (
+    x_label => 'Time',
+    y_label => 'State',
+    title   => 'Graph of self->get_name');
+ 
+  my $fname ="/usr/local/mh/web/test.gif";
+
+  if (open (ELIMG, ">$fname")) {
+     binmode ELIMG;
+     print ELIMG $graph->plot(\@graph_data);
+     close ELIMG;
+  }
+ 
+}
+ 
diff --git a/lib/Telephony_Interface.pm b/lib/Telephony_Interface.pm
index 2e56fab25..395c84fe9 100644
--- a/lib/Telephony_Interface.pm
+++ b/lib/Telephony_Interface.pm
@@ -94,7 +94,9 @@ sub check_for_data {
             $main::Serial_Ports{$port}{data_record} = undef;
                                 # Ignore garbage data (ascii is between ! thru ~)
             $data = '' if $data !~ /^[\n\r\t !-~]+$/;
+print "Caller_id_data{$port} raw data: $caller_id_data{$port}" if $main::Debug{phone};
             $caller_id_data{$port} .= ' ' . $data;
+print "Phone raw data: $data.\n" if $main::Debug{phone};
             print "Phone data: $data.\n" if $main::Debug{phone};
             if (($caller_id_data{$port} =~ /NAME.+NU?MBE?R/s) or
                 ($caller_id_data{$port} =~ /NU?MBE?R.+NAME/s) or
@@ -172,7 +174,8 @@ sub process_cid_data {
     else {
         ($date)   = $data =~ /DATE *= *(\S+)/s;
         ($time)   = $data =~ /TIME *= *(\S+)/s;
-        ($name)   = $data =~ /NAME *= *(.{1,15})/s;
+        ($name)   = $data =~ /NAME *= *(.+)\sNMBR/s if ($type eq 'rockwell');
+	($name)   = $data =~ /NAME *= *(.{1,15})/s unless $name;
         ($name)   = $data =~ /MESG *= *([^\n]+)/s unless $name;
         $name     = 'private'     if $name eq '080150';
         $name     = 'unavailable' if $name eq '08014F';
@@ -182,6 +185,7 @@ sub process_cid_data {
 
     $name   = '' unless $name;
     $number = '' unless $number;
+    $number = '' if $number eq 'O';
 
     unless ($name or $number) {
         print "\nCallerid data not parsed: p=$port t=$type d=$data date=$date time=$time number=$number name=$name\n";
@@ -200,6 +204,8 @@ sub process_cid_data {
         $name='';
     }
     $cid_type = 'U' if uc $name eq 'O' or $number eq 'O';
+    $name = 'unknown' if uc $name eq 'O';
+    $name = 'unknown' if $name eq $number; #if name is same as number than ignore the name
     $cid_type = 'N' if $number =~ /^[\d\- ]+$/;	  # Override the type if the number is known
 
 
diff --git a/lib/handy_net_utilities.pl b/lib/handy_net_utilities.pl
index 78cf3efd7..be9e0e199 100644
--- a/lib/handy_net_utilities.pl
+++ b/lib/handy_net_utilities.pl
@@ -29,7 +29,7 @@ package handy_net_utilities;
 use HTML::FormatText;
 use HTML::Parse;
 use LWP::Simple;
-use Encode qw(encode decode);
+use Encode qw(encode decode find_encoding);
 
 #require "$main::Pgm_Root/lib/site/HTML/Formatter.pm";
 
@@ -1488,11 +1488,61 @@ sub main::net_mail_summary {
 
 	# Parse any unicode from headers...
 	$from =~ s/\"//g;
-	if ($from =~ m/=\?/) {
-	   print "Unicode detected. Decoding MIME-Header from $from to " if $parms{debug} or $main::Debug{net};
-	   $from = decode("MIME-Header", $from);
-	   print "$from.\n" if $parms{debug} or $main::Debug{net};
+	if ($from =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/) {
+	   my $enc_check = find_encoding($1);
+  	   if ($enc_check) {
+	     print "Unicode $1 detected. Decoding MIME-Header 'from' from $from to " if $parms{debug} or $main::Debug{net};
+	     $from = decode("MIME-Header", $from);
+	     print "$from.\n" if $parms{debug} or $main::Debug{net};
+	     }
+	    else {
+	     print "WARNING: Unknown unicode detected $1 for 'from' $from\n";
+	    }
+	}
+	if ($sender =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/) {
+	   my $enc_check = find_encoding($1);
+  	   if ($enc_check) {
+	     print "Unicode $1 detected. Decoding MIME-Header 'sender' from $sender to " if $parms{debug} or $main::Debug{net};
+	     $sender = decode("MIME-Header", $sender);
+	     print "$sender.\n" if $parms{debug} or $main::Debug{net};
+	     }
+	    else {
+	     print "WARNING: Unknown unicode detected $1 for 'sender' $sender\n";
+	    }
+	}
+	if ($to =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/) {
+	   my $enc_check = find_encoding($1);
+  	   if ($enc_check) {
+	     print "Unicode $1 detected. Decoding MIME-Header 'to' from $to to " if $parms{debug} or $main::Debug{net};
+	     $to = decode("MIME-Header", $to);
+	     print "$to.\n" if $parms{debug} or $main::Debug{net};
+	     }
+	    else {
+	     print "WARNING: Unknown unicode detected $1 for 'to' $to\n";
+	    }
+	} 
+	if ($cc =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/) {
+	   my $enc_check = find_encoding($1);
+  	   if ($enc_check) {
+	     print "Unicode $1 detected. Decoding MIME-Header 'cc' from $cc to " if $parms{debug} or $main::Debug{net};
+	     $cc = decode("MIME-Header", $cc);
+	     print "$cc.\n" if $parms{debug} or $main::Debug{net};
+	     }
+	    else {
+	     print "WARNING: Unknown unicode detected $1 for 'cc' $cc\n";
+	    }
 	} 
+	if ($subject =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/) {
+	   my $enc_check = find_encoding($1);
+  	   if ($enc_check) {
+	     print "Unicode $1 detected. Decoding MIME-Header 'subject' from $subject to " if $parms{debug} or $main::Debug{net};
+	     $subject = decode("MIME-Header", $subject);
+	     print "$subject.\n" if $parms{debug} or $main::Debug{net};
+	     }
+	    else {
+	     print "WARNING: Unknown unicode detected $1 for 'subject' $subject\n";
+	    }
+	}  
                                 # Process 'from' into speakable name
         ($from_name) = $from =~ /\((.+)\)/;
         ($from_name) = $from =~ / *(.+?) *</ unless $from_name;
diff --git a/lib/imap_utils.pl b/lib/imap_utils.pl
index 8e30823c0..8fc3ae7c7 100644
--- a/lib/imap_utils.pl
+++ b/lib/imap_utils.pl
@@ -1,37 +1,3 @@
-=head1 B<imap_utils>
-
-=head2 SYNOPSIS
-
-NONE
-
-=head2 DESCRIPTION
-
-Adds IMAP message scan and gmail sending ability.
-
-Requires the following perl modules:
-
-  Mail::IMAPClient
-  IO::Socket::SSL
-  IO::Socket::INET
-  Time::Zone
-
-if the IMAP scan hangs before authenticating against the gmail account, reinstall the
-IO::Socket::SSL
-
-Todo: parse unread messages
-
-=head2 INHERITS
-
-B<NONE>
-
-=head2 METHODS
-
-=over
-
-=item B<UnDoc>
-
-=cut
-
 #!/usr/bin/perl
 
 # v 0.1 - initial test concept, inspired by Pete's script - H. Plato - 2 June 2008
@@ -39,6 +5,19 @@ =head2 METHODS
 
 # v 0.3 - removed gmail send to it's own library, added ssl as an option.
 
+# Adds IMAP message scan and gmail sending ability.
+# Requires the following perl modules
+#   Mail::IMAPClient
+#   IO::Socket::SSL
+#   IO::Socket::INET
+#   Time::Zone
+#
+# if the IMAP scan hangs before authenticating against the gmail account, reinstall the
+# IO::Socket::SSL
+#
+# Todo: 
+# - parse unread messages
+
 package imap_utils;
 
 use strict;
@@ -48,7 +27,7 @@ package imap_utils;
 use IO::Socket::INET;
 use POSIX;
 use Time::Zone;
-use Encode qw(encode decode);
+use Encode qw(encode decode find_encoding);
 
 sub main::get_imap {
 
@@ -206,14 +185,60 @@ sub main::get_imap {
 	$processed_count++;
 	my $from = $client->get_header($msgid, "From");
 	my $to = $client->get_header($msgid, "To");
-	my $cc = $client->get_header($msgid, "CC");
+	my $cc = "";
+	$cc = $client->get_header($msgid, "CC");
+	my $subject = "<No Subject>";
+	$subject = $client->get_header($msgid, "Subject");
 	my $msgdate = $client->get_header($msgid, "Date");
 	$from =~ s/\"//g;
-	if ($from =~ m/=\?/) {
-	   print "Unicode detected. Decoding MIME-Header from $from to " if $debug;
-	   $from = decode("MIME-Header", $from);
-	   print "$from.\n" if $debug;
-	} 
+	if ($from =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/) {
+	   my $enc_check = find_encoding($1);
+  	   if ($enc_check) {
+	     print "Unicode $1 detected. Decoding MIME-Header 'from' from $from to " if $debug;
+	     $from = decode("MIME-Header", $from);
+	     print "$from.\n" if $debug;
+	     }
+	    else {
+	     print "WARNING: Unknown unicode detected $1 for 'from' $from\n";
+	    }
+	}
+
+	if ($to =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/) {
+	   my $enc_check = find_encoding($1);
+  	   if ($enc_check) {
+	     print "Unicode $1 detected. Decoding MIME-Header 'to' from $to to " if $debug;
+	     $to = decode("MIME-Header", $to);
+	     print "$to.\n" if $debug;
+	     }
+	    else {
+	     print "WARNING: Unknown unicode detected $1 for 'to' $to\n";
+	    }
+	}
+
+	if ($cc =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/) {
+	   my $enc_check = find_encoding($1);
+  	   if ($enc_check) {
+	     print "Unicode $1 detected. Decoding MIME-Header 'cc' from $cc to " if $debug;
+	     $cc = decode("MIME-Header", $cc);
+	     print "$cc.\n" if $debug;
+	     }
+	    else {
+	     print "WARNING: Unknown unicode detected $1 for 'cc' $cc\n";
+	    }
+	}
+
+	if ($subject =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/) {
+	   my $enc_check = find_encoding($1);
+  	   if ($enc_check) {
+	     print "Unicode $1 detected. Decoding MIME-Header 'subject' from $subject to " if $debug;
+	     $subject = decode("MIME-Header", $subject);
+	     print "$subject.\n" if $debug;
+	     }
+	    else {
+	     print "WARNING: Unknown unicode detected $1 for 'subject' $subject\n";
+	    }
+	}
+
 #	decode("MIME-Header", $from) if ($from =~ m/=\?/);
 	$email_addresses{$from}++;
 	my $name = $from;
@@ -223,7 +248,6 @@ sub main::get_imap {
 	$name =~ s/\s$//g;
 	$email_names{$name}++;
 
-	my $subject= $client->get_header($msgid, "Subject");
 	my $body;
 	if ($size) {
 	   $body = $client->bodypart_string($msgid,1,$size);
@@ -379,29 +403,3 @@ sub _check_age {
 }
 
 1;
-
-
-=back
-
-=head2 INI PARAMETERS
-
-NONE
-
-=head2 AUTHOR
-
-UNK
-
-=head2 SEE ALSO
-
-NONE
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
diff --git a/lib/site/DateTime/TimeZone.pm b/lib/site/DateTime/TimeZone.pm
index f26a9b459..39b5dca73 100644
--- a/lib/site/DateTime/TimeZone.pm
+++ b/lib/site/DateTime/TimeZone.pm
@@ -1,13 +1,11 @@
 package DateTime::TimeZone;
 
-use 5.006;
-
 use strict;
-use warnings;
 
-our $VERSION = '0.84';
+use vars qw( $VERSION );
+$VERSION = '0.6603';
 
-use DateTime::TimeZone::Catalog;
+use DateTime::TimeZoneCatalog;
 use DateTime::TimeZone::Floating;
 use DateTime::TimeZone::Local;
 use DateTime::TimeZone::OffsetOnly;
@@ -26,7 +24,7 @@ use constant OFFSET      => 4;
 use constant IS_DST      => 5;
 use constant SHORT_NAME  => 6;
 
-my %SpecialName = map { $_ => 1 } qw( EST MST HST CET EET MET WET EST5EDT CST6CDT MST7MDT PST8PDT );
+my %SpecialName = map { $_ => 1 } qw( EST MST HST EST5EDT CST6CDT MST7MDT PST8PDT );
 
 sub new
 {
@@ -35,13 +33,13 @@ sub new
                       { name => { type => SCALAR } },
                     );
 
-    if ( exists $DateTime::TimeZone::Catalog::LINKS{ $p{name} } )
+    if ( exists $DateTime::TimeZone::LINKS{ $p{name} } )
     {
-        $p{name} = $DateTime::TimeZone::Catalog::LINKS{ $p{name} };
+        $p{name} = $DateTime::TimeZone::LINKS{ $p{name} };
     }
-    elsif ( exists $DateTime::TimeZone::Catalog::LINKS{ uc $p{name} } )
+    elsif ( exists $DateTime::TimeZone::LINKS{ uc $p{name} } )
     {
-        $p{name} = $DateTime::TimeZone::Catalog::LINKS{ uc $p{name} };
+        $p{name} = $DateTime::TimeZone::LINKS{ uc $p{name} };
     }
 
     unless ( $p{name} =~ m,/,
@@ -102,7 +100,7 @@ sub new
             $zone->can('olson_version')
             ? $zone->olson_version()
             : 'unknown';
-        my $catalog_version = DateTime::TimeZone::Catalog->OlsonVersion();
+        my $catalog_version = __PACKAGE__->catalog_olson_version();
 
         if ( $object_version ne $catalog_version )
         {
@@ -406,13 +404,9 @@ sub category  { (split /\//, $_[0]->{name}, 2)[0] }
 
 sub is_valid_name
 {
-    my $tz;
-    {
-        local $@;
-        $tz = eval { $_[0]->new( name => $_[1] ) };
-    }
+    my $tz = eval { $_[0]->new( name => $_[1] ) };
 
-    return $tz && $tz->isa('DateTime::TimeZone') ? 1 : 0
+    return $tz && UNIVERSAL::isa( $tz, 'DateTime::TimeZone') ? 1 : 0
 }
 
 sub STORABLE_freeze
@@ -450,11 +444,7 @@ sub STORABLE_thaw
 #
 sub offset_as_seconds
 {
-    {
-        local $@;
-        shift if eval { $_[0]->isa('DateTime::TimeZone') };
-    }
-
+    shift if eval { $_[0]->isa('DateTime::TimeZone') };
     my $offset = shift;
 
     return undef unless defined $offset;
@@ -489,11 +479,7 @@ sub offset_as_seconds
 
 sub offset_as_string
 {
-    {
-        local $@;
-        shift if eval { $_[0]->isa('DateTime::TimeZone') };
-    }
-
+    shift if eval { $_[0]->isa('DateTime::TimeZone') };
     my $offset = shift;
 
     return undef unless defined $offset;
@@ -515,54 +501,54 @@ sub offset_as_string
            );
 }
 
-# These methods all operate on data contained in the DateTime/TimeZone/Catalog.pm file.
+# These methods all operate on data contained in the DateTime/TimeZoneCatalog.pm file.
 
 sub all_names
 {
-    return wantarray ? @DateTime::TimeZone::Catalog::ALL : [@DateTime::TimeZone::Catalog::ALL];
+    return wantarray ? @DateTime::TimeZone::ALL : [@DateTime::TimeZone::ALL];
 }
 
 sub categories
 {
     return wantarray
-        ? @DateTime::TimeZone::Catalog::CATEGORY_NAMES
-        : [@DateTime::TimeZone::Catalog::CATEGORY_NAMES];
+        ? @DateTime::TimeZone::CATEGORY_NAMES
+        : [@DateTime::TimeZone::CATEGORY_NAMES];
 }
 
 sub links
 {
     return
-        wantarray ? %DateTime::TimeZone::Catalog::LINKS : {%DateTime::TimeZone::Catalog::LINKS};
+        wantarray ? %DateTime::TimeZone::LINKS : {%DateTime::TimeZone::LINKS};
 }
 
 sub names_in_category
 {
     shift if $_[0]->isa('DateTime::TimeZone');
-    return unless exists $DateTime::TimeZone::Catalog::CATEGORIES{ $_[0] };
+    return unless exists $DateTime::TimeZone::CATEGORIES{ $_[0] };
 
     return
         wantarray
-        ? @{ $DateTime::TimeZone::Catalog::CATEGORIES{ $_[0] } }
-        : [ $DateTime::TimeZone::Catalog::CATEGORIES{ $_[0] } ];
+        ? @{ $DateTime::TimeZone::CATEGORIES{ $_[0] } }
+        : [ $DateTime::TimeZone::CATEGORIES{ $_[0] } ];
 }
 
 sub countries
 {
     wantarray
-        ? ( sort keys %DateTime::TimeZone::Catalog::ZONES_BY_COUNTRY )
-        : [ sort keys %DateTime::TimeZone::Catalog::ZONES_BY_COUNTRY ];
+        ? ( sort keys %DateTime::TimeZone::ZONES_BY_COUNTRY )
+        : [ sort keys %DateTime::TimeZone::ZONES_BY_COUNTRY ];
 }
 
 sub names_in_country
 {
     shift if $_[0]->isa('DateTime::TimeZone');
 
-    return unless exists $DateTime::TimeZone::Catalog::ZONES_BY_COUNTRY{ lc $_[0] };
+    return unless exists $DateTime::TimeZone::ZONES_BY_COUNTRY{ lc $_[0] };
 
     return
         wantarray
-        ? @{ $DateTime::TimeZone::Catalog::ZONES_BY_COUNTRY{ lc $_[0] } }
-        : $DateTime::TimeZone::Catalog::ZONES_BY_COUNTRY{ lc $_[0] };
+        ? @{ $DateTime::TimeZone::ZONES_BY_COUNTRY{ lc $_[0] } }
+        : $DateTime::TimeZone::ZONES_BY_COUNTRY{ lc $_[0] };
 }
 
 
@@ -637,21 +623,34 @@ C<DateTime::TimeZone::OffsetOnly> object is returned.
 If the "name" parameter is "local", then the module attempts to
 determine the local time zone for the system.
 
-The method for finding the local zone varies by operating system. See
-the appropriate module for details of how we check for the local time
-zone.
-
-=over 4
+First it checks C<$ENV> for keys named "TZ", "SYS$TIMEZONE_RULE",
+"SYS$TIMEZONE_NAME", "UCX$TZ", or "TCPIP$TZC" (the last 4 are for
+VMS).  If this is defined, and it is not the string "local", then it
+is treated as any other valid name (including "floating"), and the
+constructor tries to create a time zone based on that name.
 
-=item * L<DateTime::TimeZone::Local::Unix>
+Next, it checks for the existence of a symlink at F</etc/localtime>.
+It follows this link to the real file and figures out what the file's
+name is.  It then tries to turn this name into a valid time zone.  For
+example, if this file is linked to F</usr/share/zoneinfo/US/Central>,
+it will end up trying "US/Central", which will then be converted to
+"America/Chicago" internally.
 
-=item * L<DateTime::TimeZone::Local::Win32>
+Some systems just copy the relevant file to F</etc/localtime> instead
+of making a symlink.  In this case, we look in F</usr/share/zoneinfo>
+for a file that has the same size and content as F</etc/localtime> to
+determine the local time zone.
 
-=item * L<DateTime::TimeZone::Local::VMS>
+Then it checks for a file called F</etc/timezone> or F</etc/TIMEZONE>.
+If one of these exists, it is read and it tries to create a time zone
+with the name contained in the file.
 
-=back
+Finally, it checks for a file called F</etc/sysconfig/clock>.  If this
+file exists, it looks for a line inside the file matching
+C</^(?:TIME)?ZONE="([^"]+)"/>.  If this line exists, it tries the
+value as a time zone name.
 
-If a local time zone is not found, then an exception will be thrown.
+If none of these methods work, it gives up and dies.
 
 =head2 $tz->offset_for_datetime( $dt )
 
@@ -757,7 +756,7 @@ use C<Locale::Country> to do so.
 
 =head2 DateTime::TimeZone->names_in_country( $country_code )
 
-Given a two-letter ISO3166 country code, this method returns a list of
+Given a two-letter ISO3066 country code, this method returns a list of
 time zones used in that country. The country code may be of any
 case. In scalar context, it returns an array reference, while in list
 context it returns an array.
@@ -794,33 +793,12 @@ your module with Storable.
 =head1 SUPPORT
 
 Support for this module is provided via the datetime@perl.org email
-list. See http://datetime.perl.org/?MailingList for details.
+list.  See http://lists.perl.org/ for more details.
 
 Please submit bugs to the CPAN RT system at
 http://rt.cpan.org/NoAuth/ReportBug.html?Queue=datetime%3A%3Atimezone
 or via email at bug-datetime-timezone@rt.cpan.org.
 
-=head1 DONATIONS
-
-If you'd like to thank me for the work I've done on this module,
-please consider making a "donation" to me via PayPal. I spend a lot of
-free time creating free software, and would appreciate any support
-you'd care to offer.
-
-Please note that B<I am not suggesting that you must do this> in order
-for me to continue working on this particular software. I will
-continue to do so, inasmuch as I have in the past, for as long as it
-interests me.
-
-Similarly, a donation made in this way will probably not make me work
-on this software much more, unless I get so many donations that I can
-consider working on free software full time, which seems unlikely at
-best.
-
-To donate, log into PayPal and send money to autarch@urth.org or use
-the button on this page:
-L<http://www.urth.org/~autarch/fs-donation.html>
-
 =head1 AUTHOR
 
 Dave Rolsky <autarch@urth.org>
@@ -833,7 +811,7 @@ datetime@perl.org list.
 
 =head1 COPYRIGHT
 
-Copyright (c) 2003-2008 David Rolsky.  All rights reserved.  This
+Copyright (c) 2003-2007 David Rolsky.  All rights reserved.  This
 program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.
 
diff --git a/lib/vsDB.pm b/lib/vsDB.pm
index 5c8ce0c49..2f648594f 100644
--- a/lib/vsDB.pm
+++ b/lib/vsDB.pm
@@ -1,1067 +1,1161 @@
-# ----------------------------------------------------------------------------
-# vsDB (verysimple database) Module
-# Copyright (c) 2001 Jason M. Hinkle. All rights reserved. This module is
-# free software; you may redistribute it and/or modify it under the same
-# terms as Perl itself.
-# For more information see: http://www.verysimple.com/scripts/
-#
-# LEGAL DISCLAIMER:
-# This software is provided as-is.  Use it at your own risk.  The
-# author takes no responsibility for any damages or losses directly
-# or indirectly caused by this software.
-# ----------------------------------------------------------------------------
-package vsDB;
-require 5.000;
-$VERSION = "1.3.9";
-$ID = "vsDB.pm";
-
-
-#_____________________________________________________________________________
-sub new {
-	my $class = shift;
-	my %keyValues = @_;
-	my (%fieldNames,@fileArray,@row,@filterArray);
-
-	# if no delimiter is specified, then make it a tab char.
-	$keyValues{'delimiter'} = "\t" unless defined($keyValues{'delimiter'});
-
-	my $this = {
-		fileName			=> $keyValues{'file'},
-		delimiter			=> $keyValues{'delimiter'},
-		fieldNames			=> \%fieldNames,
-		fileArray			=> \@fileArray,
-		filterArray			=> \@filterArray,
-		row				=> \@row,
-		recordCount		=> 0,
-		filterRecordCount		=> 0,
-		absolutePosition		=> 0,
-		pageSize			=> 10,
-		EOF				=> 1,
-		isOpen			=> 0,
-		lastError			=> '',
-		appendOnly			=> 1,
-		isDirty			=> 0,
-		originalCount		=> 0,
-		CR				=> '<CR>',
-		LF				=> '<LF>',
-	};
-	bless $this;
-	return $this;
-}
-
-
-# ###########################################################################
-# PUBLIC PROPERTIES
-
-
-#_____________________________________________________________________________
-sub Version {
-	return $VERSION;
-}
-
-#_____________________________________________________________________________
-sub ID {
-	return $ID;
-}
-
-#_____________________________________________________________________________
-sub LastError {
-	my ($this) = shift;
-	return $this->{'lastError'};
-}
-
-#_____________________________________________________________________________
-sub AbsolutePosition {
-	my ($this) = shift;
-	my ($newValue) = shift;
-	if (defined($newValue)) {
-		$this->{'absolutePosition'} = $newValue;
-		$this->_RefreshRow;
-	} else {
-		return $this->{'absolutePosition'};
-	}	
-}
-
-#_____________________________________________________________________________
-sub ActivePage {
-	my ($this) = shift;
-	my ($newValue) = shift;
-	if (defined($newValue)) {
-		$newValue = $this->PageCount if ($newValue > $this->PageCount);
-		$this->{'absolutePosition'} = ($this->{'pageSize'} * ($newValue-1)) + 1;
-		# make sure we are on the right page if filtered
-		while ($this->{'filterArray'}[$this->{'absolutePosition'}]) {
-			$this->{'absolutePosition'}++;
-		}		
-		$this->_RefreshRow;
-		return 1;
-	} else {
-	    # BUG - when filtering, this returns the wrong value
-	    return 1 if ($this->{'absolutePosition'} == 1);
-	    my ($count) = (($this->{'absolutePosition'} - 1) / $this->{'pageSize'}); #/
-	    my ($activePage) = int($count) + 1;
-	    $activePage = $this->PageCount if ($activePage > $this->PageCount);
-	    return $activePage;
-	}	
-	
-}
-
-#_____________________________________________________________________________
-sub PageSize {
-	my ($this) = shift;
-	my ($newValue) = shift;
-	if (defined($newValue)) {
-		$this->{'pageSize'} = int($newValue) if (int($newValue) > 0);
-		return 1;
-	} else {
-		return $this->{'pageSize'};
-	}	
-}
-
-#_____________________________________________________________________________
-sub PageCount {
-	my ($this) = shift;
-	my ($count) = ($this->{'filterRecordCount'} / $this->{'pageSize'}); #/
-	if (int($count) < $count) {$count = int($count)+1}
-	return $count;
-}
-
-#_____________________________________________________________________________
-sub File {
-	my ($this) = shift;
-	my ($newVal) = shift;
-	# if the file has changed, then we can't just append...
-	if ($newVal) {$this->{'appendOnly'} = 0}
-	return $this->_GetSetProperty("fileName",$newVal);
-}
-
-#_____________________________________________________________________________
-sub CR {
-	return shift->_GetSetProperty("CR",shift);
-}
-
-#_____________________________________________________________________________
-sub LF {
-	return shift->_GetSetProperty("LF",shift);
-}
-
-#_____________________________________________________________________________
-sub Delimiter {
-	return shift->_GetSetProperty("delimiter",shift);
-}
-
-#_____________________________________________________________________________
-sub RecordCount {
-	return shift->{'filterRecordCount'};
-}
-
-#_____________________________________________________________________________
-sub EOF {
-	my ($this) = shift;
-	return 1 if ($this->RecordCount < 1);
-	return $this->{'EOF'};
-}
-
-#_____________________________________________________________________________
-sub FieldValue {
-	my ($this) = shift;
-	return "EOF" if ($this->{'EOF'});
-	my ($fieldName) = shift || return "ERROR: FieldValue(): Field Name Required";
-	my ($newValue) = shift;
-	my ($fieldNumber) = $this->{'fieldNames'}{$fieldName};
-	my ($lineFeed) = chr(10);
-	my ($carriageReturn) = chr(13);
-	my ($crReplacement) = $this->{'CR'};
-	my ($lfReplacement) = $this->{'LF'};
-	return "ERROR: FieldValue('" . $fieldName . "') Field Not Found." if (!defined($fieldNumber));
-
-	# if a new value is defined, update, otherwise return current value
-	if (defined($newValue)) {
-		$this->{'isDirty'} = 1;
-		if ($this->{'absolutePosition'} <= $this->{'originalCount'}) {
-			$this->{'appendOnly'} = 0
-		};
-		# make sure we don't corrupt the file with a delimiter or
-		# line break in the data.
-		$newValue =~ s/$this->{'delimiter'}//g;
-		$newValue =~ s/$carriageReturn/$crReplacement/g;
-		$newValue =~ s/$lineFeed/$lfReplacement/g;
-		# $newValue =~ s/\n//g; # (should already be dealt with)
-		$this->{'row'}[$fieldNumber] = $newValue;
-
-		# update the fileArray to match the current row.  originally used
-		# a join on the row array, but that caused unititialize var errors
-		# when there are blank fields.  this could probably be improved by
-		# only updating when the cursor is moved or commit is called
-		my ($newRow,$newField);
-		my ($colNum) = 0;
-		foreach ($this->FieldNames) {
-			$newField = $this->{'row'}[$colNum];
-			if (!defined($newField)) {$newField = ""}
-			$newRow .= $newField;
-			$newRow .= $this->{'delimiter'};
-			$colNum++;
-		}
-		# get rid of the last delimiter
-		for (my $x = 1;$x <= length($this->{'delimiter'}); $x++) {
-			chop($newRow);
-		}
-		
-		$this->{'fileArray'}[$this->{'absolutePosition'}] = $newRow . "\n";
-		return 1;
-	} else {
-		# make sure we return a defined value || won't work because it doesn;t
-		# differentiate between 0 and null 
-		if (defined($this->{'row'}[$fieldNumber])) {
-			my $returnVal = $this->{'row'}[$fieldNumber];
-			$returnVal =~ s/$crReplacement/$carriageReturn/g;
-			$returnVal =~ s/$lfReplacement/$lineFeed/g;
-			return $returnVal;
-
-		} else {
-			return "";
-		}
-	}
-}
-
-#_____________________________________________________________________________
-sub FieldNames {
-	# returns all fieldnames as an array
-	my ($this) = shift;
-	return 0 unless ($this->{'isOpen'});
-	my ($fieldRow) = $this->{'fileArray'}[0];
-	chop ($fieldRow);
-	my (@tempfieldNames) = split($this->{'delimiter'},$fieldRow);
-	return @tempfieldNames;
-}
-
-#_____________________________________________________________________________
-sub Row {
-	# returns current row values as an array
-	my ($this) = shift;
-	return 0 unless ($this->{'isOpen'});
-	my ($tempRow) = $this->{'row'};
-	return @$tempRow;
-}
-
-#_____________________________________________________________________________
-sub xml {
-	# returns current recordset as xml
-	my ($this) = shift;
-	my ($strRootName) = shift || "vsDB";
-	my ($strElementName) = shift || "Record";
-	my ($strXml);
-
-	$strXml = "<?xml version=\"1.0\"?>\n";
-	$strXml .= "<!DOCTYPE $strRootName>\n";
-	$strXml .= "<$strRootName>\n";
-	$this->MoveFirst;
-	my (@fields) = $this->FieldNames;
-	my ($field, $fieldValue);
-	until ($this->EOF) {
-		$strXml .= "<$strElementName>\n";
-		foreach $field (@fields) {
-			$fieldValue = $this->FieldValue($field);
-			$strXml .= "<$field>$fieldValue</$field>\n";
-		}			
-		$strXml .= "</$strElementName>\n";
-	$this->MoveNext;
-	}		
-	$strXml .= "</$strRootName>\n";	
-	
-	return $strXml;
-}
-
-#_____________________________________________________________________________
-sub MoveNext {
-	# moves the curser to the next row in the data file 
-	my ($this) = shift;
-	return 0 unless ($this->{'isOpen'});
-	return 0 if ($this->{'EOF'});
-	$this->{'absolutePosition'}++;
-	while ($this->{'filterArray'}[$this->{'absolutePosition'}]) {
-		$this->{'absolutePosition'}++;
-	}		
-	$this->_RefreshRow;
-	return 1;
-}
-
-#_____________________________________________________________________________
-sub MovePrevious {
-	# moves the curser to the previous row in the data file 
-	my ($this) = shift;
-	return 0 unless ($this->{'isOpen'});
-	return 0 if ($this->{'absolutePosition'} < 2);
-	$this->{'absolutePosition'}--;
-	while ($this->{'filterArray'}[$this->{'absolutePosition'}]) {
-		$this->{'absolutePosition'}--;
-	}		
-	$this->_RefreshRow;
-	return 1;
-}
-
-#_____________________________________________________________________________
-sub MoveFirst {
-	# moves the curser to the first row in the data file 
-	my ($this) = shift;
-	return 0 unless ($this->{'isOpen'});
-	$this->{'absolutePosition'} = 1;
-	while ($this->{'filterArray'}[$this->{'absolutePosition'}]) {
-		$this->{'absolutePosition'}++;
-	}		
-	$this->_RefreshRow;
-	return 1;
-}
-
-#_____________________________________________________________________________
-sub MoveLast {
-	# moves the curser to the last row in the data file 
-	my ($this) = shift;
-	return 0 unless ($this->{'isOpen'});
-	$this->{'absolutePosition'} = $this->{'recordCount'};
-	while ($this->{'filterArray'}[$this->{'absolutePosition'}]) {
-		$this->{'absolutePosition'}--;
-	}		
-	$this->_RefreshRow;
-	return 1;
-}
-
-#_____________________________________________________________________________
-sub Delete {
-	# delete the current row 
-	my ($this) = shift;
-	return 0 unless ($this->{'isOpen'});
-	return 0 if $this->{'recordCount'} < 1;
-	return 0 if ($this->{'EOF'});
-	$this->{'isDirty'} = 1;
-	if ($this->{'absolutePosition'} <= $this->{'originalCount'}) {
-		$this->{'appendOnly'} = 0
-	};
-	my ($tempArray) = $this->{'fileArray'};
-	splice(@$tempArray,$this->{'absolutePosition'},1);
-	$this->{'recordCount'}--;
-	$this->{'filterRecordCount'}--;
-	$this->_RefreshRow;
-	return 1;
-}
-
-#_____________________________________________________________________________
-sub AddNew {
-	# add a new row to the end of the recordset
-	my ($this) = shift;
-	return 0 unless ($this->{'isOpen'});
-	$this->{'isDirty'} = 1;
-	$this->{'recordCount'}++;
-	$this->{'absolutePosition'} = $this->{'recordCount'};
-	$this->{'filterRecordCount'}++;
-	# the number of delimiter chars is fieldCount - 1
-	my ($delimiterCount) = 0;
-	foreach ($this->FieldNames) {
-		$delimiterCount++;
-	}
-	$delimiterCount--;
-
-	# add the correct number of colums using the delimiterCount
-	$this->{'fileArray'}[$this->{'absolutePosition'}] = ($this->{'delimiter'} x $delimiterCount) . "\n";
-	
-	$this->MoveLast;
-
-	return 1;
-}
-
-#_____________________________________________________________________________
-sub AddNewField {
-	# add a new row to the end of the recordset
-	my ($this) = shift;
-	my ($newFieldName) = shift || return 0;
-	my ($defaultValue) = shift;
-	$defaultValue = '' unless (defined($defaultValue));
-	
-	$this->{'isOpen'} = 1;
-	$this->{'appendOnly'} = 0;
-	$this->{'isDirty'} = 1;
-
-	# update the fieldnames array
-	my ($nextField) = 0;
-	foreach ($this->FieldNames) {
-		$nextField++;
-	}
-	$this->{'fieldNames'}{$newFieldName} = $nextField;
-
-	chop($this->{'fileArray'}[0]);
-	
-	# update the first row in the file array
-	if ($nextField > 0) {
-		$this->{'fileArray'}[0] .= $this->{'delimiter'};
-	}
-	$this->{'fileArray'}[0] .= $newFieldName . "\n";
-
-	return 1;
-}
-
-#_____________________________________________________________________________
-sub Max {
-	# returns the maximum value for the specified column
-	my ($this) = shift;
-	my ($fieldName) = shift || return 0;
-	my ($alpha) = shift || 0;
-	my ($curVal);
-	my ($curPos) = $this->{'absolutePosition'};
-	$this->MoveFirst;
-	my ($maxVal) = $this->FieldValue($fieldName);
-	while (!$this->EOF) {
-		$curVal = $this->FieldValue($fieldName);
-		if (!$alpha) {
-			if ($curVal ne "") {
-				if (int($curVal) > int($maxVal)) {$maxVal = $curVal};
-			}
-		} else {
-			if ((lc($curVal) cmp lc($maxVal)) > 0) {$maxVal = $curVal};
-		}
-		$this->MoveNext;
-	}
-	$this->AbsolutePosition($curPos);
-	return $maxVal;
-}
-
-#_____________________________________________________________________________
-sub Min {
-	# returns the maximum value for the specified column
-	my ($this) = shift;
-	my ($fieldName) = shift || return 0;
-	my ($alpha) = shift || 0;
-	my ($curVal);
-	my ($curPos) = $this->{'absolutePosition'};
-	$this->MoveFirst;
-	my ($minVal) = $this->FieldValue($fieldName);
-	while (!$this->EOF) {
-		$curVal = $this->FieldValue($fieldName);
-		if ($alpha) {
-			if ($curVal ne "") {
-				if (int($curVal) < int($minVal)) {$minVal = $curVal};
-			}
-		} else {
-			if ((lc($curVal) cmp lc($minVal)) < 0) {$minVal = $curVal};
-		}
-		$this->MoveNext;
-	}
-	$this->AbsolutePosition($curPos);
-	return $minVal;
-}
-
-#_____________________________________________________________________________
-sub Filter {
-	# $obj->Filter($fieldName,$operator,$criteria);
-
-	# TODO: > and < are not working properly... maybe text comparison problem?? 	
-	my ($this) = shift;
-	my ($fieldName) = shift || return 0;
-	my ($operator) = shift || "eq";
-	my ($criteria) = shift;
-	$criteria = "" unless defined($criteria);
-	
-	my ($filterSetting);
-
-	$this->{'filterArray'}[0] = 0;
-	$this->MoveFirst;
-
-	while (!$this->EOF) {
-		$filterSetting = 0;
-		if ($operator eq "eq" && $this->FieldValue($fieldName) ne $criteria) {
-			$filterSetting = 1;
-		} elsif ($operator eq "ne" && !($this->FieldValue($fieldName) ne $criteria)) {
-			$filterSetting = 1;
-		} elsif ($operator eq "like" && !(index(lc($this->FieldValue($fieldName)),lc($criteria),0) + 1)) {
-			$filterSetting = 1;
-		} elsif ($operator eq ">" && !($this->FieldValue($fieldName) > $criteria) ) {
-			$filterSetting = 1;
-		} elsif ($operator eq "<" && !($this->FieldValue($fieldName) < $criteria) ) {
-			$filterSetting = 1;
-		}
-		
-		# print "<p>" . $this->{'absolutePosition'} . ": " . $filterSetting . "<p>";
-		$this->{'filterArray'}[$this->{'absolutePosition'}] = $filterSetting;
-
-		$this->{'filterRecordCount'} -= 1 if ($filterSetting);	
-		$this->MoveNext;
-	}
-	$this->MoveFirst;
-	return 1;
-}
-
-#_____________________________________________________________________________
-sub RemoveFilter {
-	my ($this) = shift;
-	my (@newArray);
-	$this->{'filterArray'} = \@newArray;
-	$this->{'filterRecordCount'} = $this->{'recordCount'};
-	return 1;
-}
-
-#_____________________________________________________________________________
-sub Commit {
-	# update the file, saving all changes made 
-	my ($this) = shift;
-	my ($useFlock) = shift || 0;
-	my ($fileName) = $this->{'fileName'};
-
-	# if no changes were made, don't bother writing to the file 
-	if (!$this->{'isDirty'}) {return 1};
-
-	if ($this->{'appendOnly'}) {
-		# if only new records were added, just append to the file
-		my ($nCount);
-		if (!open (OUTPUTFILE, ">>$fileName")) {
-			$this->{'lastError'} = "Commit: Couldn't Open DataFile '$fileName' For Appending";
-			return 0
-		};
-		flock(OUTPUTFILE,2) if ($useFlock);
-		my ($tempArray) = $this->{'fileArray'};
-		for ($nCount = $this->{'originalCount'} + 1; $nCount <= $this->{'recordCount'}; $nCount++) {
-			print OUTPUTFILE @$tempArray[$nCount];
-		}
-	} else {		
-		# if records were changed or deleted, we have to replace them all 	
-		if (!open (OUTPUTFILE, ">$fileName")) {
-			$this->{'lastError'} = "Commit: Couldn't Open DataFile '$fileName' For Writing";
-			return 0
-		};
-		flock(OUTPUTFILE,2) if ($useFlock);
-		my ($tempArray) = $this->{'fileArray'};
-		print OUTPUTFILE join('',@$tempArray);
-	}
-	close (OUTPUTFILE);
-	flock(OUTPUTFILE,8) if ($useFlock);
-	return 1;
-}
-
-#_____________________________________________________________________________
-sub Sort {
-	# sorts the datafile on the given column 
-	# obj->Sort($field);
-	# if $field is ommited, or an invalid fieldname is used, defaults to
-	# the left-most column.
-	
-	my ($this) = shift;
-	my ($fieldName) = shift || '0';
-	my ($desc) = shift || '0';
-	my ($delimiter) = $this->{'delimiter'};
-
-	# can't append once we've changed the sort order 
-	$this->{'appendOnly'} = 0;	
-
-	# sorting will mess up filter, so lets remove it 
-	$this->RemoveFilter;	
-	
-	# get the fieldnumber (or default to leftmost column)
-	my ($fieldNumber) = $this->{'fieldNames'}{$fieldName} || 0;
-	# make a copy of the unsorted array pointer
-	my ($unsortedArray) = $this->{'fileArray'};
-	# remove the column names from the array
-	my ($fieldNames) = shift(@$unsortedArray);	
-	
-	# now we sort the unsorted array
-	my (@sortedArray) = sort { 
-		# custom sorting comparison routine
-		my (@aVals) = split($delimiter,$a);
-		my (@bVals) = split($delimiter,$b);
-		if ($desc) {
-			return $bVals[$fieldNumber] cmp $aVals[$fieldNumber];
-		} else {
-			return $aVals[$fieldNumber] cmp $bVals[$fieldNumber]; 
-		}
-		undef(@aVals);
-		undef(@bVals);
-	} @$unsortedArray;
-	# get rid of the unsorted array
-	undef($unsortedArray);
-	
-	# put the column names back in and update the array pointer
-	unshift(@sortedArray,$fieldNames);
-	$this->{'fileArray'} = \@sortedArray;	
-	
-	$this->MoveFirst;
-	return 1;
-}
-
-
-#_____________________________________________________________________________
-sub Open {
-	# open the file, store the contents as an array, get the number of
-	# records and retreive the first row 
-	my $this = shift;
-	my $fileName = $this->{'fileName'};
-	my $delimiter = $this->{'delimiter'};
-	my (@tempFileArray);
-
-	# security check to make sure a command is not being attempted
-	$fileName =~ s/;//g;
-	$fileName =~ s/|//g;
-
-	if (!(-e $fileName)) {
-		$this->{'lastError'} = "Open: Datafile '$fileName' Not Found";
-		return 0;
-	} elsif (!(-r $fileName)) {
-		$this->{'lastError'} = "Open: Couldn't Open DataFile '$fileName' For Reading";
-		return 0;
-	}
-
-	# try to open the file 	
-	if (open(THISFILE, "$fileName")) {
-		@tempFileArray = <THISFILE>;
-		close(THISFILE);
-	} else {
-	    return 0;
-	}
-	
-	# get the entire contents of the file	
-	$this->{'fileArray'} = \@tempFileArray;
-
-	# get the number of rows
-	$this->{'recordCount'} = @tempFileArray - 1;
-
-	# get the top row, which should be fieldnames
-	my $fileRow = $tempFileArray[0];
-	chop($fileRow);
-	
-	# split the top row into fields
-	my (@tempfieldNames) = split($delimiter,$fileRow);
-	my ($fieldName) = "";
-	my ($counter) = 0;
-	foreach $fieldName (@tempfieldNames) {
-		$this->{'fieldNames'}{$fieldName} = $counter;
-		$counter++
-	}		
-
-	$this->MoveFirst;
-	$this->{'isOpen'} = 1;
-	$this->_RefreshRow;
-	$this->{'filterRecordCount'} = $this->{'recordCount'};
-	$this->{'originalCount'} = $this->{'recordCount'};
-	return 1;
-}
-
-#_____________________________________________________________________________
-sub Close {
-	my ($this) = shift;
-	$this->{'isOpen'} = 0;
-	return 1;
-}
-
-
-# ###########################################################################
-# PRIVATE METHODS 
-
-
-#_____________________________________________________________________________
-sub DESTROY {
-	my ($this) = shift;
-	$this->Close;
-}
-
-#_____________________________________________________________________________
-sub _RefreshRow {
-	# sync the current row with the fileArray.  also do some validation to
-	# make sure we haven't moved the curser out of range 
-	my ($this) = shift;
-	return 0 unless ($this->{'isOpen'});
-	# make sure absolutePosition is a legit value  and set EOF
-	$this->{'EOF'} = 0;
-	$this->{'absolutePosition'} = 1 if ($this->{'absolutePosition'} < 1);
-	if ($this->{'absolutePosition'} > $this->{'recordCount'}) {
-		$this->{'EOF'} = 1;
-		$this->{'absolutePosition'} = $this->{'recordCount'};
-		return 1;
-	}
-
-	# now grab the next row
-	my ($tempRow) = $this->{'fileArray'}[$this->{'absolutePosition'}];
-	chop ($tempRow);
-	my (@row) = split($this->{'delimiter'},$tempRow);
-	$this->{'row'} = \@row;
-	return 1;
-}
-
-
-#_____________________________________________________________________________
-sub _GetSetProperty {
-	# private fuction that is used by properties to get/set values
-	# if a parameter is sent in, then the property is set and true is returned.
-	# if no parameter is sent, then the current value is returned
-	my $this = shift;
-	my $fieldName = shift;
-	my $newValue = shift;
-	if (defined($newValue)) {
-		$this->{$fieldName} = $newValue;
-	} else {
-		return $this->{$fieldName};
-	}
-	return 1;
-}
-
-1; # for require
-
-
-__END__
-
-=head1 NAME
-
-vsDB - Simple interface to text-delimited data files
-
-=head1 SYNOPSIS
-
-	use vsDB;
-
-	# create the object
-	my (objDB) = new vsDB(filename=>'C:\\datafile.txt', delimiter=>'\t');
-
-	# open the datafile	
-	$objDB->Open;
-
-	# add a new record
-	$objDB->AddNew; 	
-
-	# update the first name field for the new record 
-	$objDB->FieldValue('FirstName','Jason');
-
-	# commit the changes to disk
-	$objDB->Commit;
-
-	# move the cursor to the beginning of the resultset
-	$objDB->MoveFirst;
-
-	# print all of the first name fields
-	while (!$objDB->EOF) {
-		print $objDB->FieldValue('FirstName');
-		$objDB->MoveNext;
-	}
-
-	# close the datafile (optional) 	
-	$objDB->Close;
-
-=head1 DESCRIPTION
-
-vsDB provides a simple object-oriented interface for delimited
-text files.  The object model is based off of Microsoft's
-ADO RecordSet object, so anyone familiar with this will
-find vsDB somewhat familiar.  vsDB has been tested on Win32 and
-Linux.
-
-=head1 OBJECT MODEL REFERENCE: PROPERTIES
-
-=head2 AbsolutePosition([nNewPosition])
-
-AbsolutePosition returns the current cursor position in the RecordSet.  If
-[nNewPosition] is specified, then AbsolutePosition attempts to move the
-cursor to that position.  If [nNewPosition] is out of range, AbsolutePosition
-will be set to the closest valid position (usually the last record)
-
-=head2 ActivePage([nNewPage])
-
-ActivePage returns the current "Page" in the RecordSet.  If [nNewPage] is
-specified, then ActivePage attempts to move the cursor to the first record
-on the given page.  If [nNewPage] is out of range, The cursor will be
-set to the closest valid position (usually the first record of the last page)
-
-ActivePage is used along with PageSize.  See PageSize for more information.
-
-=head2 CR([strCR])
-
-CR is a character or string that vsDB uses to replace a Carriage Return
-character that is inserted in the database.  Default is "<CR>".  The value
-is used only during storage in the file and is converted back into
-a Carriage Return when you request the field value.  See also: LF
-
-=head2 Delimiter([strNewDelimiter])
-
-Delimiter returns the delimiter character that is used to separate fields
-in the datafile.  If strNewDelimiter is specified, then the delimiter is
-changed.
-
-Warning: changing the delimiter property after calling the Open method
-is a very bad thing to do!  Your file may become corrupted.
-
-=head2 EOF()
-
-EOF (End Of File) indicates that there are no more records in the RecordSet.
-If you have applied a filter, this indicates when you have reached the end
-of the matching records.  This property is commonly used to loop through
-a recordset, for example: while (!$objDB->EOF) { $objDB->MoveNext; }
-
-Note: unlike the MS RecordSet object, FieldValue will not give an EOF error
-if you try to access a FieldValue when the RecordSet is at EOF.  Instead
-is will continue to return values for the last record in the RecordSet
-
-=head2 FieldValue(FieldName,[NewValue])
-
-If [NewValue] is NOT specified, then FieldValue returns the value of the
-field specified (FieldName) for the record at the current cursor position.
-
-If [NewValue] is specified, then the value of the field specified (FieldName)
-for the record at the current cursor position is updated to [NewValue] and
-1 is returned.
-
-Note: any changes you make to the data will not be saved to disk until you call
-the Commit method.
-
-=head2 FieldNames()
-
-FieldNames returns an array containing all of the field names in the datafile.
-For example:
-
-	my (@fieldNames) = $objDB->FieldNames;
-
-=head2 File([strNewFilePath])
-
-File specifies the full path to the datafile.  This can be specified when
-the object is created or anytime before calling the Open method.  Once the
-file has been opened the RecordSet will not change if you change the File
-property.  However, if you change the File property and then call the
-Commit method, this will save the current RecordSet to the new filepath.
-In other words, it will copy the original file.
-
-Warning: Changing the File property then calling Open again may produce
-unexpected results.  If you need to access another datafile, it is recommended
-that you create another vsDB object instead.
-
-=head2 ID()
-
-Returns module identification
-
-=head2 LastError()
-
-When a non-fatal error has occured, the LastError property may contain information
-decribing the error.  Most methods will return 1 or 0 to indicate success or
-failure.  You do not need to check these return values, but should in cases where
-you suspect the method could fail.
-
-=head2 LF([strLF])
-
-LF is a character or string that vsDB uses to replace a Line Feed
-character that is inserted in the database.  Default is "<LF>".  The value
-is used only during storage in the file and is converted back into
-a Line Feed when you request the field value.  See also: CR
-
-=head2 Max(fieldName, [alpha])
-
-Max returns the maximum value for he specified fieldName.  alpha is an optional
-value that is set to 1 or 0 to indicate alphabetical characters.  By default, alpha
-is set to 0, indicating that the field is numeric.
-
-Warning: if your field contains non-numeric values, you must set alpha=1 or Max
-will produce a type-mismatch error.
-
-=head2 Min(fieldName, [alpha])
-
-Min returns the minimum value for he specified fieldName.  alpha is an optional
-value that is set to 1 or 0 to indicate alphabetical characters.  By default, alpha
-is set to 0, indicating that the field is numeric.
-
-Warning: if your field contains non-numeric values, you must set alpha=1 or Min
-will produce a type-mismatch error.
-
-=head2 PageCount()
-
-PageCount returns the number of pages in the RecordSet.  This is essentially
-the RecordCount devided by the PageSize.  If you have applied a
-filter, the PageCount will indicate only matching records.
-
-=head2 PageSize([nNewSize])
-
-PageSize returns the current page size.  If [nNewSize] is specified, then
-the PageSize is set to the new value.  PageSize is used along with ActivePage
-to simplify displaying a subset of the total records.  For example, the
-file contains 1,000 rows, but you want to display them to the user only
-10 at a time.  The PageSize is set to 10 and you can navigate through the
-results by changing the ActivePage.
-
-=head2 RecordCount()
-
-Returns the number of records in the RecordSet.  If you have applied a filter,
-RecordCount will indicate the number of matching records.
-
-=head2 Row()
-
-Row returns an array containing all of the values of the current record.
-For example:
-	
-	my (@row) = $objDB->Row;
-
-=head2 Version()
-
-Returns current version
-
-=head2 xml([strRootName] [,strElementName])
-
-Returns current recordset as xml.  strRootName and strElementName are
-optional.  Default values are "vsDB" and "Record"
-
-
-=head1 OBJECT MODEL REFERENCE: METHODS
-
-=head2 AddNew()
-
-Adds a new record to the RecordSet and moves the cursor to this new record.
-The default values for all fields is an empty string.  After you add a new
-record, you will want to change the FieldValues as needed.
-
-If you are using one of the fields as a primary key, you can use the Max
-property to obtain the highest ID number.
-
-Note: any changes you make to the data will not be saved to disk until you call
-the Commit method.
-
-=head2 AddNewField(strFieldName [,strDefaultValue])
-
-Adds a new field to the RecordSet.  strFieldName is the name of the new field.
-The new field will be added to all records and set to strDefaultValue.  If
-strDefaultValue is not specified, then the field will be empty.
-
-Note: any changes you make to the data will not be saved to disk until you call
-the Commit method.
-
-=head2 Close()
-
-In theory this would close the file, however vsDB does not keep the file handle
-open.  Currently this method simply marks the object as closed.  This method
-is also called automatically when the object is destroyed.
-
-Although it is not necessary to call this method, it is recommended that you do
-in case vsDB is later modified to keep the file handle open.  This might be
-useful for a persistent connection to the file...?
-
-=head2 Commit([blnUseFLock])
-
-Commit writes the current RecordSet in memory to the filepath specified by
-the File property.  This method should be called any time there have been data
-modifications. blnUseFLock is an optional argument that should be 1 if flock
-should be used while writing to the file.
-
-Commit re-opens the datafile with the least amount of privledges required.  If you
-have not made any changes to the RecordSet, calling Close will not access the
-datafile at all.  If you have only added new records, Commit will open the datafile
-for appending and append the new record.  If you have modified existing records,
-the file will be opening for writing and the entire file will be updated.
-
-=head2 Delete()
-
-Deletes the current record in the RecordSet.
-
-Note: any changes you make to the data will not be saved to disk until you call
-the Commit method.
-
-=head2 Filter(strFieldName,strOperator,strCriteria)
-
-Filter provides a way to either search the RecordSet or to get a specific record
-based on a primary key field.  strFieldName indicates the field that you want to
-filter.  strOperator is one of the following "eq", "ne", "like", "<" or ">" to indicate
-how the field is to be compared.  strCriteria indicates the search pattern that you
-wish to find.
-
-You can apply the Filter method more than once to further filter out records.  The
-filters are applied as "AND."  Currently there is no support for "OR" filtering.
-
-If you are using a primary key field, you can use the Filter method to locate
-the row that you want.  For example:
-
-	$objDB->Filter("ID","eq","25")
-
-The Filter method moves the cursor to the first matching record in the recordset
-as well as updates RecordCount and PageCount accordingly.
-
-Note: calling Sort will remove any filters that you have applied.  Call Sort
-first if you need to sort and filter the results.
-
-=head2 MoveNext()
-
-Advances the cursor to the next row in the RecordSet.  In other words,
-it "moves" to the next record.
-
-=head2 MovePrevious()
-
-Moves the cursor to the previous row in the RecordSet.  In other words,
-it "moves" to the previous record.
-
-=head2 MoveFirst()
-
-Moves the cursor to the first row in the RecordSet.
-
-=head2 MoveLast()
-
-Moves the cursor to the last row in the RecordSet.
-
-=head2 Open()
-
-Opens the datafile for reading and populates the RecordSet bases on the data in
-the file.  The datafile handle is actually closed immediately after reading
-the file, however the RecordSet is stored in memory.  (To sync the datafile up
-with the RecordSet, refer to the Commit method.)
-
-Warning: calling Open more than once may cause unexpected results.
-
-=head2 RemoveFilter()
-
-RemoveFilter removes any filtering that you have done using the Filter method
-and moves the cursor to the first row in the RecordSet.
-
-=head2 Sort(strFieldName [,Descending])
-
-Sort sorts the RecordSet by the strFieldName.  You can sort by multiple fields
-by calling the Sort method more than once with a different fieldname each time.
-
-Descending should be 1 if you want the sort to be in descending order instead
-of the default ascending order.
-
-Note: Calling Sort will remove any Filters that you have applied.  If you want to
-sort and filter, then call Sort first, then Filter.
-
-Warning: If you call the Commit method after sorting, the records will be saved
-to the datafile in the order in which they are sorted.  This may be desirable
-if you always sort the same way, but proceed with caution.
-
-=head1 VERSION HISTORY
-
-	1.3.9: don't allow FieldValue or Delete if EOF is true
-	1.3.8: added UseFLock argument to Commit method
-	1.3.7: Updated error messages
-	1.3.6: AddNew now moves to the last record properly
-	1.3.5: fixed record jumbling bug in xml property
-	1.3.4: filter "like" option made case-insensitive, updated ActivePage
-	1.3.3: fixed EOF not being set properly when filtering
-	1.3.2: added xml Property
-	1.3.1: added Desc option to sort routine
-	1.3.0: added AddNewField
-	1.2.7: CR and LF properties added.  fixed bug with line breaks
-	       in the data.  Added filename security check to ->Open
-	1.2.6: resolved filter + sort problem.  cleaned up documentation
-	1.2.5: added destructer, removed file locking code
-	1.2.4: fixed PageCount and RecordCount bug when using filter
-	1.2.3: optimized AddNew, fixed null field bug in FieldValue
-	1.2.2: optimized file access, added more error checking
-	1.2.1: Fixed ActivePage/Filter bug filtering out 1st record
-	1.2.0: Added ActivePage, PageSize, PageCount properties
-	1.1.4: Updated Max property to deal with numbers
-	1.1.3: Added Filter method
-	1.1.2: Added Sort, Min, Max methods
-	1.0.1: Original Release
-
-=head1 KNOWN ISSUES & LIMITATIONS
-
-vsDB loads the entire datafile into an array which could cause performance
-problems if your datafile grows large.  (largest test file was 17,000 records)
-
-ActivePage and possibly other page-related properties may return unexpected
-values when used in combination with filtering.
-
-=head1 AUTHOR
-
-Jason M. Hinkle
-
-=head1 COPYRIGHT
-
-Copyright (c) 2001 Jason M. Hinkle.  All rights reserved.
-This module is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut
-
+# ----------------------------------------------------------------------------
+# vsDB (verysimple database) Module
+# Copyright (c) 2001 Jason M. Hinkle. All rights reserved. This module is
+# free software; you may redistribute it and/or modify it under the same
+# terms as Perl itself.
+# For more information see: http://www.verysimple.com/scripts/
+#
+# LEGAL DISCLAIMER:
+# This software is provided as-is.  Use it at your own risk.  The
+# author takes no responsibility for any damages or losses directly
+# or indirectly caused by this software.
+# ----------------------------------------------------------------------------
+package vsDB;
+require 5.000;
+$VERSION = "1.4.3";
+$ID = "vsDB.pm";
+
+
+#_____________________________________________________________________________
+sub new {
+	my $class = shift;
+	my %keyValues = @_;
+	my (%fieldNames,@fileArray,@row,@filterArray);
+
+	# normalize the input for backwards compatibility & to set default delim.
+		$keyValues{'file'} = $keyValues{'file'} || $keyValues{'File'} || "";
+	$keyValues{'delimiter'} = $keyValues{'Delimiter'} unless defined($keyValues{'delimiter'});
+	$keyValues{'delimiter'} = "\t" unless defined($keyValues{'delimiter'});
+
+	my $this = {
+		fileName			=> $keyValues{'file'},
+		delimiter			=> $keyValues{'delimiter'},
+		fieldNames			=> \%fieldNames,
+		fileArray			=> \@fileArray,
+		filterArray			=> \@filterArray,
+		row				=> \@row,
+		recordCount		=> 0,
+		filterRecordCount	        => 0,
+		absolutePosition	        => 0,
+		pageSize			=> 10,
+		EOF				=> 1,
+		isOpen			=> 0,
+		lastError			=> '',
+		appendOnly			=> 1,
+		isDirty		        => 0,
+		originalCount		=> 0,
+		CR				=> '<CR>',
+		LF				=> '<LF>',
+		noFieldNames		=> $keyValues{'NoFieldNames'},
+	};
+	bless $this;
+	return $this;
+}
+
+
+# ###########################################################################
+# PUBLIC PROPERTIES
+
+
+#_____________________________________________________________________________
+sub Version {
+	return $VERSION;
+}
+
+#_____________________________________________________________________________
+sub ID {
+	return $ID;
+}
+
+#_____________________________________________________________________________
+sub LastError {
+	my ($this) = shift;
+	return $this->{'lastError'};
+}
+
+#_____________________________________________________________________________
+sub AbsolutePosition {
+	my ($this) = shift;
+	my ($newValue) = shift;
+	if (defined($newValue)) {
+		$this->{'absolutePosition'} = $newValue;
+		$this->_RefreshRow;
+	} else {
+		return $this->{'absolutePosition'};
+	}	
+}
+
+#_____________________________________________________________________________
+sub ActivePage {
+	my ($this) = shift;
+	my ($newValue) = shift;
+	if (defined($newValue)) {
+		$newValue = $this->PageCount if ($newValue > $this->PageCount);
+		$this->MoveFirst;
+		# don't need to do anything if page 1
+		return 1 if ($newValue == 1);
+		# set the new page, just move next until we hit the right spot
+		my ($records) = ($newValue * $this->PageSize) - $this->PageSize;
+		for (my $count = 0; $count < $records && !$this->EOF; $count++) {
+			$this->MoveNext;
+		}
+		# old code- faster, but doesnt work right with filters
+		#$this->{'absolutePosition'} = ($this->{'pageSize'} * ($newValue-1)) + 1;
+		# make sure we are on the right page if filtered
+		#while ($this->{'filterArray'}[$this->{'absolutePosition'}]) {
+		#	$this->{'absolutePosition'}++;
+		#}		
+		#$this->_RefreshRow;
+		return 1;
+	} else {
+	    # BUG - when filtering, this returns the wrong value
+	    return 1 if ($this->{'absolutePosition'} == 1);
+	    my ($count) = (($this->{'absolutePosition'} - 1) / $this->{'pageSize'}); #/
+	    my ($activePage) = int($count) + 1;
+	    $activePage = $this->PageCount if ($activePage > $this->PageCount);
+	    return $activePage;
+	}	
+}
+
+#_____________________________________________________________________________
+sub PageSize {
+	my ($this) = shift;
+	my ($newValue) = shift;
+	if (defined($newValue)) {
+		$this->{'pageSize'} = int($newValue) if (int($newValue) > 0);
+		return 1;
+	} else {
+		return $this->{'pageSize'};
+	}	
+}
+
+#_____________________________________________________________________________
+sub PageCount {
+	my ($this) = shift;
+	my ($count) = ($this->{'filterRecordCount'} / $this->{'pageSize'}); #/
+	if (int($count) < $count) {$count = int($count)+1}
+	return $count;
+}
+
+#_____________________________________________________________________________
+sub File {
+	my ($this) = shift;
+	my ($newVal) = shift;
+	# if the file has changed, then we can't just append...
+	if ($newVal) {$this->{'appendOnly'} = 0}
+	return $this->_GetSetProperty("fileName",$newVal);
+}
+
+#_____________________________________________________________________________
+sub CR {
+	return shift->_GetSetProperty("CR",shift);
+}
+
+#_____________________________________________________________________________
+sub NoFieldNames {
+	return shift->_GetSetProperty("noFieldNames",shift);
+}
+
+#_____________________________________________________________________________
+sub LF {
+	return shift->_GetSetProperty("LF",shift);
+}
+
+#_____________________________________________________________________________
+sub Delimiter {
+	return shift->_GetSetProperty("delimiter",shift);
+}
+
+#_____________________________________________________________________________
+sub RecordCount {
+	return shift->{'filterRecordCount'};
+}
+
+#_____________________________________________________________________________
+sub EOF {
+	my ($this) = shift;
+	return 1 if ($this->RecordCount < 1);
+	return $this->{'EOF'};
+}
+
+#_____________________________________________________________________________
+sub FieldValue {
+	my ($this) = shift;
+	my ($fieldName) = shift || return "ERROR: FieldValue(): Field Name Required";
+	my ($newValue) = shift;
+	my ($fieldNumber) = $this->{'fieldNames'}{$fieldName};
+	my ($lineFeed) = chr(10);
+	my ($carriageReturn) = chr(13);
+	my ($crReplacement) = $this->{'CR'};
+	my ($lfReplacement) = $this->{'LF'};
+	return "ERROR: FieldValue('" . $fieldName . "') Field Not Found." if (!defined($fieldNumber));
+
+	# if a new value is defined, update, otherwise return current value
+	if (defined($newValue)) {
+		$this->{'isDirty'} = 1;
+		if ($this->{'absolutePosition'} <= $this->{'originalCount'}) {
+			$this->{'appendOnly'} = 0
+		};
+		# make sure we don't corrupt the file with a delimiter or
+		# line break in the data.
+		$newValue =~ s/$this->{'delimiter'}//g;
+		$newValue =~ s/$carriageReturn/$crReplacement/g;
+		$newValue =~ s/$lineFeed/$lfReplacement/g;
+		# $newValue =~ s/\n//g; # (should already be dealt with)
+		$this->{'row'}[$fieldNumber] = $newValue;
+
+		# update the fileArray to match the current row.  originally used
+		# a join on the row array, but that caused unititialize var errors
+		# when there are blank fields.  this could probably be improved by
+		# only updating when the cursor is moved or commit is called
+		my ($newRow,$newField);
+		my ($colNum) = 0;
+		foreach ($this->FieldNames) {
+			$newField = $this->{'row'}[$colNum];
+			if (!defined($newField)) {$newField = ""}
+			$newRow .= $newField;
+			$newRow .= $this->{'delimiter'};
+			$colNum++;
+		}
+		# get rid of the last delimiter
+		for (my $x = 1;$x <= length($this->{'delimiter'}); $x++) {
+			chop($newRow);
+		}
+		
+		$this->{'fileArray'}[$this->{'absolutePosition'}] = $newRow . "\n";
+		return 1;
+	} else {
+		# make sure we return a defined value || won't work because it doesn;t
+		# differentiate between 0 and null 
+		if (defined($this->{'row'}[$fieldNumber])) {
+			my $returnVal = $this->{'row'}[$fieldNumber];
+			$returnVal =~ s/$crReplacement/$carriageReturn/g;
+			$returnVal =~ s/$lfReplacement/$lineFeed/g;
+			return $returnVal;
+
+		} else {
+			return "";
+		}
+	}
+}
+
+#_____________________________________________________________________________
+sub FieldNames {
+	# returns all fieldnames as an array
+	my ($this) = shift;
+	return 0 unless ($this->{'isOpen'});
+	my ($fieldRow) = $this->{'fileArray'}[0];
+	chop ($fieldRow);
+	my (@tempfieldNames) = split($this->{'delimiter'},$fieldRow);
+	return @tempfieldNames;
+}
+
+#_____________________________________________________________________________
+sub Row {
+	# returns current row values as an array
+	my ($this) = shift;
+	return 0 unless ($this->{'isOpen'});
+	my ($tempRow) = $this->{'row'};
+	return @$tempRow;
+}
+
+#_____________________________________________________________________________
+sub xml {
+	# returns current recordset as xml
+	my ($this) = shift;
+	my ($strRootName) = shift || "vsDB";
+	my ($strElementName) = shift || "Record";
+	my ($strXml);
+
+	$strXml = "<?xml version=\"1.0\"?>\n";
+	$strXml .= "<!DOCTYPE $strRootName>\n";
+	$strXml .= "<$strRootName>\n";
+	$this->MoveFirst;
+	my (@fields) = $this->FieldNames;
+	my ($field, $fieldValue);
+	until ($this->EOF) {
+		$strXml .= "<$strElementName>\n";
+		foreach $field (@fields) {
+			$fieldValue = $this->FieldValue($field);
+			$strXml .= "<$field>$fieldValue</$field>\n";
+		}			
+		$strXml .= "</$strElementName>\n";
+	$this->MoveNext;
+	}		
+	$strXml .= "</$strRootName>\n";	
+	
+	return $strXml;
+}
+
+#_____________________________________________________________________________
+sub MoveNext {
+	# moves the curser to the next row in the data file 
+	my ($this) = shift;
+	return 0 unless ($this->{'isOpen'});
+	return 0 if ($this->{'EOF'});
+	$this->{'absolutePosition'}++;
+	while ($this->{'filterArray'}[$this->{'absolutePosition'}]) {
+		$this->{'absolutePosition'}++;
+	}		
+	$this->_RefreshRow;
+	return 1;
+}
+
+#_____________________________________________________________________________
+sub MovePrevious {
+	# moves the curser to the previous row in the data file 
+	my ($this) = shift;
+	return 0 unless ($this->{'isOpen'});
+	return 0 if ($this->{'absolutePosition'} < 2);
+	$this->{'absolutePosition'}--;
+	while ($this->{'filterArray'}[$this->{'absolutePosition'}]) {
+		$this->{'absolutePosition'}--;
+	}		
+	$this->_RefreshRow;
+	return 1;
+}
+
+#_____________________________________________________________________________
+sub MoveFirst {
+	# moves the curser to the first row in the data file 
+	my ($this) = shift;
+	return 0 unless ($this->{'isOpen'});
+	$this->{'absolutePosition'} = 1;
+	while ($this->{'filterArray'}[$this->{'absolutePosition'}]) {
+		$this->{'absolutePosition'}++;
+	}		
+	$this->_RefreshRow;
+	return 1;
+}
+
+#_____________________________________________________________________________
+sub MoveLast {
+	# moves the curser to the last row in the data file 
+	my ($this) = shift;
+	return 0 unless ($this->{'isOpen'});
+	$this->{'absolutePosition'} = $this->{'recordCount'};
+	while ($this->{'filterArray'}[$this->{'absolutePosition'}]) {
+		$this->{'absolutePosition'}--;
+	}		
+	$this->_RefreshRow;
+	return 1;
+}
+
+#_____________________________________________________________________________
+sub Delete {
+	# delete the current row 
+	my ($this) = shift;
+	return 0 unless ($this->{'isOpen'});
+	return 0 if $this->{'recordCount'} < 1;
+	return 0 if ($this->{'EOF'});
+	$this->{'isDirty'} = 1;
+	if ($this->{'absolutePosition'} <= $this->{'originalCount'}) {
+		$this->{'appendOnly'} = 0
+	};
+	my ($tempArray) = $this->{'fileArray'};
+	splice(@$tempArray,$this->{'absolutePosition'},1);
+	$this->{'recordCount'}--;
+	$this->{'filterRecordCount'}--;
+	$this->_RefreshRow;
+	return 1;
+}
+
+#_____________________________________________________________________________
+sub AddNew {
+	# add a new row to the end of the recordset
+	my ($this) = shift;
+	return 0 unless ($this->{'isOpen'});
+	$this->{'isDirty'} = 1;
+	$this->{'recordCount'}++;
+	$this->{'absolutePosition'} = $this->{'recordCount'};
+	$this->{'filterRecordCount'}++;
+	# the number of delimiter chars is fieldCount - 1
+	my ($delimiterCount) = 0;
+	foreach ($this->FieldNames) {
+		$delimiterCount++;
+	}
+	$delimiterCount--;
+
+	# add the correct number of colums using the delimiterCount
+	$this->{'fileArray'}[$this->{'absolutePosition'}] = ($this->{'delimiter'} x $delimiterCount) . "\n";
+	
+	$this->MoveLast;
+
+	return 1;
+}
+
+#_____________________________________________________________________________
+sub AddNewField {
+	# add a new row to the end of the recordset
+	my ($this) = shift;
+	my ($newFieldName) = shift || return 0;
+	my ($defaultValue) = shift;
+	$defaultValue = '' unless (defined($defaultValue));
+	
+	$this->{'isOpen'} = 1;
+	$this->{'appendOnly'} = 0;
+	$this->{'isDirty'} = 1;
+
+	# update the fieldnames array
+	my ($nextField) = 0;
+	foreach ($this->FieldNames) {
+		$nextField++;
+	}
+	$this->{'fieldNames'}{$newFieldName} = $nextField;
+
+	chop($this->{'fileArray'}[0]);
+	
+	# update the first row in the file array
+	if ($nextField > 0) {
+		$this->{'fileArray'}[0] .= $this->{'delimiter'};
+	}
+	$this->{'fileArray'}[0] .= $newFieldName . "\n";
+
+	return 1;
+}
+
+#_____________________________________________________________________________
+sub Max {
+	# returns the maximum value for the specified column
+	my ($this) = shift;
+	my ($fieldName) = shift || return 0;
+	my ($alpha) = shift || 0;
+	my ($curVal);
+	my ($curPos) = $this->{'absolutePosition'};
+	$this->MoveFirst;
+	my ($maxVal) = $this->FieldValue($fieldName);
+	while (!$this->EOF) {
+		$curVal = $this->FieldValue($fieldName);
+		if (!$alpha) {
+			if ($curVal ne "") {
+				if (int($curVal) > int($maxVal)) {$maxVal = $curVal};
+			}
+		} else {
+			if ((lc($curVal) cmp lc($maxVal)) > 0) {$maxVal = $curVal};
+		}
+		$this->MoveNext;
+	}
+	$this->AbsolutePosition($curPos);
+	return $maxVal;
+}
+
+#_____________________________________________________________________________
+sub Min {
+	# returns the maximum value for the specified column
+	my ($this) = shift;
+	my ($fieldName) = shift || return 0;
+	my ($alpha) = shift || 0;
+	my ($curVal);
+	my ($curPos) = $this->{'absolutePosition'};
+	$this->MoveFirst;
+	my ($minVal) = $this->FieldValue($fieldName);
+	while (!$this->EOF) {
+		$curVal = $this->FieldValue($fieldName);
+		if ($alpha) {
+			if ($curVal ne "") {
+				if (int($curVal) < int($minVal)) {$minVal = $curVal};
+			}
+		} else {
+			if ((lc($curVal) cmp lc($minVal)) < 0) {$minVal = $curVal};
+		}
+		$this->MoveNext;
+	}
+	$this->AbsolutePosition($curPos);
+	return $minVal;
+}
+
+#_____________________________________________________________________________
+sub Filter {
+	# $obj->Filter($fieldName,$operator,$criteria [,$filterOr]);
+
+	# TODO: > and < are not working properly... maybe text comparison problem?? 	
+	my ($this) = shift;
+	my ($fieldName) = shift || return 0;
+	my ($operator) = shift || "eq";
+	my ($criteria) = shift;
+	my ($filterOr) = shift || 0;
+	$criteria = "" unless defined($criteria);
+	
+	my ($filterSetting);
+	my ($absolutePosition) = 0;
+
+	# manually cycle through because MoveNext will skip past any prev. filtered records
+	$this->{'absolutePosition'} = 1;
+	$this->_RefreshRow;
+	while ($this->{'absolutePosition'} != $absolutePosition) {
+		$filterSetting = 0;
+		$absolutePosition = $this->{'absolutePosition'};
+
+		#print "original val=" . ($this->{'filterArray'}[$absolutePosition] || 'x') . " ";
+
+		if ($filterOr && !$this->{'filterArray'}[$absolutePosition]) {
+			# leave record alone if it already passed and OR is specified
+			$filterSetting = 0;
+		} elsif (!$filterOr && $this->{'filterArray'}[$absolutePosition]) {
+			# don't undue any previous filters if AND is specified
+			$filterSetting = 1;
+		} elsif ($operator eq "eq" && $this->FieldValue($fieldName) ne $criteria) {
+			$filterSetting = 1;
+		} elsif ($operator eq "ne" && !($this->FieldValue($fieldName) ne $criteria)) {
+			$filterSetting = 1;
+		} elsif ($operator eq "like" && !(index(lc($this->FieldValue($fieldName)),lc($criteria),0) + 1)) {
+			$filterSetting = 1;
+		} elsif ($operator eq ">" && !($this->FieldValue($fieldName) > $criteria) ) {
+			$filterSetting = 1;
+		} elsif ($operator eq "<" && !($this->FieldValue($fieldName) < $criteria) ) {
+			$filterSetting = 1;
+		}
+		
+		# print $absolutePosition . ": " . $filterSetting;
+
+		# the filtercount may need to be decremented or incremented, depending on if
+		# the current record was filtered, re-filtered, or unfiltered
+		if ($this->{'filterArray'}[$absolutePosition]) {
+			$this->{'filterRecordCount'} = $this->{'filterRecordCount'} + 1 unless ($filterSetting);	
+		} else {
+			$this->{'filterRecordCount'} = $this->{'filterRecordCount'} - $filterSetting;
+		}
+		
+		$this->{'filterArray'}[$absolutePosition] = $filterSetting;
+
+		#print " filterCount=" . $this->{'filterRecordCount'} . "<br>";
+
+		$this->{'absolutePosition'}++;
+		$this->_RefreshRow;
+	}
+
+	$this->MoveFirst;
+	return 1;
+}
+
+#_____________________________________________________________________________
+sub RemoveFilter {
+	my ($this) = shift;
+	my (@newArray);
+	$this->{'filterArray'} = \@newArray;
+	$this->{'filterRecordCount'} = $this->{'recordCount'};
+	return 1;
+}
+
+#_____________________________________________________________________________
+sub Commit {
+	# update the file, saving all changes made 
+	my ($this) = shift;
+	my ($useFlock) = shift || 0;
+	my ($fileName) = $this->{'fileName'};
+
+	# if no changes were made, don't bother writing to the file 
+	if (!$this->{'isDirty'}) {return 1};
+
+	if ($this->{'appendOnly'}) {
+		# if only new records were added, just append to the file
+		my ($nCount);
+		if (!open (OUTPUTFILE, ">>$fileName")) {
+			$this->{'lastError'} = "Commit: Couldn't Open DataFile '$fileName' For Appending";
+			return 0
+		};
+		flock(OUTPUTFILE,2) if ($useFlock);
+		my ($tempArray) = $this->{'fileArray'};
+		for ($nCount = $this->{'originalCount'} + 1; $nCount <= $this->{'recordCount'}; $nCount++) {
+			print OUTPUTFILE @$tempArray[$nCount];
+		}
+	} else {		
+		# if records were changed or deleted, we have to replace them all 	
+		if (!open (OUTPUTFILE, ">$fileName")) {
+			$this->{'lastError'} = "Commit: Couldn't Open DataFile '$fileName' For Writing";
+			return 0
+		};
+		flock(OUTPUTFILE,2) if ($useFlock);
+		my ($tempArray) = $this->{'fileArray'};
+                if ($this->NoFieldNames) {
+                    # if no field names was specified, remove the dummy row before saving, then
+                    # put it back on after the save is complete
+                    my ($headerRow) = shift(@$tempArray);
+                    print OUTPUTFILE join('',@$tempArray);
+                    unshift(@$tempArray,$headerRow);
+                } else {
+                    print OUTPUTFILE join('',@$tempArray);
+                }
+	}
+	close (OUTPUTFILE);
+	flock(OUTPUTFILE,8) if ($useFlock);
+	return 1;
+}
+
+#_____________________________________________________________________________
+sub Sort {
+	# sorts the datafile on the given column 
+	# obj->Sort($field [, $sortMode]);
+	# if $field is ommited, or an invalid fieldname is used, defaults to
+	# the left-most column.
+    # $sortMode 0 = alpha ascending, 1 = alpha descending, 2 = numeric ascending, 3 = numeric descending
+	
+	my ($this) = shift;
+	my ($fieldName) = shift || '0';
+	my ($sortMode) = shift || '0';
+	my ($delimiter) = $this->{'delimiter'};
+
+	# can't append once we've changed the sort order 
+	$this->{'appendOnly'} = 0;	
+
+	# sorting will mess up filter, so lets remove it 
+	$this->RemoveFilter;	
+	
+	# get the fieldnumber (or default to leftmost column)
+	my ($fieldNumber) = $this->{'fieldNames'}{$fieldName} || 0;
+	# make a copy of the unsorted array pointer
+	my ($unsortedArray) = $this->{'fileArray'};
+	# remove the column names from the array
+	my ($fieldNames) = shift(@$unsortedArray);	
+	
+	# now we sort the unsorted array
+	my (@sortedArray) = sort { 
+		# custom sorting comparison routine
+		my (@aVals) = split($delimiter,$a);
+		my (@bVals) = split($delimiter,$b);
+		if ($sortMode eq "1") {
+		    # alpha descending
+			return lc($bVals[$fieldNumber]) cmp lc($aVals[$fieldNumber]);
+		} elsif ($sortMode eq "2") {
+		    # numeric ascending
+			return $bVals[$fieldNumber] > $aVals[$fieldNumber];
+		} elsif ($sortMode eq "3") {
+		    # numeric descending
+			return $bVals[$fieldNumber] > $aVals[$fieldNumber];
+		} else {
+		    # alpha ascending
+			return lc($aVals[$fieldNumber]) cmp lc($bVals[$fieldNumber]); 
+		}
+		undef(@aVals);
+		undef(@bVals);
+	} @$unsortedArray;
+	# get rid of the unsorted array
+	undef($unsortedArray);
+	
+	# put the column names back in and update the array pointer
+	unshift(@sortedArray,$fieldNames);
+	$this->{'fileArray'} = \@sortedArray;	
+	
+	$this->MoveFirst;
+	return 1;
+}
+
+
+#_____________________________________________________________________________
+sub Open {
+	# open the file, store the contents as an array, get the number of
+	# records and retreive the first row 
+	my $this = shift;
+	my $fileName = $this->{'fileName'};
+	my $delimiter = $this->{'delimiter'};
+	my (@tempFileArray);
+
+	# security check to make sure a command is not being attempted
+	$fileName =~ s/;//g;
+	$fileName =~ s/|//g;
+
+	if (!(-e $fileName)) {
+		$this->{'lastError'} = "Open: Datafile '$fileName' Not Found";
+		return 0;
+	} elsif (!(-r $fileName)) {
+		$this->{'lastError'} = "Open: Couldn't Open DataFile '$fileName' For Reading";
+		return 0;
+	}
+
+	# try to open the file 	
+	if (open(THISFILE, "$fileName")) {
+		@tempFileArray = <THISFILE>;
+		close(THISFILE);
+	} else {
+	    return 0;
+	}
+	
+        # if no fieldnames is specified, then insert a dummy row at the front
+        # so the module will use numbers as the fieldnames
+        if ($this->NoFieldNames) {
+            my ($dummyRow) = "";
+            my (@DummyFieldNames) = split($delimiter, ($tempFileArray[0] || "") );
+            my ($dummyDelim) = "";
+            my ($count) = 1;
+            foreach (@DummyFieldNames) {
+                $dummyRow .= $dummyDelim . $count;
+                $dummyDelim = $delimiter;
+				$dummyDelim = "\|" if ($dummyDelim eq "\\|"); # glitch on windows servers with | as delim
+                $count++;
+            }
+            unshift(@tempFileArray,$dummyRow . "\n") 
+        }
+
+	# get the top row, which should be fieldnames
+	my $fileRow = $tempFileArray[0] || "\n";
+	chop($fileRow);
+
+	# get the entire contents of the file	
+	$this->{'fileArray'} = \@tempFileArray;
+
+	# get the number of rows
+	$this->{'recordCount'} = @tempFileArray - 1;
+	
+	# split the top row into fields
+	my (@tempfieldNames) = split($delimiter,$fileRow);
+	my ($fieldName) = "";
+	my ($counter) = 0;
+	foreach $fieldName (@tempfieldNames) {
+	    $this->{'fieldNames'}{$fieldName} = $counter;
+	    $counter++
+	}
+
+        
+	$this->MoveFirst;
+	$this->{'isOpen'} = 1;
+	$this->_RefreshRow;
+	$this->{'filterRecordCount'} = $this->{'recordCount'};
+	$this->{'originalCount'} = $this->{'recordCount'};
+	return 1;
+}
+
+#_____________________________________________________________________________
+sub Close {
+	my ($this) = shift;
+	$this->{'isOpen'} = 0;
+	return 1;
+}
+
+
+# ###########################################################################
+# PRIVATE METHODS 
+
+
+#_____________________________________________________________________________
+sub DESTROY {
+	my ($this) = shift;
+	$this->Close;
+}
+
+#_____________________________________________________________________________
+sub _RefreshRow {
+	# sync the current row with the fileArray.  also do some validation to
+	# make sure we haven't moved the curser out of range 
+	my ($this) = shift;
+	return 0 unless ($this->{'isOpen'});
+	# make sure absolutePosition is a legit value  and set EOF
+	$this->{'EOF'} = 0;
+	$this->{'absolutePosition'} = 1 if ($this->{'absolutePosition'} < 1);
+	if ($this->{'absolutePosition'} > $this->{'recordCount'}) {
+		$this->{'EOF'} = 1;
+		$this->{'absolutePosition'} = $this->{'recordCount'};
+		return 1;
+	}
+
+	# now grab the next row
+	my ($tempRow) = $this->{'fileArray'}[$this->{'absolutePosition'}];
+	chop ($tempRow);
+	my (@row) = split($this->{'delimiter'},$tempRow);
+	$this->{'row'} = \@row;
+	return 1;
+}
+
+
+#_____________________________________________________________________________
+sub _GetSetProperty {
+	# private fuction that is used by properties to get/set values
+	# if a parameter is sent in, then the property is set and true is returned.
+	# if no parameter is sent, then the current value is returned
+	my $this = shift;
+	my $fieldName = shift;
+	my $newValue = shift;
+	if (defined($newValue)) {
+		$this->{$fieldName} = $newValue;
+	} else {
+		return $this->{$fieldName};
+	}
+	return 1;
+}
+
+1; # for require
+
+
+__END__
+
+=head1 NAME
+
+vsDB - Simple interface to text-delimited data files
+
+=head1 SYNOPSIS
+
+	use vsDB;
+
+	# create the object
+	my (objDB) = new vsDB(File=>'C:\\datafile.txt', Delimiter=>'\t');
+
+	# open the datafile	
+	$objDB->Open;
+
+	# add a new record
+	$objDB->AddNew; 	
+
+	# update the first name field for the new record 
+	$objDB->FieldValue('FirstName','Jason');
+
+	# commit the changes to disk
+	$objDB->Commit;
+
+	# move the cursor to the beginning of the resultset
+	$objDB->MoveFirst;
+
+	# print all of the first name fields
+	while (!$objDB->EOF) {
+		print $objDB->FieldValue('FirstName');
+		$objDB->MoveNext;
+	}
+
+	# close the datafile (optional) 	
+	$objDB->Close;
+
+=head1 DESCRIPTION
+
+vsDB provides a simple object-oriented interface for delimited
+text files.  The object model is based off of Microsoft's
+ADO RecordSet object, so anyone familiar with this will
+find vsDB somewhat familiar.  vsDB has been tested on Win32 and
+Linux.
+
+=head1 OBJECT MODEL REFERENCE: PROPERTIES
+
+=head2 AbsolutePosition([nNewPosition])
+
+AbsolutePosition returns the current cursor position in the RecordSet.  If
+[nNewPosition] is specified, then AbsolutePosition attempts to move the
+cursor to that position.  If [nNewPosition] is out of range, AbsolutePosition
+will be set to the closest valid position (usually the last record)
+
+=head2 ActivePage([nNewPage])
+
+ActivePage returns the current "Page" in the RecordSet.  If [nNewPage] is
+specified, then ActivePage attempts to move the cursor to the first record
+on the given page.  If [nNewPage] is out of range, The cursor will be
+set to the closest valid position (usually the first record of the last page)
+
+ActivePage is used along with PageSize.  See PageSize for more information.
+
+=head2 CR([strCR])
+
+CR is a character or string that vsDB uses to replace a Carriage Return
+character that is inserted in the database.  Default is "<CR>".  The value
+is used only during storage in the file and is converted back into
+a Carriage Return when you request the field value.  See also: LF
+
+=head2 Delimiter([strNewDelimiter])
+
+Delimiter returns the delimiter character that is used to separate fields
+in the datafile.  If strNewDelimiter is specified, then the delimiter is
+changed.
+
+Warning: changing the delimiter property after calling the Open method
+is a very bad thing to do!  Your file may become corrupted.
+
+=head2 EOF()
+
+EOF (End Of File) indicates that there are no more records in the RecordSet.
+If you have applied a filter, this indicates when you have reached the end
+of the matching records.  This property is commonly used to loop through
+a recordset, for example: while (!$objDB->EOF) { $objDB->MoveNext; }
+
+Note: unlike the MS RecordSet object, FieldValue will not give an EOF error
+if you try to access a FieldValue when the RecordSet is at EOF.  Instead
+is will continue to return values for the last record in the RecordSet
+
+=head2 FieldValue(FieldName,[NewValue])
+
+If [NewValue] is NOT specified, then FieldValue returns the value of the
+field specified (FieldName) for the record at the current cursor position.
+
+If [NewValue] is specified, then the value of the field specified (FieldName)
+for the record at the current cursor position is updated to [NewValue] and
+1 is returned.
+
+Note: any changes you make to the data will not be saved to disk until you call
+the Commit method.
+
+=head2 FieldNames()
+
+FieldNames returns an array containing all of the field names in the datafile.
+For example:
+
+	my (@fieldNames) = $objDB->FieldNames;
+
+=head2 File([strNewFilePath])
+
+File specifies the full path to the datafile.  This can be specified when
+the object is created or anytime before calling the Open method.  Once the
+file has been opened the RecordSet will not change if you change the File
+property.  However, if you change the File property and then call the
+Commit method, this will save the current RecordSet to the new filepath.
+In other words, it will copy the original file.
+
+Warning: Changing the File property then calling Open again may produce
+unexpected results.  If you need to access another datafile, it is recommended
+that you create another vsDB object instead.
+
+=head2 ID()
+
+Returns module identification
+
+=head2 LastError()
+
+When a non-fatal error has occured, the LastError property may contain information
+decribing the error.  Most methods will return 1 or 0 to indicate success or
+failure.  You do not need to check these return values, but should in cases where
+you suspect the method could fail.
+
+=head2 LF([strLF])
+
+LF is a character or string that vsDB uses to replace a Line Feed
+character that is inserted in the database.  Default is "<LF>".  The value
+is used only during storage in the file and is converted back into
+a Line Feed when you request the field value.  See also: CR
+
+=head2 Max(fieldName, [alpha])
+
+Max returns the maximum value for he specified fieldName.  alpha is an optional
+value that is set to 1 or 0 to indicate alphabetical characters.  By default, alpha
+is set to 0, indicating that the field is numeric.
+
+Warning: if your field contains non-numeric values, you must set alpha=1 or Max
+will produce a type-mismatch error.
+
+=head2 Min(fieldName, [alpha])
+
+Min returns the minimum value for he specified fieldName.  alpha is an optional
+value that is set to 1 or 0 to indicate alphabetical characters.  By default, alpha
+is set to 0, indicating that the field is numeric.
+
+Warning: if your field contains non-numeric values, you must set alpha=1 or Min
+will produce a type-mismatch error.
+
+=head2 NoFieldNames([nNewVal])
+
+Use this option if the datafile does not have fieldnames in the first row.
+You must set this property = 1 BEFORE you open the file, though.
+If you set this property = 1 before you open the file, then the first row will
+be treated as data and not fieldnames.  This can also be set when you
+create the object if you specify NoFieldNames => 1 as a parameter.
+
+If you enable this property, then you can refer to the fields by their order.
+So, the first field would be FieldValue("1"), the second FieldValue("2"), etc.
+
+=head2 PageCount()
+
+PageCount returns the number of pages in the RecordSet.  This is essentially
+the RecordCount devided by the PageSize.  If you have applied a
+filter, the PageCount will indicate only matching records.
+
+=head2 PageSize([nNewSize])
+
+PageSize returns the current page size.  If [nNewSize] is specified, then
+the PageSize is set to the new value.  PageSize is used along with ActivePage
+to simplify displaying a subset of the total records.  For example, the
+file contains 1,000 rows, but you want to display them to the user only
+10 at a time.  The PageSize is set to 10 and you can navigate through the
+results by changing the ActivePage.
+
+=head2 RecordCount()
+
+Returns the number of records in the RecordSet.  If you have applied a filter,
+RecordCount will indicate the number of matching records.
+
+=head2 Row()
+
+Row returns an array containing all of the values of the current record.
+For example:
+	
+	my (@row) = $objDB->Row;
+
+=head2 Version()
+
+Returns current version
+
+=head2 xml([strRootName] [,strElementName])
+
+Returns current recordset as xml.  strRootName and strElementName are
+optional.  Default values are "vsDB" and "Record"
+
+
+=head1 OBJECT MODEL REFERENCE: METHODS
+
+=head2 AddNew()
+
+Adds a new record to the RecordSet and moves the cursor to this new record.
+The default values for all fields is an empty string.  After you add a new
+record, you will want to change the FieldValues as needed.
+
+If you are using one of the fields as a primary key, you can use the Max
+property to obtain the highest ID number.
+
+Note: any changes you make to the data will not be saved to disk until you call
+the Commit method.
+
+=head2 AddNewField(strFieldName [,strDefaultValue])
+
+Adds a new field to the RecordSet.  strFieldName is the name of the new field.
+The new field will be added to all records and set to strDefaultValue.  If
+strDefaultValue is not specified, then the field will be empty.
+
+Note: any changes you make to the data will not be saved to disk until you call
+the Commit method.
+
+=head2 Close()
+
+In theory this would close the file, however vsDB does not keep the file handle
+open.  Currently this method simply marks the object as closed.  This method
+is also called automatically when the object is destroyed.
+
+Although it is not necessary to call this method, it is recommended that you do
+in case vsDB is later modified to keep the file handle open.  This might be
+useful for a persistent connection to the file...?
+
+=head2 Commit([blnUseFLock])
+
+Commit writes the current RecordSet in memory to the filepath specified by
+the File property.  This method should be called any time there have been data
+modifications. blnUseFLock is an optional argument that should be 1 if flock
+should be used while writing to the file.
+
+Commit re-opens the datafile with the least amount of privledges required.  If you
+have not made any changes to the RecordSet, calling Close will not access the
+datafile at all.  If you have only added new records, Commit will open the datafile
+for appending and append the new record.  If you have modified existing records,
+the file will be opening for writing and the entire file will be updated.
+
+=head2 Delete()
+
+Deletes the current record in the RecordSet.
+
+Note: any changes you make to the data will not be saved to disk until you call
+the Commit method.
+
+=head2 Filter(strFieldName,strOperator,strCriteria [,blnOR))
+
+Filter provides a way to either search the RecordSet or to get a specific record
+based on a primary key field.  strFieldName indicates the field that you want to
+filter.  strOperator is one of the following "eq", "ne", "like", "<" or ">" to indicate
+how the field is to be compared.  strCriteria indicates the search pattern that you
+wish to find.
+
+You can apply the Filter method more than once to further filter out records.  The
+filters are applied as "AND."  If you specify a value (other than 0) for blnOR, then
+"OR" filtering will be used instead of AND.
+
+If you are using a primary key field, you can use the Filter method to locate
+the row that you want.  For example:
+
+	$objDB->Filter("ID","eq","25")
+
+The Filter method moves the cursor to the first matching record in the recordset
+as well as updates RecordCount and PageCount accordingly.
+
+Note: calling Sort will remove any filters that you have applied.  Call Sort
+first if you need to sort and filter the results.
+
+=head2 MoveNext()
+
+Advances the cursor to the next row in the RecordSet.  In other words,
+it "moves" to the next record.
+
+=head2 MovePrevious()
+
+Moves the cursor to the previous row in the RecordSet.  In other words,
+it "moves" to the previous record.
+
+=head2 MoveFirst()
+
+Moves the cursor to the first row in the RecordSet.
+
+=head2 MoveLast()
+
+Moves the cursor to the last row in the RecordSet.
+
+=head2 Open()
+
+Opens the datafile for reading and populates the RecordSet bases on the data in
+the file.  The datafile handle is actually closed immediately after reading
+the file, however the RecordSet is stored in memory.  (To sync the datafile up
+with the RecordSet, refer to the Commit method.)
+
+Warning: calling Open more than once may cause unexpected results.
+
+=head2 RemoveFilter()
+
+RemoveFilter removes any filtering that you have done using the Filter method
+and moves the cursor to the first row in the RecordSet.
+
+=head2 Sort(strFieldName [,SortMethod])
+
+Sort sorts the RecordSet by the strFieldName.  You can sort by multiple fields
+by calling the Sort method more than once with a different fieldname each time.
+
+SortMethod is optional and has four options (below).  If you specify a numeric sort,
+then all field values for that column must be numeric or you will get a type mismatch
+runtime error.
+	0 = Alpha sort ascending (default)
+	1 = Alpha sort descending
+	2 = Numeric sort ascending
+	3 = Numeric sort descending
+
+Note: Calling Sort will remove any Filters that you have applied.  If you want to
+sort and filter, then call Sort first, then Filter.
+
+Warning: If you call the Commit method after sorting, the records will be saved
+to the datafile in the order in which they are sorted.  This may be desirable
+if you always sort the same way, but proceed with caution.
+
+=head1 VERSION HISTORY
+
+	1.4.3: Added NoFieldNames property for files without fieldnames in the first row
+	1.4.2: Sort is updated to support numeric in addition to alphabetic sort
+	1.4.1: Sort is now case-insensitive
+	1.4.0: fixed active page bug when filter is on & added OR argument to Filter
+	1.3.9: don't allow delete if EOF is true, FieldValue returns "EOF"
+	1.3.8: added UseFLock argument to Commit method
+	1.3.7: Updated error messages
+	1.3.6: AddNew now moves to the last record properly
+	1.3.5: fixed record jumbling bug in xml property
+	1.3.4: filter "like" option made case-insensitive, updated ActivePage
+	1.3.3: fixed EOF not being set properly when filtering
+	1.3.2: added xml Property
+	1.3.1: added Desc option to sort routine
+	1.3.0: added AddNewField
+	1.2.7: CR and LF properties added.  fixed bug with line breaks
+	       in the data.  Added filename security check to ->Open
+	1.2.6: resolved filter + sort problem.  cleaned up documentation
+	1.2.5: added destructer, removed file locking code
+	1.2.4: fixed PageCount and RecordCount bug when using filter
+	1.2.3: optimized AddNew, fixed null field bug in FieldValue
+	1.2.2: optimized file access, added more error checking
+	1.2.1: Fixed ActivePage/Filter bug filtering out 1st record
+	1.2.0: Added ActivePage, PageSize, PageCount properties
+	1.1.4: Updated Max property to deal with numbers
+	1.1.3: Added Filter method
+	1.1.2: Added Sort, Min, Max methods
+	1.0.1: Original Release
+
+=head1 KNOWN ISSUES & LIMITATIONS
+
+vsDB loads the entire datafile into an array which could cause performance
+problems if your datafile grows large.  (largest test file was 17,000 records)
+
+ActivePage and possibly other page-related properties may return unexpected
+values when used in combination with filtering.
+
+=head1 AUTHOR
+
+Jason M. Hinkle
+
+=head1 COPYRIGHT
+
+Copyright (c) 2001 Jason M. Hinkle.  All rights reserved.
+This module is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+=cut
+
diff --git a/lib/vsLock.pm b/lib/vsLock.pm
index 4277ded9d..a242c957c 100644
--- a/lib/vsLock.pm
+++ b/lib/vsLock.pm
@@ -1,612 +1,611 @@
-;# $Id
-;#  vsLock v 0.103
-;#  Modified by Jason M. Hinkle, 2001
-;#
-;#  Based on File::Lock
-;#  Copyright (c) 1998, Raphael Manfredi
-;#  
-;#  You may redistribute only under the terms of the Artistic License,
-;#  as specified in the README file that comes with the distribution.
-;#
-;# $Log: vsLock.pm,v $
-;# Revision 1.3  2004/02/01 19:24:35  winter
-;#  - 2.87 release
-;#
-;# Revision 0.1.1.1  1998/05/12  07:42:19  ram
-;# patch1: Baseline for first alpha release.
-;#
-
-########################################################################
-package vsLock; @ISA = qw(Exporter);
-
-#
-# This package extracts the simple locking logic used by mailagent-3.0
-# into a standalone Perl module to be reused in other applications.
-#
-
-use strict;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-use Sys::Hostname;
-
-require Exporter;
-
-@ISA = qw(Exporter);
-@EXPORT = ();
-@EXPORT_OK = qw(lock trylock unlock);
-$VERSION = '0.103';
-
-$vsLock::LOCKER = undef;	# Default locking object
-
-#
-# ->make
-#
-# Create a file locking object, responsible for holding the locking
-# parameters to be used by all the subsequent locks requested from
-# this locking object.
-#
-# Configuration attributes:
-#
-#   max				max number of attempts
-#	delay			seconds to wait between attempts
-#	format			how to derive lockfile from file to be locked
-#	hold			max amount of seconds before breaking lock (0 for never)
-#	ext				lock extension
-#	nfs				true if lock must "work" on top of NFS
-#	warn			flag to turn warnings on
-#	wmin			warn once after that many waiting seconds
-#	wafter			warn every that many seconds after first warning
-#	wfunc			warning function to be called
-#
-# The creation routine first and sole argument is a "hash table list" listing
-# all the configuration attributes. Missing attributes are given a default
-# value. A call to ->configure can alter the configuration parameters of
-# an existing object.
-#
-sub new {
-	my $self = bless {}, shift;
-	my (@hlist) = @_;
-	$self->configure(@hlist);
-
-	# Set configuration defaults
-	$self->{'max'} = 30 unless $self->{'max'};
-	$self->{'delay'} = 2 unless $self->{'delay'};
-	$self->{'hold'} = 3600 unless $self->{'hold'};
-	$self->{'ext'} = '.lock' unless defined $self->{'ext'};
-	$self->{'nfs'} = 0 unless defined $self->{'nfs'};
-	$self->{'warn'} = 1 unless defined $self->{'warn'};
-	$self->{'wfunc'} = \&core_warn unless defined $self->{'wfunc'};
-	$self->{'wmin'} = 15 unless $self->{'wmin'};
-	$self->{'wafter'} = 20 unless $self->{'wafter'};
-
-	return $self;
-}
-
-#
-# ->configure
-#
-# Extract known configuration parameters from the specified hash list
-# and use their values to change the object's corresponding parameters.
-#
-# Parameters are specified as (-warn => 1, -ext => '.lock') for instance.
-#
-sub configure {
-	my $self = shift;
-	my (%hlist) = @_;
-	my @known = qw(max delay hold format ext nfs warn wfunc wmin wafter);
-	foreach my $attr (@known) {
-		$self->{$attr} = $hlist{"-$attr"} if defined $hlist{"-$attr"};
-	}
-}
-
-#
-# Attribute access
-#
-
-sub max			{ $_[0]->{'max'} }
-sub delay		{ $_[0]->{'delay'} }
-sub format		{ $_[0]->{'format'} }
-sub hold		{ $_[0]->{'hold'} }
-sub nfs			{ $_[0]->{'nfs'} }
-sub ext			{ $_[0]->{'ext'} }
-sub warn		{ $_[0]->{'warn'} }
-sub wmin		{ $_[0]->{'wmin'} }
-sub wafter		{ $_[0]->{'wafter'} }
-sub wfunc		{ $_[0]->{'wfunc'} }
-sub Version		{ return $VERSION; }
-
-sub core_warn	{ CORE::warn(@_) }
-
-#
-# ->lock
-#
-# Lock specified file, possibly using alternate file "format".
-# Returns whether file was locked or not at the end of the configured
-# blocking period.
-#
-# For quick and dirty scripts wishing to use locks, create the locking
-# object if not invoked as a method, turning on warnings.
-#
-sub lock {
-	my $self = shift;
-	unless (ref $self) {			# Not invoked as a method
-		unshift(@_, $self);
-		$self = $vsLock::LOCKER ||
-			vsLock->make('-warn' => 1);
-	}
-	my ($file, $format) = @_;		# File to be locked, lock format
-	return $self->_acs_lock($file, $format, 0);
-}
-
-#
-# ->trylock
-#
-# Attempt to lock specified file, possibly using alternate file "format".
-# If the file is already locked, don't block and return false.
-#
-# For quick and dirty scripts wishing to use locks, create the locking
-# object if not invoked as a method, turning on warnings.
-#
-sub trylock {
-	my $self = shift;
-	unless (ref $self) {			# Not invoked as a method
-		unshift(@_, $self);
-		$self = $vsLock::LOCKER ||
-			vsLock->make('-warn' => 1);
-	}
-	my ($file, $format) = @_;		# File to be locked, lock format
-	return $self->_acs_lock($file, $format, 1);
-}
-
-#
-# ->unlock
-#
-# Unlock file.
-# Returns true if file was unlocked.
-#
-sub unlock {
-	my $self = shift;
-	unless (ref $self) {			# Not invoked as a method
-		unshift(@_, $self);
-		$self = $vsLock::LOCKER ||
-			vsLock->make('-warn' => 1);
-	}
-	my ($file, $format) = @_;		# File to be unlocked, lock format
-	return $self->_acs_unlock($file, $format);
-}
-
-#
-# ->lockfile
-#
-# Return the name of the lockfile, given the file name to lock and the custom
-# string provided by the user. The following macros are substituted:
-#	%D: the file dir name
-#   %f: the file name (full path)
-#   %F: the file base name (last path component)
-#   %p: the process's pid
-#   %%: a plain % character
-#
-sub lockfile {
-	my $self = shift;
-	my ($file, $format) = @_;
-	local $_ = defined($format) ? $format : $self->format;
-	s/%%/\01/g;				# Protect double percent signs
-	s/%/\02/g;				# Protect against substitutions adding their own %
-	s/\02f/$file/g;			# %f is the full path name
-	s/\02D/&dir($file)/ge;	# %D is the dir name
-	s/\02F/&base($file)/ge;	# %F is the base name
-	s/\02p/$$/g;			# %p is the process's pid
-	s/\02/%/g;				# All other % kept as-is
-	s/\01/%/g;				# Restore escaped % signs
-	$_;
-}
-
-# Return file basename (last path component)
-sub base {
-	my ($file) = @_;
-	my ($base) = $file =~ m|^.*/(.*)|;
-	$base;
-}
-
-# Return dirname
-sub dir {
-	my ($file) = @_;
-	my ($dir) = $file =~ m|^(.*)/.*|;
-	$dir;
-}
-
-#
-# _acs_lock			-- private
-#
-# Internal locking routine.
-#
-# If $try is true, don't wait if the file is already locked.
-# Returns true if the file was locked.
-#
-sub _acs_lock {		## private
-	my $self = shift;
-	my ($file, $format, $try) = @_;
-	my $max = $self->max;
-	my $delay = $self->delay;
-	my $stamp = $$;
-
-	# For NFS, we need something more unique than the process's PID
-	$stamp .= hostname if $self->nfs;
-
-	# Compute locking file name -- hardwired default format is "%f.lock"
-	my $lockfile = $file . $self->ext;
-	$format = $self->format unless defined $format;
-	$lockfile = $self->lockfile($file, $format) if defined $format;
-
-	# Break lock if held for too long
-	$self->_acs_check($file, $lockfile) if $self->hold;
-
-	my $waited = 0;					# Amount of time spent sleeping
-	my $lastwarn = 0;				# Last time we warned them...
-	my $warn = $self->warn;
-	my ($wmin, $wafter, $wfunc);
-	($wmin, $wafter, $wfunc) = 
-		($self->wmin, $self->wafter, $self->wfunc) if $warn;
-	my $locked = 0;
-	my $mask = umask(0333);			# No write permission
-	local *FILE;
-
-	while ($max-- > 0) {
-		if (-f $lockfile) {
-			next unless $try;
-			umask($mask);
-			return 0;				# Already locked
-		}
-
-		# Attempt to create lock
-		if (open(FILE, ">$lockfile")) {
-			print FILE "$stamp\n";
-			close FILE;
-			open(FILE, $lockfile);	# Check lock
-			my $l;
-			chop($l = <FILE>);
-			$locked = $l eq $stamp;
-			$l = <FILE>;			# Must be EOF
-			$locked = 0 if defined $l; 
-			close FILE;
-			last if $locked;		# Lock seems to be ours
-		} elsif ($try) {
-			umask($mask);
-			return 0;				# Already locked, or cannot create lock
-		}
-	} continue {
-		sleep($delay);				# Busy: wait
-		$waited += $delay;
-
-		# Warn them once after $wmin seconds and then every $wafter seconds
-		if (
-			$warn &&
-				((!$lastwarn && $waited > $wmin) ||
-				($waited - $lastwarn) > $wafter)
-		) {
-			my $waiting  = $lastwarn ? 'still waiting' : 'waiting';
-			my $after  = $lastwarn ? 'after' : 'since';
-			my $s = $waited == 1 ? '' : 's';
-			&$wfunc("WARNING $waiting for $file lock $after $waited second$s");
-			$lastwarn = $waited;
-		}
-	}
-
-	umask($mask);
-	return $locked;
-}
-
-#
-# ->_acs_unlock		-- private
-#
-# Unlock file. If lock format is specified, it must match the one used
-# at lock time.
-#
-# Return true if file was indeed locked by us and is now properly unlocked.
-#
-sub _acs_unlock {	## private
-	my $self = shift;
-	my ($file, $format) = @_;		# Locked file, locking format
-	my $stamp = $$;
-	$stamp .= hostname if $self->nfs;
-
-	# Compute locking file name -- hardwired default format is "%f.lock"
-	my $lockfile = $file . $self->ext;
-	$format = $self->format unless defined $format;
-	$lockfile = $self->lockfile($file, $format) if defined $format;
-
-	local *FILE;
-	my $unlocked = 0;
-
-	if (-f $lockfile) {
-		open(FILE, $lockfile);
-		my $l;
-		chop($l = <FILE>);
-		close FILE;
-		if ($l eq $stamp) {			 # Pid (plus hostname possibly) is OK
-			$unlocked = 1;
-			unlink $lockfile or $unlocked = 0;
-		}
-	}
-
-	# It's reasonable to expect $! to be meaningful at this point
-	&{$self->wfunc}("WARNING did not unlock $file: $!")
-		if !$unlocked && $self->warn;
-
-	return $unlocked;				# Did we successfully unlock?
-}
-
-#
-# ->_acs_check
-#
-# Make sure lock lasts only for a reasonable time. If it has expired,
-# then remove the lockfile.
-#
-sub _acs_check {
-	my $self = shift;
-	my ($file, $lockfile) = @_;
-	return unless -f $lockfile;
-
-	my $mtime = (stat($lockfile))[9];
-	my $hold = $self->hold;
-
-	# If file too old to be considered stale?
-	if ((time - $mtime) > $hold) {
-		unlink $lockfile;
-		if ($self->warn) {
-			$file =~ s|.*/(.*)|$1|;	# Keep only basename
-			my $s = $hold == 1 ? '' : 's';
-			&{$self->wfunc}("UNLOCKED $file (lock older than $hold second$s)");
-		}
-	}
-}
-
-1;
-
-########################################################################
-
-=head1 NAME
-
-vsLock - simple file locking scheme
-
-=head1 SYNOPSIS
-
- use vsLock qw(lock trylock unlock);
-
- # Simple locking using default settings
- lock("/some/file") || die "can't lock /some/file\n";
- warn "already locked\n" unless trylock("/some/file");
- unlock("/some/file");
-
- # Build customized locking manager object
- $lockmgr = new vsLock(-format => '%f.lck',
-	-max => 20, -delay => 1, -nfs => 1);
-
- $lockmgr->lock("/some/file") || die "can't lock /some/file\n";
- $lockmgr->trylock("/some/file");
- $lockmgr->unlock("/some/file");
-
- $lockmgr->configure(-nfs => 0);
-
-=head1 DESCRIPTION
-
-This simple locking scheme is not based on any file locking system calls
-such as C<flock()> or C<lockf()> but rather relies on basic file system
-primitives and properties, such as the atomicity of the C<write()> system
-call. It is not meant to be exempt from all race conditions, especially over
-NFS. The algorithm used is described below in the B<ALGORITHM> section.
-
-It is possible to customize the locking operations to attempt locking
-once every 5 seconds for 30 times, or delete stale locks (files that are
-deemed too ancient) before attempting the locking.
-
-=head1 ALGORITHM
-
-The locking alogrithm attempts to create a I<lockfile> using a temporarily
-redefined I<umask> (leaving only read rights to prevent further create
-operations). It then writes the process ID (PID) of the process and closes
-the file. That file is then re-opened and read. If we are able to read the
-same PID we wrote, and only that, we assume the locking is successful.
-
-When locking over NFS, i.e. when the one of the potentially locking processes
-could access the I<lockfile> via NFS, then writing the PID is not enough.
-We also write the hostname where locking is attempted to ensure the data
-are unique.
-
-=head1 CUSTOMIZING
-
-Customization is only possible by using the object-oriented interface,
-since the configuration parameters are stored within the object. The
-object creation routine C<make> can be given configuration parmeters in
-the form a "hash table list", i.e. a list of key/value pairs. Those
-parameters can later be changed via C<configure> by specifying a similar
-list of key/value pairs.
-
-To benefit from the bareword quoting Perl offers, all the parameters must
-be prefixed with the C<-> (minus) sign, as in C<-format> for the I<format>
-parameter..  However, when querying the object, the minus must be omitted,
-as in C<$obj-E<gt>format>.
-
-Here are the available configuration parmeters along with their meaning,
-listed in alphabetical order:
-
-=over 4
-
-=item I<delay>
-
-The amount of seconds to wait between locking attempts when the file appears
-to be already locked. Default is 2 seconds.
-
-=item I<ext>
-
-The locking extension that must be added to the file path to be locked to
-compute the I<lockfile> path. Default is C<.lock> (note that C<.> is part
-of the extension and can therefore be changed). Ignored when I<format> is
-also used.
-
-=item I<format>
-
-Using this parmeter supersedes the I<ext> parmeter. The formatting string
-specified is run through a rudimentary macro expansion to derive the
-I<lockfile> path from the file to be locked. The following macros are
-available:
-
-	%%	A real % sign
-	%f	The full file path name
-	%D	The directory where the file resides
-	%F	The base name of the file
-	%p	The process ID (PID)
-
-The default is to use the locking extension, which itself is C<.lock>, so
-it is as if the format used was C<%f.lock>, but one could imagine things
-like C</var/run/%F.%p>, i.e. the I<lockfile> does not necessarily lie besides
-the locked file (which could even be missing).
-
-When locking, the locking format can be specified to supersede the object
-configuration itself. Be sure to use the same locking format when unlocking!
-For instance, you can say:
-
-	$obj->lock('ppp', '/var/run/ppp.%p');
-	$obj->configure(-format => '/var/run/ppp.%p');
-	$obj->unlock('ppp');	# Okay, since format changed
-
-This also works when the calling C<lock()> without an object, and this is
-where it is most useful since in that case you have no object to configure!
-The example above becomes:
-
-	lock('ppp', '/var/run/ppp.%p');    # file ppp may not even exist!
-	<do whatever>
-	unlock('ppp', '/var/run/ppp.%p');  # MUST specify here
-
-=item I<hold>
-
-Maximum amount of seconds we may hold a lock. Past that amount of time,
-an existing I<lockfile> is removed, being taken for a stale lock. Default
-is 3600 seconds. Specifying 0 prevents any forced unlocking.
-
-=item I<max>
-
-Amount of times we retry locking when the file is busy, sleeping I<delay>
-seconds between attempts. Defaults to 30.
-
-=item I<nfs>
-
-A boolean flag, false by default. Setting it to true means we could lock
-over NFS and therefore the hostname must be included along with the process
-ID in the stamp written to the lockfile.
-
-=item I<wafter>
-
-Stands for I<warn after>. It is the number of seconds past the first
-warning during locking time after which a new warning should be emitted.
-See I<warn> and I<wmin> below. Default is 20.
-
-=item I<warn>
-
-A boolean flag, true by default. To suppress any warning, set it to false.
-
-=item I<wfunc>
-
-A function pointer to dereference when a warning is to be issued. By default,
-it points to Perl's C<warn()> function.
-
-=item I<wmin>
-
-The minimal amount of time when waiting for a lock after which a first
-warning must be emitted, if I<warn> is true. After that, a warning will
-be emitted every I<wafter> seconds. Defaults to 15.
-
-=back
-
-Each of those configuration attributes can be queried on the object directly:
-
-	$obj = vsLock->make(-nfs => 1);
-	$on_nfs = $obj->nfs;
-
-Those are pure query routines, i.e. you cannot say:
-
-	$obj->nfs(0);			# WRONG
-	$obj->configure(-nfs => 0);	# Right
-
-to turn of the NFS attribute. That is because my OO background chokes
-at having querying functions with side effects.
-
-=head1 INTERFACE
-
-The OO interface documented below specifies the signature and the
-semantics of the operations. Only the C<lock>, C<trylock> and
-C<unlock> operation can be imported and used via a non-OO interface,
-with the exact same signature nonetheless.
-
-The interface contains all the attribute querying routines, one for
-each configuration parmeter documented in the B<CUSTOMIZING> section
-above, plus, in alphabetical order:
-
-=over 4
-
-=item configure(I<-key =E<gt> value, -key2 =E<gt> value2, ...>)
-
-Change the specified configuration parameters and silently ignore
-the invalid ones.
-
-=item lock(I<file>, I<format>)
-
-Attempt to lock the file, using the optional locking I<format> if
-specified, otherwise using the default I<format> scheme configured
-in the object, or by simply appending the I<ext> extension to the file.
-
-If the file is already locked, sleep I<delay> seconds before retrying,
-repeating try/sleep at most I<max> times. If warning is configured,
-a first warning is emitted after waiting for I<wmin> seconds, and
-then once every I<wafter> seconds, via  the I<wfunc> routine.
-
-Before the first attempt, and if I<hold> is non-zero, any existing
-I<lockfile> is checked for being too old, and it is removed if found
-to be stale. A warning is emitted via the I<wfunc> routine in that
-case, if allowed.
-
-Returns true if the file has been successfully locked.
-
-=item lockfile(I<file>, I<format>)
-
-Simply compute the path of the I<lockfile> that would be used by the
-I<lock> procedure if it were passed the same parameters.
-
-=item make(I<-key =E<gt> value, -key2 =E<gt> value2, ...>)
-
-The creation routine for the simple lock object. Returns a blessed hash
-reference.
-
-=item trylock(I<file>, I<format>)
-
-Same as I<lock> except that it immediately returns false and does not
-sleep if the to-be-locked file is busy, i.e. already locked. Any
-stale locking file is removed, as I<lock> would do anyway.
-
-Returns true if the file has been successfully locked.
-
-=item unlock(I<file>, I<format>)
-
-Unlock the I<file>. If the optional I<format> parameter is given, it
-must be the same as the one that was used at I<lock> time.
-
-=back
-
-=head1 BUGS
-
-The algorithm is not bullet proof.  It's only reasonably safe.  Don't bet
-the integrity of a mission-critical database on it though.
-
-The sysopen() call should probably be used with the C<O_EXCL|O_CREAT> flags
-to be on the safer side. Still, over NFS, this is not an atomic operation
-anyway.
-
-=head1 AUTHOR
-
-Raphael Manfredi F<E<lt>Raphael_Manfredi@grenoble.hp.comE<gt>>
-
-=head1 SEE ALSO
-
-File::Flock(3).
-
-=cut
-
+;# $Id
+;#  vsLock v 0.103
+;#  Modified by Jason M. Hinkle, 2001
+;#
+;#  Based on File::Lock
+;#  Copyright (c) 1998, Raphael Manfredi
+;#  
+;#  You may redistribute only under the terms of the Artistic License,
+;#  as specified in the README file that comes with the distribution.
+;#
+;# $Log: vsLock.pm,v $
+;# Revision 0.1.1.1  1998/05/12  07:42:19  ram
+;# patch1: Baseline for first alpha release.
+;#
+
+########################################################################
+package vsLock; @ISA = qw(Exporter);
+
+#
+# This package extracts the simple locking logic used by mailagent-3.0
+# into a standalone Perl module to be reused in other applications.
+#
+
+use strict;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+use Sys::Hostname;
+
+require Exporter;
+
+@ISA = qw(Exporter);
+@EXPORT = ();
+@EXPORT_OK = qw(lock trylock unlock);
+$VERSION = '0.103';
+
+$vsLock::LOCKER = undef;	# Default locking object
+
+#
+# ->make
+#
+# Create a file locking object, responsible for holding the locking
+# parameters to be used by all the subsequent locks requested from
+# this locking object.
+#
+# Configuration attributes:
+#
+#   max				max number of attempts
+#	delay			seconds to wait between attempts
+#	format			how to derive lockfile from file to be locked
+#	hold			max amount of seconds before breaking lock (0 for never)
+#	ext				lock extension
+#	nfs				true if lock must "work" on top of NFS
+#	warn			flag to turn warnings on
+#	wmin			warn once after that many waiting seconds
+#	wafter			warn every that many seconds after first warning
+#	wfunc			warning function to be called
+#
+# The creation routine first and sole argument is a "hash table list" listing
+# all the configuration attributes. Missing attributes are given a default
+# value. A call to ->configure can alter the configuration parameters of
+# an existing object.
+#
+sub new {
+	my $self = bless {}, shift;
+	my (@hlist) = @_;
+	$self->configure(@hlist);
+
+	# Set configuration defaults
+	$self->{'max'} = 30 unless $self->{'max'};
+	$self->{'delay'} = 2 unless $self->{'delay'};
+	$self->{'hold'} = 3600 unless $self->{'hold'};
+	$self->{'ext'} = '.lock' unless defined $self->{'ext'};
+	$self->{'nfs'} = 0 unless defined $self->{'nfs'};
+	$self->{'warn'} = 1 unless defined $self->{'warn'};
+	$self->{'wfunc'} = \&core_warn unless defined $self->{'wfunc'};
+	$self->{'wmin'} = 15 unless $self->{'wmin'};
+	$self->{'wafter'} = 20 unless $self->{'wafter'};
+
+	return $self;
+}
+
+#
+# ->configure
+#
+# Extract known configuration parameters from the specified hash list
+# and use their values to change the object's corresponding parameters.
+#
+# Parameters are specified as (-warn => 1, -ext => '.lock') for instance.
+#
+sub configure {
+	my $self = shift;
+	my (%hlist) = @_;
+	my @known = qw(max delay hold format ext nfs warn wfunc wmin wafter);
+	foreach my $attr (@known) {
+		$self->{$attr} = $hlist{"-$attr"} if defined $hlist{"-$attr"};
+	}
+}
+
+#
+# Attribute access
+#
+
+sub max			{ $_[0]->{'max'} }
+sub delay		{ $_[0]->{'delay'} }
+sub format		{ $_[0]->{'format'} }
+sub hold		{ $_[0]->{'hold'} }
+sub nfs			{ $_[0]->{'nfs'} }
+sub ext			{ $_[0]->{'ext'} }
+sub warn		{ $_[0]->{'warn'} }
+sub wmin		{ $_[0]->{'wmin'} }
+sub wafter		{ $_[0]->{'wafter'} }
+sub wfunc		{ $_[0]->{'wfunc'} }
+sub Version		{ return $VERSION; }
+
+sub core_warn	{ CORE::warn(@_) }
+
+#
+# ->lock
+#
+# Lock specified file, possibly using alternate file "format".
+# Returns whether file was locked or not at the end of the configured
+# blocking period.
+#
+# For quick and dirty scripts wishing to use locks, create the locking
+# object if not invoked as a method, turning on warnings.
+#
+sub lock {
+	my $self = shift;
+	unless (ref $self) {			# Not invoked as a method
+		unshift(@_, $self);
+		$self = $vsLock::LOCKER ||
+			vsLock->make('-warn' => 1);
+	}
+	my ($file, $format) = @_;		# File to be locked, lock format
+	return $self->_acs_lock($file, $format, 0);
+}
+
+#
+# ->trylock
+#
+# Attempt to lock specified file, possibly using alternate file "format".
+# If the file is already locked, don't block and return false.
+#
+# For quick and dirty scripts wishing to use locks, create the locking
+# object if not invoked as a method, turning on warnings.
+#
+sub trylock {
+	my $self = shift;
+	unless (ref $self) {			# Not invoked as a method
+		unshift(@_, $self);
+		$self = $vsLock::LOCKER ||
+			vsLock->make('-warn' => 1);
+	}
+	my ($file, $format) = @_;		# File to be locked, lock format
+	return $self->_acs_lock($file, $format, 1);
+}
+
+#
+# ->unlock
+#
+# Unlock file.
+# Returns true if file was unlocked.
+#
+sub unlock {
+	my $self = shift;
+	unless (ref $self) {			# Not invoked as a method
+		unshift(@_, $self);
+		$self = $vsLock::LOCKER ||
+			vsLock->make('-warn' => 1);
+	}
+	my ($file, $format) = @_;		# File to be unlocked, lock format
+	return $self->_acs_unlock($file, $format);
+}
+
+#
+# ->lockfile
+#
+# Return the name of the lockfile, given the file name to lock and the custom
+# string provided by the user. The following macros are substituted:
+#	%D: the file dir name
+#   %f: the file name (full path)
+#   %F: the file base name (last path component)
+#   %p: the process's pid
+#   %%: a plain % character
+#
+sub lockfile {
+	my $self = shift;
+	my ($file, $format) = @_;
+	local $_ = defined($format) ? $format : $self->format;
+	s/%%/\01/g;				# Protect double percent signs
+	s/%/\02/g;				# Protect against substitutions adding their own %
+	s/\02f/$file/g;			# %f is the full path name
+	s/\02D/&dir($file)/ge;	# %D is the dir name
+	s/\02F/&base($file)/ge;	# %F is the base name
+	s/\02p/$$/g;			# %p is the process's pid
+	s/\02/%/g;				# All other % kept as-is
+	s/\01/%/g;				# Restore escaped % signs
+	$_;
+}
+
+# Return file basename (last path component)
+sub base {
+	my ($file) = @_;
+	my ($base) = $file =~ m|^.*/(.*)|;
+	$base;
+}
+
+# Return dirname
+sub dir {
+	my ($file) = @_;
+	my ($dir) = $file =~ m|^(.*)/.*|;
+	$dir;
+}
+
+#
+# _acs_lock			-- private
+#
+# Internal locking routine.
+#
+# If $try is true, don't wait if the file is already locked.
+# Returns true if the file was locked.
+#
+sub _acs_lock {		## private
+	my $self = shift;
+	my ($file, $format, $try) = @_;
+	my $max = $self->max;
+	my $delay = $self->delay;
+	my $stamp = $$;
+
+	# For NFS, we need something more unique than the process's PID
+	$stamp .= hostname if $self->nfs;
+
+	# Compute locking file name -- hardwired default format is "%f.lock"
+	my $lockfile = $file . $self->ext;
+	$format = $self->format unless defined $format;
+	$lockfile = $self->lockfile($file, $format) if defined $format;
+
+	# Break lock if held for too long
+	$self->_acs_check($file, $lockfile) if $self->hold;
+
+	my $waited = 0;					# Amount of time spent sleeping
+	my $lastwarn = 0;				# Last time we warned them...
+	my $warn = $self->warn;
+	my ($wmin, $wafter, $wfunc);
+	($wmin, $wafter, $wfunc) = 
+		($self->wmin, $self->wafter, $self->wfunc) if $warn;
+	my $locked = 0;
+	my $mask = umask(0333);			# No write permission
+	local *FILE;
+
+	while ($max-- > 0) {
+		if (-f $lockfile) {
+			next unless $try;
+			umask($mask);
+			return 0;				# Already locked
+		}
+
+		# Attempt to create lock
+		if (open(FILE, ">$lockfile")) {
+			print FILE "$stamp\n";
+			close FILE;
+			open(FILE, $lockfile);	# Check lock
+			my $l;
+			chop($l = <FILE>);
+			$locked = $l eq $stamp;
+			$l = <FILE>;			# Must be EOF
+			$locked = 0 if defined $l; 
+			close FILE;
+			last if $locked;		# Lock seems to be ours
+		} elsif ($try) {
+			umask($mask);
+			return 0;				# Already locked, or cannot create lock
+		}
+	} continue {
+		sleep($delay);				# Busy: wait
+		$waited += $delay;
+
+		# Warn them once after $wmin seconds and then every $wafter seconds
+		if (
+			$warn &&
+				((!$lastwarn && $waited > $wmin) ||
+				($waited - $lastwarn) > $wafter)
+		) {
+			my $waiting  = $lastwarn ? 'still waiting' : 'waiting';
+			my $after  = $lastwarn ? 'after' : 'since';
+			my $s = $waited == 1 ? '' : 's';
+			&$wfunc("WARNING $waiting for $file lock $after $waited second$s");
+			$lastwarn = $waited;
+		}
+	}
+
+	umask($mask);
+	return $locked;
+}
+
+#
+# ->_acs_unlock		-- private
+#
+# Unlock file. If lock format is specified, it must match the one used
+# at lock time.
+#
+# Return true if file was indeed locked by us and is now properly unlocked.
+#
+sub _acs_unlock {	## private
+	my $self = shift;
+	my ($file, $format) = @_;		# Locked file, locking format
+	my $stamp = $$;
+	$stamp .= hostname if $self->nfs;
+
+	# Compute locking file name -- hardwired default format is "%f.lock"
+	my $lockfile = $file . $self->ext;
+	$format = $self->format unless defined $format;
+	$lockfile = $self->lockfile($file, $format) if defined $format;
+
+	local *FILE;
+	my $unlocked = 0;
+
+	if (-f $lockfile) {
+		open(FILE, $lockfile);
+		my $l;
+		chop($l = <FILE>);
+		close FILE;
+		if ($l eq $stamp) {			 # Pid (plus hostname possibly) is OK
+			$unlocked = 1;
+			unlink $lockfile or $unlocked = 0;
+		}
+	}
+
+	# It's reasonable to expect $! to be meaningful at this point
+	&{$self->wfunc}("WARNING did not unlock $file: $!")
+		if !$unlocked && $self->warn;
+
+	return $unlocked;				# Did we successfully unlock?
+}
+
+#
+# ->_acs_check
+#
+# Make sure lock lasts only for a reasonable time. If it has expired,
+# then remove the lockfile.
+#
+sub _acs_check {
+	my $self = shift;
+	my ($file, $lockfile) = @_;
+	return unless -f $lockfile;
+
+	my $mtime = (stat($lockfile))[9];
+	my $hold = $self->hold;
+
+	# If file too old to be considered stale?
+	if ((time - $mtime) > $hold) {
+		unlink $lockfile;
+		if ($self->warn) {
+			$file =~ s|.*/(.*)|$1|;	# Keep only basename
+			my $s = $hold == 1 ? '' : 's';
+			&{$self->wfunc}("UNLOCKED $file (lock older than $hold second$s)");
+		}
+	}
+}
+
+1;
+
+########################################################################
+
+=head1 NAME
+
+vsLock - simple file locking scheme
+
+=head1 SYNOPSIS
+
+ use vsLock qw(lock trylock unlock);
+
+ # Simple locking using default settings
+ lock("/some/file") || die "can't lock /some/file\n";
+ warn "already locked\n" unless trylock("/some/file");
+ unlock("/some/file");
+
+ # Build customized locking manager object
+ $lockmgr = new vsLock(-format => '%f.lck',
+	-max => 20, -delay => 1, -nfs => 1);
+
+ $lockmgr->lock("/some/file") || die "can't lock /some/file\n";
+ $lockmgr->trylock("/some/file");
+ $lockmgr->unlock("/some/file");
+
+ $lockmgr->configure(-nfs => 0);
+
+=head1 DESCRIPTION
+
+This simple locking scheme is not based on any file locking system calls
+such as C<flock()> or C<lockf()> but rather relies on basic file system
+primitives and properties, such as the atomicity of the C<write()> system
+call. It is not meant to be exempt from all race conditions, especially over
+NFS. The algorithm used is described below in the B<ALGORITHM> section.
+
+It is possible to customize the locking operations to attempt locking
+once every 5 seconds for 30 times, or delete stale locks (files that are
+deemed too ancient) before attempting the locking.
+
+=head1 ALGORITHM
+
+The locking alogrithm attempts to create a I<lockfile> using a temporarily
+redefined I<umask> (leaving only read rights to prevent further create
+operations). It then writes the process ID (PID) of the process and closes
+the file. That file is then re-opened and read. If we are able to read the
+same PID we wrote, and only that, we assume the locking is successful.
+
+When locking over NFS, i.e. when the one of the potentially locking processes
+could access the I<lockfile> via NFS, then writing the PID is not enough.
+We also write the hostname where locking is attempted to ensure the data
+are unique.
+
+=head1 CUSTOMIZING
+
+Customization is only possible by using the object-oriented interface,
+since the configuration parameters are stored within the object. The
+object creation routine C<make> can be given configuration parmeters in
+the form a "hash table list", i.e. a list of key/value pairs. Those
+parameters can later be changed via C<configure> by specifying a similar
+list of key/value pairs.
+
+To benefit from the bareword quoting Perl offers, all the parameters must
+be prefixed with the C<-> (minus) sign, as in C<-format> for the I<format>
+parameter..  However, when querying the object, the minus must be omitted,
+as in C<$obj-E<gt>format>.
+
+Here are the available configuration parmeters along with their meaning,
+listed in alphabetical order:
+
+=over 4
+
+=item I<delay>
+
+The amount of seconds to wait between locking attempts when the file appears
+to be already locked. Default is 2 seconds.
+
+=item I<ext>
+
+The locking extension that must be added to the file path to be locked to
+compute the I<lockfile> path. Default is C<.lock> (note that C<.> is part
+of the extension and can therefore be changed). Ignored when I<format> is
+also used.
+
+=item I<format>
+
+Using this parmeter supersedes the I<ext> parmeter. The formatting string
+specified is run through a rudimentary macro expansion to derive the
+I<lockfile> path from the file to be locked. The following macros are
+available:
+
+	%%	A real % sign
+	%f	The full file path name
+	%D	The directory where the file resides
+	%F	The base name of the file
+	%p	The process ID (PID)
+
+The default is to use the locking extension, which itself is C<.lock>, so
+it is as if the format used was C<%f.lock>, but one could imagine things
+like C</var/run/%F.%p>, i.e. the I<lockfile> does not necessarily lie besides
+the locked file (which could even be missing).
+
+When locking, the locking format can be specified to supersede the object
+configuration itself. Be sure to use the same locking format when unlocking!
+For instance, you can say:
+
+	$obj->lock('ppp', '/var/run/ppp.%p');
+	$obj->configure(-format => '/var/run/ppp.%p');
+	$obj->unlock('ppp');	# Okay, since format changed
+
+This also works when the calling C<lock()> without an object, and this is
+where it is most useful since in that case you have no object to configure!
+The example above becomes:
+
+	lock('ppp', '/var/run/ppp.%p');    # file ppp may not even exist!
+	<do whatever>
+	unlock('ppp', '/var/run/ppp.%p');  # MUST specify here
+
+=item I<hold>
+
+Maximum amount of seconds we may hold a lock. Past that amount of time,
+an existing I<lockfile> is removed, being taken for a stale lock. Default
+is 3600 seconds. Specifying 0 prevents any forced unlocking.
+
+=item I<max>
+
+Amount of times we retry locking when the file is busy, sleeping I<delay>
+seconds between attempts. Defaults to 30.
+
+=item I<nfs>
+
+A boolean flag, false by default. Setting it to true means we could lock
+over NFS and therefore the hostname must be included along with the process
+ID in the stamp written to the lockfile.
+
+=item I<wafter>
+
+Stands for I<warn after>. It is the number of seconds past the first
+warning during locking time after which a new warning should be emitted.
+See I<warn> and I<wmin> below. Default is 20.
+
+=item I<warn>
+
+A boolean flag, true by default. To suppress any warning, set it to false.
+
+=item I<wfunc>
+
+A function pointer to dereference when a warning is to be issued. By default,
+it points to Perl's C<warn()> function.
+
+=item I<wmin>
+
+The minimal amount of time when waiting for a lock after which a first
+warning must be emitted, if I<warn> is true. After that, a warning will
+be emitted every I<wafter> seconds. Defaults to 15.
+
+=back
+
+Each of those configuration attributes can be queried on the object directly:
+
+	$obj = vsLock->make(-nfs => 1);
+	$on_nfs = $obj->nfs;
+
+Those are pure query routines, i.e. you cannot say:
+
+	$obj->nfs(0);			# WRONG
+	$obj->configure(-nfs => 0);	# Right
+
+to turn of the NFS attribute. That is because my OO background chokes
+at having querying functions with side effects.
+
+=head1 INTERFACE
+
+The OO interface documented below specifies the signature and the
+semantics of the operations. Only the C<lock>, C<trylock> and
+C<unlock> operation can be imported and used via a non-OO interface,
+with the exact same signature nonetheless.
+
+The interface contains all the attribute querying routines, one for
+each configuration parmeter documented in the B<CUSTOMIZING> section
+above, plus, in alphabetical order:
+
+=over 4
+
+=item configure(I<-key =E<gt> value, -key2 =E<gt> value2, ...>)
+
+Change the specified configuration parameters and silently ignore
+the invalid ones.
+
+=item lock(I<file>, I<format>)
+
+Attempt to lock the file, using the optional locking I<format> if
+specified, otherwise using the default I<format> scheme configured
+in the object, or by simply appending the I<ext> extension to the file.
+
+If the file is already locked, sleep I<delay> seconds before retrying,
+repeating try/sleep at most I<max> times. If warning is configured,
+a first warning is emitted after waiting for I<wmin> seconds, and
+then once every I<wafter> seconds, via  the I<wfunc> routine.
+
+Before the first attempt, and if I<hold> is non-zero, any existing
+I<lockfile> is checked for being too old, and it is removed if found
+to be stale. A warning is emitted via the I<wfunc> routine in that
+case, if allowed.
+
+Returns true if the file has been successfully locked.
+
+=item lockfile(I<file>, I<format>)
+
+Simply compute the path of the I<lockfile> that would be used by the
+I<lock> procedure if it were passed the same parameters.
+
+=item make(I<-key =E<gt> value, -key2 =E<gt> value2, ...>)
+
+The creation routine for the simple lock object. Returns a blessed hash
+reference.
+
+=item trylock(I<file>, I<format>)
+
+Same as I<lock> except that it immediately returns false and does not
+sleep if the to-be-locked file is busy, i.e. already locked. Any
+stale locking file is removed, as I<lock> would do anyway.
+
+Returns true if the file has been successfully locked.
+
+=item unlock(I<file>, I<format>)
+
+Unlock the I<file>. If the optional I<format> parameter is given, it
+must be the same as the one that was used at I<lock> time.
+
+=back
+
+=head1 BUGS
+
+The algorithm is not bullet proof.  It's only reasonably safe.  Don't bet
+the integrity of a mission-critical database on it though.
+
+The sysopen() call should probably be used with the C<O_EXCL|O_CREAT> flags
+to be on the safer side. Still, over NFS, this is not an atomic operation
+anyway.
+
+=head1 AUTHOR
+
+Raphael Manfredi F<E<lt>Raphael_Manfredi@grenoble.hp.comE<gt>>
+
+=head1 SEE ALSO
+
+File::Flock(3).
+
+=cut
+
+
+
diff --git a/web/bin/button_hp.pl b/web/bin/button_hp.pl
new file mode 100644
index 000000000..e095982a2
--- /dev/null
+++ b/web/bin/button_hp.pl
@@ -0,0 +1,209 @@
+
+$^W = 0;                        # Avoid redefined sub msgs
+
+# Create jpeg buttons on-the-fly with GD module
+# For text buttons:  <img src="/bin/button.pl?text you want" border="0">
+# For item buttons:  <img src="/bin/button.pl?item_name&item&item_state" border="0">
+
+# Authority: anyone
+
+my ($text, $state, $bg_color, $file_name_only) = @ARGV;
+
+my $type = 'item';
+
+print "db v6 t=$text t=$type s=$state bg=$bg_color\n";
+
+#my ($state, $x, $y) = $state_xy =~ /(\S+)\?(\d+),(\d+)/;
+
+$state    = ''  unless $state;
+$type     = ''  unless $type;
+$bg_color = 'white' unless $bg_color;
+
+unless ($Info{module_GD}) {
+    return;
+}
+
+my $image_file = $text;
+$image_file =~ s/^\$//;           # Drop leading $ on object name
+$image_file =~ s/ *$//;           # Drop trailing blanks
+$image_file .= "_$type"  if $type;
+$image_file .= "_$state" if $state;
+$image_file =~ s/ /_/g;           # Blanks in file names are nasty
+$image_file = "/cache/$image_file.jpg";
+
+
+my $nocache = 0;
+#$nocache = 1;
+##if (-e "$config_parms{data_dir}$image_file" or $nocache) {
+##    return $image_file if $file_name_only;
+##   print "Returning data from: $image_file\n";
+##    my $data = file_read "$config_parms{data_dir}$image_file";
+##    return &mime_header($image_file, 1, length $data) . $data;
+##}
+
+                                # Look for an icon
+my ($icon, $light);
+
+    my $object = &get_object_by_name($text);
+#    ($icon) = &http_get_local_file(&html_find_icon_image($object, 'voice'));
+#   $light = 1 if $text =~ /light/i or $text =~ /lite/i;
+#    $light = 1 if $object->isa('X10_Item') and !$object->isa('X10_Appliance');
+
+if ($state eq 'door') {
+	$icon = './../web/graphics/icon_door.jpg';
+	}
+elsif ($state eq 'motion') {
+	$icon = './../web/graphics/icon_motion.jpg';
+	}
+elsif ($state eq 'brightness') {
+	$icon = './../web/graphics/icon_motion.jpg';
+	}
+
+
+my $tmp1 = &html_find_icon_image($object,'voice');
+my $s2 = $object->state;
+print "db icon=$icon state_s2=$s2 tmp1=$tmp1\n";
+
+undef $icon if $icon and $icon !~ /.jpg$/i;  # GD does not do gifs :(
+my $image_icon = GD::Image->newFromJpeg($icon) if $icon;
+
+my $image;
+if ($image_icon or $type eq 'item') {
+
+                       # Template = blank_on/off/unk or blank_light_on/off/dim
+    my $template = 'blank';
+    $template .= '_light' if $light;
+    if ($state eq 'on' or $state eq 'off') {
+        $template .= "_$state";
+    }
+    else {
+        $template .= ($light) ? '_dim' : '';
+    }
+    $template  = 'blank_textbutton' unless $type;
+    $template .= "_$bg_color" if $bg_color and $bg_color ne 'white';
+
+                         # GD in 5.8 gives gray for white jpg??  Allow for png, which is still gray :(
+    my $file = "$config_parms{html_dir}/graphics/$template.png";
+    if (-f $file) {
+        $image = GD::Image->newFromPng($file);
+    }
+    else {
+        $file  = "$config_parms{html_dir}/graphics/$template.jpg";
+        $image = GD::Image->newFromJpeg($file);
+    }
+
+    if ($image_icon and $template !~ /_light/) {
+        my ($iw, $ih) = $image_icon->getBounds();
+        $image->copyResized($image_icon, 7, 6, 0, 0, 40, 40, $iw, $ih);
+    }
+
+    my $color;
+
+  # Filter out starting keyword Sensor
+    my $filter = &pretty_object_name($text);
+       $filter =~ s/^sensor//i;
+
+    my @lines = split ' ', $filter, 3;
+
+  # Combine lines if they are short enough
+    if (length $lines[0] . $lines[1] < 12) {
+        $lines[0] .= " $lines[1]";
+        $lines[1]  = $lines[2];
+        $lines[2]  = '';
+    }
+    if (length $lines[1] . $lines[2] < 12) {
+        $lines[1] .= " $lines[2]";
+        $lines[2]  = '';
+    }
+
+                 # gdGiantFont, gdLargeFont, gdMediumBoldFont, gdSmallFont and gdTinyFont
+    my ($font, $x);
+    if ($type) {
+        $font = gdMediumBoldFont;
+        $x = 55;
+    }
+    else {
+        $font = gdMediumBoldFont;
+#       $font = gdTinyFont;
+#       $font = gdSmallFont;
+        $x = 35;
+    }
+    $image->string($font, $x ,   6, ucfirst $lines[0], $color);
+    $image->string($font, $x ,  18, ucfirst $lines[1], $color) if $lines[1];
+    $image->string($font, $x ,  30, ucfirst $lines[2], $color) if $lines[2];
+
+my $sname;
+    if ($state eq 'door') {
+       $x += 45;
+	if ($s2 eq 'on') {
+		$sname = "Open";
+		$color = $image->colorClosest(255,0,0);
+		}
+	else {
+		$sname = "Closed";
+		$color = $image->colorClosest(0,0,0);
+		}
+        $image->string($font, $x ,  30, ucfirst $sname, $color);
+}
+    elsif ($state eq 'motion') {
+        $x += 45;
+	if ($s2 eq 'motion') {
+		$color = $image->colorClosest(255,0,0);
+		}
+	else {
+		$color = $image->colorClosest(0,0,0);
+		}
+        $image->string($font, $x ,  30, ucfirst $s2, $color);
+}
+    elsif ($state eq 'brightness') {
+        $x += 45;
+	if ($s2 eq 'light') {
+		$color = $image->colorClosest(255,0,0);
+		}
+	else {
+		$color = $image->colorClosest(0,0,0);
+		}
+        $image->string($font, $x ,  30, ucfirst $s2, $color);
+}
+
+
+
+}
+else {
+    my $template  = 'blank_textbutton';
+    $template .= "_$bg_color" if $bg_color and $bg_color ne 'white';
+
+                         # GD in 5.8 gives gray for white jpg??  Allow for png
+    my $file = "$config_parms{html_dir}/graphics/$template.png";
+    if (-f $file) {
+        $image = GD::Image->newFromPng($file);
+    }
+    else {
+        $file  = "$config_parms{html_dir}/graphics/$template.jpg";
+        $image = GD::Image->newFromJpeg($file);
+    }
+
+                                 # calculate size of image and text for offset
+
+    my $textsize = length $text;
+    my $font = gdMediumBoldFont; # Choices: gdTinyFont, gdLargeFont, gdSmallFont, gdMediumBoldFont
+    $font = gdTinyFont if $textsize > 14;
+
+    my ($imwidth,$imheight) = $image->getBounds();
+    my $ftwidth = ($font->width);
+    my $offset = $imwidth - ($ftwidth * $textsize);
+    my $black = $image->colorClosest(50,50,50);
+    $image->string($font, $offset/2-3, 12, $text, $black);
+}
+
+                                # make the background transparent
+my $white = $image->colorClosest(255,255,255);
+$image->transparent($white);
+
+                                # Write out a copy to the cache
+print "Writing image to cache: $config_parms{data_dir}$image_file\n";
+my $jpeg = $image->jpeg;
+file_write "$config_parms{data_dir}$image_file", $jpeg;
+
+return $image_file if $file_name_only;
+return &mime_header($image_file, 1, length $jpeg) . $jpeg;
diff --git a/web/bin/button_sensor.pl b/web/bin/button_sensor.pl
new file mode 100644
index 000000000..35abcf6b1
--- /dev/null
+++ b/web/bin/button_sensor.pl
@@ -0,0 +1,174 @@
+
+$^W = 0;                        # Avoid redefined sub msgs
+
+# Create jpeg buttons on-the-fly with GD module
+# For text buttons:  <img src="/bin/button.pl?text you want" border="0">
+# For item buttons:  <img src="/bin/button.pl?item_name&item&item_state" border="0">
+
+# Authority: anyone
+
+my ($text, $type, $bg_color) = @ARGV;
+
+##print "db v6 t=$text  s=$state bg=$bg_color\n";
+
+#my ($state, $x, $y) = $state_xy =~ /(\S+)\?(\d+),(\d+)/;
+
+$bg_color = 'white' unless $bg_color;
+
+unless ($Info{module_GD}) {
+    return;
+}
+
+my $image_file = $text;
+$image_file =~ s/^\$//;           # Drop leading $ on object name
+$image_file =~ s/ *$//;           # Drop trailing blanks
+$image_file =~ s/ /_/g;           # Blanks in file names are nasty
+$image_file = "/cache/$image_file.jpg";
+
+
+my $nocache = 0;
+#$nocache = 1;
+##if (-e "$config_parms{data_dir}$image_file" or $nocache) {
+##    return $image_file if $file_name_only;
+##   print "Returning data from: $image_file\n";
+##    my $data = file_read "$config_parms{data_dir}$image_file";
+##    return &mime_header($image_file, 1, length $data) . $data;
+##}
+
+                                # Look for an icon
+my ($icon, $light);
+
+    my $object = &get_object_by_name($text);
+#    ($icon) = &http_get_local_file(&html_find_icon_image($object, 'voice'));
+#   $light = 1 if $text =~ /light/i or $text =~ /lite/i;
+#    $light = 1 if $object->isa('X10_Item') and !$object->isa('X10_Appliance');
+
+if ($type eq 'door') {
+	$icon = './../web/graphics/icon_door.jpg';
+	}
+elsif ($type eq 'motion') {
+	$icon = './../web/graphics/icon_motion.jpg';
+	}
+elsif ($type eq 'brightness') {
+	$icon = './../web/graphics/icon_motion.jpg';
+	}
+elsif ($type eq 'water') {
+	$icon = './../web/graphics/icon_water.jpg';
+	}
+
+
+#my $tmp1 = &html_find_icon_image($object,'voice');
+my $state = $object->state;
+
+undef $icon if $icon and $icon !~ /.jpg$/i;  # GD does not do gifs :(
+my $image_icon = GD::Image->newFromJpeg($icon) if $icon;
+
+my $image;
+
+    # Template = blank_on/off/unk or blank_light_on/off/dim
+    my $template  = 'blank_sens';
+    $template .= "_$bg_color" if $bg_color and $bg_color ne 'white';
+
+    # GD in 5.8 gives gray for white jpg??  Allow for png, which is still gray :(
+    my $file = "$config_parms{html_dir}/graphics/$template.png";
+    if (-f $file) {
+        $image = GD::Image->newFromPng($file);
+    }
+    else {
+        $file  = "$config_parms{html_dir}/graphics/$template.jpg";
+        $image = GD::Image->newFromJpeg($file);
+    }
+
+    if ($image_icon and $template !~ /_light/) {
+        my ($iw, $ih) = $image_icon->getBounds();
+        $image->copyResized($image_icon, 7, 6, 0, 0, 40, 40, $iw, $ih);
+    }
+
+    my $color;
+
+  # Filter out starting keyword Sensor
+    my $filter = &pretty_object_name($text);
+       $filter =~ s/^sensor//i;
+
+    my @lines = split ' ', $filter, 3;
+
+  # Combine lines if they are short enough
+    if (length $lines[0] . $lines[1] < 12) {
+        $lines[0] .= " $lines[1]";
+        $lines[1]  = $lines[2];
+        $lines[2]  = '';
+    }
+    if (length $lines[1] . $lines[2] < 12) {
+        $lines[1] .= " $lines[2]";
+        $lines[2]  = '';
+    }
+
+                 # gdGiantFont, gdLargeFont, gdMediumBoldFont, gdSmallFont and gdTinyFont
+    my ($font, $x);
+        $x = 50;
+        $font = gdMediumBoldFont;
+#       $font = gdTinyFont;
+#       $font = gdSmallFont;
+
+    $image->string($font, $x ,   6, ucfirst $lines[0], $color);
+    $image->string($font, $x ,  18, ucfirst $lines[1], $color) if $lines[1];
+    $image->string($font, $x ,  30, ucfirst $lines[2], $color) if $lines[2];
+
+my $sname;
+    if ($type eq 'door') {
+       $x += 45;
+	if (($state eq 'on') or ($state eq 'open')) {
+		$sname = "Open";
+		$color = $image->colorClosest(255,0,0);
+		}
+	else {
+		$sname = "Closed";
+		$color = $image->colorClosest(0,0,0);
+		}
+        $image->string($font, $x ,  30, ucfirst $sname, $color);
+}
+    elsif ($type eq 'motion') {
+        $x += 45;
+	if ($state eq 'motion') {
+		$color = $image->colorClosest(255,0,0);
+		}
+	else {
+		$color = $image->colorClosest(0,0,0);
+		}
+        $image->string($font, $x ,  30, ucfirst $state, $color);
+}
+    elsif ($type eq 'brightness') {
+        $x += 45;
+	if ($state eq 'light') {
+		$color = $image->colorClosest(255,0,0);
+		}
+	else {
+		$color = $image->colorClosest(0,0,0);
+		}
+        $image->string($font, $x ,  30, ucfirst $state, $color);
+}
+
+    elsif ($type eq 'water') {
+        $x += 65;
+	if ($state eq 'on') {
+		$sname = "Wet";
+		$color = $image->colorClosest(255,0,0);
+		}
+	else {
+		$sname = "Dry";
+		$color = $image->colorClosest(0,0,0);
+		}
+        $image->string($font, $x,  30, ucfirst $sname, $color);
+}
+
+
+                                # make the background transparent
+my $white = $image->colorClosest(255,255,255);
+$image->transparent($white);
+
+                                # Write out a copy to the cache
+print "Writing image to cache: $config_parms{data_dir}$image_file\n";
+my $jpeg = $image->jpeg;
+file_write "$config_parms{data_dir}$image_file", $jpeg;
+
+return &mime_header($image_file, 1, length $jpeg) . $jpeg;
diff --git a/web/bin/icon_panic.pl b/web/bin/icon_panic.pl
new file mode 100644
index 000000000..848b2d7ba
--- /dev/null
+++ b/web/bin/icon_panic.pl
@@ -0,0 +1,16 @@
+
+# Return a panic mode button - red to start panic process, green to cancel
+
+# Authority: anyone
+
+my $icon = '/ia5/images/panicred.gif';
+my $action = '';
+#my $action = '/SET;referer/ia5/top.shtml?hpc_panic_mode=on';
+#           # Return a user specific icon, or default logout icon if not found.
+#if (active $hpc_timer_panic) {
+#    $icon = '/ia5/images/panicgreen.gif';
+#    $action = '/SET;referer/ia5/top.shtml?hpc_panic_mode=off';
+#}
+
+#print "\ndbx a=$Authorized i=$icon a=$action\n";
+return "<a href='$action' target='title'><img src='$icon' alt='Panic Mode' border=0></a>";
diff --git a/web/bin/phone_in.pl b/web/bin/phone_in.pl
index 9b063c837..7b69367ac 100644
--- a/web/bin/phone_in.pl
+++ b/web/bin/phone_in.pl
@@ -2,6 +2,7 @@
 # read_phone_logs* is from phone_logs.pl code files
 my $html_calls;
 my $display_name;
+my $display_num;
 my @logs   = &read_phone_logs1('callerid');
 my @calls  = &read_phone_logs2(100, @logs);
 for my $r (@calls) {
@@ -10,11 +11,15 @@
     $display_name = $name;
     $display_name =~ s/_/ /g; # remove underscores to make it print pretty
     next unless $num;
+    $display_num = $num;
+    if  ($display_num =~ /\d\d\d\d\d\d\d\d\d\d/) {
+      $display_num = (substr $num,0,3) . "-" . (substr $num,3,3) . "-" . (substr $num,6,4);
+    }
 #   next unless $line;
 
     $html_calls .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
 #    $html_calls .= "<td nowrap><a href=\"phone_search.pl?search=$num\"><img src='/graphics/ico_magnify.gif' border=0 alt='Show last call from $num'></a>&nbsp;<a href=\"phone_search.pl?search=$num\"><img src='/graphics/ico_magnify.gif' border=0 alt='Show last call from $num'></a></td>";
-    $html_calls .= "<td nowrap>$time</td><td nowrap><a href=\"phone_search.pl?search=$num\"><img src='/graphics/ico_magnify.gif' border=0 alt='Show last call from $num'></a>&nbsp;$num</td>";
+    $html_calls .= "<td nowrap>$time</td><td nowrap><a href=\"phone_search.pl?search=$num\"><img src='/graphics/ico_magnify.gif' border=0 alt='Show last call from $num'></a>&nbsp;$display_num</td>";
     $html_calls .= "<td nowrap><a href=\"callerid.pl?cidnumber=$num&cidname=$name&showlist=0\"><img src='/graphics/ico_plus.gif' border=0 alt='Add $num to phone.callerid.list file'></a>&nbsp;$display_name</td><td nowrap>$line</td>";
     $html_calls .= "</tr>";
 }
diff --git a/web/bin/statuspanel.pl b/web/bin/statuspanel.pl
new file mode 100644
index 000000000..5486d10d6
--- /dev/null
+++ b/web/bin/statuspanel.pl
@@ -0,0 +1,64 @@
+
+# This web page example is from Brian Klier.  It is called from statuspannel.shtml
+
+return "
+<IMG SRC=\"/mh/graphics/$alarmactive->{state}.gif\">
+<font size=-1>
+ALARM: <b>$alarmactive->{state}</b><br>
+<!--<IMG SRC=\"/mh/graphics/$needatt->{state}.gif\">
+NEED OF ATTENTION: <b>$needatt->{state}</b><br>-->
+</font>
+Time: <b>$Time_Now</b>&nbsp;&nbsp;&nbsp;
+Temperature: <b>$CurrentTemp&deg;</b>
+<IMG border=1 height=7 SRC=\"/mh/graphics/appledot.gif\" width=$CurrentTemp><br>
+Wind: <b>$WXWindDirVoice</b> at <b>$WXWindSpeed</b> MPH.<br>
+<br>
+<font size=-1>
+Last Tracked: <b>$GPSSpeakString</b><br>
+Last Weather: <b>$WXSpeakString</b><br>
+Last Incoming Call: <b>$PhoneName ($PhoneNumber)</b>, at <b>$PhoneTime</b> on <b>$PhoneDate</b><br>
+<br>
+<IMG SRC=\"/mh/graphics/lamp/$living_room->{state}.gif\">
+Living Room: <b>$living_room->{state}</b>&nbsp;&nbsp;&nbsp;
+<IMG SRC=\"/mh/graphics/lamp/$front_entryway->{state}.gif\">
+Front Entryway: <b>$front_entryway->{state}</b></br>
+<IMG SRC=\"/mh/graphics/lamp/$bedroom_lamp->{state}.gif\">
+Bedroom: <b>$bedroom_lamp->{state}</b>&nbsp;&nbsp;&nbsp;
+<IMG SRC=\"/mh/graphics/lamp/$back_porch_light->{state}.gif\">
+Back Porch: <b>$back_porch_light->{state}</b><br>
+<IMG SRC=\"/mh/graphics/lamp/$kitchen_light->{state}.gif\">
+Kitchen: <b>$kitchen_light->{state}</b><br>
+<br>
+<font size=-1>
+<IMG SRC=\"/mh/graphics/$projector->{state}.gif\">
+Projector: <b>$projector->{state}</b>&nbsp;&nbsp;&nbsp;
+<IMG SRC=\"/mh/graphics/$air_cond_fan->{state}.gif\">
+Air Conditioner: <b>$air_cond_fan->{state}</b>&nbsp;&nbsp;&nbsp;
+<IMG SRC=\"/mh/graphics/$circ_fan->{state}.gif\">
+Floor Fan: <b>$circ_fan->{state}</b><br>
+<IMG SRC=\"/mh/graphics/$boombox_bedroom->{state}.gif\">
+Boombox: <b>$boombox_bedroom->{state}</b>&nbsp;&nbsp;&nbsp;
+<IMG SRC=\"/mh/graphics/$bed_heater->{state}.gif\">
+Bed Heater: <b>$bed_heater->{state}</b>&nbsp;&nbsp;&nbsp;
+<IMG SRC=\"/mh/graphics/$request_music_stuff->{state}.gif\">
+Music: <b>$request_music_stuff->{state}</b><br>
+<br>
+<IMG SRC=\"/mh/graphics/$motion_detector_frontdoor->{state}.gif\">
+Entryway Motion: <b>$motion_detector_frontdoor->{state}</b>&nbsp;&nbsp;&nbsp;
+<IMG SRC=\"/mh/graphics/$motion_detector_backdoor->{state}.gif\">
+Back Door Motion: <b>$motion_detector_backdoor->{state}</b><br>
+<IMG SRC=\"/mh/graphics/$motion_detector_kitchen->{state}.gif\">
+Kitchen Motion: <b>$motion_detector_kitchen->{state}</b>&nbsp;&nbsp;&nbsp;
+<IMG SRC=\"/mh/graphics/$low_light_kitchen->{state}.gif\">
+Kitchen Low Light: <b>$low_light_kitchen->{state}</b><br>
+<IMG SRC=\"/mh/graphics/$motion_detector_living_room->{state}.gif\">
+Living Room Motion: <b>$motion_detector_living_room->{state}</b>&nbsp;&nbsp;&nbsp;
+<IMG SRC=\"/mh/graphics/$low_light_living_room->{state}.gif\">
+Living Room Low Light: <b>$low_light_living_room->{state}</b><br>
+<IMG SRC=\"/mh/graphics/$motion_detector_garage->{state}.gif\">
+Garage Motion: <b>$motion_detector_garage->{state}</b>&nbsp;&nbsp;&nbsp;
+<IMG SRC=\"/mh/graphics/$low_light_garage->{state}.gif\">
+Garage Low Light: <b>$low_light_garage->{state}</b>
+</font>
+";
+
diff --git a/web/graphics/icons/pcomm2.png b/web/graphics/icons/pcomm2.png
index de0b15935276a1b12dd0c68f3ea59a80b133f723..3eec4958262f80230b2422a72939ecf4abb5d264 100644
GIT binary patch
delta 281
zcmV+!0p|X~1j7W77YZB%0{{R3^6a1yks%WSFp)JY4FCWD00000007%HTR4-D0jZH^
zM1RytL_t(2&xMd762dSLMHhhxRh398xBw1~!uJTAp`r(<4RRaP88C^$ZgV*{y9sR-
zf2K2?H@pA;4MYkeUqul_r$4v=Oqy4~0>Ewqnx;8z!1*soD<szF3TQ@cV-tARb$!%%
zvZWZwit`D`uqQ493Q{jHv~Sy1K(?p-BWeS^jaEP`a9MHhdkE9Y!@aJO@{3hZ)M5#I
zKw|Sd8V8&(@dqlLGRTWKS_Kqixh{h_Iq-zHoYHj$=Nkj|U=Tt-9Q=IAG3nHP08>n{
fVh?~SLQ(tz`-|<r-{1;z00000NkvXXu0mjfvp#P7

delta 278
zcmV+x0qOq31i}Q67YZN*0{{R3fmCP5ks%WSCy_NP1mbc{*pm|hM}OQ&L_t(|oQ2S_
z4uUWc2H<mGsA2IDWbg&toSocx1fPL{2VlkVfPqAp_6=GV*Cu@^ue}x!2mgeGeCb`U
z2W}H^4mmSe6(aKl{S<-=gaWgI765i%P!z@S3r>IGr(_F{14Z+=!#r5W^R@)xSMs>p
zgP#jTDCs4E<znqQ0A{z)IxEYPA+$i9-4ncSN{wO#&x=2@l*9!t@P^H`&e@SZ9&811
z(_%;f92_IW*4VXlOH~P+rt~^cs&4ku_zrYJ`lr?n2y-Q%e*#(><kp<yH6AE7HN_m_
cYE#??6J;Z!N@&bCk!`6707*qoM6N<$g43mUYXATM

diff --git a/web/newclock/index.shtml b/web/newclock/index.shtml
new file mode 100644
index 000000000..8ce0828da
--- /dev/null
+++ b/web/newclock/index.shtml
@@ -0,0 +1,257 @@
+<HEAD>
+<TITLE>MisterHouse NewClock index2</TITLE>
+<META HTTP-EQUIV="Refresh" CONTENT="900">
+<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
+<META HTTP-EQUIV="Expires" CONTENT="-1">
+
+<!- Updated shtml file to better fit audrey screens and uses ->
+<!- The built in $weather{TempOutdoor} for outdoor temp      ->
+<!- Todo - display F or C depending on preference            ->
+
+<SCRIPT LANGUAGE="JavaScript">
+<!-- The JavaScript Source!! http://javascript.internet.com -->
+
+<!-- Begin   function extract(h,m,s,type) {
+
+var dn;
+c1 = new Image(); c1.src = "numbers2/c1.gif";
+c2 = new Image(); c2.src = "numbers2/c2.gif";
+c3 = new Image(); c3.src = "numbers2/c3.gif";
+c4 = new Image(); c4.src = "numbers2/c4.gif";
+c5 = new Image(); c5.src = "numbers2/c5.gif";
+c6 = new Image(); c6.src = "numbers2/c6.gif";
+c7 = new Image(); c7.src = "numbers2/c7.gif";
+c8 = new Image(); c8.src = "numbers2/c8.gif";
+c9 = new Image(); c9.src = "numbers2/c9.gif";
+c0 = new Image(); c0.src = "numbers2/c0.gif";
+cb = new Image(); cb.src = "numbers2/cb.gif";
+cam = new Image(); cam.src = "numbers2/cam.gif";
+cpm = new Image(); cpm.src = "numbers2/cpm.gif";
+function extract(h,m,s,type) {
+if (!document.images) return;
+if (h <= 9) {
+document.images.a.src = cb.src;
+document.images.b.src = eval("c"+h+".src");
+}
+else {
+document.images.a.src = eval("c"+Math.floor(h/10)+".src");
+document.images.b.src = eval("c"+(h%10)+".src");
+}
+if (m <= 9) {
+document.images.d.src = c0.src;
+document.images.e.src = eval("c"+m+".src");
+}
+else {
+document.images.d.src = eval("c"+Math.floor(m/10)+".src");
+document.images.e.src = eval("c"+(m%10)+".src");
+}
+if (s <= 9) {
+document.g.src = c0.src;
+document.images.h.src = eval("c"+s+".src");
+}
+else {
+document.images.g.src = eval("c"+Math.floor(s/10)+".src");
+document.images.h.src = eval("c"+(s%10)+".src");
+}
+if (dn == "AM") document.j.src = cam.src;
+else document.images.j.src = cpm.src;
+}
+function show3() {
+if (!document.images)
+return;
+var Digital = new Date();
+var hours = Digital.getHours();
+var minutes = Digital.getMinutes();
+var seconds = Digital.getSeconds();
+dn = "AM";
+if ((hours >= 12) && (minutes >= 1) || (hours >= 13)) {
+dn = "PM";
+hours = hours-12;
+}
+if (hours == 0)
+hours = 12;
+extract(hours, minutes, seconds, dn);
+setTimeout("show3()", 1000);
+}
+//  End -->
+</script>
+</HEAD>
+
+<BODY onLoad="show3()" bgcolor="#FFFFFF">
+
+<center><table width="620" border=0>
+<tr><td>
+<br>
+</td></tr>
+<tr><td>
+<table width="620" border=0><tr>
+<td>
+<! -------------------- Alarm Clock Button .pl ---------------->
+<! - Removed as it wasn't functional yet                      ->
+<! -------------------- Clock ---------------------------------->
+<center>
+<img height=100 src="numbers2/cb.gif" width=75 name=a>
+<img height=100 src="numbers2/cb.gif" width=75 name=b>
+<img height=70 src="numbers2/colon.gif" width=40 name=c>
+<img height=100 src="numbers2/cb.gif" width=75 name=d>
+<img height=100 src="numbers2/cb.gif" width=75 name=e>
+<img height=70 src="numbers2/colon.gif" width=40 name=f>
+<img height=60 src="numbers2/cb.gif" width=45 name=g>
+<img height=60 src="numbers2/cb.gif" width=45 name=h>
+<img height=60 src="numbers2/cam.gif" width=45 name=j>
+</center>
+</td>
+</tr></table>
+</td></tr>
+<tr><td><hr></hr></td></tr>
+<tr><td><center><img src='numbers/text.gif' border=0></center></td></tr>
+<tr><td>
+<center>
+<table width="600" border=0>
+<tr><td width="100" > 
+<script language=javascript>
+<!-----------------------------------MONTH --------------------->
+nctDay= new Date();
+var month = nctDay.getMonth()+1;
+
+var numberofimagesm = 12;
+imagesm = new Array(numberofimagesm+1);
+imagesm[1] = "<img src='numbers/m1.gif' height=60 width=100>";
+imagesm[2] = "<img src='numbers/m2.gif' height=60 width=100>";
+imagesm[3] = "<img src='numbers/m3.gif' height=60 width=100>";
+imagesm[4] = "<img src='numbers/m4.gif' height=60 width=100>";
+imagesm[5] = "<img src='numbers/m5.gif' height=60 width=100>";
+imagesm[6] = "<img src='numbers/m6.gif' height=60 width=100>";
+imagesm[7] = "<img src='numbers/m7.gif' height=60 width=100>";
+imagesm[8] = "<img src='numbers/m8.gif' height=60 width=100>";
+imagesm[9] = "<img src='numbers/m9.gif' height=60 width=100>";
+imagesm[10] = "<img src='numbers/m10.gif' height=60 width=100>";
+imagesm[11] = "<img src='numbers/m11.gif' height=60 width=100>";
+imagesm[12] = "<img src='numbers/m12.gif' height=60 width=100>";
+document.write(imagesm[month]);
+//-->
+</script>
+</td>
+
+<td width="100" > 
+<script language=javascript>
+<!-----------------------------------DATE------------------------>
+
+var curdate = new Date()
+var mday = curdate.getDate()
+
+var dateimages = 31;
+images = new Array(dateimages+1);
+images[1] = "<img src='numbers/date/1.gif' height=60 width=80>";
+images[2] = "<img src='numbers/date/2.gif' height=60 width=80>";
+images[3] = "<img src='numbers/date/3.gif' height=60 width=80>";
+images[4] = "<img src='numbers/date/4.gif' height=60 width=80>";
+images[5] = "<img src='numbers/date/5.gif' height=60 width=80>";
+images[6] = "<img src='numbers/date/6.gif' height=60 width=80>";
+images[7] = "<img src='numbers/date/7.gif' height=60 width=80>";
+images[8] = "<img src='numbers/date/8.gif' height=60 width=80>";
+images[9] = "<img src='numbers/date/9.gif' height=60 width=80>";
+images[10] = "<img src='numbers/date/10.gif' height=60 width=80>";
+images[11] = "<img src='numbers/date/11.gif' height=60 width=80>";
+images[12] = "<img src='numbers/date/12.gif' height=60 width=80>";
+images[13] = "<img src='numbers/date/13.gif' height=60 width=80>";
+images[14] = "<img src='numbers/date/14.gif' height=60 width=80>";
+images[15] = "<img src='numbers/date/15.gif' height=60 width=80>";
+images[16] = "<img src='numbers/date/16.gif' height=60 width=80>";
+images[17] = "<img src='numbers/date/17.gif' height=60 width=80>";
+images[18] = "<img src='numbers/date/18.gif' height=60 width=80>";
+images[19] = "<img src='numbers/date/19.gif' height=60 width=80>";
+images[20] = "<img src='numbers/date/20.gif' height=60 width=80>";
+images[21] = "<img src='numbers/date/21.gif' height=60 width=80>";
+images[22] = "<img src='numbers/date/22.gif' height=60 width=80>";
+images[23] = "<img src='numbers/date/23.gif' height=60 width=80>";
+images[24] = "<img src='numbers/date/24.gif' height=60 width=80>";
+images[25] = "<img src='numbers/date/25.gif' height=60 width=80>";
+images[26] = "<img src='numbers/date/26.gif' height=60 width=80>";
+images[27] = "<img src='numbers/date/27.gif' height=60 width=80>";
+images[28] = "<img src='numbers/date/28.gif' height=60 width=80>";
+images[29] = "<img src='numbers/date/29.gif' height=60 width=80>";
+images[30] = "<img src='numbers/date/30.gif' height=60 width=80>";
+images[31] = "<img src='numbers/date/31.gif' height=60 width=80>";
+document.write(images[mday]);
+//-->
+</script>
+</td>
+
+<td width="100" >   
+<script language=javascript>
+<!-----------------------------------WEEK------------------------->
+nctday=new Date();
+day=nctday.getDay();
+
+var numberofimages = 7;
+images = new Array(numberofimages+1);
+images[0] = "<img src='numbers/w0.gif' height=60 width=100>";
+images[1] = "<img src='numbers/w1.gif' height=60 width=100>";
+images[2] = "<img src='numbers/w2.gif' height=60 width=100>";
+images[3] = "<img src='numbers/w3.gif' height=60 width=100>";
+images[4] = "<img src='numbers/w4.gif' height=60 width=100>";
+images[5] = "<img src='numbers/w5.gif' height=60 width=100>";
+images[6] = "<img src='numbers/w6.gif' height=60 width=100>";
+document.write(images[day]);
+//-->
+</script> 
+
+<!------------------Insert Temperature ( numbers/date/temp.gif saved by URL_get_weather.pl in code dir------------>
+
+</td>
+<td width="160" > <img src='numbers/temp/t<!--#include var="$Weather{TempOutdoor}"-->.gif' height=60 width=140>
+<img src='numbers/temp/celc.gif' height=35 width=40>
+</td></tr></table></center>
+</td></tr>
+<tr><td><br>
+<table width="620" border=0>
+
+<!-----------------------------------Insert Calendar.js------------>
+
+<tr><td><SCRIPT SRC="calendar.js"></SCRIPT></td><td>
+
+<!----------Insert Earth Map (Updated every hour each month (So as not to tax earth server) ------>
+<!----------See "http://www.fourmilab.ch/earthview" for more information about earth viewer ------>
+<center>
+<a href='javascript:history.go(-1)'>
+
+<script language=javascript>
+<!-----------------------------------Hourly earth graph --------------------->
+HImage = new Date();
+var hours = HImage.getHours();
+var numberofimagesm = 24;
+imagesm = new Array(numberofimagesm+1);
+imagesm[0] = "<img src='maps/0.jpg' height='180' width='360' border=0>";
+imagesm[1] = "<img src='maps/1.jpg' height='180' width='360' border=0>";
+imagesm[2] = "<img src='maps/2.jpg' height='180' width='360' border=0>";
+imagesm[3] = "<img src='maps/3.jpg' height='180' width='360' border=0>";
+imagesm[4] = "<img src='maps/4.jpg' height='180' width='360' border=0>";
+imagesm[5] = "<img src='maps/5.jpg' height='180' width='360' border=0>";
+imagesm[6] = "<img src='maps/6.jpg' height='180' width='360' border=0>";
+imagesm[7] = "<img src='maps/7.jpg' height='180' width='360' border=0>";
+imagesm[8] = "<img src='maps/8.jpg' height='180' width='360' border=0>";
+imagesm[9] = "<img src='maps/9.jpg' height='180' width='360' border=0>";
+imagesm[10] = "<img src='maps/10.jpg' height='180' width='360' border=0>";
+imagesm[11] = "<img src='maps/11.jpg' height='180' width='360' border=0>";
+imagesm[12] = "<img src='maps/12.jpg' height='180' width='360' border=0>";
+imagesm[13] = "<img src='maps/13.jpg' height='180' width='360' border=0>";
+imagesm[14] = "<img src='maps/14.jpg' height='180' width='360' border=0>";
+imagesm[15] = "<img src='maps/15.jpg' height='180' width='360' border=0>";
+imagesm[16] = "<img src='maps/16.jpg' height='180' width='360' border=0>";
+imagesm[17] = "<img src='maps/17.jpg' height='180' width='360' border=0>";
+imagesm[18] = "<img src='maps/18.jpg' height='180' width='360' border=0>";
+imagesm[19] = "<img src='maps/19.jpg' height='180' width='360' border=0>";
+imagesm[20] = "<img src='maps/20.jpg' height='180' width='360' border=0>";
+imagesm[21] = "<img src='maps/21.jpg' height='180' width='360' border=0>";
+imagesm[22] = "<img src='maps/22.jpg' height='180' width='360' border=0>";
+imagesm[23] = "<img src='maps/23.jpg' height='180' width='360' border=0>";
+
+document.write(imagesm[hours]);
+//-->
+</script>
+</a></center>
+</td></tr></table>
+</td></tr></table>
+</BODY>
+</HTML>
diff --git a/web/newclock/maps/0.jpg b/web/newclock/maps/0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..275b51f63e25ed5c1893c288b3afcaa24e4b85b9
GIT binary patch
literal 26868
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
G=6?aE25iaz

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/1.jpg b/web/newclock/maps/1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..87cf8334909c9f511340bafdc625f388b1c5f64a
GIT binary patch
literal 26715
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

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/10.jpg b/web/newclock/maps/10.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..79987b158ab293b29d2dd3fafab447c851286671
GIT binary patch
literal 25296
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

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/11.jpg b/web/newclock/maps/11.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7c3334fd186ccb7201fd3c39719ca2c3f6ba7d08
GIT binary patch
literal 25023
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%0DCxS_`DIN*PgkB=q>rSbey~97C&4t5GZY?
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
Q4BU~tPtnH~zP}&;2bH~zu>b%7

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/12.jpg b/web/newclock/maps/12.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d882f97efefd942d908fe958ed7fedf8bba39715
GIT binary patch
literal 24888
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

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/13.jpg b/web/newclock/maps/13.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3bd57f471901bdca12ed9126a603b8724b5a6755
GIT binary patch
literal 25047
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

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/14.jpg b/web/newclock/maps/14.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ede6bf52f58700c9a2c6ad3a4f4fab4e584e8ebe
GIT binary patch
literal 25186
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
LO7dn!{+;<hjU^J~

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/15.jpg b/web/newclock/maps/15.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..df391c6870b9afb1d447ade183e8162187eccd62
GIT binary patch
literal 25475
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

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/16.jpg b/web/newclock/maps/16.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c04543563a1af4ee20d8759e5890ed84c84dc339
GIT binary patch
literal 25745
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
I=kL`20Ip9t-v9sr

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/17.jpg b/web/newclock/maps/17.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..42151f90e1aeea1cddc652997b59840d423a1602
GIT binary patch
literal 25806
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
Rqxe_24uuW{8S?M9{{f+PB>w;a

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/18.jpg b/web/newclock/maps/18.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..595bf48bdde96fa9233f05b3f5141d2db1add643
GIT binary patch
literal 27276
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

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/19.jpg b/web/newclock/maps/19.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ebdd5fd63a70bee33a5ca4a28f87c3423c727d93
GIT binary patch
literal 25866
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

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/2.jpg b/web/newclock/maps/2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6436bb42d49bef4cad28e4ef8aaec6c2e315b742
GIT binary patch
literal 26446
zcmbTcWl&sC^esBL1h)XeXM#iU;2H)C4ud-cC%^;=?gTQp6Wrb1g1fsz7~B%v;qm+5
zSMOE5Pw(D7)&1pko$6KHXYbW(?U%)uO#q%eSPl$8KmY&`ULU~A3P1{gj*5zgih_=Y
zhK7NGj)_HtjrHaY78wB{E)gX;H5DZ}1qBU=oq>jq6-YtB_>qZ~gOi7chnhh^gr7^8
zotua2zmFhbU|?Xq!6L=RCgq}~pym4CZZDkxd~^hHL_Z`1IshU*0unyLOD}->b)6^(
z|I+~fcSAr#LPkMFL&v~;^E#m(4}ge(goKEUgo1*M{5sqF^*sO?ABBLHQv#Jx)dY>s
ziHOTTCL0|nS=~jfHuVq0ZR#9=fl2a~l#Kj6Jp&^XGY>D{M}7f8sZY{i8Cf}bbq!63
zmbQ+rnYqOmODk&|=r<QvH}~%zfkD9`p+CaHW8>lz5|ffsQgd?i@(T)!ic4y0>*^aC
zo0?m?dwTo&2L^|Rr)Os8<`)*1mj7(Qw|92;_74uv&Mz*nu5WJd?*GGu06_X*uwKXi
z1?>NW3;z`tA~G@(GTMK*5D?v7I}$!J3N0rpfrKiWi4!3mmp?j@WK4E-7Y2}9?H{qJ
z^Asiti09Ayv;Uy|53>J%zykh{ko`Zv{$E_n04yYg*Udx12Z#YK7k8@`xgAsfK8*V6
zrsz&B9y_mIo7(dHSSYjd-6RHmp>Y?-t?F}_j1bmKxRZ+8*yRa!qhLx9`o>G#-rb*J
zlt5TnAl6;EtmwdxFKj2)qW5(tRa}s#NdrN4Ae*Pd;MC_F;dZV!m2wTbA!HQ|zFXFQ
zCjN*dc3i6*bM42uX!&TJxuk~Fe5yyiwh5_`Cl=?7kpd}kJ;bXzawiU}G|NSzRq|qR
z1)kT!z6r5t_R{i&*m+##{j}cXBo%SrjWn)~UvLAK1$kUOYZtBW{u#KxoX9SJiiqnp
zxhl$+jd2rJg_8=XDx~1_3mP=6io&D7ow@GO)M=G>H>D?E9elnrnsuz2KWhpu=_ULT
zZKHSr2ns}N_bonLSLj9d@bW;WsXNHD<{J>fZOr(QnM}Ei;CEL<&E5UxiAtpjj=es_
z+M&ohvIF(@Ta>G9p6y~oh3Ir$SS8TsF-#LP^xTv2nW%goRLY2N60{LY02QIjKA!ek
zO9G|=5NhFgKtFkDhF@k@v2YmfKf+thU+I>zbz6FML&rhQ)CSFc%Ba~EP}0~pKk_6U
z(W9XX%QUszy2~zPoQ*r5m*D|<)cIBuK8fcw!dBq|A3(#oRPBS0HaSOje_xmL^%v4x
zW*?)!RQ&lTDt9_K6p_T$mstZJZm7?BYHmZYdxjelt$GkZKSJLOn7}dzHC@hF)#V<3
zy-6`sjor_}vZU^d@|71UAr6yuc^H<NPl-E%ywj@rh`KK8VCJII%j4ZHjvUJ(czwDi
zne1TRgLQ%ADDotlJf@cVhQ!(1YUrvA`X0V5Bf5u%fSA_U1do}p@gA#aipF5;O#gLS
z$&xuEmT$1&M4pwZqG-VvwiRZkL(^KPUp*}M?w@EgT4SL{DT)7<bu{nJNqf~Hgr95?
z%QMZA=d?Ba8T_pHF2cCHe5Z-|K4_vb7BUtl7E==Yt7r&XyxLp3ba}_Mbh$U5p4=QO
znBE`I-?sdqI}2~dU$LE!h;-s1=*#Sl`d1czcJm`f;+#NxsJjY$*O4}}Z5OJ`cs1EO
zeagEx<=%hCHg#GzGB`xW7L9f&({A~@x03B&^!TRB_@r;j7zNB{o^nDJbU&l$$mfe+
zmci@U+*TH;ZbtAsdZ2Jm*U9}sJf`~vU{wHr+F=&s;#5e;iQl?UH&kS-aPczB;aKHm
z@xs+YjJ{owe3N-XDy9oDnV{N}#kk^WzNye@`~K&OOfbzTfb%*2=NVehC<iamM4R$6
zkxr<vXSx-A2C2Wkr~8Ez(zB$j2q)nSAXxEj1Wy<d*Wvu_rEmPR43W+?j{A*ZRX=P&
z;01sY5?$PO2+_VyCcMM3L4rR4IMj<|GH<Bwwtk9sjZy8XKoy6GM{%k5(VmUqFMtlC
zN5&UG(2WF3j5prjso&i{IrgHU1*X;rqE`dIdm}JNE7Q(#HNXRh%xJg2a{GN}SJNT`
zgnhY{CaT)=gwh9i%u}~~|5zMsv-7Nd+P3@=dONFpCfO|j@aDTxxv>B|>*Rl-nid&9
zCQNlzE_a$2BjC{+DcZC;Er*3-UgVTm9;F^iuS!ENd^9qC#pmT$i^~0#i_;vt#1yw&
z$w;BmREWZ}CW)%?1~2nnT8r~^)kSF1XEx2_ow@qG6<eOqyt(|6>}CDuG;=xn88tCy
zHwx+=tHiCyRq{_;OLU!mQb~3W2&^Q))UID+zG^G=95e(Y`|k#9B<Z5&wf<Un_VrTT
ztKc`$c9P6Rsi=6D`6n9T&a^zQ8Vd<jeyZ>5m(#;4=eQa?;teSoN+M(K^mJ0Xkh9Bg
z9WKlsD#}m%GQI)^Tq6G$P^<wx+k3lTCYtk}7Wvs_X4QTAT#w?&FlCf-vPs?|B)1{7
zhyN2JZ$+;n$6K_{naCy`lc$rK%zk7Ju-3w+VZj$ortJ8=_xQD^z<@aj)K6rFg@bmH
zUFw3cVTtyv^I;PkY#QXKsqtX>Xe-IWgk(G%Ts;8tl}}!@e*tKhZ2TpU?;JYMChI~v
zdjTA&{V*FqegSOI%>P{JZo($;Mkp-LZ_Pmbu+JRd-S5ylj;{Q$8xeDsKyiauj~!%?
zXQb>foB8E@Mquy-@a+{&#Wxl*5Itvl;bc_d?PL*`fcjru))@G%YLrQuy6&9hsU{Zp
z!g5@+c2RYyQ>U1J9%GF2Dd4J~8UCpZEQ3@{B>O`pqI9NdOv(bU3{m}jpt}8C<_?5z
zCRIOV<ptms1358)#QO=1qhi~z;~fu(UcE(xd6@PF8t*L-yRdcp$K6fK3CfH{qRq}5
z{0-w7AvWV3W~3^J&^7>S4Zpdu25<UiR}iY+=H@LE5NMhTA?erO^n(RR=8wJ4!t3R~
zX2+GI%wF3M{D!O6GG}(6!KXWXT5e0rm6Q{S(d^RZr3WG(C7jaMiC^(*vI_rjPrek5
zN<3du!kVgle3Ke<<nhf)do_z`Hdfke=);ft?~#VjX17~KiY11!j$iX8vg2p&f4hDt
zca@oC=qH!Q@3^LIErj;b-OhkP#lH;&w|&)(SVXg2Nj!67W^Pi(EJn&!`MbS3wzp@8
z<AJTryq0V+S3T~nJ^PzaC7c^T7<rfvjk`TX)QNT#j_fKls=GrW{QIa^hnuq-yP`H>
zbapuI=W}k!ToV8JSkaoKEu7#gQVZ)4E)L1PgIEk+wT%JS*!AQc%@CYv-T{FV|43iK
zJ9~4rLV|cZXGhs$gos%d{aVX}lSu0)Ly@8T9s}GGheu62WNUk`0GYv&Z1YFigN5I^
z1?!+TI(|#NFA!$RtmgAooa3w)0Bcn7nAaHPh-^QtlMosiZ6*+DIZ<IZ=tRd7jsMTY
z&V-FJR%6rr`{Sw0FSR8rHa2#9>G{DRH1C9e*6NdOdd`BDO^-+HTW>st7#-jpGZ9U=
zl&y6Rjqh%pIRbr21^V0tZ7%GsVKDP37zavqhQMVx?^#8ea6_af8+ihN{Uc7><;3Ms
zSq9mq#lyE7nJWEddG@Rjp(gfeQ*_J|zIE=5l%YX>0XP|btU!99<dSl_*U)D@EMfm9
zL^+VlfFaB9<qO~k`54Spy0OMk3Q=qK1t7wryRr3L%t|2bVrk)o1S8$Mc!zd~Oa0{0
z_h$!cWdDw8!I!Nf&T@CGSo+!>41eEC6O-xX!mz?{RUzx8IzyyD_@)`i&X*j}Tev{u
zjAo>JZta3HPj3y`os}KfX_UO9>H$)hOCE61--LfMQp>|!=K;<oE49rJ-Y~kPf6&5s
zUqU1MZ1I8h?-2ZydGoTOR-(4Lb*3jzj7j~SL!CR)hb-(_mxDg9K9sq!vJtkr^FHQt
zDn4eJEf#6s-*~Ms8;`g~WS^&@gRA^w0uK)D#QCCoR}rfIrI_rnXqxV#godad{!*}p
z>gyS9wcKiVomK@2w!@82m(OdFu8<e<t*8l%e<#p&7|}){!x}`M;|2BeyX!2n4<p<N
zUI1?o<gN!jdB5l>63?=*5|sVup^e`r|7FjvVeNdgyfyyDc;@laqz7}1>7Y-63?+c$
z(Q4-ntU1CQ<&(U|)mApiJ`sB#rXWBN5*>`Dg3SdEe?MZ3<zdNF&%BFr9hci|`?J;R
zV@x2BaqVs)`F3iZLDp`W6EA9PZO^>s@{b2qyT{qF?To{tOu-$jMn@T#wN0cNHM$V(
zzR=s^Q|(y2w8DvBO)rN|aoG=;IMSQ`T0CaBT1a(#-e53-e`w7VMf;4$Ov1jVJzt&%
zVfdmtJLgK15%8;O`o|cZAH_G2hX3GAfxXCJKGJ$J*HhiRCm@xcEu+K}lG;;%%ykMe
zI!zSzH9BVj;Cdt=43vK=-Y8Zr9+~1+S=AXykc|OQyj8;8mMEE44p5PB;BYtBE%S+g
zB^a_wxn}-=J&NlWz?ItIE_iiC;sszK88xWRSVE&dG)B*4&4@VacH>wvo9=hBcQ>PZ
z>J}|KO#tsekx~wSn;{-k44SPcE@cuB!RRk^&!x8VY2J%d9V#-AN4E`=&u|Utd@LCX
zpB{X^ygQHjLy0z@6Q`2$58o_I#zI0R)!{5^U#|rcAO4!)(?gJBse7jdhu#r64tf@E
zWh{KezNr8WWZ9{)63S*L@)>(j>$a{qvw4Rg%6RB!cv{v2%s0=j@-<myviXM&6zhV&
z^iM&8<0}Jq=`oJoi??cm82$o2tdf-F8>YEgl&F0*z;s+~1LB_`U(q<*SbxZK?yzy7
z1S`tNfJ12sD>xU<3lxA3SURZuNMvFuWt1KcTGe%Cpz=}v@rz#du@>KJx5wO-I2DrS
zKw3}&nq!&FIZqf*8WKCI2Qn!yogDo!DE4;&0Dfqb;O32b(09e_C9*X#hPmAg)29{V
zNMd!`7oe`NojMVHf9vBN#hJSH0%+Nnop?m!-Hu&RaD)ayD9kf_<$vfXN42~rlkhx?
zj)13ap2)&Uh!5XXJrlBPW5Wq21sFOp1Dj8oEuX~e<~0=z47^_$tMcv`{>rsFM3GFx
zV~Ixm?kVTb$ndeg3)gS4a=z@<d|d-mZ$iG`_V_IC*Zj<e|9S^SjqYZ}sU}*!0A!kL
z`A@C`WS>~}62Y3d(GvSoNQwl+`@Ncs3?=4mQpy^hy%$H3n;&BQ59sCYofL={!v0Vn
zsu`|GP_16wXO48(4%B@mShL!JgR$RS)W^Bb910N6HU4Df6%j7TcH)7_SfwjdoCS#Q
zby(NMvhxzPWQ2U+E$+n4J2hD_|KVG7^z5W%@=?sg{ykjeT5DoHH6Bu<RL-8ygB|_$
z<a6tQ{bI#{^sRrswah5reOGivH%`_$BPBn?&hp<@5(|p1h_bFa*+Vf6|31KXrkr_%
zJV3Z#|6B?z{sO=}AM^q0eE*ZFaz^2FiagM=Zb9SQkwTsRt@O;S+v?-{hCH&CU~$eD
zK-3F>IqB_UJ%n<+ICbqDA{*#QAeR1Vgp^E6yz|;bf5pq_Ut6eMBKc3OD|aC91t3-Y
z0{A2RFYf^<d5$^}bj&Q|J-zziBtKC#C)-hQD<H;!J)j!^Aq6^kgKc1jH2*wl-0K(N
z6Vl(oG7G%bJKcws_&TZ~n-79f`Zrm5GmHIGUY47Kf4<aooae=%<TfXqiv|yo?NwJ$
z_hr7VS47j!K<`T*OUvXzMkJHT-Ya)cxNhbhWDGCL+m4wl6)CVLa)?QW0dVs_5hvyi
zHGF#pojsRs3GK7z(P7Y1(?<O08i&qTpYo2G9yBU@vpmGb=vY<)iE@pPQuFB<h?Ity
z?8g{EH(Z!r&TDk(v3R+WZJJWF{Rnv*R}=G@A`NeWo~e?%yRw6>U?W$+EA=Y7;U>^J
zA$X;A?z7aK`kV0iq^i!r0bPm}f&fYG>ceB1=7MLsglH6G4$<6pZrGX1sa2@ckqlMc
zB*NctwSs7ZT&~PS$>u^%<DQ$oj)E+8c{#db1xbAucCrMph_|D4fl*QsAXB%5^pfXU
z_LVJaK7fa|WowCoWXoz8O(x@__H<)D8wx9(aftX+JlBU5K_jos2kIRuNKTpm@L8&1
zB$|I~ep+0?tW=K)5K^~yfT6^_>k>;US7kkRh8`$kijRnmY!J<^xJe9_f3e2L9<_t$
zs3P>^D(9<8aKUo<1v)zidEcIn1mn2goG1-Of+<MQip93ooSSCtKF=@6Iy*PLtIZG-
z(`~dbH(V+uHPke`b>RH_ENxkTS%Ln=i*TGgv~~R_6=r{XZCWN&AytHQ)?$t_BMCk<
z$-K6#tAxtEyHXZheW)x}?$H?1X8k9^f~LN0rhE1NPTH?)@YMatNYL#25Y2~@$OPy0
zEj=x;XH+~zsms8^WwE2$YK0qRl-X@qPHzCE;k<0(#t$8G?sv7$(80Uf3B&FtPo1&0
zKR3grQ*DLIvX^6;&1Y9@>ybQRqV69{?;_;{r~>PyzPiU2brGw`v8!V)?C!~4D&yFy
zFW&~t9QSK)#&nwS<nE%qtHC9^JV?D>40E6Rama0m`{zmN-5>0>N#R%^;xWB(9|8re
z0fAa+t!1HO<r4`p68`{kV#z_eign)PTAf*HWtk10HALA-I3^1aP1(H%yW-u}+93U~
zmTq@!zoq<#z3<n(CYW6h`H<1UllZ#aI&ZOl?eU0+S)8@M+1_jmH^gUrxTQph3NsJY
zU?b^vA@qm}G<!89b@*194}-ZdSpObDXZY@r6H@FZuoLEMLD^8hbwumNG>zTU1M>V#
z*xv#1mb|Xuvc{Sgiq~9)29qM~GkZcY2eC?<MGz`t2ju@f&HgaFQ+IkFD2vBP>5(?q
z`e|gnXk0u1O<ug0;_Np3=*rd?U2myoX=7E<8EvE*gY1R@iCTUKb1#~yTrPIU)tpOU
zEd$jXP~gB&TujAx`D9&6HX-jy+zF&go7(xEuk@qy+g2IK;s<(A^*&%X0>wF}bFTt$
z!`qyDYoszKYy0gBtYLc7tHjg%vd}v5`iL|3oX<rClV*QlGIgJw_ox<M+gwlf8g5Z?
zC;n`dw8@g#@LooilBei`WwiK1=%u2_wV~na1oOYCZX&D~K$~yArGmXlErvt;9oEvg
z$T)LaBmL)KwQ0_Sv^Yq4w#$z<>EXEI?{+J6l**g)#*%83hVT@zxLHmb!?~2#k+*#S
z@XL~rvF7E@CmZYT(0)Atytwd<07!C@+W`)H0i;2yib3_}^7tN$1@ki>w1=p2Q)P|6
zZ{znPKqoE9N~a{gx8kgzejn$uao>dD?Kj1EbigNW=M;#ta~CFuW+E=R=8^VD(@ubs
z4$qo&ec$abm<25t9+{uF!-jK?83M!+lg%BwYP6&Nx|HR^I>Ly_A@e&rw5@5Uv9xiI
z+K9;wk#}qH_po`Gdb52YD08|X)?88(yv096c_db@QJ)ZF*e9Zs%(D_q+g%op<CO6`
zU74+i>lmFt*bGbHNl+CuE$@04iPngiW0j)hW0uimCa<|81VxNu=;m72z$e|7aW2nH
zqVTDwTP>I#rmmDqi&`M+#$=!Tr6p2KKoNlJAi-0p+Q4&3M6$Yrao61M6pnOt2#*ZS
z90+$8e+zi{62;~e7}ICIcEd#1>nOwe9c$zebBaFmog)aoKy-@=M8-k$mG_EeSLVOh
zC@i|<I;A-`GA6rMdn+F3?jV3EG}qwuPs_37cwZY)!&}-Wm2MO^tPf-FS@56Ecps05
z6c;xHOm&aYjs=VfXQ?kBhO+n6()6C<STJ1XVKCX3`4j@?qGb@27s6xt#k+1Mc!i(3
zem*6UceTiXBA5D^!@}^=5N<E@e&sM-#QFsC^fvhW7)xB6C~Cw`!<~N4k*O?#!nHH*
z_#HUqN2ju|6IDAIcBwPx8;oHNPs_!kbx{O&cS}2s&ip0Uv7R-vx>{ha%`;p~cVi}>
zKEi15+0l?ddA2<v<#AeMo7oGXT=h<z3NTQwP!78M0#z<fOLUA2j&iyJO)hICcV?eI
zLC361s;{X!;y3xsgo{rZBk6M7K1Y7KCo@{?y=<lqC$~!#E*c7jz~HPnoOkoP+n7r8
z6TEMB#kCw{vWRWpX*%GfsfJ&3f*-IRem!Mmrn_a3ofTx}?29dV<Y^_Tgud4m^81CB
zwGtR*mr*}F{7cLAE$QDrlSA@eh)IeHqWd6S34eG34>ObW8Za;?UN!uPuPHvrt<V&P
zi3sQ5R0E^_{gv=nE?l*9z=i;INFpK=x@RSfQ@1v#O_?k@@Ms;c-pt2}WV3OE^aAMA
zKzckBV4IDd;xju|){Ts;S1fEHP_*lB;i4?#uu@y>B&HkGAhy72|9&FdgB^dcIJ;7<
zb;{{KIQVGY<t$KKV}RI1m69bxwVG(`%$4U;#{)X$pt*mtq6rxs6OfpgsjwcK#P|QJ
zp_KcPgXc;>4FJ0C;|3lnK?Z=~gsAfJDBF9)ipkY`=f#V#Gr4N*o5%gcY)W({H_E07
zssx6FjL?e$F5;u8@q)3p-}<7G_Bo^E<7q&Teo-pS#K_Uo+FC1vNU23JY=iQ3GR)eZ
z;mBX<xZ(UyHm>%)=KgBEJ*U;zM6>Fq&emjGWh<*ZSOQzIvSi6M0GWD8XB_n1obmSu
zpl{c2PhmAZv@(?Fya%b4{n%gT$Axra8E8W+9d#P+&F&Y%byrE#u+H=*hj!^D$~E(w
zgPM!maiz~TBH7xMzY^%>g7<sG*ts|-M3nja9KRR!32XN0X!koiyO|}(?Pj1Gc{sTD
z@ti@#uf3+Rsyhp!JW@DhC~!Rh$nIiK9*#hf1Fz0pObpSwY8l`lM<M9Ue<<ry_FAq+
zCxAd=;B|_4VDXUXRWW_0TcHfm0*8I%XFO;A7XXsxUeKNCryhEb$okO6D6a6OD;`H{
zgTISK{FS=@3Uad!4AJcs|I~(GA^dQN`W8jAO>s3abFtNyhQoA5*H#oU70FyGm10z-
zS~_^Wy6-}1_5k^_4Z$nj=8$yFfCCpU%kHw=|5#Y}>y=V*Dn|lQR!H4~F%e{E6GgAo
z6c_9uZ@%z@cA)nQSSAcS^DC?S2{N`K!_k@SDxI0P*jC`c-2}6grirmgk^7m;6G6EO
zvOWKK&J3UZHN9x-=<XF-v!=9|*{Ff(N<v*sh;CKSbbS3jbcj&F!SG`bm4qFhhll29
zRwL3Vm6d)b3yiuKGMeb~SxttB!?;N0l|Uas*!pVvgJ|Ek_xs+@4KR=Ey;Bm-QysR5
z2~&k-6cljyEn)T|4N;2S&lwVbbD~3t>q7e7z<ivX{DB{s-S0a=J>R^2#lbR!nd01e
zNiCtdjQ_~6OI0tNmo3zgsgDEwd^AHHWn;6GO&hw~gC}uQoL|4Xy%zxO1Iaaaei;z4
z*=%H&FB}DIhf{=igjhES91LIfQCqS%Gm!pWuj32qT;-ghPxY$&OL4EZ`{j#9G&uby
zE>sS7&V4&~mq>u4QCYwg{au@eKqI59-KM#YNr<SyI1Q#zm6O7;8S^}$I}@m+kT0qq
z?q`V%3s2#>K<;LUL$1(biIzJ?&)W^(x8z3eP#nem?NJW=OLK)ZU3VJY`>bC=#^3u(
z4sZjwpA%3)97fJE3!ynFF%04vR$4Og@AoB?{TDbccz;tY@AbzS;c84Nal2Ar+~!nY
zbGW!MTR&!Ixy(C#IFSa|)Ml>CQT|u%il6MzDZ-JOP=938j%PSI&kk1&&{^*O0y1k!
z1_3spXvexs{vpitAkpl1rFhV&{YdmF3svCguiCkd>>gy03_hI?D=X<qW9oN;%`WOE
z9kMzA#U&qR=;sKya!j)_4Q)m5pK?bbXB^H>%}HqgC~fga2y|++uO@Vla|5CCN`qnZ
zjyI;?oNZhyAI(I2!y{bY=_q4$-Zv7D|0QZ3`+7y{_Qi1BKvAz;XN1@f#ptg~;la<M
zLvA8}sVd||J3y8TeW^917%KEVnHKD5tFh4@TvlZQ47-omBm?Z@-g>hzw?#kA0$nw}
ze(+G1ENkSOCuos#{_=kCg2<~p5-w80Uw?~WN)vrT%`SV_(UB0$GvovXVtp!eUz<7T
zQ)z8_5TueA+zd=zIh<XuS(O{Uf6MDjFh;*4t?hp-Pyw;duw>n%4>QPj?wvs|$R#}>
z`qrnd%b1hg9nP4A7|vLLAWfw5+SLKn^06OPI5u2!bCOe=SpowFH=~q-RBCp>kN8K*
z4bcO8ac$XQfhhLPmlH+fI3gt+F+nIT_n306``9cjiN^)!iQch6rmb2PdJM=|o*JJX
zv+%?O%inI$xJ(e6giVkhEdRK{_*iv@?jq!fPO<HunJ+m-6(|gw@$aIl=lYXWpxkZ{
z$K5JzhE+^3xZgz@T_%GJv!qVW8|PH#3N>hp#Sv76+Va*ErW3^^s`NPa%b1Fk@bT1N
z0kJcfNRj$zk)6S~@*GlrN@DqM>6atJ30KW6>qV~1TIFFrB8)OD!IT5K?O$^YN8iV1
zMe@gU*QFt3ws6kw{)&~g;fk9q1Ub=tMUFX8{k|y12=Hds3zbeX9cl-Qer09H5g>hh
zc|F!7V+YXy2QmC--w9nMtwkcXrk!8At0&Wm+qJ#0k$~09BF_36M@J8jxxC*NFMvdA
zjr6%+?@NX9)XUif;pssaI_Jce?<D~D(|xqznof(;x|~B$U;*;<-oK)(cqKnS8}GKu
z@~Od2&Iu16E}?1W*>G$wJ>dOREGhyot$rl4Fx76dek?`<=UQ6ER(;*Cy1L&XyH>i=
z5sh}(jiPDu?CY2R&YAxF$lJ<G({6B+Q7E=KKjQ9x|0$AJ0Kg~4W#i;l*yVs{XQ>~x
zR@{X~sf6mwyld8KVbU%^t$bi$80cv$ToHk#DpWaqR)KH|9dk0ZlH{37{8`Hz7@uD{
zm#`p}2<Oi8`Aiv8+xARaY!*pu--<Sfx|IunUOw4+zqd*okEI2mU`K|Y{e3J+AC<^w
zqq=5BmA?UsaE^UH?^P;nWs8|pN&`-YlgL&D4VHa3Y%W!ip{Mo&3dgHtu`8=Ntrx|&
zNbJg?O9NoT93ssO<%Tn-mI-d$m;6W+5Jf$83)|rGGB@@D*-p-AXDx=Pufz4Cqg80%
zVoBj^X$gB&cSg{K`OJc~?6j2@+Ku#;Q0hvf7l5X6@qtO%HeY3pNTEl}d6ZK|g7EU<
zl9j2AR!mq-qSZ!PZSg+m3@P!r!8&VY0+urXjb~(zBTcAkXq-E32D|0WS7Cy)xB$Q&
z?-aRnjWtDF>F6<ATSS#p+@$|{1y@T?tF5trmuS!9vta^NT8GKQFO_c$?e-#msf2ZJ
zJGYSrc++M1hev4@l{K7e^&Mpplar9E0N16B*N%(&TaG>^O^gBqa9v%Wgs;U#bnDvc
z2x@9zxxfDFbs8HVc<WG5cSgKF?<aFbz9FBiV-NmG7}y1X#CMR`>RE%VImrV?_X?(F
z=gJYjJ(L!oOme@2){hHPJAQv+5jA-CF@$RR)y9w`lx`0D%1GU+nW4|ZuO_>XPS?uv
zgl~x~O$YP78Z%zAs_pdK<no4U#A}zBq|Vbb5C3IYyOY_r>F)0g$Yr(}g%B$Ien%W{
ziM99w5Z3s&$hBkcSV%@{a^WpdVhu7aR&bTU%1{V}(E6V|6I&>rtR8`!8Z<l32mH{F
zW#qNlfXThYq|N*m=xzuZg{Unn-fxawGn@ytc9Cg7#Z;NPLwOO!llB|g;}sE}zASg=
z@+%=a8q6;MT{}U=zPep}<X9TC9Sa8D6)E!k>Cc@lG@UqEaIul;yxIBbbB-uSwh@Z$
zN)_Cz;yp{P>hL)#GdFw0Rh}<v*)*H*Xy5KyOD(gVA?D=4JqK|y_4$_4cEPVAy-p&%
z40%5XORzUrmMn$Xfp}>o;|jRbjj)!qiuj6S*pGrcOmM3iRT`$F+DP-ZY9xTS&5PR2
zmTD)B%R>-9GhgjNEMCn0aQjj`9k*S<?NFhR_sr@GZ*~k>u5sUYV<F7g@paqaK^k^P
z=9Bii2)o`QEmJ(d+^oyefbm__yIN9xJY4WSM6o?436whNVU1rNr_YHa^KYwEW){ag
z*tQGlElOrU+vZiNA{K}E`TI7{T&lKt{hL*Sj&|6)*5u>uNFCxg2oYJ>bEB)HU)R4A
zFv3BnKx$5S)?-+yVBf=2i=1{8M;h}zu5Qj-60B(wT;LAQIu4rfGw<OaYf(dADdvQ)
zr}45~x%>q_*I*%u2`^0Blb<QnP~UIVdxkM%wyAt>lB0E}KA+9VwqKR;Qugy}g(aPo
zF#WTP_3j*3Ygu+BGzrCi7Ix{eF?&U`oT~Y_5#_J)eJ#I6<AWdSUGMF~{J!%hs54A1
z;~x^KN=p=}Dui=tnqWw?Gxh=A6V;je5rpfjh6CjF)wbe@0H&|$3AK8Utdm!e{qHX_
zo`#V(`i$vIglM~}8BPPY8YS6WZ=ci&h+AI(8CFq!MGAkKK*r4$itXcq8dW_FZX?Vs
zY4#%4#D>Cn`~qacNDvYN`{&PJP0~*Ly;)ocF=Q)DQBpL_ag$?KGN0Sog*FkD^GO!i
zz7qXQq&4qu8puZW$tl43#T~Ay)wF$LLMI)e&?Y5-#t=30+abYqSJjP5bf!5MhWjh6
zQXe{#F$ew(3Zw7b#2zi=@Arh)OHd5PJ)g53WTx`i5r}Z>41tcvOxNPTqw^4TJ?rWG
z;k#cu51&x}9l`LU;;*g*wxQwfQ(4WCt9soVwpi=NZW@v$+_Ak^n=ph$x1$7<9*GaB
zWlPkam^eiLd?#kw`Hs{xwm9+b=oZ@;mvOj0Qme;)f87=c#A<DrwblJ!3JH@PIp3RL
zZ9Sw6i4i7-;=kiy&hUEbkjnQnr@R<IzJ{=<jWI?{Fvc>Pn%oM^?Xlk?_-Zcw@vS<p
z&`6hbTEjY^bFl03^09<cMx$fatLXI9(87;cT#p7C7uBD{+90(Ta;&JYBjYuB5LY*E
zgSte<$4!B??d_YOf)Xkz<G{3nEo3#&Zj+l2qo_EQ3FlNcQOxOX3Q`T%Wvn{2K7bk@
z(>KV-@7kN6pAtPRs1t-nDB8b<#(9VvF;R7KgOidpI`<RPmet*AP}~d}01|=%?E`PS
zzz@{r&1i_t;%4zxC@jkXA!!+o%<jk*@x&vRX*0y!7X$#RdJyi;=dx~L%j_&m<(&Qb
zq_gUDz@ZysIsZ3B(djQ4OaSR;GK-a{>lz`=cY39KLFKJK5;O=#`y8PYlzn2_^Q@;Q
z;e#VQ!-&0;1?zzw%JOHwm*2A+xQLMU#{<W*#*B0qci))?OAH}JE1I!qdjsPmzre&)
zsj03&5W#rAJV-3NjKF8=(aU1sl#4b<>wzUVWRqj>{IX(SEgQwQ;8_NkuG6}-n7E+^
z4l6s|HX{Ll%n-b~=5=PQ$7UxK=6pX^EU?<P=`EwYqoZ!UwfuLe!!_z*)Q^)oL|V~B
znA|>hX+_E5(+cPU7lAV)u!v`k^n_CVU}nx0h2grzd-pW6NWmGD^bUHX?%;m#c=#?t
z>3qwmw!Z7fhsWA40JDE$<ISxiU_Hx;WUx0_;tK6Z`2tU|U9R6*f_M0z=)=k6!jb6V
zBX}KjJ~~>HS31enB&^n#XE;WssuO<>7{|RVKM~WIK9O1#1h#OXP(=OuCz`Nea2qP6
z#|VN+gW`~qXD@Hyg%oP;C9jSVWm^O=q>yE3@ZzUzy@DK)6!N&=`7b&3BZK}|0dCF0
z%B#>~NBQ4_mJSNcd8JF(wL{L!+>O{&!NMOas;-~N#b|E=_;{i3a`a&E-EKTpTSnQ?
z%>PU*)Uv%suhr_OB4X@tme<G&V173W(FVFcK%Y89$Ro~Ukz8@AOo=|RV_@_nRY&-}
z6K@*Zo-i|RA{QMpbf$_bVaEeG({zF6LFPVo1=NY%1&>+yJ>OC!r}Q&ueFb0rMsqfI
z0XkE`i;iv!2^yU7*_B;&8tfYP7I=)%`qvjWvz5B+`99KqW!XZadg7t;;?`g1qucb7
z4UOJ+d&CCfMD<qcHPFp{_@WWs_j$#gzwd5wZsC!Ol&?Rl2uq@3zD4z#d$Yl5@H`u_
z>uOtXS~Omqe(-MX`&L%hV{;T};J6s|S;g<qje)AuhU@e?0(a)dNL0>xY0#Cxab_}M
zPHT#N11ZL#82wldp|m}u%Fn(*P@To$(zsh?k#NtSDKX-XOXJhdxC``+$6i9b(<#z@
zF=)&?$^7aEaSP=R2JSdaSPS^;J#7`+5Lm^ea+YYyZvEx$3C}Guo#eX7pX)!q6U4dg
zVTIto8yxE0+<jG2C9?UVXMjzd74gkymu&2UoF6I%a&%e!OF)%(8E8_O&-FG#E?8!C
z5^<A(1AicFryn<Ks|E*|1+U=C`Rsd=g`~%(1C~xiWz&^QYc=3*qP>~Mqa)Qrx?NA{
zFbBjsuRA|`?3Dup1-)*J3unq245yf=1MSrGpoN;c`L8wNS>_$Y14<bQilwXGI4;Js
zR2oc<&1?OA2>$n(U-$G{?2n`!-l?>VGz$?0CJv~dUq800EhaWL>9NW4Ck)=vD@9$w
zBcBua%D>EOH|b?lRwBckm4&xGHHHea*oY@fx3Jk|8%9_q6uj4y?{5k=Y+n-!oLSp@
zS{*j;ke6fo$x~yE>@GQ`3DKzzI<r9Z#30$wG(&K{H)_cQi%T$cr}<ViMX>TUezK-z
zQkPID2UzIrD0sF(>6xa<a<urN0y51w-mlixg0zacQ*VH#q7!uD{q>p=z<A*o)+z?I
z8dsi$FxxD!_~;()6#O9IeEa4K38wYgG16%_sKRlAaPZE&%w_s8)is^6_hNun+YvMS
zaE<Tj^+@qos9g+ve9JKyWBm_2>H}F-LbHq9^M5A#i@$%vL8sqw-9U=bd}ADwSzw!i
zkB6ZizTa(pAWtzpm&RMjI1*o`t5f)arIwpYdp>>jY-Qz_IdWf9v#EgD%7NO_0r%&r
zTE{Z(xY;O^TTMmdJZPJ&NQjv3kpp*Xz`kUQ7NfGqh54r((g_pIhN6>+;v+SbycIph
zpUEZ#al!QYi*iLDl;iM+_K0{*3ca!PhJ=TrvPv%V5<wZ4$rWzJi**wJaRCwpt77zn
zJ^+H2se_EPg8zXci+q<;yn6V9x|4LMV-8F;ob~m-s#b;ao{b1germeHF1Kl^ND35F
zwOkg9yy&ewyhM5|Q1+-QOIV#>rGRG#qsntFki}9`BU6xyRd>UV@}gp{(~DB#yGUgx
zg$bL(f7jdW<d2q@|8yuD461P7y#F8PQ#b0$f=du98Z7qYLLinx1<i0rO#PD{e$p@Y
zQ^dM)jvxuF(*jelf2|+0Qc)nnhc*MchWPshu1cJKC-%JK!jYnYW*W{3d_!g#Xh)1L
z87P1T#zac&<{12>F(cqYiVfu#U4!0H%qwxVkIh7sfz;5xY|K_x?TM+X$+0pqlWO*B
zpsq^X)sC+NkS+>NX(j!#aHRpy-q!y*-){hiONs>6{_cxS*eGGM$&ekHgU`9m3DdUI
zsP>4ds|vYJKrRI_x}d~<`-Uq_CdQmjj@`)FSFxFtDAZYySurOf=O@ZwKQzVwlEe`^
z>#@}wz`>#iPKM<hh>#^%xc}-4MnjRKFm^dn*~_SNfKx#AC<2v54m4$;V1dG-A+iH;
z94|*C2hz&}<;I5Ct#1*6)dPrWF~t^`n|o7AJ_&ON9mH(`_dw_m3zl}%)sOfyBJTeM
zJ?461{<U^RYqbP9UB-NzV1{La1yC!;S|ccGP%GQohjd1xd(5tXM;)2Y?qo<{UvTb(
zyPHFDYRrkQ8R)LIihGf|Uyj&4YStrDhl48UG~Z^e1a*sBy*f|{=B>t#jAwh+M~M>X
z-UB_vDYs1?=Y20=Y+aKPP2S2Q?`3n^Dfvk4xl*p3=;Ao~HtSxa59BZ-T-hf|($UiX
zk#CH!=uY@|iw5qVzEW<X!J^`}LARNgIno4G?s=ts(uqUgKcX9Hfx)X1x47jl8_PL+
zlLwmah@-Yx@9N7v(fS1$GDgpG1B&{89O>KXDckqT!S#v`^s&RMas&<YuEtpumK0Ai
zdn!g&_Zg{Pr9b81WShr>{FkDc@;BIm1D|K?v>v$D%o>_r{bMEuCtxMRWib{47m%Ns
z6XrBs4!0P~nH(1I(s%L56a^^_gip`pq<S7%^?C-`y|ZCNhG+bS8<v(FKxS5k%dPR*
zHF!F-u@@>y2RufaX4zQxLV8R;Vf~VLGmDcfGNF7C?%da0NIIYfL5eA4vidfEpR=|^
z*GDmhaDEc^*Vr@4NLOJb1s-PJzaNTy$R$2uRIWB<8gk+Fqty%s_jJ8}vK1HR63{l+
z(%(EeF*FN1VhjIgqf+K0UEgaQ*HnNiJ0VQnU;Fjj1RYUpc>lCH@?9)fz$R6pXvP)w
zkGg`8vA^FI5m$jow9-5Ao^DsgkMGNSeC?tYn15zy!WoLLsQ>7eut_bmsRou3t1q=v
zOOc%Axa;gT!kE7en_n#O_k(5B?=?vN{hBN;>?U5>rSV=*bM*G5)uUpZ&Ts69D5s=_
z#f)@ldg2uN4^ld5Uw@3Ve(Uq87~NWqj2#_mDT$wKf?7WGt;zmUv8`>X4v32wuar7{
zjR-#u2G6?B_<o>SiB-$nmrxeDuDtGQ`VlFva~ypW{<OT<I2$xSwPZB%?k*H1TY!I%
z68$8jZRSK+gd|ri(`H6*r6$;tkvI)2lEX8=*_H*POHV2~6cRl|p*2HlK0ep>1I5cJ
z1Ud`P@W%eSB62uEIbt9!)Plr9ufe~E#o2{+G*ij*WZMO)lB~oUHIRL$ZB8+-7#vxj
zPgfoXTsa+T$V^Z_EG)S>IJDKCogN(*{^xVvJiB~KyUi7(9;vDfeA=@9swNrho%DAz
zdYD7T@C6WI`DQ6`nWweE(>7Q=fT)JrE5J!(=XtWF<!Nk{u=EdD{{#OJyaM-vC}I2Z
z%c0Z0R@3Y$+XZ!oQ^tv(?@%d;Ze9r3Ou#;~yO4Tsxyt1Yo1#6rYa%ZD$FBEC_!;6u
zWCQRgoAng)h%d(r_!3O^*}8Ne%>!gf0gh;UQc=*iAE9cmGK^FK50q1lv`!rnN{!?n
z`CHOAfp4t7^ug1%nI0wx#DBwn(gQOmF>E@Bby``FQkk|Vl$T?()X8(K`O|{K9c4FX
z&$sgdE@m2^xRPk8mXCXsVPh9N+jP{*X5A8$ny{^+%$$>jMPqB~XAJf8a7xpXy}?VK
zBVw2RBLR4_{WTe_WAgzN23j{YuH_UG8TbDFSkivAvAoyR)SSp4OJdPLD`zZzIbbtZ
zeUVpBbLJDhT#-h#F7y3l96~Jo@uuk@bD?o&bapd9gMunFyW*7Td4wX)a7|$cfR-!=
ze_Fp23wAumo91S=Q*$PAB|f&8aSn|7^qqf6QcW##w|&0Rx00hSRT~~0sm3^CvyCJ2
z)I6b^lbS|?t|IYn7#BH<;X<Iq??<k+PQa#xvtXu8*4`-SbakMErE*cmAwAL(qOA2B
zs<x*ad%d3!Y!aB0b%<6VZDv5QAf1v@BNm<?Me`h=gdh9yp2BQ#t~;KloY+)<#UsIQ
zZ#vF_*@!iAHW~1(6rm*Llv77{)DNHhnYToui>`TPmrK7<7&H7A`IJ_|aJ>38CLe@E
zu!5VYsnFPr=y$LX%By5tKx>tk<A=#P#>g*_<3|pa3slbWYo=mi)>p@zCO5On?|aXJ
z#h8!8)2c}FCgSxjzFGQO1WXRYQV-RiW5X~rqsOSiz*Leb<wC6f3&4R>9=<hLao?n}
zaYr<eqil<$jYviU5(Z5`{WGVNdcKkD)&i}uf;a(Ak*G|JR*y-G+I-?PQ67@w#MTGJ
ze8+4Qe#$`Dmx#_iq{!KjjD55b+Em4H01XNP7yvN#rB$7VAx)C&I|w_;xuSARs}IK<
z+|A^LXgA!&v^bC%41;ApM-5Js)8!-)#bYt%gp0H3RC^~ei`bNl@~zM{W@lRs+3X)&
z$1TI~=Mzy!<z@1PHy7l3`@>TOt>ohwC9x6h{(2!~v0m^ML&@v#DPu~pPJNAf?iO<2
z@aKKyQ;CX6;3rPmBwJAZ=Y<vB`^7&M3kMM%tz0aC7Jhh4#|(?ym3sl~WMMZ;T*DFD
zygsFs2xaV&fr*lsqJ+QfKzM)9;kKQeZ+jvP{bxIs!w}y<AU$sI`?<urNJ*~WH)Gtx
zdhSv20*7*<SAj|kA9p|Zb%g&Nvr_$RwHhjkK>43&El0<`%kNOA1&4m1fnmj6y;e3J
z&2Rh#r3VJn`eNGkv-qZ~az@I)=VQ$ImZ4-2mPA^@T@*cs7eMjRLQ!6GwZdN0Pg;8b
zZFFXb_fyM!48HzKZY~LUfFUx|$YbD)D$3K>xPN$aWjN0q5xm`x4nIm|D<9mYubwSG
z&55B6o-_6R;K|PAVT>?yHn8*Ai0e%Q!B-YW1~+~*7{aaPk*1e`@wEr5oO7Q3SJs~5
zOZfSdtwt|WnBO6X&}^e~j=H<6=o`dPVf<)`BYm_mJAyM%;$jG1<{I()FzRjpTenJy
z-|yz|yt`Ml;f=o!w8?|;mAvLgm|-Y}sG@-z!gJG^tntw$5=!hJiU*h1-;J2Cs<k<g
z5p01-hYngR(E0bKTi?*1+doc&n0wy&9X!kMcJuZe=;jZ_Zg8wJl8Qu1tcrA@RlWcW
zTMY;<4c2(n#_7Mmf3HoE4F^VbQn>Oq(4|6Rmy-Y3tnteoMrJJO<O(JEaj`_tJ-%g|
zJ0B@*!=piNcJBH~!ccVyJg-<YW-NK*h|2$0!OxexKSD>%EiC^vah3x^=Y&7_S`evO
zm$BzFs{JXXNs*(0X9W6hoK=t<KKAfLuUbQXay5?1S24>t)F1f(&#-h+Q!g-xR;jNz
zImI~PV%fx7ZjB4%!N&`31aDIztH-vp-RosvRSl>hY$aUvA1xP`W_T-W4^<{a+U)SV
z9F$Hw@~$f7r`qHSe(F%N2gLRcyvYzBC~!w?)2F~}{_6N3zV6&M71r6G(=I|r>h<lQ
zRb!5Fy>d(7rUkLkReAWfv!ub0E`khili<~(<Q@LJud1KOK)St``5Dp?%F<^~xe-q#
z(&^#W=RRGKQ!hd~AD@2e=C~o!rM_*aB6>qcT}f%9*Ix_4bs<+s=ss1=ycjdH@z{2q
z9})`YEbcT`(rMyHI?~s?ZiRk#0)k=(kc?S9?-8aeaRZBuG;>Y`Z<|yh9<@dD1ra9h
zZ0C3#=5PEP1qS5vEwLw-&7pStbi+ITLt>#$^EGt_($dosj=@v;S`Vw$$WFI#>WFW;
z^)pY+r!-oDP-14i04+bKnJm<tb_~@_puoYbW|E*ss`a<nrC$AysjIT$0>a;(H8XP#
zYP&eW>SWu+SC2LZti;ruSWU<PK`cix%)nkBn%LoGQr2i0mc4I1vAGYqmApI$!)15C
z)>qms0UgPnZAc^|&LxfaPcnSmqu!gZ;l*ZOP^@u3WmiKM6XJ%mDjTWKek1lTxeZjQ
zo#MI8SwOCBsU6vlX+nab+U?ObJ^Z?3NE_j9o2Du|mU}#ENYve}WU_MB>X)&gREin<
z{iBkc*U8?(now33e79<j=#8ciPXl-?&^VZ#f*2lJ-5(G8N)&`|e+mH8Eb}!pxN5oJ
zr2GT<9(7hFKF5aXzbp3A1ukr+C~D<6)oF#aPI0;ekVAoF$C!S;_m^fcSE6+H@>x6S
zUY58Ff#T#$R?@SWSv5S)KITfaS*U!MbH$b%GSU^1zedc2ks<Twa4wD(*^z1u6Pc#5
z$X!k!y=HT_<UoVa0_#Z&_^Y}BN%4mys~)5b6lijpjf0Eo@|LPnUZ16zZP=?f$&r&T
zjo7rz<OF7<?0t>XO<7V_`E+qaSd3$cNknA`a{jM6vUCu=z*Z7boqCo2XSM0+nW_rJ
zh^(uea8tss!jFqrdFG@5*TN?zCjRWTu;EJJKOUrJsM1Ne@jG`0o`jjI?r=3GE+pd&
znR4t!HpiSiPV8GOzSj!Q0MRt{`MFeUpcZ5iV-?}m#Ru}}lhfp+4Xcw4GE@`A_i{`r
z6=c+f1SH0WO9`@IC@fbxGf#r9%GSsl!6W;&D#e%O@ajHZYp!0LAe5MRgqfXZ%bAO!
z9*gSbTuixQO>`hXF$8oKg<-?F??d_nw52Qnt0)pcD>Ukaw791-=27YQn(z1@dq3HZ
zusICpWEq16=T<x;PSHU)q04Q;iUN|kyN4dPcAvi!sfm2qFf@BJis9%ie(L+=;>so|
zr*dkFJBeWEi`^T&ghHmGRaDHzo8%ur;Ix|Bd9oX}0sc#>ukV0#E896h6jNeAFvGyS
zIGlm)q<TaUhPtE^D*5j5s#NS>^n?`#x<Qn(hi+5~<?_1TO1JZ1Oio%Ne<#&tgh<`b
zreXA>X!kxxF89dqD*tjBunI~jHOuBqgZ>cxd+P_C5Uux`w#v}X2o+i70u#%jE3cEG
ziH-l_UG<UgBPSv2+AD0XAi?%=bHqv^-Nq9&I?~cIXbhnvP8(c}Me|7@kB?V;2%wh=
z5T_K__Z_UTfvZFm(6N@lqD;BxOGhd`A8S&S5W?W)=5<{=rlQZvV;S`d63ujqy2~sN
zU-0au)i5TMKR*eSq_TC@e$zpv!oVTr!@<qI54@YZV;fniDJ9%xBITzJCDu6LUS-r1
z=w3DU>R8-kSU4~sD!GuDj+;3bV3xYcSZ2|jX<k})&s0({PxP!NzgpaIzuHGL>TVWs
z+aj9jtvYyrawoK7P6nJrN>f{QN7acQfw~jL-Do;HZGaX&Y-t95nqM9t%nKnl7^4fh
ztDZoMd^#$`mBJk}zsuZo-eTGM?y$i8`1xpM=&ytB?yhU%mz|U-L(V7WCSx1c6s0Y&
za#kNBvQ|MWaKz(q$l3ag@HeoiNLucVz1JL_PO-(CH3L??s!BiKiSlm?M^6#?JRFim
zF(p-GtNMG$ad$p0gI(M`f^9Op>P>FtC*Xs<>4v-0^Ur9*@Lf!SM**>X_ql!Fy8NkE
zUnS*Wvh*R$O?I!sVW%}(cr48^x8?~&CN(mN_qd;#dBkkQzR^{u(KL>=%_|5$Bc&pz
z2l7j|gF`>)d<lb&cROZdb*ow0lm?!eTK6dY>&jDl6>PpoR-tb|I$OxZTcXroXCu!g
z=OV-=Ql2&I(6+ULiti{#Hc)TaGE?T_sr7T@&du?V@8Vf(FVZ%YJnd{lZWoo4OedAF
zA4B*FSHj?%C}`%GXYf58^mopt1IX>@D8u`xuQa$^Ue#&s#B45vK3%(>Ev9or>M6ZQ
zUyomhijOJoWO81Q!vXQ>`;o40dykDSY~h`JiXO<4pDLwfYYnKu!1`LlwKCli@^(jm
zB}2H}ZKV43Zsh-Amym)GA6>5VW}=WdrKk(~6*$6dl4m-AL^`G$qFJMI*k{poGKlPX
zHf{^vdLvi<S*0<JK9nODznL`C0Zr<1-}ddP#@?w-CBO5v0D-slP{b;gbs8M4Qc5Yp
zxrcb#REXzt-<MfBqG?}XfFT?t*D9MWwnQeD`D%Xp5x@}=xwyoKs1isn4xLsgOC(UI
zT`hOFs}F6sV1j`&B1~Al^Sf)++*f5bze_rfYD7>}D!x0osYAjs8FOE0Qut@}qCBCW
z;hYL!n;?3|KC)aMfN302bB-S&k!cc7yx%MN1?a1St;RSonK1IkSo{vT701YO;8n*{
zsSZ|SZ;3;{z-FLet0rw%YaCpg&r_-FLWIk~+{iR0O+zQjR)+5ifVSq2vV;2=c@e_N
zeLWO>KH{DaGqmYjC~%gHJbby8PrWU59}?&}tA9{xI|^Rq1?+77UwwUdSQAb3Zs>{>
zmC$={ij<&qf_{Y1dk;v5(7SZ$3Wm@XLZ~71Djh^oI#LWokfQW1Ak9Mi?)v@ieV+Tz
zy?@Nivzyu3-I<*;XU=)gn;tT<v`9B;$if?xKEkC$qzGiA_q1!S++_b5&dj+j+a?>Y
zJF+O^)pu<AAr?wkiZK>J-^6kRoXRr&<bK0SkxEYO?O@0?V)~q)GA}tBf81bk98E93
zIgPVVuKh_O1*{*G1<5^#Eam<{L8-Y88wGudpVDE0bzS}q<ZN>VgLj>g2$aagBYiv2
zUgliv8`rd`Y;IMnrdvZgULC&lwVvCrrY9ZP<4uHdsMVvIhwQAY+*Uf%rfvf@Ui?}?
z9D;#ihMf(u1F8x^sbs&u_$xY2H@S8;G3{>$upoTrUu&!*;QZi}8DY$tWuV!S!Z!td
zry!3Nanr18E7^%rzermpN;Qiu)89TMdF&fzUMOx_v6i|1C$(s$D&!iZ!zMwWQ*JRA
zvBio<`j@6}>02qSqHp*a2mp{@#{w$lF}-+6o@^u9(A&XYoQ>7~7UdBM<eSQ3Q(EV+
zeO#HMDP-<i4@p!z;2JdDn)+q$8**9^bm!yGx|M-?#n?XAX>3~OxXifx8L^>&l1QUZ
zRybW3<HIk_YZ)Aij)@sk3RW_OAu%w&3|6H&Uh12aUsItJHm$90j%bU;kJ-=e_#L}W
zVLa~>7K$|mXiTB}i!;gi+QqU$&y*lu0q%6u4xjRhs`$`+Ts7p412#|gAV`*Qf;?bb
z|K+%bY9(vj0`P=#_3ZiIR#r6ef~Dy%WVlKT%9>9j-B-<WwJ*}j7oKxbz3Zr1aOtj*
z;GWg6nO#{qRGG8g9}0}1&Limzs`#)(9~Oo+caXEDEyLm{vE|B@q8VCx?2zC0Qo4Jd
zPz-#<aXxE#B)Sx-Xd>7&-Gl|Nx*(iZ_LDe!hemNAYz&+pGMXHAlO5A6q|IR0`I8^-
z@!sQU*&lO4H6IF`4d+k4dYWyYsMtnF8^|V9W|D^lxp9-ib6<!8hF`ibHP!O42U?c|
zlS%KfFOzR3^9&oVzQkk!(Fu2;=xe*Fz1X1lH4^Xv{mIT<XC^6|9^O~q>nyeGLeutH
z<kr?4|2(PF-&eW0Nt<@Ln@43jrg_(B{?p7Y?ToSgU%W>jZ^f#zO%WiXEgs#IF5*G!
zrSm;!VVD-W=Zntgh|)K@EWZ51@=8C4Yrk?dj$9O5LP@TJXqFu1`dwcPR!CTdy&IaL
zkMn<0FvwhuT(s*B*%vf2uA8KDkG$6>j#O-Hdz=-uZb}K-<SA&eJ$o-q+*itLN2v`R
zbM|olkoKEkw6MBiH+~Gg%o2!6QjJmFWF)S#H51(xu{%cPLQAfrwVQ8^k$2$SR$&*(
zng*KWk>aqGzRQencJpglGK|7$GU&o*kL&RUBK|OG4ZIIiX|oKnyn?{LL_0`UrmGx6
z(TF;uqm`7<|7ZmMBV__F@NkW$dMjVChE3ZPsAO4BCC#d2wAzdJmETL&1-Hp74lF+5
z9f$cDtY8NN7<P~p0bH>J+Wxx=X{V)%Dg7+?l9&Wu{Fsm%s3cj0MAT1RkcV2NB$~!h
z9ULvv4>l&bwvv&rnf&M>aDqlg8>1y^K?*2uAS>@E&mcT_Du2O<+@{M1Qk5Xy3<_NZ
zP+tj#?63IcST+k<R4xYk#MaUDZL6kv^6z(z4R`(CTR(&^kOq7!wFEO1C@Zd1$Hid~
z#LAR`wY`>S-+JkCmAJz^?sH^l2N3P(M@obtS@N;Zmlk3U=E^Ni(X5f}RU^_pApM5Q
zU@vZ|Z6Y<l5ZwdeTjDRjERbD10%trtv}={rBcUv$-s65M7U{miD8?AW|Bkipc{Psd
z`{?gH&#G^UokQ51thl)jk1UIQPLo(ldE0#P;)cw~5{{qMWv9|L%{t9a-nm6i$KUew
zIi|~1dK2|+k)xs}q<)3tS%>|kynGqh#gqrU8d{VR2U;&#=R{3=xJ9YT+#8jqh?A`C
zuf)ZZeChPxQGKhk9*SKRPW!z%1vnBce$wWWW{>YHxU_oh<u?qHfTJG)wbpIvB$Dw)
zA6<e873({08syG#uNFu)FRmC}kj9P_P!m){dHP(j^R@S;P?jYUHIe7OaRnP4Sk^_6
zuG_OilEx&Q8b)touGAknm({(@kk;M!DEd(oWfw+2C`-T42}9gm<gegBov7*n(N@hF
zpa*HaoaWusKc;XpC?llwcec{to4Sy6no=iMrH%>i$#z|1gFJ&bp&R_d`xRTbPiFho
z9p7gc?CPXaj}H*dahTKBJAMWM)>w;?41a?ybxdHWYYz@&SCA!Pu*s=Go_wMw-P?EQ
z=)0?1E>P}fCXo6Fewcm6=7fgz%VCMsp_L_eERAc_PZ;B~(NJY*MVm{~<G}bcjLU($
zgyQYP82v}XYjg@k&=jHJdXJKEJBIrcF-`B&=<BM)`3qqj-4c<#Ql_62z8~micH@P`
z%xM3po$wfTnERKnBC7C1Zr%3u^z8v7b1vjURj;D?R9(m_<A8?Z!&%#lRXNp|?;hUD
z-rvq-b=90*)e-`gQY!|Do0#RZF1-2NBiBxa?y7thO&<crEUW_k*$xAntMQdeM+IIz
z#Upgx<pO6htW;Pippa8_^gBX3O?K9HgoGwW>bXycu1sx87S4HtveHym$u8XmpA{QL
z%$0BZjJDV|^M1rZno}DtlVR<qPmo0CnFL|E%^#{UH7S~FZSTTES9FJh_Yr6rBK^N0
z8)e;j@t)-12cz#f{o&(^m+q>s7u_F_%FT?wB3svyiJ20(Crh|Chbz2~df(L#n=Aeo
z<Ym9M-(e<s(RfkwFlNGduKq=yNA)fCYZ*(e;AqP5LklmLkNg7Ym}ea6{TBbgp=!rs
zq~LV)SL8@WhFSQHg86)g5P#8HT<?az^Z~&f{dHoxLN)Oq{R-X}C&&6n&#xdcw`@n+
zLNkB9Sin0~IkG?KaHsWw*`h~!@*pdD&X>)YPpP&Zu`Lnm*Js_k>E;66rW1a;-Vlh=
z48ga#ty2{*(f2Z@)(bf5Jy921is+@{-aM-N7i8Yq^!a<i{s%B-N05CqJ{DI{<xkH&
z{bscvlQP;c=p$hEqe7|XdP-l|8fLHD)|9uU(75nRh2Bi(mVcI!D}+l#flO(VO-3CA
zV59(8RBlQ3z+EuFwZoK=Eb>>R0ZHc*DFKF*f!kwrCO0yosYURmQX=>=1}Gga)yl<f
zOdQ?&!cTVsl4aCxks)OBB_Q6rS?QnqlKSTlan*i^0jQ-KE#Qe`K1;rXZ&$2McGk+E
zCpSiUQikx))lM*DqHH?21J9D{lUV<W;I<1rGtuI}q3U2Tc+Z8%jTxm#<i{fwnW0t4
zTEuOAVd7-V2um`%{OXTNE9gk?r!_VYJ9LLicO^%~vR*jD{ExC`(hr&~YGn1c3sZA8
zalT5}m<jz_Gt27+%F2q98Q0~O%tp+mTcWYp0$p$9ZSUxMyxnve>Ua7pS%a|L&$ing
zdZfAi%6`_^`0Cw9QmR&Na(i%#b3;FpacN-LdHzmV=?ZciBtIrO+1~40E*@aGk#<{z
z4c1!V?2$7~lPi;bAzsg!`$JE`m19PAIfUtPi(aT(8U+~<Yp(SYeak8B_Oo*CRa-rk
zh$-#HZM*FjI%i@G-ZR>~u=df$#d_<J+(xtRYfvf8xrua1)7r(GfPUYdAi2ireNA?-
z-CE<mzI*K2UU!_&S7*=TLH7=t&=<U{YAiOrrxk+nO%%Ql=+p-F%a@H?YjW>W_%T>_
z>cqrQ@nES}ufYTu;tFJ@j_c|ojpq6hGE{jSJe!42)ew96<@4VEIIXH=?>LVbl#6Qr
z6WU&e7kIhG)GBQ|%J+h1QL9?w^4#L`o7A?=ST;(*Q&oihi*tUr`17u8m(G{!EM^YS
zle#Lo1S@~TSyp1{Ha>EeYc=`x>vSr9<(Mj5=AM~=(=~o$Yyf6Q%8{y;*OL^fwvux~
z-RDFY19ORj@5zn9<x-NkwW6h{l5?@m&{mlOB0|UeDzba$p$SNH%zWJKuHLeP*ZV{$
z*<4~@&d^|aty=qWoR&zt1@=C@^t&m5(uU0wZQYr<kG+aFHhsN>Eey*o3ieE-+L40Z
zo?Ad%v*jEjv`Qz0T*zRf7)xHs+)Zyb7rk+RQ+?I%m$Lp8-ncdHqhS~MjMwtJ8^iu9
z`#XXm(G)k2*j3(sP6*4|*1))ARgTwmIQTb$#w&-6{1Uh)n*}BXk3J5-<yFOhai(&Q
zbVY{$GqrLfl(A}1l0*|~;<tC{!Q~O!Lv8RnkU~T2xN1WtQ?KAzg#Rf!u(3MkO?;S;
z{d~u)-g-_E$^0N`B5U_(i35EZRZ`mZX`j6GeWx+8PQ`r-LMxl8A@#MG%kj3O-#DE@
zYOgH8nwi@H&-^4Ppx`BwceSo{K>Rbqj^<YrZNVvru^-VI#dVH-omrg;JI!5BMApzU
z2k64=CtSQO)_3(xQy6*eJ070=x(u-OsDyK!J(P;}v*GxJHHFs>mEl?C-X?ew3PfdK
zNW_ASI_pLp>Toie8DboucVoaGRI((U3|$C-EgKm$ca#p{cnp1+AugGGDIZ=$cR+G+
ze5hmz5_OW8(y!`0Rw4_c4+y?Y$xvcf0_ZOIE0L*`iBuPIT7=PJ0sK3qk|oKae?1|f
zHg9->#U}Od!A4;7V8Z+l)txxh5BPw)McXyC`GS8ziGBt)Om}1DIOVDfKm23<239UW
zESAX}T9xa+FWc)B*R!L7H9?QmvHCM`91^FsM+tSkprK(NE~50!2Q;hGaYDWd^j0AS
zripNA8qfI-!?dVwb)h^0t)(}tlp(s5<_Y8~Uvxl2B)zH8gvC^t7ZxyBE?<^Gfn;>9
z#OD8`ZYx*$*mz)aBxb=OFf@B$mY*waZl+L!ZeHIt{O3K+c+ZH2+iFYBQWzoy3YbpV
zz!0ycq(VLrYvjw);iYkvl@Se;o8!t<VJVC+{ES9+f}_=V{MAY+(U}$O?0wmk%((h0
z09^W%`XC=+4Q29M8%<uSpi1q%@c4*JOJv**bJ|$#4GZitc^>op@Kf9sh;3y+4N}^s
zOhfZ^fouNNMq5gaX?hZOAlB})ru|VZ8IueDTRGJfuRM5NEfatvL#@86tkJbv`X`1@
z&Y+t%^riCsmrHHh*C}Gs!(H1}O?<}Qx3m|K#8MvkzWuCYOItav7peH9%$;pHR@93x
zm1esIThJHCSS#iopec@RPfj=aIv%ukr>}8S`Fy%8j^Sg3fH^h)Zef)8tu>P8wVXGM
z;`E7=);V()*ThE33v0t=|Ky8`95@b?J40p(yBRI5d61aKH{^!9SFopI%V(Ia3&WLb
zr#?c8A#5VN<2OJz!lK9u$2(#-WfQ40@!H?MV$3mFCtsSfP!YB5*(U>2y7cG}RjcT?
z>Lf{ZO}8g<=!<}0YS|oz64sOQO_Tu>LoEc$VGy#X`?Vko5zJg%-W0W`!FUU@soM3}
z%KQfHI0dAUGS*+TOH-~Wn1c?!x38;ZPTN+`x>6!X<|hBE*g}*FbP3oXT4-V{NOMp6
z1DULp$NI#5ha6+j<S4nC8|E6XgzMkApImZTv~W_23!q9HMZ`?5-Yy*@zH}bp$XAK;
zv@ls$B)GYoO5^r>!Tx!~?IkcmWIXKF@RjKnLD##HoSKh}L{BOcL34jquPf_y?3b@c
zKiIhd2fA%{cc|AYZFH$OueHETl3DXk*YLt=#Q-=vqmekq;T-K>N|wR0$v;!LX%W_z
zNuGWqqVk|Xoo9wcEHo*zt!#nj-1Is=&ZOhkL<c1l#1Yk94ap^l+PGPvW&9X4naHaY
z(B*U3VyA~?Ff>$tLhBvfOS`yn7gLtO-)w_#(+1WxXsAHR$VI;sV*gC7m($c*=&$RB
za5Ll7Ud9z>st30jX8h{S56#LNk$T+EoaApz$kmHeXFP;G4KK_Jm}m);6V=YNNxfg{
zupVe$lJ!HhtGaXJ(QiAc>5NRiOy4~~KG<gEf)m<{C=JyanMFhcG}W2^Y8~wqfI89x
zhy_59fDL`AMaIAg(qxg6CE)ab6<Gf6uS7+PK2c^0ec|I+Wl#O&ct&Ip>ym$zR^;8Y
z6b>*+2z1;7k@$iJRjm?*<>fgFblul-u@0Z6VX&b=&g1E_k(`;-o~aDkP_Vbj@W3W{
z%qiKK@oaIbe^W#+|BY|OR_h}_J50ntqkVA&%*04!F5YD!V7{TWlr%$E@b6O@`1%7t
zr=`GYX`fbOv-h%@rCK!B`tF~HCw`mj*bx4j;SG>1XG_LU9J?i3k?D5A$|3`9+y<gF
z(OjxB>I3r6kH+b@r%Qf<nV0BF^0bz;awcS_LVPSdG^eLERGqV5!>H(YC)N=So+b^W
zjuC0pzbLax@LXmHp=CjVu!YW2gIp#a^E!WjnZ@J{2_bD)7uxQjo$&Ag%go&y3REeY
z!otXLDwUQzzY3;cVfLi0IBuPpyi@no;%#F8R4eMOkEJEv`SOdfcUX%7X1Pu{)H-%h
zn9)c(G5eSNMA1q4_1Jr4yO_ORg2~IS0%xm?g8XY=-#Ta>=)VxyA2Yk7Ii^dVC-bdS
z!qvg@vD<)uB(3>GMfuQqUUDj{(qy}Uh|wS#sZGIQBm<HZyGuj_3x3l#)?&kri;RgU
zB*i(|P3eO_3j~(mD#+R=3ou&NA{}I8a=ZHnP$bhMUWeG9C>j4;Zi+Dt`@|9x4d?13
z_%`xibcdOQS2(~2g?EtoBJJOmS*o2lZrN<c%Tl$shTDrIJ8j%orVESP!$t*t!1XcH
z&_#MUY7qDC;4KC2u-uB3+ZQin<_f#(Jti`d;jR(t2UuzsAm);F8{PuOX&RpN^~cpr
zUEWRxf;Lrf7sp>3R;xiijMih}?7ghnjvSJ!vZ+GdJYUx!jfv-rs*eZWRM=IGk54On
z6B4tTFz;?=`mO5LDw!tvWa-NEpTXPXHNrF_l8o2p069J~Z~PL*<-x?YhH3Muyf!4x
zbH>mgc==G%M%(D6vha_s@H+}4k348xr03VJ@hK-=$SrY?RPFq19J^ENy}TxTEp8V<
z@v?$;q&}C&2%73QPG2wkdH!2_%uCqqit~L*nL@3VO5OK!@V$hP&l<VErw=jrnq)}d
zckl#lPPYg7qibr^CMY`#S)0YHSe705$Xlnz7v0x$csQKihHaw4&2cb}=1Do*42RqB
zenGIg8ZUr*{GX|)C8Md%`vL>xAPJ<5IvCV}gJc<yU;tAG_1{B7j7Sj~1lU6S-9`Y$
zUPCCQ+Zfn@bR!dsaz%%f)Xer}j`DdP`A6kICf~;TWFwL}6Yog9--8;}XDEcRJr=mG
zRJ8cxo|VSjJF!jlsr6m;E}_u$>!vz4eM3mAyIy&olx;#x+WhcNA|-(D3yc9KKOhl`
zXlW&EG8s>6f52oAwOxM#s>5eA!Fg$H(|MmZYB{|vzsA7f%9UO1+d9I^)yC}fcch4}
zpNQ(IEuv#QJORxN2XHqXjBcM%llKnj%*a>ujF>30HZ}2ap6VNJm{U|n{X^de7$~}r
z?2Abwch={}wf8U@WXVsMMeWh_c&S2^iQq@JFw&@I#2q<0ce^}u{>rkL*0_!oX^o32
z`Hh^30<002Xna~Y!M6d0Y>q$H#Hd@O1>(nGv?|dYwD7@bu!$WynqzXGFDDM8!)8GA
z*#J!BS>NN}ZX{)CWNI7eti*fE8q089p#Ug}eAy&Mi;@+`MKqcug_mbAQCJ*)nbCPG
zf#eB*aCguD%KkyWjHoqx^Xg-Knul0(vFrhxF}CD#+Igq#Zg_>J48!n%j4AS&;76{D
zsV2*Q!N$q{l00pU9WbbxTJmy5RHDjM>$+p2a;o>hb09zfKLV^-Ie;{V|LyGmZ^E~^
z=u6G;)KPvv8B>QkFiy#t4{nHln@g&$rZW>b8r%h}Z+H_@>Cqmp#bwR^r2F3+Q2za5
zfW$+W-DNKs0@JlO-BYotZ~m+{n@da~bh2UT!iie`GWv|2^6ET4!3!K4cq+)P0}O@#
zZI$LCP&rSeE*z#$c2vfA3aL><*-wBA6ST7dVm9e!izj@LNihfJX$*94jET+BBy8&A
zYK&nfoR;|pB5%ycU1@+n6CMXSs(AXGzE;|zz<x-%pH|B6n559k5v0I|WKpISk9}Cs
zyhf6WFuq<|vfAhkF(d|<*Fn1SJmB6Nt?70-QTuvhSALd!Fb=1}TAj?s4~=qHCi~ht
z4~w{D;JOxGco^Ih{n=&)*&{zjs)KabB~DGF2>vxnY{Bl5$k~z=&NQT?sK}TkvzL&_
zn9vTC1;=5;fYF&E@zZXNUNDM-QhpQXHh%S6-D8*sJ}f)-RdYj6-`?;+aV_H$e>Rbl
zMuphFV}s86zXwSMaGg+qb8!#^MM);a<wZgQP~?^}ajM@(efpaxOZ=CU_EwY;pcX-_
zK>l5kFB6#6Ow14lO?47G{4fB$0yKLRn+`CMQIm$y8yH~8qoci_OxoK71DXH|y_BDF
zp2R>yKZ~te=VN~EWit}~ZhK1v*sFB9Q)PYJ!);_!Y1zesj>`Ctf%AzhEqGr;OyKzW
zID0K*WU%;Bw7uj-<5AI9s0y(#0bHlZdtP~i;pC*W<VEt37J`6wD{^?o;|KvTtti7_
zah`FvO(G#qos3!K1B#H0Fuu9&OUdFC9#l?$=U)&5y{EAhOf=IWXd%oMT$AvMbBC8d
zW*S=;@X@$~iQma-R}<4ParCo7N;4}5=o*Jt$iYX@6PihvEF4|cQ!yO_HcDL~q#tb2
z9RxU>faoyj14vf|Uol3Fjmxcl&%fnzoXBIQvh#Aq_|CIWCbFpf*{N%@H~xx6zV8xl
zV}f9cgt5Co2aD7F?eyq|EJJm&zvkfocdER7J^zV-UN2D;Vzo49oleltV0Cz(ao->k
zCYoi{1MEBgUM>n9CgTamd}*Gl9eoH>@eV(tK=5ofGE@}Rjph_*Jeg(N_jF~%QD(r+
zvwK+9{mfUJVp(a@2U{A^W#wGi1nTP%8jwTU3n3d~@K33WbgJ|-=1s<&qc_j)JSCZI
zJ`E6y2VHIbfGJMvI$F+|S+g6Or+fiavh)T(&jS6QRFvi~t~I{PPd;r&jwQ)7TW;u#
zkS<&Ng%&Hx3%jLa?d~N`$vURUD3MvF@4q6{-kS1mUid=%9pQ=%|3jl=+Fo7xAH!Fw
ziGJ4pEgfUw-+kE!B*9UTUI1%GecJY0GG&x)hGh$Yi(O`4|AANw?HoxsXq{I*e=r%n
z9(il+gA@w8f`M|%*!BV!#7+uQ&($2cc7CAR#(dI`|HgGh%G52Pac_g<%<-h8*D!s#
z9fz!coVRpZ@bjoeF`M(nKjqvNRaDD7=Di+CZCBlYcDFkVMXWSl?aA`1w~#1DO4&}7
zUWiWe@M(7?`AA*xeAl@G2(7y4V<O~z+;@I5{iX`upcvx(;}D=B;y+xd<R!mtbmz`j
z@RjKab%e@~lh>t$S*U|@Kv(*o8BP0=Z4APPGdtmp*qRKv+VQPVg?M2n^Cr(fRTFAN
zpOM;H)G?FM?rUlPqNViR3C0=Z)9XP1b*=nbdrJ#FL15wWA;>N&Xn)>ODoac<Y*LIu
zp8Tc)*<^W+GDhS1;sxvU9<OWc(a4HA`y0GNjYg}w-ve9j&z_~T0rmk50lj^_s(Ru(
z4yJj2_Jv{bd&7#vbBFlzxa6&fn&|)@!4l^|Dt`QfVS(U_-5tdj@#=R7#h^%WKwj_5
z<hgxm5N)y(rm8qIOTL@={bB;El=$;v_o@01iH`bzGUu#CS{-8`XvPpZ)yE&Y9X6K>
zVuEgxQnp3mi-U(QhPm;9R$K|rMHVl#S)jK23r&~$QO$V|4W1AW7k`@+@Jqqod;My%
z8*o~us@zL0^RS3u%Xye^>MJ-nUhR`cUnH0iPC2RPrz@tel^)Tkq<64<zm}}8^>wdb
zm*NX&QXmp|#&LN9G`n>c;;}1Ich7=b>WhzoOpk%aE@~#A3w+4qP46Bt%@*(Nzu9Yc
z+k#VRy8&OJx-+uGu)A9b#F$$>`@s65Yx~#pB%+4AJogVCReac4h0>3w)aL5q$4*xe
z><eFA_YmFs58d9{uh0P$o%b|v?9-l*6;3eL)4!k1ZVIUCZ&Kz<%}`}{f3f>HSkk*i
z<m+UfQ@C6KXZ6MX&Z$-n?^kW;eJKG0GPd%F<)ooAhkE2Ys)M?ELG3PLTbmiFyqWTV
z+HRXtl<fEZSfR%ty3@Ft5X^*LQX>y}_+<A_s%y1+WQM;@%eLVgUM`mOKVm?L$WYmJ
z%vA<&XNXsw5tQCYD&}m)apfu7M8(jd8t?q47C)3_o<N2^V!9C@bimS?q#DGMTB?T=
z8~QfeZ|=d4SNgE{OqM{htNo~VuxOgkBOoV4@Hy$>>$oXC91j}D`1vNip-#p%JWD#`
zv-XORs8M{<KH4F9>#=@o(ENJBFI(D&b4uh9b*qPz#mnoT2oAi&zLMrVjZ7-fD*ZAk
zQ`gr83(iyGm+NaL3jWqOI5ED}IZULasG+3ITBju{dH8DgY086hzWMW`D8~zN*JruU
zrg<C;t)I>^EiPsrb1!Q_^6dPz8%~5$?Iq9pXcWXF1JBiY{vgm%hm~(~^e<lPpRbwT
zfposM6;i%6G3W*PA~i5d&q|h@gKPt0816Kl+FQptc_ct_pJ=Fk?J+ISQq3OqeJqj6
zgk#gY2^yP5bt&(^K2UCGsq9So>>jUpb9bTx+bK=6pPO1nDP{p_=W`f4pMZX)uo+`L
zEvr-y6#Sg`HT$t%i@b`NN_=wsw%KNJT9j-AmXKWUO7%&rbjDa|>xbQnrp#~S)yZX3
z-r<N7VU+1YIAO5%o-<wV&!&B6%~HvL^%2saU#FW_Y0|427oY=SMg%>`DrbUN#!HlO
zBDv(y34{QS#OaUZW3;Mo`K5SxZ{DS5IH}sh&od2Cgl@6bxn$r!+zT|qz8p=tTa2=I
zw0WDae#48pAt=f8SrAL5jJmnlcL~>pC#z~_Q*I?6#2)whDR{nc87~*kw7lmW!2K=Z
zEv|6ghL$mFtFo)ri+Y@Tn4^Q7gH625jc|1&4)7x~HMV*;RGj%)D#>h(y%Y@6P*wM#
zy-(ym4LxftRq(33B2_`TN7YNeZ6c$NzAi^5)VA8tnpz4iG~1{V6QdDJ;Ob@6ra60U
zD;Nm7`!)|!zIi#fDzEf;*GpPNQ~H*u5=}j69l;ug;<Fc<N~=o7t(zKt7bT7u=pr3?
zdzRMNW+yN7E0E~>a7!vji;hzq|8(Xfy}{b8cMJvz+RwzE&ehHJ_J>8T#BI_PhW&Yq
zPdr*#*bvQENo)$t{6aAG2-tzw-z^1|MqkM~Yo%jJ#W$+;S$3x5z1kP3Y6F=bgIlhF
zZVy;*xpNA+RZEn2<g7+f$LX9a+5LEz5E@k9|HYS_AbBC~K%b0JDhfq0@Am5p5D<rv
zdb=YezLZogkfQmNH;$a*m}e_=Ns=t>hQJ>g90sS~(=NT(wt8d)ThMu44C>(`9u4n^
za|T_?p4n*pA%3j3e4zat@EvkkA_ma<2nL-{sc{*Tr_Hs)E6Y;fKlAMbcK|?NROA>(
zjl{FOl)?Q6%Z9Cw_xD*(Dpi}k;OE1CCOKh?O=T)AT9-G$>kY`LlRB!7q3ZjGf^Y1N
zu}=<ky|fkrHZ=YPMVj2LnmZs13t056`h~d_9;z(q-sevfkUZpNMF@Fti~je`GESF1
zI&c1q9fX8pUad4*W(?*`*-+T0;7{kBd0aL5yG<+gz~<hjCKNHWHJk8{(?$pDMI=r=
z!}}({q*X2bH0jI<`p5OjCzndK7X``_4;dc(*uV-ZTR~OI-el~qwEFWTO)MvWc=P*3
z6~YO2Kh+3%eqXyLecykFDJ?)?d$8MKM@4SR(_rPFp<ngaI}W)jg9@eBqgAqV1?qW6
z(W8;$Za<ZWf(jo^22CWTs;sqq3`b|b-(l<CC|xhlN_!g5C9VqTs0H8tGCbVfCx24<
z9#VQ{?C(CzLB%mS<&TthYoIT|Tra}@D(R8XsD;oxy@iw8g9SjruAhyBMUvjc#Repg
zcf7@{d3lPR-Sz6Oxeez`*QPgwd+v4S82_;P;EV0dzgelLEGs`Ej=LW`cx7>KUH6=#
z5};QhJFR(JFR}5?GSwj}%OO8T+vb&AqM?4j5Ct<yvvF&x7NAv=xs`i?DM(*L&x!WA
zpq^q4ec9C&!FK-@TpOsrrNkV98mI@p2nUQ@UM%H6?hHQofC~Sgx?W%eB|&c<MgV>U
z?=^e<Dp?XzX||hOT_6C>2V)6948)7*1vW_}(a@K5j725u0^p$$X{W&t0}N?E8=a`B
zik=g|rl!|}`|m-%{O|j_;oM4=?q|u|gYj=6g9$O}Jt6J+VY)nLQsuRmb0?iSPkY85
z#lR>)R&2FrCvWnu&LPV+JCCj&y8!IKRRsjt9E5W={5-(qUr^!pyMrp#wjljKS9!-(
zayT~}v`Zr2!${dj@M62%j7V?Y@${govK3%#``!>FKD`_C;PNLj@o4L`BM11B#?*n^
zFf$IaC*{@DMb#kll6C_0`dPrB1&lNjc-$}pGGHu`zqzt<{_BnZd6CB-Uj6q9LK=9|
zS3cb=D$OAJB3z-nWMriqNtf<_J?Tx$OEq1n&P<ZOEn{Q|yrPTSaQTuEFaWCm&i*g;
COt_o?

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/20.jpg b/web/newclock/maps/20.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c19a57bef02eee7fe795116b7db16a5eeaa9eb22
GIT binary patch
literal 25868
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
U@BVwb{j9#2GJ`Uj|L^<%1B#_+ApigX

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/21.jpg b/web/newclock/maps/21.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e5f54e3bf02f725f3517997aa62bd30384fd235b
GIT binary patch
literal 26140
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

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/22.jpg b/web/newclock/maps/22.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f379c276e5870ae4d59817ffa017d9730ce6d16c
GIT binary patch
literal 26614
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
Tf7389lBnCBkN=>czcc>_K;i<M

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/23.jpg b/web/newclock/maps/23.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b734d26e859d5622984b672c368cb5fe2df497d2
GIT binary patch
literal 26723
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
WRg8lcv!u>(*>7<<acOY=UHBik$0yzZ

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/3.jpg b/web/newclock/maps/3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..cbbffe95919dd158e7199b535e8b4dd02cc2019b
GIT binary patch
literal 26311
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
LEDYN5clQ4Pcdc|u

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/4.jpg b/web/newclock/maps/4.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5ba1be542156e9b8dd057f6a46d1f94b4abd64fb
GIT binary patch
literal 26272
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

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/5.jpg b/web/newclock/maps/5.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..26cc1be7f5f158e5f2f5cb9ef8ea5b6cede468ae
GIT binary patch
literal 26246
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
K5+=v|o%vsv98}c+

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/6.jpg b/web/newclock/maps/6.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..64996b8b8e8f3fb0e33e7b38e675b7c3431fac0d
GIT binary patch
literal 26379
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
PB=RRX8*Ih!&&>Y-c_C|8

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/7.jpg b/web/newclock/maps/7.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0eac8452248541fda258ff2da15b82241b2fcfbb
GIT binary patch
literal 26289
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

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/8.jpg b/web/newclock/maps/8.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0c5bb692398f325438f6d7838d4841e4ba141bac
GIT binary patch
literal 26058
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

literal 0
HcmV?d00001

diff --git a/web/newclock/maps/9.jpg b/web/newclock/maps/9.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0aa57d513638c04610c39ca9da26eb6e416a236d
GIT binary patch
literal 25652
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
DW%@TK

literal 0
HcmV?d00001

diff --git a/web/newclock/numbers/text.gif b/web/newclock/numbers/text.gif
index 72b521f73bb2487e90646197832bbbfb718ce20e..392fc636d561d088fce18c688ddf50d53b1b61bb 100644
GIT binary patch
delta 764
zcmX@Xx`LbA-P6s&GEs<$kKy}7?xcwUveZDV^*Rhd05X+<<3EEUhm6OD1qYisgtcN$
zY*=`>T|n7uj>pDDN4q7Av+kVOxcGR#f^(OQ=cXkmCu;<+iaEJy>FMbP$*1OcZeDhF
zwuLxf!Gi<_7Dhf69-e>$j*Se=oE8iU7Z@2iyedC^;S5<2G~d$D&9uv8<;6yarB)eQ
z-!kj3ZI(T36_C)N5U?yj)<j^%0`*(dvnsjHXn#o$;IMwn_RRA8x`Pb-at6LOVuzTH
zb&7MaOxUsZ(GCtdnGLTW9DKqa%j>;lkELN42fNSv(g_b5<2d+*JWREBZ98&~FGx8-
zVS?i$mc7C%1|N28d^^P<djGMroAcApPjPg1=xNycrT%e;yokhsh=i>9clc}m*DYW$
zi{Y5!T>ekySH<Bkeez#SA4J(5{K_1=`#!(m{s#6*j-l}lEEA?jM*msZ5+6KI^vfLv
zR+To9Bp=(dxZDoQ28YJ=FONS+=dy9QU-`js#*7wDqmV`IyfzLDOdNNvFK|#_G~-b(
z^F#NA4uVQy^E&IrA8A}_60n&r5o5D6Vs42f(*&tp39V<dLQJ~8D^@8@DwnLb)M9f;
zf6M84p{sYP+JW*|p)U+f3|l%E%;0=gF*Bc&LE(<Wm!lldJzUDJsWHTMsy=No{nsIz
z;l8getzy2Tz@upqtF9+>R`apU?-#fbo*eIbj$?M=)MJ(_yP2-lOFUS<u<gq7<teW1
z5(^#WdZid<thWu5Z|KePdQ>{MXr|V*rM3@(yIWNkq_6*Z^4gvC#~&_}&KGQQkE>f?
zwEE(zq={1>uD<NJ>%Jee##iCxE`?98rubEsMuis66?+xtzP9bbbdF8l(?aG%RZow~
zF%3Q7!20KQ$i81mDeL2J_C+hGFg{?KmUmFVUFYKwk?@?4M<vqNd^{#o{^sNHHdYn}
FYXI~tLy`ah

delta 627
zcmV-(0*w8r3&;fvM@dFFIbrbu4gkcF3u1pE`2+v}0000i00000@c|A100sXbB#vZh
zo@lDBZ0o*oEYEap-*~R?eDD9jpm0bm8jr}Na>;BupU|juO08ON1BYV(5jX^+K*3Q6
zj0g^Z$U%UhwOX!Mgyvp{Z?gGJ9(myoYk+NcMt=?p1|(i;ZVnA13R{Iihgu?*U|oM-
z5LuI+T9A}P0S^yqrhyO(siq4e0H%tkjtCD2lMWBC4|}6NvACvo5C_AU4havJ5Dy7(
zgug+$4#o%!A`GSp*$D{-tg6yHUdqhWTAI4MvAqzb2+8i_Kcx=^1F0g$T=@sQ4-_<O
z1R<6$UA%nJ%VBWU15E~&JtTo}#Ik>dLn;b*@XC$EjsybQQiO3w#WlN1|EwEOz?7L%
zYFH60nWK~g1R<GSM9E9RgNOthqBP}_CJv!H8$2L@00G66B8V0>s-q%I5iLsz96FO~
zjgt`8nQEkEX*_o}0T_$swFb;(aH9U>S@35-S_wz!0sugl!nQDwsxl^kpI(2c%@FVf
zKoaoRlvlMS0N`yzM5m4)KV7^B&?&T1w`QJE%3j~W5BlBW1;HoYx(8DV9qpo_RtOQL
zY6^>ZCvDAj+k}+bv6;BvFTjEo)UNcq*T`d(_REZwM2@U;2c5?|Z}b(xRzgrJDgoy1
z7N4d2o_v`#Y%Nub_RW5Ua=2gT9N2Vzwf>7N1EA5xZer-c2P|yxLCi%Qju7Kt33-%(
z3`u>F#GoK>?DilEha|E_0V5Ou;u;!mXu^e?0D=h^Yyj9vf+of&<BT-cXyc7I=BVS2
NJof10kE4YE06Qr342%E(


From 8da315d12a828b53015367da95c39188b086325e Mon Sep 17 00:00:00 2001
From: hplato <hplato@gmail.com>
Date: Wed, 2 Oct 2013 19:46:20 -0600
Subject: [PATCH 153/330] X10_Items.pm updated for MS13 fix

---
 lib/X10_Items.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/X10_Items.pm b/lib/X10_Items.pm
index b8695edd9..1cfaa580f 100644
--- a/lib/X10_Items.pm
+++ b/lib/X10_Items.pm
@@ -1537,8 +1537,12 @@ sub init {
                                 # Note: name is require, as $self->{object_name} is not
                                 # set yet on startup :(
 sub new {
-    my ($class, $id, $name, $type) = @_;
-    my $self = X10_Item->new();
+##    my ($class, $id, $name, $type) = @_;
+##    my $self = X10_Item->new();
+    my ($class, $id, $name, $type, $interface) = @_;
+    print "[X10_Sensor] class=$class, id=$id, name=$name, interface=$interface\n" if $main::Debug{x10};
+    my $self = X10_Item->new($id, $interface, $type);
+
 
     $$self{state} = '';
     bless $self, $class;

From 18942e68ec28c27521e7604fa66265b530685f62 Mon Sep 17 00:00:00 2001
From: bpgross <bpgross@shaw.ca>
Date: Thu, 3 Oct 2013 10:51:25 -0600
Subject: [PATCH 154/330] added clesius support to setpoints

---
 code/support/hai-omnistat/omnistat.pl | 191 ++++++++++++++------------
 1 file changed, 105 insertions(+), 86 deletions(-)

diff --git a/code/support/hai-omnistat/omnistat.pl b/code/support/hai-omnistat/omnistat.pl
index dd23ca76b..6adefa851 100644
--- a/code/support/hai-omnistat/omnistat.pl
+++ b/code/support/hai-omnistat/omnistat.pl
@@ -55,7 +55,16 @@
 
 foreach my $omnistat (@omnilist)
 {
-    my $temprange = join(",", (50..90));
+    my $temprange;
+    if( $config_parms{Omnistat_celcius} )
+    {
+       $temprange = join(",", (10..32));
+    }
+    else
+    {
+       $temprange = join(",", (50..90));
+    }
+
     $stat_reset_timer[$omnistat] = new Timer();
     # little trick to support an index if you have more than one stat, and no index otherwise
     my $statidx = " ";
@@ -84,85 +93,95 @@
 foreach my $omnistat (@omnilist)
 {
     if ($Reload or $Reread or $New_Day) {
-	# Talking to Omnistats can be a bit expensive for mh, due to the main loop hangs this can create, so we'll wait
-	# 60 seconds after the event to space things out from whatever else might be happening at those magic times
-	# (plus an offset for each omnistat id)
-	$stat_reset_timer[$omnistat]->set(60 + $omnistat*4);
+        # Talking to Omnistats can be a bit expensive for mh, due to the main loop hangs this can create, so we'll wait
+        # 60 seconds after the event to space things out from whatever else might be happening at those magic times
+        # (plus an offset for each omnistat id)
+        $stat_reset_timer[$omnistat]->set(60 + $omnistat*4);
     }
 
     if ($stat_reset_timer[$omnistat]->expired) {
-	Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: Resetting time");
-	#$omnistat[$omnistat]->cooling_anticipator('10');
-	#$omnistat[$omnistat]->heating_anticipator('10');
-	#$omnistat[$omnistat]->cooling_cycle_time('8');
-	#$omnistat[$omnistat]->heating_cycle_time('8');
-	$omnistat[$omnistat]->set_time;
+        Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: Resetting time");
+        #$omnistat[$omnistat]->cooling_anticipator('10');
+        #$omnistat[$omnistat]->heating_anticipator('10');
+        #$omnistat[$omnistat]->cooling_cycle_time('8');
+        #$omnistat[$omnistat]->heating_cycle_time('8');
+        $omnistat[$omnistat]->set_time;
     }
 
     # update data once a minute, per omnistat offset seconds.
     if ($New_Second and $Second eq $omnioffset[$omnistat]) {
-	# we make the extended group1 call that also retreives the stat's output status
-	my ($cool_sp, $heat_sp, $mode, $fan, $hold, $temp, $output) = $omnistat[$omnistat]->read_group1("true");
-	my $stat_type = $omnistat[$omnistat]->get_stat_type;
-	# Remember the queried values in our own cache so that we don't query this from other places unless
-	# necessary (this is important in a multiple thermostat sharing the same cable situation 
-	# where querying two stats in code later will cause collisions on the cable).
-	$omnicache{$omniname[$omnistat]}->{'cool_sp'} = $cool_sp;
-	$omnicache{$omniname[$omnistat]}->{'heat_sp'} = $heat_sp;
-	$omnicache{$omniname[$omnistat]}->{'mode'} = $mode;
-	$omnicache{$omniname[$omnistat]}->{'fan'} = $fan;
-	$omnicache{$omniname[$omnistat]}->{'hold'} = $hold;
-	$omnicache{$omniname[$omnistat]}->{'temp'} = $temp;
-	$omnicache{$omniname[$omnistat]}->{'output'} = $output;
-	$omnicache{$omniname[$omnistat]}->{'stat_type'} = $stat_type;
-
-	# This mashes $hold and $mode together from registers cached in the group1 call and outputs a combined string
-	$mode = $omnistat[$omnistat]->get_mode;
-
-	Omnistat::omnistat_log("".$omniname[$omnistat]." Omnistat $stat_type: Indoor temp is $temp, HVAC Command: $output, heat to $heat_sp, cool to $cool_sp, mode: $mode");
-
-	# only store the temperature from the first stat (which we'll assume is master)
-	$Weather{TempIndoor} = $temp  if ($omnistat == $omnilist[0]);
+        # we make the extended group1 call that also retreives the stat's output status
+        my ($cool_sp, $heat_sp, $mode, $fan, $hold, $temp, $output) = $omnistat[$omnistat]->read_group1("true");
+        my $stat_type = $omnistat[$omnistat]->get_stat_type;
+        # Remember the queried values in our own cache so that we don't query this from other places unless
+        # necessary (this is important in a multiple thermostat sharing the same cable situation
+        # where querying two stats in code later will cause collisions on the cable).
+        $omnicache{$omniname[$omnistat]}->{'cool_sp'} = $cool_sp;
+        $omnicache{$omniname[$omnistat]}->{'heat_sp'} = $heat_sp;
+        $omnicache{$omniname[$omnistat]}->{'mode'} = $mode;
+        $omnicache{$omniname[$omnistat]}->{'fan'} = $fan;
+        $omnicache{$omniname[$omnistat]}->{'hold'} = $hold;
+        $omnicache{$omniname[$omnistat]}->{'temp'} = $temp;
+        $omnicache{$omniname[$omnistat]}->{'output'} = $output;
+        $omnicache{$omniname[$omnistat]}->{'stat_type'} = $stat_type;
+
+        # This mashes $hold and $mode together from registers cached in the group1 call and outputs a combined string
+        $mode = $omnistat[$omnistat]->get_mode;
+
+        Omnistat::omnistat_log("".$omniname[$omnistat]." Omnistat $stat_type: Indoor temp is $temp, HVAC Command: $output, heat to $heat_sp, cool to $cool_sp, mode: $mode");
+
+        # only store the temperature from the first stat (which we'll assume is master)
+        $Weather{TempIndoor} = $temp  if ($omnistat == $omnilist[0]);
+
+        if( $omniname[$omnistat] )
+        {
+           my $tempname = "TempIndoor$omniname[$omnistat]";
+           $Weather{$tempname} = $temp;
+        }
     }
 
     if ($state = $v_omnistat_fan[$omnistat]->said) {
-	$omnistat[$omnistat]->fan($state);
+        $omnistat[$omnistat]->fan($state);
+        respond "$omniname[$omnistat] fan $state";
     }
 
     if ($state = $v_omnistat_resume[$omnistat]->said) {
-	$omnistat[$omnistat]->restore_setpoints;
+        $omnistat[$omnistat]->restore_setpoints;
+        respond "Restore $omniname[$omnistat] Omnistat";
     }
 
     if ($state = $v_omnistat_hold[$omnistat]->said) {
-	$omnistat[$omnistat]->hold($state);
+        $omnistat[$omnistat]->hold($state);
+        respond "$omniname[$omnistat] hold $state";
     }
 
     if ($state = $v_omnistat_mode[$omnistat]->said) {
-	$omnistat[$omnistat]->mode($state);
+        $omnistat[$omnistat]->mode($state);
+        respond "$omniname[$omnistat] mode $state";
     }
 
     if ($state = $v_omnistat_cool_sp[$omnistat]->said) {
-	$omnistat[$omnistat]->cool_setpoint($state);
-	speak "Air conditioning set to $state degrees for $omniname[$omnistat] Omnistat";
-	Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: Air conditioning set to $state degrees", 2);
+        $omnistat[$omnistat]->cool_setpoint($state);
+        respond "Air conditioning set to $state degrees for $omniname[$omnistat] Omnistat";
+        Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: Air conditioning set to $state degrees", 2);
     }
 
     if ($state = $v_omnistat_heat_sp[$omnistat]->said) {
-	$omnistat[$omnistat]->heat_setpoint($state);
-	speak "Heat set to $state degrees for $omniname[$omnistat] Omnistat";
-	Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: Heat set to $state degrees", 2);
+        $omnistat[$omnistat]->heat_setpoint($state);
+        respond "Heat set to $state degrees for $omniname[$omnistat] Omnistat";
+        Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: Heat set to $state degrees", 2);
     }
 
     if ($state = $v_omnistat_setting[$omnistat]->said) {
-	my ($heat,$cool);
-	$cool = $omnistat[$omnistat]->get_cool_sp;
-	$heat = $omnistat[$omnistat]->get_heat_sp;
-	speak "cool setpoint $cool, heat setpoint $heat";
-	Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: cool setpoint $cool, heat setpoint $heat", 2);
+        my ($heat,$cool);
+        $cool = $omnistat[$omnistat]->get_cool_sp;
+        $heat = $omnistat[$omnistat]->get_heat_sp;
+        respond "cool setpoint $cool, heat setpoint $heat";
+        Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: cool setpoint $cool, heat setpoint $heat", 2);
     }
 
     if ($state = $v_omnistat_background[$omnistat]->said) {
-	$omnistat[$omnistat]->set_background_color($state);
+        $omnistat[$omnistat]->set_background_color($state);
     }
 
     # Old code left over in case it's useful to some -- merlin
@@ -184,55 +203,55 @@
     #}
 
     if (time_now '7:45 PM')  {
-	my $filter_days = $omnistat[$omnistat]->get_filter_reminder;
-	if ($filter_days == 0)
-	{
-	    speak "Replace the furnace filter linked to $omniname[$omnistat] Omnistat";
-	    print_log "$omniname[$omnistat] Omnistat: replace the filter";
-	    Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: replace the filter", 0);
-	    # reset the timer to 6 months
-	    $omnistat[$omnistat]->set_filter_reminder(180);
-	}
-	else
-	{
-	    Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: $filter_days days before filter replacement", 1);
-	}
+        my $filter_days = $omnistat[$omnistat]->get_filter_reminder;
+        if ($filter_days == 0)
+        {
+            speak "Replace the furnace filter linked to $omniname[$omnistat] Omnistat";
+            print_log "$omniname[$omnistat] Omnistat: replace the filter";
+            Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: replace the filter", 0);
+            # reset the timer to 6 months
+            $omnistat[$omnistat]->set_filter_reminder(180);
+        }
+        else
+        {
+            Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: $filter_days days before filter replacement", 1);
+        }
     }
 
     # set stat temperature every 5 minutes at an offset to reduce hangs
     if ($Minute % 5 == 0 and $New_Second and $Second eq ($omnioffset[$omnistat]+5))
     {
-	# Set the outside temp on the thermostat if available (refreshing this value should cause the
-	# stat to display the outside temperature on the display).
-	if ($Weather{TempOutdoor}) {
-	    Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: Setting outside temperature to $Weather{TempOutdoor}", 2);
-	    $omnistat[$omnistat]->outdoor_temp($Weather{TempOutdoor});
-	}
-
-	if ($omnistat[$omnistat]->is_omnistat2 and defined ($Weather{TempOutdoor}))
-	{
-	    # Change the backlight based on outside temp
-	    my $background_color;
-
-	    if ($Weather{TempOutdoor} >= 95)    { $background_color = "Red"; }
-	    elsif ($Weather{TempOutdoor} >= 85) { $background_color = "Yello"; }
-	    elsif ($Weather{TempOutdoor} >= 65) { $background_color = "Green"; }
-	    elsif ($Weather{TempOutdoor} >= 55) { $background_color = "Purple"; }
-	    elsif ($Weather{TempOutdoor} < 55)  { $background_color = "Blue"; }
-	    else                                { $background_color = "Orange"; }
-
-	    Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: Setting background color to $background_color", 2);
-	    $omnistat[$omnistat]->set_background_color($state);
-	}
+        # Set the outside temp on the thermostat if available (refreshing this value should cause the
+        # stat to display the outside temperature on the display).
+        if ($Weather{TempOutdoor}) {
+            Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: Setting outside temperature to $Weather{TempOutdoor}", 2);
+            $omnistat[$omnistat]->outdoor_temp($Weather{TempOutdoor});
+        }
+
+        if ($omnistat[$omnistat]->is_omnistat2 and defined ($Weather{TempOutdoor}))
+        {
+            # Change the backlight based on outside temp
+            my $background_color;
+
+            if ($Weather{TempOutdoor} >= 95)    { $background_color = "Red"; }
+            elsif ($Weather{TempOutdoor} >= 85) { $background_color = "Yello"; }
+            elsif ($Weather{TempOutdoor} >= 65) { $background_color = "Green"; }
+            elsif ($Weather{TempOutdoor} >= 55) { $background_color = "Purple"; }
+            elsif ($Weather{TempOutdoor} < 55)  { $background_color = "Blue"; }
+            else                                { $background_color = "Orange"; }
+
+            Omnistat::omnistat_log("$omniname[$omnistat] Omnistat: Setting background color to $background_color", 2);
+            $omnistat[$omnistat]->set_background_color($state);
+        }
     }
 
     # WARNING: Reading state_now here empties the 'state_now' flag. If you need it elsewhere, that won't work.
     # For debugging, Omnistat.pl will also output state changes like so:
     # 25/11/2011 23:30:37   Omnistat[2]->read_reg: set state->now to temp_change
-    
+
     # If you plan on using state_now elsewhere in your code, you should leave this commented this out:
     # if ($state = $omnistat[$omnistat]->state_now) {
-    # 	Omnistat::omnistat_log("".$omniname[$omnistat]." Omnistat State set to: $state", 3);
+    #   Omnistat::omnistat_log("".$omniname[$omnistat]." Omnistat State set to: $state", 3);
     # }
 }
 

From 2897c73192942360b93ed0063496adb0c7718428 Mon Sep 17 00:00:00 2001
From: hplato <hplato@gmail.com>
Date: Thu, 3 Oct 2013 18:23:09 -0600
Subject: [PATCH 155/330] 	modified:   lib/X10_Items.pm

---
 lib/X10_Items.pm         |  1 -
 web/bin/button_action.pl |  2 +-
 web/bin/button_sensor.pl | 23 ++++++++++++++++++-----
 web/bin/list_buttons.pl  | 21 +++++++++++++++++++--
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/lib/X10_Items.pm b/lib/X10_Items.pm
index 1cfaa580f..76ee79559 100644
--- a/lib/X10_Items.pm
+++ b/lib/X10_Items.pm
@@ -76,7 +76,6 @@ Since this item is inherits from Generic_Item, you can use the set_with_timer me
   set_with_timer $watchdog_light '20%', 5 if file_unchanged $watchdog_file;
 
 
-
 =head1 DESCRIPTION
 
 =head1 INHERITS
diff --git a/web/bin/button_action.pl b/web/bin/button_action.pl
index 3d635755c..6fb05b00b 100644
--- a/web/bin/button_action.pl
+++ b/web/bin/button_action.pl
@@ -64,7 +64,7 @@
 # experimental, and this delay causes MH to pause for the duration of the
 # delay, this is currently disabled by default. But feel free to enable
 # to see if things improve.
-#sleep(1);
+sleep(2) if $object->isa('Insteon::BaseDevice');
 
 my $h = &referer("/bin/list_buttons.pl?$list_name");
 
diff --git a/web/bin/button_sensor.pl b/web/bin/button_sensor.pl
index 35abcf6b1..a2c21513f 100644
--- a/web/bin/button_sensor.pl
+++ b/web/bin/button_sensor.pl
@@ -9,7 +9,7 @@
 
 my ($text, $type, $bg_color) = @ARGV;
 
-##print "db v6 t=$text  s=$state bg=$bg_color\n";
+#print "db v6 t=$text  s=$type bg=$bg_color\n";
 
 #my ($state, $x, $y) = $state_xy =~ /(\S+)\?(\d+),(\d+)/;
 
@@ -43,17 +43,21 @@
 #   $light = 1 if $text =~ /light/i or $text =~ /lite/i;
 #    $light = 1 if $object->isa('X10_Item') and !$object->isa('X10_Appliance');
 
+my $graphic_dir = "./../web/graphics";
+$graphic_dir = $config_parms{html_alias_graphics} if defined $config_parms{html_alias_graphics};
+
 if ($type eq 'door') {
-	$icon = './../web/graphics/icon_door.jpg';
+#	$icon = './../web/graphics/icon_door.jpg';
+	$icon = $graphic_dir . '/icon_door.jpg';
 	}
 elsif ($type eq 'motion') {
-	$icon = './../web/graphics/icon_motion.jpg';
+	$icon = $graphic_dir . '/icon_motion.jpg';
 	}
 elsif ($type eq 'brightness') {
-	$icon = './../web/graphics/icon_motion.jpg';
+	$icon = $graphic_dir . '/icon_motion.jpg';
 	}
 elsif ($type eq 'water') {
-	$icon = './../web/graphics/icon_water.jpg';
+	$icon = $graphic_dir . '/icon_water.jpg';
 	}
 
 
@@ -61,6 +65,11 @@
 my $state = $object->state;
 
 undef $icon if $icon and $icon !~ /.jpg$/i;  # GD does not do gifs :(
+
+die "Cannot find source graphic file!" unless (-f $icon);
+
+print "graphic file = $icon\n";
+
 my $image_icon = GD::Image->newFromJpeg($icon) if $icon;
 
 my $image;
@@ -71,11 +80,15 @@
 
     # GD in 5.8 gives gray for white jpg??  Allow for png, which is still gray :(
     my $file = "$config_parms{html_dir}/graphics/$template.png";
+    $file  = "$config_parms{html_alias_graphics}/$template.png" if defined $config_parms{html_alias_graphics}; 
+
     if (-f $file) {
         $image = GD::Image->newFromPng($file);
     }
     else {
         $file  = "$config_parms{html_dir}/graphics/$template.jpg";
+	$file  = "$config_parms{html_alias_graphics}/$template.jpg" if defined $config_parms{html_alias_graphics}; 
+	die "Cannot find source template file!" unless (-f $file);
         $image = GD::Image->newFromJpeg($file);
     }
 
diff --git a/web/bin/list_buttons.pl b/web/bin/list_buttons.pl
index 3dedf71f5..f66329f69 100644
--- a/web/bin/list_buttons.pl
+++ b/web/bin/list_buttons.pl
@@ -60,6 +60,22 @@
 		}
 	}
 
+my $prefix = "light";
+    if ($object->get_type eq 'Generic_Item') {
+	my @states = $object->get_states;
+	my $index;
+	for ($index = 0; $index < @states; $index++) {
+#	  print "db: item=$item states[$index]=[$states[$index]] state=[$state]\n";
+   	  last if ($states[$index] eq $state);
+	}
+	$index++;
+	$index = 0 if ($index > ($#states));
+	  print "db: state_new=[$states[$index]] index=[$index] states=$#states\n";
+	$state_new = $states[$index];
+	$prefix = "generic";
+    }
+
+
     my $name   = &pretty_object_name($item);
 
     my $icon;
@@ -68,10 +84,11 @@
         $state = 'on' if $state eq '100%';
         $state = 'off' if $state eq '0%';
         $icon = $state;
-        $icon = 'dim' if $state =~ /d+/;
-        my $image = "/graphics/light-" . lc $item . "_" . $icon . ".gif";
+        $icon = 'dim' if (($state =~ /d+/) and ($prefix ne "generic"));
+        my $image = "/graphics/" . $prefix . "-" . lc $item . "_" . $icon . ".gif";
         $image =~ s/ /_/g;
         $image =~ s/\$//g;
+#print "db: image=$image\n";
         my ($file) = (&http_get_local_file($image));
         $image = "/bin/button.pl?$item&item&$state" unless -e $file;
 #       $image = "/bin/button.pl?$item&item&$state" unless -e "$config_parms{html_dir}$image";

From 6cd77297e749f9f2afe91b28bb408fa52316360f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 3 Oct 2013 19:16:34 -0700
Subject: [PATCH 156/330] Insteon: Add Success_Callback to Message Object

Success_callback is eval'd when the ACK for the message is received.
- Note: There are so many callbacks all over the place within the code, it might be nice to condense as many as possible into this routine.
---
 lib/Insteon/BaseInsteon.pm |  9 ++++++++-
 lib/Insteon/Message.pm     | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 7e857a6d3..48aeee65b 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -831,8 +831,15 @@ sub _process_message
 				. $self->get_object_name . " in response to a "
 				. $pending_cmd . " command, but the command code "
 				. $msg{cmd_code} . " is incorrect. Ignorring received message.");
-            $self->corrupt_count_log(1) if $self->can('corrupt_count_log');
+			$self->corrupt_count_log(1) if $self->can('corrupt_count_log');
 			$p_setby->active_message->no_hop_increase(1);
+		} elsif ($clear_message && $p_setby->active_message->success_callback){
+			main::print_log("[Insteon::BaseObject] DEBUG4: Now calling message success callback: "
+				. $p_setby->active_message->success_callback) if $main::Debug{insteon} >= 4;
+			package main;
+				eval $p_setby->active_message->success_callback;
+				::print_log("[Insteon::BaseObject] problem w/ success callback: $@") if $@;
+			package Insteon::BaseObject;
 		}
 	}
         elsif ($msg{is_nack})
diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index 70ea818f3..fea11d116 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -104,6 +104,22 @@ sub failure_callback
         return $$self{failure_callback};
 }
 
+=item C<success_callback(data)>
+
+Data will be evaluated after the receipt of an ACK from the device for this command.
+
+=cut
+
+sub success_callback
+{
+	my ($self, $callback) = @_;
+        if ($callback)
+        {
+        	$$self{success_callback} = $callback;
+        }
+        return $$self{success_callback};
+}
+
 =item C<send_attempts(data)>
 
 Stores and retrieves the number of times Misterhouse has tried to send the message.

From 25905c98799e146109c9692da7739ef4aa8c4b7c Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 3 Oct 2013 19:27:59 -0700
Subject: [PATCH 157/330] Insteon: Add routine for Linking I2CS devices

The routine requires a few steps to complete
---
 lib/Insteon/BaseInsteon.pm | 48 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 48aeee65b..ee5fd36c9 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -25,6 +25,7 @@ L<Generic_Item|Generic_Item>
 
 package Insteon::BaseObject;
 
+use Switch;
 use strict;
 use Insteon::AllLinkDatabase;
 
@@ -1393,6 +1394,53 @@ sub link_to_interface
         }
 }
 
+=item C<link_to_interface_i2cs([group,data3])>
+
+Performs the same task as C<link_to_interface> however this routine is designed
+to perform the initial link to I2CS devices.  These devices cannot be initially
+linked to the PLM in the normal way.  This process requires more steps than the
+normal routine which will take longer to perform and therefore is more prone to
+faile.  As such, this should likely only be used if necessary.
+
+=cut
+
+sub link_to_interface_i2cs
+{
+	my ($self,$p_group, $p_data3, $step) = @_;
+	my $success_callback_prefix = $self->get_object_name."->link_to_interface_i2cs('$p_group','$p_data3',";
+	my $success_callback = "";
+	my $failure_callback = "::print_log('[Insteon::BaseInsteon] Error Link_To_Interface_I2CS ".
+		"routine failed for device: ".$self->get_object_name."')";
+	$step = 0 if ($step eq '');
+	switch ($step){
+		case (0) { #Put PLM into initiate linking mode
+			$success_callback = $success_callback_prefix . "'1')";
+			$self->interface()->initiate_linking_as_controller('00', $success_callback, $failure_callback);	
+		}
+		case (1) { #Ask device to respond to link request
+			$success_callback = $success_callback_prefix . "'2')";
+			$self->enter_linking_mode($p_group, $success_callback, $failure_callback);	
+		}
+		case (2) { #Scan device to get an accurate link table
+			$success_callback = $success_callback_prefix . "'3')";
+			$self->scan_link_table($success_callback, $failure_callback);
+		}
+		case (3) { #Add link from device->PLM
+			$success_callback = $success_callback_prefix . "'4')";
+			my $group = $p_group;
+			$group = '01' unless $group;
+			my $link_info = "deviceid=" . lc $self->device_id . " group=$group is_controller=0 ".
+				"callback=$success_callback failure_callback=$failure_callback";
+			$self->interface->add_link("$link_info");
+		}
+		case (4) {
+			::print_log('[Insteon::BaseInsteon] Link_To_Interface_I2CS successfully completed'.
+				' for device ' .$self->get_object_name);
+		}
+	}
+}
+
+
 =item C<unlink_to_interface([group])>
 
 Will delete the contoller link from the device to the interface if such a link exists.

From 20e48aca2aaad26d3f31cf6bd7a96a51e0943e88 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 3 Oct 2013 19:31:29 -0700
Subject: [PATCH 158/330] Insteon: Add Callback to Routines used by Link to
 I2CS

Each routine needs to have success and failure callback parameters
---
 lib/Insteon/BaseInsteon.pm | 16 +++++++++-------
 lib/Insteon_PLM.pm         | 13 +++++++++++--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index ee5fd36c9..eccd36445 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1440,7 +1440,6 @@ sub link_to_interface_i2cs
 	}
 }
 
-
 =item C<unlink_to_interface([group])>
 
 Will delete the contoller link from the device to the interface if such a link exists.
@@ -1471,7 +1470,7 @@ sub unlink_to_interface
         }
 }
 
-=item C<enter_linking_mode(group)>
+=item C<enter_linking_mode(group, success_callback, failure_callback)>
 
 BETA -- Can be used to create the initial link with i2cs devices.  i1 devices
 will not respond to this command.  In the future, this will be incorporated into a
@@ -1490,12 +1489,14 @@ Returns: nothing
 
 sub enter_linking_mode
 {
-	my ($self,$p_group) = @_;
+	my ($self,$p_group, $success_callback, $failure_callback) = @_;
 	my $group = $p_group;
 	$group = '01' unless $group;
 	my $extra = sprintf("%02x", $group);
 	$extra .= '0' x (30 - length $extra);
 	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'linking_mode', $extra);
+	$message->success_callback($success_callback);
+	$message->failure_callback($failure_callback);
 	$self->_send_cmd($message);
 }
 
@@ -1827,11 +1828,12 @@ Returns: nothing
 =cut 
 
 sub get_engine_version {
-   my ($self) = @_;
+   my ($self, $success_callback, $failure_callback) = @_;
 
    my $message = new Insteon::InsteonMessage('insteon_send', $self, 'get_engine_version');
    my $self_object_name = $self->get_object_name;
-   $message->failure_callback("$self_object_name->_get_engine_version_failure()");
+   $message->failure_callback("$self_object_name->_get_engine_version_failure();$failure_callback");
+   $message->success_callback($success_callback);
    $self->_send_cmd($message);
 }
 
@@ -3157,7 +3159,7 @@ C<Insteon::BaseDevice::enter_linking_mode()>.
 
 sub initiate_linking_as_controller
 {
-	my ($self, $p_group) = @_;
+	my ($self, $p_group, $success_callback, $failure_callback) = @_;
 	# iterate over the members
 	if ($$self{members}) {
 		foreach my $member_ref (keys %{$$self{members}}) {
@@ -3169,7 +3171,7 @@ sub initiate_linking_as_controller
 			}
 		}
 	}
-	$self->interface()->initiate_linking_as_controller($p_group);
+	$self->interface()->initiate_linking_as_controller($p_group, $success_callback, $failure_callback);
 }
 
 =item C<derive_message([command,extra])>
diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index dd6315f74..743144d55 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -308,7 +308,7 @@ controller will be added for this group, otherwise it will be for group 00.
 
 sub initiate_linking_as_controller
 {
-	my ($self, $group) = @_;
+	my ($self, $group, $success_callback, $failure_callback) = @_;
 
 	$group = '00' unless $group;
 	# set up the PLM as the responder
@@ -316,6 +316,8 @@ sub initiate_linking_as_controller
 	$cmd .= $group; # WARN - must be 2 digits and in hex!!
         my $message = new Insteon::InsteonMessage('all_link_start', $self);
         $message->interface_data($cmd);
+        $message->success_callback($success_callback);
+        $message->failure_callback($failure_callback);
 	$self->queue_message($message);
 }
 
@@ -509,6 +511,13 @@ sub _parse_data {
 					}
                                         elsif ($record_type eq $prefix{all_link_start})
                                         {
+                                        	if ($self->active_message->success_callback){
+							package main;
+							eval ($self->active_message->success_callback);
+							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
+								if $@ and $main::Debug{insteon} >= 1;
+							package Insteon_PLM;
+                                        	}
                                                 # clear the active message because we're done
                 				$self->clear_active_message();
                                         }
@@ -538,7 +547,7 @@ sub _parse_data {
                                                 {
 							$callback = $pending_message->callback(); #$$self{_mem_callback};
 							$$self{_mem_callback} = undef;
-                                                }
+                                                } 
                                                 if ($callback){
 							package main;
 							eval ($callback);

From ea07cb2d611be9179339497c333cb91f6343e9b3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 3 Oct 2013 19:32:16 -0700
Subject: [PATCH 159/330] Insteon: Convert Link_to_Interface to Handle i2cs or
 non-i2cs devices

The routine first checks to see if the device will respond to a get_engine_version request.
If any ACK is received the routine continues as normal.  In this case even if the device is an I2CS, the device must already have link entries as it responds to the PLM.
If a NAK is received, it is assumes that this device is an i2cs and the link_to_interface_i2cs routine is called.
---
 lib/Insteon/BaseInsteon.pm | 54 ++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index eccd36445..c3ced8cc3 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1373,25 +1373,45 @@ the device.
 
 sub link_to_interface
 {
-	my ($self,$p_group, $p_data3) = @_;
+	my ($self,$p_group, $p_data3, $step) = @_;
 	my $group = $p_group;
 	$group = '01' unless $group;
-	# add a link first to this device back to interface
-	# and, add a reference to creating a link from interface back to device via hook
-	my $callback_instance = $self->interface->get_object_name;
-	my $callback_info = "deviceid=" . lc $self->device_id . " group=$group is_controller=0";
-	my %link_info = ( object => $self->interface, group => $group, is_controller => 1,
-#		on_level => '100%', ramp_rate => '0.1s',  Controllers don't use on_level or ramp_rate
-		callback => "$callback_instance->add_link('$callback_info')");
-	$link_info{data3} = $p_data3 if $p_data3;
-        if ($self->_aldb) {
-	   $self->_aldb->add_link(%link_info);
-        }
-        else
-        {
-           &main::print_log("[BaseInsteon] This item " . $self->get_object_name .
-              " does not have an ALDB object.  Linking is not permitted.");
-        }
+	my $success_callback_prefix = $self->get_object_name."->link_to_interface(\"$p_group\",\"$p_data3\",";
+	my $success_callback = "";
+	my $failure_callback = '::print_log("[Insteon::BaseInsteon] Error: The Link_To_Interface '.
+		'routine failed for device: '.$self->get_object_name.'")';
+	$step = 0 if ($step eq '');
+	switch ($step){
+		case (0) { #If NAK on get_engine, then this is an I2CS device
+			$success_callback = $success_callback_prefix . "\"1\")";
+			$failure_callback = $self->get_object_name."->link_to_interface_i2cs(\"$p_group\",\"$p_data3\")";
+			$self->get_engine_version($success_callback, $failure_callback);	
+		}
+		case (1) { #Add Link from object->PLM
+			$success_callback = $success_callback_prefix . "\"2\")";
+			my %link_info = ( object => $self->interface, group => $group, is_controller => 1,
+				callback => "$success_callback", failure_callback=> "$failure_callback");
+			$link_info{data3} = $p_data3 if $p_data3;
+		        if ($self->_aldb) {
+			   $self->_aldb->add_link(%link_info);
+		        }
+		        else
+		        {
+		           &main::print_log("[Insteon::BaseInsteon] Error: This item, " . $self->get_object_name .
+		              ", does not have an ALDB object.  Linking is not permitted.");
+		        }
+		}
+		case (2){ #Add Link from PLM->object
+			$success_callback = $success_callback_prefix . "\"3\")";
+			my $link_info = "deviceid=" . lc $self->device_id . " group=$group is_controller=0 " .
+				"callback=$success_callback failure_callback=$failure_callback";	
+		        $self->interface->add_link($link_info);
+		}
+		case (3){
+			::print_log('[Insteon::BaseInsteon] Link_To_Interface successfully completed'.
+				' for device ' .$self->get_object_name);			
+		}
+	}
 }
 
 =item C<link_to_interface_i2cs([group,data3])>

From 8319d8da71c71dc9c171523db815129bd9840e4f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 3 Oct 2013 21:07:23 -0700
Subject: [PATCH 160/330] Insteon: Linking Mode Requires an ACK, Don't Clear
 Messages on All_Link_Complete

---
 lib/Insteon/BaseInsteon.pm | 1 +
 lib/Insteon_PLM.pm         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index c3ced8cc3..1ea23ff7d 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -976,6 +976,7 @@ sub _process_command_stack
                                 or $message->command eq 'get_operating_flags'
                                 or $message->command eq 'read_write_aldb'
                                 or $message->command eq 'ping'
+                                or $message->command eq 'linking_mode' 
                                 )
                         {
 				$$self{awaiting_ack} = 1;
diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index 743144d55..b14308a88 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -743,7 +743,7 @@ sub _parse_data {
                 { #ALL-Linking Completed
 			my $link_address = substr($message_data,4,6);
 			&::print_log("[Insteon_PLM] DEBUG2: ALL-Linking Completed with $link_address ($message_data)") if $main::Debug{insteon} >= 2;
-                        $self->clear_active_message();
+                        #$self->clear_active_message();
 		}
                 elsif ($parsed_prefix eq $prefix{all_link_clean_failed} and ($message_length == 12))
                 { #ALL-Link Cleanup Failure Report

From 16797ffe75392b8f93785359e727f43c27a34d88 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 4 Oct 2013 17:34:00 -0700
Subject: [PATCH 161/330] Insteon: Enhance HopCount, Change to Average of 10

A moving average of the last 20 hop_counts was a bit excessive and required 10 messages before a hop count would change.
---
 lib/Insteon/BaseInsteon.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 74bfcd6a1..0b19a33e2 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -268,7 +268,7 @@ sub default_hop_count
 		#Calculate a simple moving average
 		unshift(@{$$self{hop_array}}, $hop_count); 
 		$$self{hop_sum} += ${$$self{hop_array}}[0];
-		$$self{hop_sum} -= pop(@{$$self{hop_array}}) if (scalar(@{$$self{hop_array}}) >20);
+		$$self{hop_sum} -= pop(@{$$self{hop_array}}) if (scalar(@{$$self{hop_array}}) >10);
 		$$self{default_hop_count} = int(($$self{hop_sum} / scalar(@{$$self{hop_array}})) + 0.5);
 
 		#Allow for per-device settings

From 2159a5186f382267737be919a9c8b5037735dc18 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 5 Oct 2013 12:34:00 -0700
Subject: [PATCH 162/330] Insteon_I2CS_Linking: Clear Active Message When PLM
 Reports All-Linking-Complete

Rather than clear the linking mode command when the device ACKs, wait to clear the message until the PLM reports the linking success.
---
 lib/Insteon/BaseInsteon.pm |  9 +++++++++
 lib/Insteon_PLM.pm         | 10 +++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 1ea23ff7d..73a61c7f0 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -801,6 +801,15 @@ sub _process_message
 					$clear_message = 1;
 				}
 			}
+			elsif ($pending_cmd eq 'linking_mode'){
+				$corrupt_cmd = 1 if ($msg{cmd_code} ne $self->message_type_hex($pending_cmd));
+				if (!$corrupt_cmd){
+					&::print_log("[Insteon::BaseObject] received linking mode ACK from " . $self->{object_name})
+						if $main::Debug{insteon};
+					$self->interface->_set_timeout('xmit', 2000);
+					$clear_message = 0;
+				}
+			}
 			else
                         {
 				if (($pending_cmd eq 'do_read_ee') && 
diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index b14308a88..0dc156830 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -743,7 +743,15 @@ sub _parse_data {
                 { #ALL-Linking Completed
 			my $link_address = substr($message_data,4,6);
 			&::print_log("[Insteon_PLM] DEBUG2: ALL-Linking Completed with $link_address ($message_data)") if $main::Debug{insteon} >= 2;
-                        #$self->clear_active_message();
+			if ($self->active_message->success_callback){
+				main::print_log("[Insteon::Insteon_PLM] DEBUG4: Now calling message success callback: "
+					. $self->active_message->success_callback) if $main::Debug{insteon} >= 4;
+				package main;
+					eval $self->active_message->success_callback;
+					::print_log("[Insteon::Insteon_PLM] problem w/ success callback: $@") if $@;
+				package Insteon::BaseObject;
+			}
+                        $self->clear_active_message();
 		}
                 elsif ($parsed_prefix eq $prefix{all_link_clean_failed} and ($message_length == 12))
                 { #ALL-Link Cleanup Failure Report

From 93575699464e1bceddbf5121f0037088119b8a1a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 5 Oct 2013 13:36:00 -0700
Subject: [PATCH 163/330] Insteon_Scene_Builder: Make Code More Readable, Add
 Controller and Responder Hash

Attempted to make the code more readable by using more descriptive variable names.

Created a responders and controllers hash, this makes the looping of the hash members a bit more straightforward at the cost of adding another global variable.  Alternatively, another level of keys could be added to global scene hash to decrease the number of global variables
---
 lib/read_table_A.pl | 58 ++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index 165dd708c..aaff6ee51 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -23,7 +23,8 @@ sub read_table_init_A {
 	%objects=();
 	%packages=();
         %addresses=();
-        %scenes=();
+        %scene_build_controllers=();
+        %scene_build_responders=();
 }
 
 sub read_table_A {
@@ -994,13 +995,18 @@ sub read_table_A {
         $object = '';
     }
     elsif($type eq "SCENE_BUILD") {
-	#SCENE_BUILD, scene_name, scene_member, controller?, responder?, onlevel, ramprate
-        my ($scene_member, $scene_controller, $scene_responder, $on_level, $ramp_rate);
-        ($name, $scene_member, $scene_controller, $scene_responder, $on_level, $ramp_rate) = @item_info;
+	#SCENE_BUILD, scene_name, scene_member, is_controller?, is_responder?, onlevel, ramprate
+        my ($scene_member, $is_scene_controller, $is_scene_responder, $on_level, $ramp_rate);
+        ($name, $scene_member, $is_scene_controller, $is_scene_responder, $on_level, $ramp_rate) = @item_info;
         if( ! $packages{Scene}++ ) {   # first time for this object type?
             $code .= "use Scene;\n";
         }
-	$scenes{$name}{$scene_member} = "$scene_controller,$scene_responder,$on_level,$ramp_rate";
+	if ($is_scene_controller){
+		$scene_build_controllers{$name}{$scene_member} = "1";
+	}
+	if ($is_scene_responder){
+		$scene_build_responders{$name}{$scene_member} = "$on_level,$ramp_rate";
+	}
 	$object = '';
     }
     elsif ($type eq "PHILIPS_HUE"){
@@ -1059,45 +1065,47 @@ sub read_table_A {
 }
 
 sub read_table_finish_A {
-    my ($code, $scene, $scene_member, %scene_data, $member_data);
-    foreach $scene (sort keys %scenes) {
+    my $code = '';
+    #a scene cannot exist without a responder, but it could lack a controller if
+    #scene is a PLM Scene
+    foreach my $scene (sort keys %scene_build_responders) {
         $code .= "\n#SCENE_BUILD Definition for scene: $scene\n";
 
-        #Doesn't work because object technically doesn't exist yet. Is it even necessary to limit to ICONTROLLER's?
+        #Doesn't work because object technically doesn't exist yet. Is it even 
+        #necessary to limit to ICONTROLLER's?
         #my $object = &get_object_by_name($scene);
         #if(defined($object) and $object->isa("Insteon::InterfaceController")) {
 
         if($objects{$scene}) {
-            #Since an INSTEON_ICONTROLLER exists with the same name as the scene, make it a controller of the scene, too.
-            $scenes{$scene}{$scene}="1,0";
+            #Since an INSTEON_ICONTROLLER exists with the same name as the scene, 
+            #make it a controller of the scene, too.
+            $scene_build_controllers{$scene}{$scene}="1";
         }
-        #Make a hash copy so we can iterate through the hash inside another iteration of the same hash. Is there a better way?
-        my %scenememberlist=%{$scenes{$scene}};
 
-        #Loop through the hash and find all controller->responder combinations that make sense.
-        while (($scene_member, $member_data) = each($scenes{$scene})) {
-            my ($scene_controller, $scene_responder) = split(',', $member_data);
+        #Loop through the controller hash
+        foreach my $scene_controller (keys $scene_build_controllers{$scene}) {
+            if ($objects{$scene_controller}) {
+            	#Make a link to each responder in the responder hash
+                while (my ($scene_responder, $responder_data) = each($scene_build_responders{$scene})) {
+                    my ($on_level, $ramp_rate) = split(',', $responder_data);
 
-            if (($objects{$scene_member}) and ($scene_controller)) {
-                while (my($scene2_member, $member2_data) = each(%scenememberlist)) {
-                    my ($scene2_controller, $scene2_responder, $on_level, $ramp_rate) = split(',', $member2_data);
-
-                    if (($objects{$scene2_member}) and ($scene2_responder) and ($scene_member ne $scene2_member)) {
+                    if (($objects{$scene_responder}) and ($scene_responder ne $scene_controller)) {
                         if ($on_level) {
                             if ($ramp_rate) {
                                 $code .= sprintf "\$%-35s -> add(\$%s,'%s','%s');\n",
-                                    $scene_member, $scene2_member, $on_level, $ramp_rate;
-                        } else {
-                                $code .= sprintf "\$%-35s -> add(\$%s,'%s');\n", $scene_member, $scene2_member, $on_level;
+                                    $scene_controller, $scene_responder, $on_level, $ramp_rate;
+                            } else {
+                                $code .= sprintf "\$%-35s -> add(\$%s,'%s');\n", 
+                                    $scene_controller, $scene_responder, $on_level;
                             }
                         } else {
-                            $code .= sprintf "\$%-35s -> add(\$%s);\n", $scene_member, $scene2_member;
+                            $code .= sprintf "\$%-35s -> add(\$%s);\n", $scene_controller, $scene_responder;
                         }
                     }
                 }
 
             } else {
-                print "\nThere is no object called $scene_member defined.  Ignoring SCENE_BUILD entry.\n" unless $objects{$scene_member};
+                print "\nThere is no object called $scene_controller defined.  Ignoring SCENE_BUILD entry.\n";
             }
         }
     }

From d59152740bd3f1e372be2ed7127ec7e1f8a43cb5 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 5 Oct 2013 13:37:00 -0700
Subject: [PATCH 164/330] Insteon_Scene_Builder: Declare Global Variables

Oops, forgot to declare the new hashes as globals
---
 lib/read_table_A.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index aaff6ee51..8e28ae6c0 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -14,7 +14,7 @@
 
 #print_log "Using read_table_A.pl";
 
-my (%groups, %objects, %packages, %addresses, %scenes);
+my (%groups, %objects, %packages, %addresses, %scene_build_controllers, %scene_build_responders);
 
 sub read_table_init_A {
                                 # reset known groups

From 6e950faa2699cd0c8267f822cb0f92a73a6b7946 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 7 Oct 2013 17:47:00 -0700
Subject: [PATCH 165/330] Insteon_HopCount: Check Per Device Setting on All
 Calls to Default_Hop_Count

Moved per device setting outside of logic so that they are checked even if a hop_count is not passed.
---
 lib/Insteon/BaseInsteon.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 0b19a33e2..a3d137992 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -271,17 +271,18 @@ sub default_hop_count
 		$$self{hop_sum} -= pop(@{$$self{hop_array}}) if (scalar(@{$$self{hop_array}}) >10);
 		$$self{default_hop_count} = int(($$self{hop_sum} / scalar(@{$$self{hop_array}})) + 0.5);
 
-		#Allow for per-device settings
-		$$self{default_hop_count} = $$self{max_hops} if ($$self{max_hops} &&
-			$$self{default_hop_count} > $$self{max_hops});
-		$$self{default_hop_count} = $$self{min_hops} if ($$self{min_hops} &&
-			$$self{default_hop_count} < $$self{min_hops});
-
 		::print_log("[Insteon::BaseObject] DEBUG4: ".$self->get_object_name
 			."->default_hop_count()=".$$self{default_hop_count}
 			." :: hop_array[]=". join("",@{$$self{hop_array}})) 
 			if $main::Debug{insteon} >= 4;
 	}
+
+	#Allow for per-device settings
+	$$self{default_hop_count} = $$self{max_hops} if ($$self{max_hops} &&
+		$$self{default_hop_count} > $$self{max_hops});
+	$$self{default_hop_count} = $$self{min_hops} if ($$self{min_hops} &&
+		$$self{default_hop_count} < $$self{min_hops});	
+	
         return $$self{default_hop_count};
 }
 

From c3e335028906e00817be310cf7368f11bd6b4517 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 8 Oct 2013 18:44:04 -0700
Subject: [PATCH 166/330] Insteon_Thermo_i2: Decode Status Flag

Only Cooling and Heating statuses appear to be supported.  Bits 4 and 6 are also always enabled, I don't currently know what these are.  Sadly, humidifying and dehumidifying do not appear to be supported.
---
 lib/Insteon/Thermostat.pm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 5ed8c940c..7d5707c46 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -866,9 +866,19 @@ sub hex_short_temp{
 }
 
 sub hex_status{
-	### Not sure about this one yet, was 80 when set to auto but no activity
-	## need to call _cooling, _heating, _high_humid, and _low_humid when 
-	## figured out
+	my ($self, $hex_status) = @_;
+	# Bit 	Value	Bit	Value
+	# 0	Cooling	4	1??	
+	# 1	Heating	5	0??
+	# 2	0??	6	1??
+	# 3	0??	7	0??
+	# Sadly, dehumidifying and humidifying do not appear to be reported here
+	my ($pre_cooling, $pre_heating) = ($$self{cooling}, $$self{heating});
+	$$self{cooling} = ($hex_status & 0x01) ? 'on' : 'off';
+	$$self{heating} = ($hex_status & 0x02) ? 'on' : 'off';
+	if (($pre_cooling ne $$self{cooling}) || ($pre_heating ne $$self{heating})){
+		$self->set_receive('status_change');
+	}
 }
 
 sub hex_heat{

From 101143b7435b274677d49b4fa66847f4fd144ab7 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 8 Oct 2013 18:45:28 -0700
Subject: [PATCH 167/330] Insteon_Thermo_i2: Update status on Humidifying or
 Dehumdifying

---
 lib/Insteon/Thermostat.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 7d5707c46..cb2e1d1ec 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -914,6 +914,7 @@ sub _high_humid {
 	my ($self,$p_state) = @_;
 	if ($p_state ne $$self{high_humid}) {
 		$$self{high_humid} = $p_state;
+		$self->set_receive('status_change');
 	}
 	return $$self{high_humid};
 }
@@ -922,6 +923,7 @@ sub _low_humid {
 	my ($self,$p_state) = @_;
 	if ($p_state ne $$self{low_humid}) {
 		$$self{low_humid} = $p_state;
+		$self->set_receive('status_change');
 	}
 	return $$self{low_humid};
 }

From c2fee31b6f8442b67bc3786ce16e76c1aa593660 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 8 Oct 2013 19:44:24 -0700
Subject: [PATCH 168/330] Insteon_I2CS_Linking: Move Success Callback Eval to
 BaseInterface

This allows for per device _process_message subs to exist without needing to reproduce all of the eval code.
---
 lib/Insteon/BaseInsteon.pm   |  9 +--------
 lib/Insteon/BaseInterface.pm | 10 +++++++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 73a61c7f0..f465feef7 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -843,14 +843,7 @@ sub _process_message
 				. $msg{cmd_code} . " is incorrect. Ignorring received message.");
 			$self->corrupt_count_log(1) if $self->can('corrupt_count_log');
 			$p_setby->active_message->no_hop_increase(1);
-		} elsif ($clear_message && $p_setby->active_message->success_callback){
-			main::print_log("[Insteon::BaseObject] DEBUG4: Now calling message success callback: "
-				. $p_setby->active_message->success_callback) if $main::Debug{insteon} >= 4;
-			package main;
-				eval $p_setby->active_message->success_callback;
-				::print_log("[Insteon::BaseObject] problem w/ success callback: $@") if $@;
-			package Insteon::BaseObject;
-		}
+		} 
 	}
         elsif ($msg{is_nack})
         {
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index e562aa763..e6c1fd906 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -562,7 +562,15 @@ sub on_standard_insteon_received
                         		       		# ask the object to process the received message and update its state
                         		       		# Object will return true if this is the end of the send transaction
 		   					if($object->_process_message($self, %msg)) {
-		   						$self->clear_active_message();
+								if ($self->active_message->success_callback){
+									main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
+										. $self->active_message->success_callback) if $main::Debug{insteon} >= 4;
+									package main;
+										eval $self->active_message->success_callback;
+										::print_log("[Insteon::BaseInterface] problem w/ success callback: $@") if $@;
+									package Insteon::BaseInterface;
+								}
+								$self->clear_active_message();
 		   					}
                                                 }
                                                 else

From 608d81cc188d43bf1d3f2b0e21f5aad0b1cf8d88 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 8 Oct 2013 19:50:57 -0700
Subject: [PATCH 169/330] Inston_Thermo_i2: Convert Poll_Status to an Internal
 Sub, Replace with Request_Status

This more closely matches what the user would expect
---
 lib/Insteon/Thermostat.pm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index cb2e1d1ec..8f863bd5b 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -83,7 +83,7 @@ message are also NOT sent when the humidity setpoints are exceeded.  Instead,
 you must define the heating, high_humdid, and _low_humid groups and link them
 to MH.  (The base group 01 is the cooling group and should always be linked to
 MH).  When linked, these groups will send on/off commands to MH when these events
-occur.  Alternatively, you can periodically call the poll_simple method to check 
+occur.  Alternatively, you can periodically call request_status() to check 
 the status of these attributes.
 
 Linking:
@@ -621,16 +621,21 @@ sub sync_links{
 	return $self->SUPER::sync_links($audit_mode, $callback, $failure_callback);
 }
 
-=item C<poll_simple()>
+=item C<_poll_simple()>
 
 Requests the status of all Thermostat data points (temp, fan, mode ...) in a single
-request.  Only available for I2CS devices.
+request.  Called by C<request_status>, you likely don't need to call this directly
+Only available for I2CS devices.
+
 =cut
-sub poll_simple{
-	my ($self) = @_;
+
+sub _poll_simple{
+	my ($self, $success_callback, $failure_callback) = @_;
 	my $extra = "020000000000000000000000000000";
 	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
 	$$message{add_crc16} = 1;
+	$message->failure_callback($failure_callback);
+	$message->success_callback($success_callback);
 	$self->_send_cmd($message);
 }
 
@@ -976,7 +981,7 @@ sub sync_time {
 	#points such as mode and what not becuase we can't just set the time without
 	#setting these variables too.
 	$$self{sync_time} = 1;
-	$self->poll_simple();
+	$self->_poll_simple();
 }
 
 =item C<high_humid_setpoint()>

From 3de1e9d86982c55cbc9ea76526604adeb645021e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 8 Oct 2013 19:52:24 -0700
Subject: [PATCH 170/330] Insteon_Thermo_i2: Add Request_status Routine

---
 lib/Insteon/Thermostat.pm | 68 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 60 insertions(+), 8 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 8f863bd5b..4c50a2f37 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -658,6 +658,57 @@ sub get_status() {
 	return $output;
 }
 
+=item C<print_status()>
+
+Prints the currently known status to the log as a text string.
+
+=cut
+sub print_status() {
+	my ($self) = @_;
+	my $root = $self->get_root();
+	my $output = "[Insteon:Thermo_i2CaS] The status of " . $root->get_object_name . " is:\n";
+	$output .= "Mode: ";
+	$output .= $root->get_mode();
+	$output .= "; Status: ";
+	$output .= "Heating, " if ($$root{heating} eq 'on');
+	$output .= "Cooling, " if ($$root{cooling} eq 'on');
+	$output .= "Dehumidifying, " if ($$root{high_humid} eq 'on');
+	$output .= "Humidifying" if ($$root{low_humid} eq 'on');
+	$output .= 'Off' if ($output eq '');
+	$output .= "; Temp: ";
+	$output .= $root->get_temp();
+	$output .= "; Humid: ";
+	$output .= $root->get_humid();
+	$output .= "; Heat SP: ";
+	$output .= $root->get_heat_sp();
+	$output .= "; Cool SP: ";
+	$output .= $root->get_cool_sp();
+	$output .= "; High Humid SP: ";
+	$output .= $root->_high_humid();
+	$output .= "; Low Humid SP: ";
+	$output .= $root->_low_humid();
+	::print_log($output);
+}
+
+=item C<get_humid()>
+
+Returns the current humidity at the thermostat. 
+=cut
+sub get_humid() {
+   my ($self) = @_;
+   return $$self{'humid'};
+}
+
+sub request_status { 
+	my ($self) = @_;
+	$self = $self->get_root();
+	my $self_name = $self->get_object_name;
+	my $failure_callback = "::print_log('[Insteon:Thermo_i2CS] ERROR: Failed to get status for $self_name.');";
+	my $print_callback = $self_name . "->print_status";
+	my $humid_callback = $self_name . "->_poll_humid_setpoints(\'$print_callback\', \"$failure_callback\")";
+	$self->_poll_simple($humid_callback, $failure_callback);
+}
+
 sub _process_message {
 	my ($self,$p_setby,%msg) = @_;
 	my $clear_message = 0;
@@ -733,11 +784,8 @@ sub _process_message {
 			#10 = humid high		#24 = 1 = Status Report Enabled
 			#12 = firmware			#26 = 1 = External Power On
 							#28 = 1 = Int, 2=Ext Temp
-			main::print_log("[Insteon::Thermo_i2CS] Humidity setpoints for ".
-				$self->get_object_name . " are High: " .
-				$self->_high_humid(hex(substr($msg{extra}, 8, 2))) .
-				" Low: " . $self->_low_humid(hex(substr($msg{extra}, 10, 2)))
-				) if $main::Debug{insteon};
+			$self->_high_humid(hex(substr($msg{extra}, 8, 2)));
+			$self->_low_humid(hex(substr($msg{extra}, 10, 2)));
 			$clear_message = 1;
 			$self->_process_command_stack(%msg);
 		}
@@ -1022,16 +1070,20 @@ sub low_humid_setpoint {
 	$self->_send_cmd($message);
 }
 
-=item C<get_humid_setpoints()>
+=item C<_poll_humid_setpoints()>
 
 Retreives and prints the current humidity high and low setpoints.  Only available for I2CS devices.
+
 =cut
-sub get_humid_setpoints{
-	my ($self) = @_;
+
+sub _poll_humid_setpoints{
+	my ($self, $success_callback, $failure_callback) = @_;
 	my $extra = "00000001";
 	$extra .= '0' x (30 - length $extra);
 	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
 	$$self{_ext_set_get_action} = 'get';
+	$message->failure_callback($failure_callback);
+	$message->success_callback($success_callback);
 	$self->_send_cmd($message);
 }
 

From 86b5dc16e140cb6b791e6438d0ba35e2de4929b9 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Wed, 9 Oct 2013 02:18:40 -0400
Subject: [PATCH 171/330] Initial addition of Audrey aupport

---
 code/common/pa_control.pl |  51 +++++++--
 lib/Audrey_Play.pm        |  65 ++++++++++++
 lib/PAobj.pm              | 216 +++++++++++++++++++++++++++-----------
 lib/read_table_A.pl       |  10 +-
 4 files changed, 265 insertions(+), 77 deletions(-)
 create mode 100644 lib/Audrey_Play.pm

diff --git a/code/common/pa_control.pl b/code/common/pa_control.pl
index bff9da14b..da32500e7 100644
--- a/code/common/pa_control.pl
+++ b/code/common/pa_control.pl
@@ -48,8 +48,10 @@
 $pactrl->init() if $Startup or $Reload;
 
 # Hooks to flag which rooms to turn on based on "rooms=" parm in speak command
+&Speak_parms_add_hook(\&pa_parms_stub) if $Reload;
 &Speak_pre_add_hook(\&pa_control_stub) if $Reload;
-&Play_pre_add_hook (\&pa_control_stub) if $Reload;
+&Play_parms_add_hook(\&pa_parms_stub)  if $Reload;
+&Play_pre_add_hook(\&pa_control_stub)  if $Reload;
 
 if (said $v_pa_test) {
     my $state = $v_pa_test->{state};
@@ -67,38 +69,65 @@
     $pactrl->set('allspeakers',$state,'unmuted');
 }
 
-sub pa_control_stub {
-    my (%parms) = @_;
-    my @pazones;
-    my $mode = $parms{mode};
-    unless ($mode) {
+sub pa_parms_stub {
+    my ($parms) = @_;
+    unless ($parms->{mode}) {
         if (defined $mode_mh) { # *** Outdated (?)
-            $mode = state $mode_mh;
+            $parms->{mode} = state $mode_mh;
         } else {
-            $mode = $Save{mode};
+            $parms->{mode} = $Save{mode};
         }
     }
+    return if $parms->{mode} eq 'mute' or $parms->{mode} eq 'offline';
+    
+    my $results = $pactrl->prep_parms($parms);
+    
+    my %pa_zones = $pactrl->get_pa_zones();
+    push(@{$parms->{web_hook}},\&pa_web_hook) if $pa_zones{audrey} ne '';
+
+    print "PA: parms_stub set results: $results\n" if $Debug{pa} >=2;
+    
+}
+
+sub pa_control_stub {
+    my (%parms) = @_;
+    my @pazones;
+    my $mode = $parms{mode};
+#    unless ($mode) {
+#        if (defined $mode_mh) { # *** Outdated (?)
+#            $mode = state $mode_mh;
+#        } else {
+#            $mode = $Save{mode};
+#        }
+#    }
     return if $mode eq 'mute' or $mode eq 'offline';
 
     my $rooms = $parms{rooms};
     print "PA: control_stub: rooms=$rooms, mode=$mode\n" if $Debug{pa};
-    my $results = $pactrl->set($rooms,ON,$mode,%parms);
+    my $results = $pactrl->audio_hook(ON,%parms);
     print "PA: control_stub set results: $results\n" if $Debug{pa} >=2;
     set $pa_speaker_timer $pa_timer if $results;
+    return $results;
 }
 
+sub pa_web_hook {
+    my (%parms) = @_;
+    $pactrl->web_hook(\%parms);
+}
+
+
           #Turn off speakers when MH says it's done speaking/playing
 if (state_now $mh_speakers eq OFF) {
     unset $pa_speaker_timer;
     print "PA: Turning speakers off\n" if $Debug{pa};
-    $pactrl->set('allspeakers',OFF,'normal');
+    $pactrl->audio_hook(OFF,'normal');
 }
 
           #Setup Fail-safe speaker shutoff
 $pa_speaker_timer = new Timer;
 set $pa_speaker_timer 60 if state_now $mh_speakers eq ON;
 if (expired $pa_speaker_timer) {
-    print "PA: Timer expired.\n" if $Debug{pa};
+    print "PA: Timer expired. Forcing PA speakers off.\n" if $Debug{pa};
     set $mh_speakers OFF;
 }
 
diff --git a/lib/Audrey_Play.pm b/lib/Audrey_Play.pm
new file mode 100644
index 000000000..550739e14
--- /dev/null
+++ b/lib/Audrey_Play.pm
@@ -0,0 +1,65 @@
+use strict;
+
+package Audrey_Play;
+
+=head1 NAME
+
+B<Audrey_Play> - This object can be used to play sound files on the Audrey.
+
+=head1 SYNOPSIS
+
+
+blah blah
+
+
+
+=head1 DESCRIPTION
+
+=head1 INHERITS
+
+B<Generic_Item>
+
+=head1 METHODS
+
+=over
+
+=cut
+
+@Audrey_Play::ISA = ('Generic_Item');
+
+my $address;
+
+sub Init {
+    #&::MainLoop_pre_add_hook(  \&Weather_Item::check_weather, 1 );
+}
+
+=item C<new($ip)>
+
+$ip is the IP address of the Audrey.
+
+=cut
+
+sub new {
+   my ($class, $ip) = @_;
+   my $self = { };
+   $self->{address}=$ip;
+   
+   if ($ip) {
+      &::print_log("Creating Audrey_Play object...");
+   } else {
+      warn 'Empty expression is not allowed.';
+   }
+
+   bless $self, $class;
+   return $self;         
+}
+
+sub play {
+   my ($self,$web_file) = @_;
+   &::print_log("Called 'play' in Audrey_Play object...");
+   my $MHWeb = $::Info{IPAddress_local} . ":" . $::config_parms{http_port};
+   &::print_log($MHWeb);
+   &::run("get_url -quiet http://" . $self->{address} . "/mhspeak.shtml?http://" . $MHWeb . "/" . $web_file . " /dev/null");
+}
+
+1;
\ No newline at end of file
diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index e0d96cbd9..f75832ffe 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -27,7 +27,7 @@ B<Generic_Item>
 
 use strict;
 
-my (%pa_weeder_max_port,%pa_zone_types,%pa_zone_type_by_zone);
+my (%pa_weeder_max_port,%pa_zone_types,%pa_zones);
 
 package PAobj;
 
@@ -63,12 +63,12 @@ sub init {
     $self->check_group('default');
 
     my @speakers = $self->get_speakers('allspeakers');
-    my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl);
+    my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl,@speakers_audrey);
 
     for my $room (@speakers) {
         my $ref = &::get_object_by_name("pa_$room");
         my $type = $ref->get_type();
-        &::print_log("PAObj: init: room=$room, zonetype=$type");
+        &::print_log("PAobj: init: room=$room, zonetype=$type");
         $pa_zone_types{$type}++ unless $pa_zone_types{$type};
         
         if($type eq 'wdio') {
@@ -86,26 +86,30 @@ sub init {
         if($type eq 'object') {
             push(@speakers_obj,$room);
         }
+        if($type eq 'audrey') {
+            push(@speakers_audrey,$room);
+        }
     }
     
-    &::print_log("PAObj: speakers_wdio: $#speakers_wdio") if $main::Debug{pa} || $#speakers_wdio gt -1;
-    &::print_log("PAObj: speakers_x10: $#speakers_x10") if $main::Debug{pa} || $#speakers_x10 gt -1;
-    &::print_log("PAObj: speakers_xap: $#speakers_xap") if $main::Debug{pa} || $#speakers_xap gt -1;
-    &::print_log("PAObj: speakers_xpl: $#speakers_xpl") if $main::Debug{pa} || $#speakers_xpl gt -1;
-    &::print_log("PAObj: speakers_obj: $#speakers_obj") if $main::Debug{pa} || $#speakers_obj gt -1;
+    &::print_log("PAobj: speakers_wdio: $#speakers_wdio") if $main::Debug{pa} || $#speakers_wdio gt -1;
+    &::print_log("PAobj: speakers_x10: $#speakers_x10") if $main::Debug{pa} || $#speakers_x10 gt -1;
+    &::print_log("PAobj: speakers_xap: $#speakers_xap") if $main::Debug{pa} || $#speakers_xap gt -1;
+    &::print_log("PAobj: speakers_xpl: $#speakers_xpl") if $main::Debug{pa} || $#speakers_xpl gt -1;
+    &::print_log("PAobj: speakers_obj: $#speakers_obj") if $main::Debug{pa} || $#speakers_obj gt -1;
+    &::print_log("PAobj: speakers_audrey: $#speakers_audrey") if $main::Debug{pa} || $#speakers_audrey gt -1;
 
     if ($#speakers_wdio > -1) {
         $self->init_weeder(@speakers_wdio);
         return 0 unless %pa_weeder_max_port;
     }
     if ($pa_zone_types{'x10'}) {
-        &::print_log("PAObj: x10 PA type initialized...") if $main::Debug{pa};
+        &::print_log("PAobj: x10 PA type initialized...") if $main::Debug{pa};
     }
     if ($pa_zone_types{'xap'}) {
-        &::print_log("PAObj: xAP PA type initialized...") if $main::Debug{pa};
+        &::print_log("PAobj: xAP PA type initialized...") if $main::Debug{pa};
     }
     if ($pa_zone_types{'xpl'}) {
-        &::print_log("PAObj: xPL PA type initialized...") if $main::Debug{pa};
+        &::print_log("PAobj: xPL PA type initialized...") if $main::Debug{pa};
     }
     return 1;
 }
@@ -116,7 +120,7 @@ sub init_weeder
     my (%weeder_ref,%weeder_max);
     undef %pa_weeder_max_port;
     for my $room (@speakers) {
-        &::print_log("PAObj: init PA Room loaded: $room") if $main::Debug{pa};
+        &::print_log("PAobj: init PA Room loaded: $room") if $main::Debug{pa};
         my $ref = &::get_object_by_name('pa_' . $room . '_obj');
         $ref->{state} = 'off';
         my ($card,$id);
@@ -124,83 +128,146 @@ sub init_weeder
 
         $weeder_ref{$card} = '' unless $weeder_ref{$card};
         $weeder_ref{$card} .= $id;
-        &::print_log("PAObj: init card: $card, id: $id, Room: $room, List: $weeder_ref{$card}") if $main::Debug{pa};
+        &::print_log("PAobj: init card: $card, id: $id, Room: $room, List: $weeder_ref{$card}") if $main::Debug{pa};
     }
 
     for my $card ('A' .. 'P','a' .. 'p') {
         if ($weeder_ref{$card}) {
             my $data = $weeder_ref{$card};
             $weeder_max{$card}=$self->last_char($data);
-            &::print_log("PAObj: init weeder board=$card, ports=$data, max port=" . $weeder_max{$card}) if $main::Debug{pa};
+            &::print_log("PAobj: init weeder board=$card, ports=$data, max port=" . $weeder_max{$card}) if $main::Debug{pa};
         }
     }
     %pa_weeder_max_port = %weeder_max;
 }
 
-sub set
+sub prep_parms
 {
-    my ($self,$rooms,$state,$mode,%voiceparms) = @_;
-    my $results = 0;
-    &::print_log("PAObj: delay: $$self{pa_delay}\n") if $main::Debug{pa} >=3;
-    &::print_log("PAObj: set,mode: " . $mode . ",rooms: " . $rooms) if $main::Debug{pa} >=3;
+    my ($self,$parms) = @_;
+    #my $self = {};
+    &::print_log("PAobj: delay: $$self{pa_delay}\n") if $main::Debug{pa} >=3;
+    &::print_log("PAobj: set,mode: " . $parms->{mode} . ",rooms: " . $parms->{rooms}) if $main::Debug{pa} >=3;
 
-    my @speakers = $self->get_speakers($rooms);
+    my @speakers = $self->get_speakers($parms->{rooms});
     @speakers = $self->get_speakers('') if $#speakers == -1;
-    &::print_log("PAObj: Proposed rooms: ".join(', ', @speakers)) if $main::Debug{pa} >=2;
-    @speakers = $self->get_speakers_speakable($mode,@speakers);
-    &::print_log("PAObj: Will speak in rooms: ".join(', ', @speakers)) if $main::Debug{pa};
-
-    my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl);
+    &::print_log("PAobj: Proposed rooms: ".join(', ', @speakers)) if $main::Debug{pa} >=2;
+    @speakers = $self->get_speakers_speakable($parms->{mode},@speakers);
+    &::print_log("PAobj: Will speak in rooms: ".join(', ', @speakers)) if $main::Debug{pa};
+    
+    $parms->{pa_zones} = join(',', @speakers);
+    
+    my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl,@speakers_audrey);
 
     for my $room (@speakers) {
         my $ref = &::get_object_by_name("pa_$room");
         my $type = lc $ref->get_type();
         if($type eq 'wdio' || $type eq 'wdio_old') {
-            &::print_log("PAObj: speakers_wdio: Adding $room") if $main::Debug{pa} >=3;
+            &::print_log("PAobj: speakers_wdio: Adding $room") if $main::Debug{pa} >=3;
             push(@speakers_wdio,$room);
         }
         if($type eq 'x10') {
-            &::print_log("PAObj: speakers_x10: Adding $room") if $main::Debug{pa} >=3;
+            &::print_log("PAobj: speakers_x10: Adding $room") if $main::Debug{pa} >=3;
             push(@speakers_x10,$room);
         }
         if($type eq 'xap') {
-            &::print_log("PAObj: speakers_xap: Adding $room") if $main::Debug{pa} >=3;
-            push(@speakers_xap,$room) if $state eq 'on'; #Only need to send if speech is starting
+            &::print_log("PAobj: speakers_xap: Adding $room") if $main::Debug{pa} >=3;
+            push(@speakers_xap,$room);
         }
         if($type eq 'xpl') {
-            &::print_log("PAObj: speakers_xpl: Adding $room") if $main::Debug{pa} >=3;
-            push(@speakers_xpl,$room) if $state eq 'on'; #Only need to send if speech is starting
+            &::print_log("PAobj: speakers_xpl: Adding $room") if $main::Debug{pa} >=3;
+            push(@speakers_xpl,$room);
         }
         if($type eq 'object') {
-            &::print_log("PAObj: speakers_object: Adding $room") if $main::Debug{pa} >=3;
+            &::print_log("PAobj: speakers_object: Adding $room") if $main::Debug{pa} >=3;
             push(@speakers_obj,$room);
         }
+        if($type eq 'audrey') {
+            &::print_log("PAobj: speakers_audrey: Adding $room") if $main::Debug{pa} >=3;
+            push(@speakers_audrey,$room);
+        }
     }
     
-    &::print_log("PAObj: speakers_wdio: $#speakers_wdio") if $main::Debug{pa}  >=2 || $#speakers_wdio gt -1;
-    &::print_log("PAObj: speakers_x10: $#speakers_x10") if $main::Debug{pa}  >=2 || $#speakers_x10 gt -1;
-    &::print_log("PAObj: speakers_xap: $#speakers_xap") if $main::Debug{pa}  >=2 || $#speakers_xap gt -1;
-    &::print_log("PAObj: speakers_xpl: $#speakers_xpl") if $main::Debug{pa}  >=2 || $#speakers_xpl gt -1;
-    &::print_log("PAObj: speakers_obj: $#speakers_obj") if $main::Debug{pa}  >=2 || $#speakers_obj gt -1;
+    &::print_log("PAobj: speakers_wdio: $#speakers_wdio") if $main::Debug{pa}  >=2 || $#speakers_wdio gt -1;
+    &::print_log("PAobj: speakers_x10: $#speakers_x10") if $main::Debug{pa}  >=2 || $#speakers_x10 gt -1;
+    &::print_log("PAobj: speakers_xap: $#speakers_xap") if $main::Debug{pa}  >=2 || $#speakers_xap gt -1;
+    &::print_log("PAobj: speakers_xpl: $#speakers_xpl") if $main::Debug{pa}  >=2 || $#speakers_xpl gt -1;
+    &::print_log("PAobj: speakers_obj: $#speakers_obj") if $main::Debug{pa}  >=2 || $#speakers_obj gt -1;
+    &::print_log("PAobj: speakers_audrey: $#speakers_audrey") if $main::Debug{pa}  >=2 || $#speakers_audrey gt -1;
+
+    
+    $pa_zones{wdio}=join(',',@speakers_wdio);
+    $pa_zones{x10}=join(',',@speakers_x10);
+    $pa_zones{xap}=join(',',@speakers_xap);
+    $pa_zones{xpl}=join(',',@speakers_xpl);
+    $pa_zones{obj}=join(',',@speakers_obj);
+    $pa_zones{audrey}=join(',',@speakers_audrey);
+    
+    $parms->{web_file}="web_file";# if $#speakers_wdio gt -1;
+    
+    if(
+        1
+        && $pa_zones{wdio} eq ''
+        && $pa_zones{x10} eq ''
+        && $pa_zones{xap} eq ''
+        && $pa_zones{xpl} eq ''
+        && $pa_zones{obj} eq ''
+        
+    ) {
+        $$parms{to_file}='/dev/null';
+    }
+    
+    return 1;
+    
+}
+
+sub audio_hook
+{
+    my ($self,$state,%voiceparms) = @_;
+    my $results = 0;
+#    my @speakers = split(',', $voiceparms{pa_zones});
+
+    my @speakers_wdio=split(',',$pa_zones{wdio});
+    my @speakers_x10=split(',',$pa_zones{x10});
+    my @speakers_xap=split(',',$pa_zones{xap});
+    my @speakers_xpl=split(',',$pa_zones{xpl});
+    my @speakers_obj=split(',',$pa_zones{obj});
     
     #TODO: Properly handle $results across multiple types
     #TODO: Break up the wdio zones based on serial port, in case there are more than one.
+    $results=0;
     $results = $self->set_weeder($state,'weeder',@speakers_wdio) 			if $#speakers_wdio > -1;
     $results = $self->set_x10($state,@speakers_x10) 			if $#speakers_x10 > -1;
     $results = $self->set_xap($state,\@speakers_xap,\%voiceparms) 	if $#speakers_xap > -1;	
     $results = $self->set_xpl($state,\@speakers_xpl,\%voiceparms) 	if $#speakers_xpl > -1;
     $results = $self->set_obj($state,@speakers_obj) 			if $#speakers_obj > -1;
-
+    
     select undef, undef, undef, $$self{pa_delay} if $results;
+    &::print_log("PAobj: set results: $results");
+    
+    $results=0;
+    if($pa_zones{wdio} ne '') {$results=1;print_log('------> wdio detected, talking...');}
 
     return $results;
 }
 
+sub web_hook
+{
+    my ($self,$parms) = @_;
+    &::print_log("PAobj: web_hook! Audrey: " . $pa_zones{audrey});
+    return unless $pa_zones{audrey} ne '';
+    my $results=0;
+    my @speakers_audrey=split(',', $pa_zones{audrey});
+    
+    $results = $self->set_audrey($parms->{web_file},@speakers_audrey);
+    
+    return $results;
+}
+
 sub set_obj
 {
     my ($self,$state,@speakers) = @_;
     for my $room (@speakers) {
-        &::print_log("PAObj: set_obj: " . $room . " / " . $state) if $main::Debug{pa} >=2;
+        &::print_log("PAobj: set_obj: " . $room . " / " . $state) if $main::Debug{pa} >=2;
         my $ref = &::get_object_by_name("pa_$room");
         if ($ref) {
             $ref->set($state);
@@ -208,18 +275,34 @@ sub set_obj
     }
 }
 
+sub set_audrey
+{
+    my ($self,$speakFile,@speakers) = @_;
+    &::print_log("PAobj: set_audrey: file: " . $speakFile) if $main::Debug{pa} >=4;
+    &::print_log("PAobj: set_audrey: count: " . $#speakers) if $main::Debug{pa} >=4;
+    
+    for my $room (@speakers) {
+        #my $ref = &::get_object_by_name('pa_'.$room);
+        my $refobj = &::get_object_by_name('pa_'.$room.'_obj');
+        if ($refobj) {
+            &::print_log("PAobj: set_audrey: " . $room . " / " . $speakFile) if $main::Debug{pa} >=2;
+            $refobj->play($speakFile);
+        }
+    }
+}
+
 sub set_x10
 {
     my ($self,$state,@speakers) = @_;
     my ($x10_list,$pa_x10_hc,$ref,$refobj);
 
     for my $room (@speakers) {
-        &::print_log("PAObj: set_x10: " . $room . " / " . $state) if $main::Debug{pa} >=3;
+        &::print_log("PAobj: set_x10: " . $room . " / " . $state) if $main::Debug{pa} >=3;
         $ref = &::get_object_by_name('pa_'.$room);
         $refobj = &::get_object_by_name('pa_'.$room.'_obj');
         if ($refobj && $ref) {
             my ($id) = $ref->get_address();
-            &::print_log("PAObj: set_x10 ID: $id, State: $state, Room: $room") if $main::Debug{pa} >=2;
+            &::print_log("PAobj: set_x10 ID: $id, State: $state, Room: $room") if $main::Debug{pa} >=2;
             $refobj->set($state);
         }
     }
@@ -231,13 +314,13 @@ sub set_xap {
     my %voiceparms = %$param2;
     return unless $#speakers > -1;
     for my $room (@speakers) {
-        &::print_log("PAObj: set_xap: " . $room . " / " . $state) if $main::Debug{pa} >=3;
+        &::print_log("PAobj: set_xap: " . $room . " / " . $state) if $main::Debug{pa} >=3;
         my $ref = &::get_object_by_name('pa_'.$room.'_obj');
         if ($ref) {
             $ref->send_message($ref->target_address, $ref->class_name => {say => $voiceparms{text}, volume => $voiceparms{volume}, mode => $voiceparms{mode}, voice => $voiceparms{voice} });
-            &::print_log("PAObj: xap cmd: $ref->{object_name} is sending voice text: $voiceparms{text}") if $main::Debug{pa};
+            &::print_log("PAobj: xap cmd: $ref->{object_name} is sending voice text: $voiceparms{text}") if $main::Debug{pa};
         } else {
-            &::print_log("PAObj: Unable to locate object for: pa_$room");
+            &::print_log("PAobj: Unable to locate object for: pa_$room");
         }
     }
 }
@@ -248,7 +331,7 @@ sub set_xpl {
     my %voiceparms = %$param2;
     return unless $#speakers > -1;
     for my $room (@speakers) {
-        &::print_log("PAObj: set_xpl: " . $room . " / " . $state) if $main::Debug{pa} >=3;
+        &::print_log("PAobj: set_xpl: " . $room . " / " . $state) if $main::Debug{pa} >=3;
         my $ref = &::get_object_by_name('pa_'.$room.'_obj');
         if ($ref) {
             my $max_length = $::config_parms{"pa_$room" . "_maxlength"};
@@ -258,9 +341,9 @@ sub set_xpl {
                $text = substr($text, 0, $max_length) if $max_length < length($text);
             }
             $ref->send_cmnd($ref->class_name => {speech => $text, voice => $voiceparms{voice}, volume => $voiceparms{volume}, mode => $voiceparms{mode} });
-            &::print_log("PAObj: set_xpl: $ref->{object_name} is sending voice text: $voiceparms{text}") if $main::Debug{pa};
+            &::print_log("PAobj: set_xpl: $ref->{object_name} is sending voice text: $voiceparms{text}") if $main::Debug{pa};
         } else {
-            &::print_log("PAObj: Unable to locate object for: pa_$room");
+            &::print_log("PAobj: Unable to locate object for: pa_$room");
         }
     }
 }
@@ -272,14 +355,14 @@ sub set_weeder
     my $weeder_command='';
     my $command='';
     for my $room (@speakers) {
-        &::print_log("PAObj: set_weeder: " . $room . " / " . $state) if $main::Debug{pa} >=3;
+        &::print_log("PAobj: set_weeder: " . $room . " / " . $state) if $main::Debug{pa} >=3;
         my $ref = &::get_object_by_name('pa_'.$room.'_obj');
         if ($ref) {
             $ref->{state} = $state;
             my ($card,$id) = $ref->{id_by_state}{'on'} =~ /^D?(.)H(.)/s;
             $weeder_ref{$card}='' unless $weeder_ref{$card};
             $weeder_ref{$card} .= $id;
-            &::print_log("PAObj: card: $card, id: $id, Room: $room") if $main::Debug{pa} >=2;
+            &::print_log("PAobj: card: $card, id: $id, Room: $room") if $main::Debug{pa} >=2;
         }
     }
 
@@ -294,7 +377,7 @@ sub set_weeder
         }
     }
     return 0 unless $weeder_command;
-    &::print_log("PAObj: Sending $weeder_command to the weeder card(s)") if $main::Debug{pa};
+    &::print_log("PAobj: Sending $weeder_command to the weeder card(s)") if $main::Debug{pa};
     $weeder_command =~ s/\\r/\r/g;
     &Serial_Item::send_serial_data($weeder_port, $weeder_command) if $main::Serial_Ports{$weeder_port}{object};
     return 1;
@@ -323,7 +406,7 @@ sub get_weeder_string
         }
 
         $bit_flag = ($state eq 'on') ? 1 : 0;                # get 0 or 1
-        &::print_log("PAObj: get_weeder_string card: $card, bit=$bit state=$bit_flag") if $main::Debug{pa} >=2;
+        &::print_log("PAobj: get_weeder_string card: $card, bit=$bit state=$bit_flag") if $main::Debug{pa} >=2;
         $byte_code += ($bit_flag << $bit_counter);        # get bit in byte position
 
         if ($bit_counter++ >= 3) {
@@ -351,7 +434,7 @@ sub get_speakers
     my ($self,$rooms) = @_;
     my @pazones;
 
-    &::print_log("PAObj: get_speakers,rooms: " . $rooms) if $main::Debug{pa} >=2;
+    &::print_log("PAobj: get_speakers,rooms: " . $rooms) if $main::Debug{pa} >=2;
     if ($::mh_speakers->{rooms}) {
         $rooms = $::mh_speakers->{rooms};
         $::mh_speakers->{rooms} = '';
@@ -363,22 +446,22 @@ sub get_speakers
         no strict 'refs';
         my $ref = &::get_object_by_name("pa_$room");
         if ($ref) {
-            &::print_log("PAObj: name=$ref->{object_name}") if $main::Debug{pa};
+            &::print_log("PAobj: name=$ref->{object_name}") if $main::Debug{pa};
             if (UNIVERSAL::isa($ref,'Group')) {
-                &::print_log("PAObj: It's a group!") if $main::Debug{pa} >=2;
+                &::print_log("PAobj: It's a group!") if $main::Debug{pa} >=2;
                 for my $grouproom ($ref->list) {
                     $grouproom = $grouproom->get_object_name;
                     $grouproom =~ s/^\$pa_//;
                     $grouproom =~ s/^\$paxpl_//;
                     $grouproom =~ s/^\$paxap_//;
-                    &::print_log("PAObj:  - member: $grouproom\n") if $main::Debug{pa} >=2;
+                    &::print_log("PAobj:  - member: $grouproom") if $main::Debug{pa} >=2;
                     push(@pazones, $grouproom);
                 }
             } else {
                 push(@pazones, $room);
             }
         } else {
-            &::print_log("PAObj: WARNING: PA zone of '$room' not found!");
+            &::print_log("PAobj: WARNING: PA zone of '$room' not found!");
         }
     }
     return @pazones;
@@ -387,13 +470,13 @@ sub get_speakers
 sub check_group
 {
     my ($self,$group) = @_;
-    &::print_log("PAObj: check group=$group") if $main::Debug{pa} >=2;
+    &::print_log("PAobj: check group=$group") if $main::Debug{pa} >=2;
     my $ref = &::get_object_by_name("pa_$group");
-    if (!$ref) {&::print_log("PAObj: check group: Error! Group does not exist: $group"); return;}
+    if (!$ref) {&::print_log("PAobj: check group: Error! Group does not exist: $group"); return;}
     my @list = $ref->list;
-    &::print_log("PAObj: check group=$group, list=$#list") if $main::Debug{pa} >=2;
+    &::print_log("PAobj: check group=$group, list=$#list") if $main::Debug{pa} >=2;
     if ($#list == -1) {
-        &::print_log("PAObj: check populating group: $group!") if $main::Debug{pa};
+        &::print_log("PAobj: check populating group: $group!") if $main::Debug{pa};
         for my $room ($self->get_speakers('allspeakers')) {
             my $ref2 = &::get_object_by_name("pa_$room");
             $ref->add($ref2);
@@ -411,19 +494,26 @@ sub get_speakers_speakable
 
     for my $room (@zones) {
         my $ref = &::get_object_by_name("pa_$room");
-        &::print_log("PAObj: speakable: name=$ref->{object_name}") if $main::Debug{pa} >=3;
+        &::print_log("PAobj: speakable: name=$ref->{object_name}") if $main::Debug{pa} >=3;
         if ($ref->{sleeping} == 0) {
             $ref->{mode} = 'normal' unless $ref->{mode};
             my $gss_mode = $ref->{mode};
             if ($gss_mode ne 'sleeping' && ($gss_mode eq 'normal' || $mode eq 'unmuted')) {
                 push(@pazones,$room);
-                &::print_log("PAObj: speakable: Pushing $room into pazones array:$#pazones") if $main::Debug{pa} >=2;
+                &::print_log("PAobj: speakable: Pushing $room into pazones array:$#pazones") if $main::Debug{pa} >=2;
             }
         }
     }
     return @pazones;
 }
 
+sub get_pa_zones
+{
+    my ($self) = @_;
+    &::print_log("PAobj: get_pa_zones");# if $main::Debug{pa} >=3;
+    return %pa_zones;
+}
+
 sub set_delay
 {
     my ($self,$delay) = @_;
@@ -439,7 +529,7 @@ sub print_speaker_states
         $ref = &::get_object_by_name("pa_$speaker");
         $room = $ref->{object_name};
         $room =~ s/^\$pa_//;
-        &::print_log("PAObj: name=$room, state=$ref->{state}") if $main::Debug{pa};
+        &::print_log("PAobj: name=$room, state=$ref->{state}") if $main::Debug{pa};
     }
 }
 
diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index 0d197677e..f924d1343 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -22,12 +22,12 @@ sub read_table_init_A {
 	%groups=();
 	%objects=();
 	%packages=();
-      %addresses=();
+  %addresses=();
 }
 
 sub read_table_A {
     my ($record) = @_;
-
+    
     if($record =~ /^#/ or $record =~ /^\s*$/) {
        return;
     }
@@ -551,6 +551,10 @@ sub read_table_A {
                 $code .= sprintf "\$%-35s -> tie_items(\$%s,'off','off');\n",$name,$address;
                 $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n",$name,$address;
             }
+        } elsif (lc $pa_type eq 'audrey') {
+            require 'Audrey_Play.pm';
+            $code .= sprintf "\$%-35s = new Audrey_Play('%s');\n",$name.'_obj',$address;
+            $code .= sprintf "\$%-35s -> hidden(1);\n", $name.'_obj';
         } elsif (lc $pa_type eq 'x10') {
             $other = join ', ', (map {"'$_'"} @other); # Quote data
             $code .= sprintf "\$%-35s = new X10_Appliance('%s','%s');\n",$name.'_obj',$address, $serial;
@@ -1130,4 +1134,4 @@ sub read_table_A {
 # Revision 1.3  2000/10/01 23:29:40  winter
 # - 2.29 release
 #
-#
+#
\ No newline at end of file

From a970d64da40c8da0f015ffb779e857effe021bfe Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 17:37:00 -0700
Subject: [PATCH 172/330] Insteon_Thermo_i2: Fix Typos in Comments

---
 lib/Insteon/Thermostat.pm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 4c50a2f37..61ab1dc21 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -80,7 +80,7 @@ the EF group as described above and run sync links.
 
 Broadcast messages are NOT sent when the heater turns on/off.  Broadcast
 message are also NOT sent when the humidity setpoints are exceeded.  Instead,
-you must define the heating, high_humdid, and _low_humid groups and link them
+you must define the heating, high_humid, and low_humid groups and link them
 to MH.  (The base group 01 is the cooling group and should always be linked to
 MH).  When linked, these groups will send on/off commands to MH when these events
 occur.  Alternatively, you can periodically call request_status() to check 
@@ -116,17 +116,20 @@ thermostat can be created in user code:
    $thermo_setpoint_c = new Insteon::Thermo_setpoint_c($thermostat);
    $thermo_humidity = new Insteon::Thermo_humidity($thermostat);  #Only available on i2CS devices
    $thermo_status = new Insteon::Thermo_status($thermostat);  #Only available on i2CS devices
+   $thermo_humidity_setpoint_h = new Insteon::Thermo_setpoint_humid_h($thermostat);  #Only available on i2CS devices
+   $thermo_humidity_setpoint_l = new Insteon::Thermo_setpoint_humid_l($thermostat);  #Only available on i2CS devices
+
 
 where $thermostat is the parent object to track.  The state of these child objects
-will be the state of the various objects.  This makes the display of the various
-states easier within MH.  The child objects also make it easier to change the 
-various states on the thermostat.
+will be the state of the various attributes of the thermostat.  This makes the 
+display of the various states easier within MH.  The child objects also make it 
+easier to change the various states on the thermostat.
 
 see code/examples/Insteon_thermostat.pl for more.
 
 =head1 BUGS
 
-This code has not been tested on older Venstar thermsotats, however it is believed
+This code has not been tested on older Venstar thermostats, however it is believed
 that the basic functionality should work as it did in the old code.
 
 =head1 AUTHOR

From 3fa31ea29413d6046ff9f055f0573c7758690cb1 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 17:37:00 -0700
Subject: [PATCH 173/330] Insteon_thermo_i2: Add Humidity Setpoint Child
 Objects

---
 lib/Insteon/Thermostat.pm | 88 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 61ab1dc21..58167fa9d 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -469,6 +469,12 @@ sub parent_event {
 	elsif ($p_state eq 'status_change'){
 		$$self{child_status}->set_receive($self->get_status(), $self);
 	}
+	elsif ($p_state eq 'low_humid_setpoint_change'){
+		$$self{child_setpoint_humid_l}->set_receive($self->get_low_humid_sp(), $self);
+	}
+	elsif ($p_state eq 'high_humid_setpoint_change'){
+		$$self{child_setpoint_humid_h}->set_receive($self->get_high_humid_sp(), $self);
+	}
 }
 
 # Overload methods we don't use, but would otherwise cause Insteon traffic.
@@ -1304,6 +1310,88 @@ sub set_receive {
 	$self->SUPER::set($p_state);
 }
 
+package Insteon::Thermo_setpoint_humid_h;
+use strict;
+
+@Insteon::Thermo_setpoint_humid_h::ISA = ('Generic_Item');
+
+sub new {
+	my ($class, $parent) = @_;
+	my $self = new Generic_Item();
+	bless $self, $class;
+	$$self{parent} = $parent;
+	@{$$self{states}} = ('Lower' , 'Higher');
+	$$self{parent}{child_setpoint_humid_h} = $self;
+	$$self{parent} -> tie_event ('$object->parent_event("$state")', "high_humid_setpoint_change");
+	return $self;
+}
+
+sub set {
+	my ($self, $p_state, $p_setby, $p_response) = @_;
+	my $found_state = 0;
+	foreach my $test_state (@{$$self{states}}){
+		if (lc($test_state) eq lc($p_state)){
+			$found_state = 1;
+		}
+	}
+	if ($found_state){
+		::print_log("[Insteon::Thermo_i2CS] Received request to set high humidity setpoint to "
+			. $p_state . " for device " . $self->get_object_name);
+		if (lc($p_state) eq 'lower'){
+			$$self{parent}->high_humid_setpoint($$self{parent}->get_high_humid_sp - 1);
+		}
+		elsif (lc($p_state) eq 'higher'){
+			$$self{parent}->high_humid_setpoint($$self{parent}->get_high_humid_sp + 1);
+		}
+	}
+}
+
+sub set_receive {
+	my ($self, $p_state) = @_;
+	$self->SUPER::set($p_state);
+}
+
+package Insteon::Thermo_setpoint_humid_l;
+use strict;
+
+@Insteon::Thermo_setpoint_humid_l::ISA = ('Generic_Item');
+
+sub new {
+	my ($class, $parent) = @_;
+	my $self = new Generic_Item();
+	bless $self, $class;
+	$$self{parent} = $parent;
+	@{$$self{states}} = ('Lower', 'Higher');
+	$$self{parent}{child_setpoint_humid_l} = $self;
+	$$self{parent} -> tie_event ('$object->parent_event("$state")', "low_humid_setpoint_change");
+	return $self;
+}
+
+sub set {
+	my ($self, $p_state, $p_setby, $p_response) = @_;
+	my $found_state = 0;
+	foreach my $test_state (@{$$self{states}}){
+		if (lc($test_state) eq lc($p_state)){
+			$found_state = 1;
+		}
+	}
+	if ($found_state){
+		::print_log("[Insteon::Thermo_i2CS] Received request to set low humidity setpoint to "
+			. $p_state . " for device " . $self->get_object_name);
+		if (lc($p_state) eq 'lower'){
+			$$self{parent}->low_humid_setpoint($$self{parent}->get_low_humid_sp - 1);
+		}
+		elsif (lc($p_state) eq 'higher'){
+			$$self{parent}->low_humid_setpoint($$self{parent}->get_low_humid_sp + 1);
+		}
+	}
+}
+
+sub set_receive {
+	my ($self, $p_state) = @_;
+	$self->SUPER::set($p_state);
+}
+
 1;
 =back
 

From ba1831fc3c58c9b924e01a5d1fd507436b4a1396 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 17:37:00 -0700
Subject: [PATCH 174/330] Insteon_Thermo_i2: Change Name of (De)Humidifying
 Functions to Match Nomenclature

Heating, Cooling, ... should be humidifying and the like
---
 lib/Insteon/Thermostat.pm | 47 ++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 58167fa9d..34d7200b3 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -584,7 +584,7 @@ sub init {
 	my ($self) = @_;
 	$$self{message_types} = \%message_types;
 	#Set saved state unique to i2CS devices
-	$self->restore_data('humid', 'cooling', 'heating', 'high_humid', 'low_humid');
+	$self->restore_data('humid', 'cooling', 'heating', 'humidifying', 'dehumidifying', 'high_humid_sp', 'low_humid_sp');
 }
 
 sub set {
@@ -605,10 +605,10 @@ sub set {
 		$root->_heating($link_state);
 	}
 	elsif ($self->group eq '03') {
-		$root->_high_humid($link_state);
+		$root->_dehumidifying($link_state);
 	}
 	elsif ($self->group eq '04') {
-		$root->_low_humid($link_state);
+		$root->_humidifying($link_state);
 	}
 	#Update the status of linked devices
 	$self->set_linked_devices($link_state);
@@ -661,8 +661,8 @@ sub get_status() {
 	my $output = "";
 	$output .= "Heating, " if ($$root{heating} eq 'on');
 	$output .= "Cooling, " if ($$root{cooling} eq 'on');
-	$output .= "Dehumidifying, " if ($$root{high_humid} eq 'on');
-	$output .= "Humidifying" if ($$root{low_humid} eq 'on');
+	$output .= "Dehumidifying, " if ($$root{dehumidifying} eq 'on');
+	$output .= "Humidifying" if ($$root{humidifying} eq 'on');
 	$output = 'Off' if ($output eq '');
 	return $output;
 }
@@ -679,11 +679,13 @@ sub print_status() {
 	$output .= "Mode: ";
 	$output .= $root->get_mode();
 	$output .= "; Status: ";
-	$output .= "Heating, " if ($$root{heating} eq 'on');
-	$output .= "Cooling, " if ($$root{cooling} eq 'on');
-	$output .= "Dehumidifying, " if ($$root{high_humid} eq 'on');
-	$output .= "Humidifying" if ($$root{low_humid} eq 'on');
-	$output .= 'Off' if ($output eq '');
+	my $output_status = '';
+	$output_status .= "Heating, " if ($$root{heating} eq 'on');
+	$output_status .= "Cooling, " if ($$root{cooling} eq 'on');
+	$output_status .= "Dehumidifying, " if ($$root{dehumidifying} eq 'on');
+	$output_status .= "Humidifying" if ($$root{humidifying} eq 'on');
+	$output_status .= 'Off' if ($output_status eq '');
+	$output .= $output_status;
 	$output .= "; Temp: ";
 	$output .= $root->get_temp();
 	$output .= "; Humid: ";
@@ -972,22 +974,31 @@ sub _heating {
 }
 
 
-sub _high_humid {
+sub _dehumidifying {
 	my ($self,$p_state) = @_;
-	if ($p_state ne $$self{high_humid}) {
-		$$self{high_humid} = $p_state;
+	if ($p_state ne $$self{dehumidifying}) {
+		$$self{dehumidifying} = $p_state;
 		$self->set_receive('status_change');
 	}
-	return $$self{high_humid};
+	return $$self{dehumidifying};
 }
 
-sub _low_humid {
+sub _humidifying {
 	my ($self,$p_state) = @_;
-	if ($p_state ne $$self{low_humid}) {
-		$$self{low_humid} = $p_state;
+	if ($p_state ne $$self{humidifying}) {
+		$$self{humidifying} = $p_state;
 		$self->set_receive('status_change');
 	}
-	return $$self{low_humid};
+	return $$self{humidifying};
+}
+
+sub _high_humid_sp {
+	my ($self,$p_state) = @_;
+	if ($p_state ne $$self{high_humid_sp}) {
+		$$self{high_humid_sp} = $p_state;
+		$self->set_receive('high_humid_setpoint_change');
+	}
+	return $$self{high_humid_sp};
 }
 
 =item C<mode()>

From a7d18a21fbe8acf5deb79c9a1a24499efe0a7518 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 17:37:00 -0700
Subject: [PATCH 175/330] Insteon_Thermo_i2: Use Simple_Message Whenever
 Possible

---
 lib/Insteon/Thermostat.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 34d7200b3..4f6457d55 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -621,8 +621,8 @@ sub sync_links{
 	if (!$audit_mode && ref $bcast_obj && $self->is_root){
 		#Make sure thermostat is set to broadcast changes
 		::print_log("[Insteon::Thermo_i2CS] (sync_links) Enabling thermostat broadcast setting.") unless $audit_mode;
-		my $extra = "000008000000000000000000000000";
-		my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+		my $extra = "000008";
+		my $message = $self->simple_message('extended_set_get', $extra);
 		$$self{_ext_set_get_action} = 'set';
 		$self->_send_cmd($message);
 	}
@@ -640,8 +640,8 @@ Only available for I2CS devices.
 
 sub _poll_simple{
 	my ($self, $success_callback, $failure_callback) = @_;
-	my $extra = "020000000000000000000000000000";
-	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+	my $extra = "02";
+	my $message = $self->simple_message('extended_set_get', $extra);
 	$$message{add_crc16} = 1;
 	$message->failure_callback($failure_callback);
 	$message->success_callback($success_callback);

From 3aa224a5c7d7e1fe3de3e7f7aaa9c53acb2838e9 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 17:37:00 -0700
Subject: [PATCH 176/330] Insteon_Thermo_i2: Fix Typo in Debug Log Entry

---
 lib/Insteon/Thermostat.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 4f6457d55..56ab41bd6 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -675,7 +675,7 @@ Prints the currently known status to the log as a text string.
 sub print_status() {
 	my ($self) = @_;
 	my $root = $self->get_root();
-	my $output = "[Insteon:Thermo_i2CaS] The status of " . $root->get_object_name . " is:\n";
+	my $output = "[Insteon:Thermo_i2CS] The status of " . $root->get_object_name . " is:\n";
 	$output .= "Mode: ";
 	$output .= $root->get_mode();
 	$output .= "; Status: ";

From 0680d3914b8b80fa555afe5f0755808a69a57917 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 17:37:00 -0700
Subject: [PATCH 177/330] Insteon_Thermo_i2: Create Get_Humid_Setpoint
 Functions

---
 lib/Insteon/Thermostat.pm | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 56ab41bd6..5c150f71f 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -695,9 +695,9 @@ sub print_status() {
 	$output .= "; Cool SP: ";
 	$output .= $root->get_cool_sp();
 	$output .= "; High Humid SP: ";
-	$output .= $root->_high_humid();
+	$output .= $root->get_high_humid_sp();
 	$output .= "; Low Humid SP: ";
-	$output .= $root->_low_humid();
+	$output .= $root->get_low_humid_sp();
 	::print_log($output);
 }
 
@@ -1001,6 +1001,34 @@ sub _high_humid_sp {
 	return $$self{high_humid_sp};
 }
 
+sub _low_humid_sp {
+	my ($self,$p_state) = @_;
+	if ($p_state ne $$self{low_humid_sp}) {
+		$$self{low_humid_sp} = $p_state;
+		$self->set_receive('low_humid_setpoint_change');
+	}
+	return $$self{low_humid_sp};
+}
+
+=item C<get_high_humid_sp()>
+
+Returns the current high humidity setpoint. 
+=cut
+sub get_high_humid_sp {
+	my ($self) = @_;
+	return $$self{high_humid_sp};
+}
+
+=item C<get_low_humid_sp()>
+
+Returns the current low humidity setpoint. 
+=cut
+sub get_low_humid_sp {
+	my ($self) = @_;
+	return $$self{low_humid_sp};
+}
+
+
 =item C<mode()>
 
 Sets system mode to argument: 'off', 'heat', 'cool', 'auto', 'program_heat', 

From 0e48368743813ae3d6be165264656d9eaa3f9224 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 17:37:00 -0700
Subject: [PATCH 178/330] Insteon_Thermo_i2: Manually Set (De)Humidifying
 States on Request Status

There does not appear to be any request which can be made to the device to get the status of the Humidifying or Dehumidifying group (perhaps a direct request to each device->group would work)

But in order to make sure that the two groups are in the proper state after a call to request_status we just manually set them inside the code
---
 lib/Insteon/Thermostat.pm | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 5c150f71f..fdaf83549 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -795,8 +795,23 @@ sub _process_message {
 			#10 = humid high		#24 = 1 = Status Report Enabled
 			#12 = firmware			#26 = 1 = External Power On
 							#28 = 1 = Int, 2=Ext Temp
-			$self->_high_humid(hex(substr($msg{extra}, 8, 2)));
-			$self->_low_humid(hex(substr($msg{extra}, 10, 2)));
+			$self->_high_humid_sp(hex(substr($msg{extra}, 8, 2)));
+			$self->_low_humid_sp(hex(substr($msg{extra}, 10, 2)));
+			
+			#Humidifying and Dehumidifying are only reported by the
+			#thermostat as scene-commands.  When a user calls 
+			#request_status, we manually check the values and update
+			#as appropriate
+			if ($self->get_high_humid_sp > $self->get_humid){
+				$self->_dehumidifying('off'); 
+			} else {
+				$self->_dehumidifying('on');	
+			}
+			if ($self->get_low_humid_sp < $self->get_humid){
+				$self->_humidifying('off');
+			} else {
+				$self->_humidifying('on');	
+			}
 			$clear_message = 1;
 			$self->_process_command_stack(%msg);
 		}

From 95597cbe160ef4683eb8442f9889dfdecaf369b5 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 17:37:00 -0700
Subject: [PATCH 179/330] Insteon_Thermo_i2: Set Humidity Setpoint Pending
 States on Extended Message ACK

---
 lib/Insteon/Thermostat.pm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index fdaf83549..296ad1ad0 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -740,6 +740,24 @@ sub _process_message {
 			$$self{_ext_set_get_action} = undef;
 			$self->_process_command_stack(%msg);	
 		}
+		elsif ($$self{_ext_set_get_action} eq 'set_high_humid'){
+			main::print_log("[Insteon::Thermostat] Received ACK of high humid setpoint ".
+				"for ". $self->get_object_name) if $main::Debug{insteon};	
+			$self->_high_humid_sp($$self{_high_humid_pending});
+			$clear_message = 1;
+			$$self{_ext_set_get_action} = undef;
+			$$self{_high_humid_pending} = undef;
+			$self->_process_command_stack(%msg);
+		}
+		elsif ($$self{_ext_set_get_action} eq 'set_low_humid'){
+			main::print_log("[Insteon::Thermostat] Received ACK of low humid setpoint ".
+				"for ". $self->get_object_name) if $main::Debug{insteon};	
+			$self->_low_humid_sp($$self{_low_humid_pending});
+			$clear_message = 1;
+			$$self{_ext_set_get_action} = undef;
+			$$self{_low_humid_pending} = undef;
+			$self->_process_command_stack(%msg);
+		}
 	} 
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_extended}) {
 		if (substr($msg{extra},0,4) eq "0201") {

From 47aeab1e398033d358d19af9ee8528133edaded8 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 17:37:00 -0700
Subject: [PATCH 180/330] Insteon_Thermo_i2: Humidity Setpoints must be in
 range of [1-99], Set Pending Flag

---
 lib/Insteon/Thermostat.pm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 296ad1ad0..8c9109817 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -1122,13 +1122,18 @@ sub high_humid_setpoint {
 	my ($self, $value) = @_;
 	main::print_log("[Insteon::Thermo_i2CS] Setting high humid setpoint -> $value") if $main::Debug{insteon};
 	if($value !~ /^\d+$/){
-		main::print_log("[Insteon::Thermostat] ERROR: Setpoint $value not numeric");
+		main::print_log("[Insteon::Thermo_i2CS] ERROR: Setpoint $value not numeric");
 		return;
 	}
+	if($value > 99 || $value < 1){
+		main::print_log("[Insteon::Thermo_i2CS] ERROR: Setpoint must be between 1-99, not $value");
+		return;		
+	}
 	my $extra = "00000B" . sprintf("%02x", $value);
 	$extra .= '0' x (30 - length $extra);
 	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
-	$$self{_ext_set_get_action} = 'set';
+	$$self{_ext_set_get_action} = 'set_high_humid';
+	$$self{_high_humid_pending} = $value;
 	$self->_send_cmd($message);
 }
 
@@ -1141,13 +1146,18 @@ sub low_humid_setpoint {
 	my ($self, $value) = @_;
 	main::print_log("[Insteon::Thermo_i2CS] Setting low humid setpoint -> $value") if $main::Debug{insteon};
 	if($value !~ /^\d+$/){
-		main::print_log("[Insteon::Thermostat] ERROR: Setpoint $value not numeric");
+		main::print_log("[Insteon::Thermo_i2CS] ERROR: Setpoint $value not numeric");
 		return;
 	}
+	if($value > 99 || $value < 1){
+		main::print_log("[Insteon::Thermo_i2CS] ERROR: Setpoint must be between 1-99, not $value");
+		return;		
+	}
 	my $extra = "00000C" . sprintf("%02x", $value);
 	$extra .= '0' x (30 - length $extra);
 	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
-	$$self{_ext_set_get_action} = 'set';
+	$$self{_ext_set_get_action} = 'set_low_humid';
+	$$self{_low_humid_pending} = $value;
 	$self->_send_cmd($message);
 }
 

From 503dc19fee3c77092891d966c4ade9bf27aa5137 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 17:37:00 -0700
Subject: [PATCH 181/330] Fix Nabble Links in MailList Page

Closes #230
---
 docs/maillist.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/maillist.html b/docs/maillist.html
index 5d026fb5a..0e83c4e54 100644
--- a/docs/maillist.html
+++ b/docs/maillist.html
@@ -25,8 +25,8 @@ <h3>Mailing list info</h3>
 or use the 
 <a href=http://news.gmane.org/thread.php?group=gmane.comp.misc.misterhouse.user>Gmane web interface</a>
 
-<li>Nabler also has <a href=http://www.nabble.com/MisterHouse-f14392.html>nice web interface</a>
-as well as a <a href=http://www.nabble.com/MisterHouse-f14392.xml>RSS feed</a>
+<li>Nabler also has <a href=http://misterhouse.10964.n7.nabble.com/>nice web interface</a>
+as well as a <a href=http://misterhouse.10964.n7.nabble.com/MisterHouse-f2.xml>RSS feed</a>
 
 <li>We also have an IRC channel, details
 <a href=http://misterhouse.wikispaces.com/DiscussionForums>on the Wiki</a>

From d63e458a42402092798aba8fd9015621f4eaf811 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 17:37:00 -0700
Subject: [PATCH 182/330] Insteon_i2CS_Linking: Add Success_Callback to
 Extended Messages

---
 lib/Insteon/BaseInterface.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index e6c1fd906..a461b284a 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -718,6 +718,14 @@ sub on_extended_insteon_received
                    	}
 		   	&::print_log("[Insteon::BaseInterface] Processing message for " . $object->get_object_name) if $main::Debug{insteon} >=3;
 			if($object->_process_message($self, %msg)) {
+				if ($self->active_message->success_callback){
+					main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
+						. $self->active_message->success_callback) if $main::Debug{insteon} >= 4;
+					package main;
+						eval $self->active_message->success_callback;
+						::print_log("[Insteon::BaseInterface] problem w/ success callback: $@") if $@;
+					package Insteon::BaseInterface;
+				}
 				$self->clear_active_message();
 			}
 		}

From dd130c693cfb1fdf8fc58446b8489b3fe9031802 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 18:30:21 -0700
Subject: [PATCH 183/330] Change Referenced to Web Cache Directory to
 html_alias_cache

html_alias_cache is defined as data_dir/cache by default.  Most installations will only require the data_dir to be defined, only those with special installations would need the cache dir to be outside the data_dir.

Closes #229
---
 bin/mh                                  |  4 ++--
 code/common/mh_control.pl               |  8 +++-----
 code/public/whole_house_audio_speech.pl |  4 ++--
 lib/Voice_Text.pm                       |  2 +-
 web/bin/ListManager.pl                  |  2 +-
 web/bin/button.pl                       | 18 +++++++++---------
 web/bin/button2.pl                      | 18 +++++++++---------
 web/bin/resizephoto.pl                  |  2 +-
 web/cache/empty_file.txt                |  5 -----
 9 files changed, 28 insertions(+), 35 deletions(-)
 delete mode 100644 web/cache/empty_file.txt

diff --git a/bin/mh b/bin/mh
index 40fe04342..e85103685 100755
--- a/bin/mh
+++ b/bin/mh
@@ -736,7 +736,7 @@ sub setup {
                                 # Make various directories, if missing
     mkdir ("$config_parms{data_dir}/logs", 0777)         unless -d "$config_parms{data_dir}/logs";
     mkdir ("$config_parms{data_dir}/web", 0777)          unless -d "$config_parms{data_dir}/web";
-    mkdir ("$config_parms{data_dir}/cache", 0777)        unless -d "$config_parms{data_dir}/cache";
+    mkdir ("$config_parms{html_alias_cache}", 0777)        unless -d "$config_parms{html_alias_cache}";
     mkdir ("$config_parms{html_dir}/tv", 0777)           unless -d "$config_parms{html_dir}/tv";
     mkdir ("$config_parms{html_dir}/tv/clicktv", 0777)   unless -d "$config_parms{html_dir}/tv/clicktv";
 
@@ -3819,7 +3819,7 @@ sub play {
                                 # Let the speak code push the wav file
                                 # For speak (TTS), this gets done in Voice_Text.pm
         if ($parms{address}) {
-            copy $file, "$config_parms{data_dir}/cache/speak_address.$Second.wav";
+            copy $file, "$config_parms{html_alias_cache}/speak_address.$Second.wav";
             for my $address (split ',', $parms{address}) {
                 my $address_code = $config_parms{voice_text_address_code};
                 $address_code =~ s|\$address|$address|;
diff --git a/code/common/mh_control.pl b/code/common/mh_control.pl
index 6117eea36..211f6430f 100644
--- a/code/common/mh_control.pl
+++ b/code/common/mh_control.pl
@@ -529,14 +529,12 @@ ()
 # Clear the web cache directory
 $v_clear_cache = new Voice_Cmd 'Clear the web cache directory', '';
 $v_clear_cache->set_info(
-    'Delete all the auto-generated .jpg files in mh/web/cache');
+    'Delete all the auto-generated .jpg files in html_alias_cache directory');
 $v_clear_cache->tie_event('&handle_clear_cache_state()'); # noloop
 sub handle_clear_cache_state() {
     my $cmd = ($OS_win) ? 'del' : 'rm';
-    $cmd .= " $config_parms{html_dir}/cache/*.jpg";
-    $cmd =~ s|/|\\|g if $OS_win;
-    system $cmd;
-    $cmd .= " $config_parms{html_dir}/cache/*.wav";
+    $cmd .= " $config_parms{html_alias_cache}/*.jpg";
+    $cmd .= " $config_parms{html_alias_cache}/*.wav";
     $cmd =~ s|/|\\|g if $OS_win;
     system $cmd;
     print_log "Ran: $cmd";
diff --git a/code/public/whole_house_audio_speech.pl b/code/public/whole_house_audio_speech.pl
index 64b24e00c..638a872db 100644
--- a/code/public/whole_house_audio_speech.pl
+++ b/code/public/whole_house_audio_speech.pl
@@ -254,7 +254,7 @@ sub pre_speak_hook {
    print_log "Speech: player string is: $player_str";
    if ($player_str) {
       $SpeechCount++;
-      $parms->{'to_file'} = "$config_parms{data_dir}/cache/speak_festival.${Hour}.${Minute}.${Second}.${SpeechCount}.wav";
+      $parms->{'to_file'} = "$config_parms{html_alias_cache}/speak_festival.${Hour}.${Minute}.${Second}.${SpeechCount}.wav";
       $parms->{'use_players'} = $player_str;
    } else {
       $parms->{'no_speak'} = 1;
@@ -282,7 +282,7 @@ sub post_speak_hook {
 #####################################################################
 
 if ($New_Hour) {
-   system('find', "$config_parms{data_dir}/cache", '-mmin', '+5', '-exec', 'rm', '-f', '{}', ';');
+   system('find', "$config_parms{html_alias_cache}", '-mmin', '+5', '-exec', 'rm', '-f', '{}', ';');
 }
 
 if ($Reload) {
diff --git a/lib/Voice_Text.pm b/lib/Voice_Text.pm
index bf515a4b1..8c1002e73 100644
--- a/lib/Voice_Text.pm
+++ b/lib/Voice_Text.pm
@@ -134,7 +134,7 @@ sub speak_text {
     if ($parms{address}) {
         my @address = split ',', $parms{address};
         delete $parms{address};
-        $parms{to_file} = "$main::config_parms{html_dir}/cache/speak_address.$main::Second.wav";
+        $parms{to_file} = "$main::config_parms{html_alias_cache}/speak_address.$main::Second.wav";
 
         &speak_text(%parms);
         package main;   # So the we do not have to use $main::
diff --git a/web/bin/ListManager.pl b/web/bin/ListManager.pl
index 51961b2df..0b61d38b9 100644
--- a/web/bin/ListManager.pl
+++ b/web/bin/ListManager.pl
@@ -1298,7 +1298,7 @@ =head1 Credits and contact information
 #  ======================== POD END ==================================
 ];
 
-   open DOC, "echo \"$POD\" | pod2html --cachedir=$config_parms{data_dir}/cache --flush 2>/dev/null |";
+   open DOC, "echo \"$POD\" | pod2html --cachedir=$config_parms{html_alias_cache} --flush 2>/dev/null |";
    my $content = 0;
    while (<DOC>) {
       $content = 1 if /<body/;
diff --git a/web/bin/button.pl b/web/bin/button.pl
index 9654b07b7..34338ee92 100644
--- a/web/bin/button.pl
+++ b/web/bin/button.pl
@@ -32,7 +32,7 @@
 $image_file .= "_$type"  if $type;
 $image_file .= "_$state" if $state;
 $image_file =~ s/ /_/g;           # Blanks in file names are nasty
-$image_file = "/cache/$image_file.jpg";
+$image_file = "/$image_file.jpg";
 
 # Set to 1 if you'd like to disable the image cache. Normally you should
 # not need to do this because it affects performance (MisterHouse needs
@@ -41,11 +41,11 @@
 # time the button generation script (this script) is called.
 my $nocache = 0;
 
-if (-e "$config_parms{data_dir}$image_file" && !$nocache) {
-    return $image_file if $file_name_only;
+if (-e "$config_parms{html_alias_cache}$image_file" && !$nocache) {
+    return "/cache".$image_file if $file_name_only;
 #   print "Returning data from: $image_file\n";
-    my $data = file_read "$config_parms{data_dir}$image_file";
-    return &mime_header($image_file, 1, length $data) . $data;
+    my $data = file_read "$config_parms{html_alias_cache}$image_file";
+    return &mime_header("/cache".$image_file, 1, length $data) . $data;
 }
 
                                 # Look for an icon
@@ -185,9 +185,9 @@
 $image->transparent($white);
 
                                 # Write out a copy to the cache
-print "Writing image to cache: $config_parms{data_dir}$image_file\n";
+print "Writing image to cache: $config_parms{html_alias_cache}$image_file\n";
 my $jpeg = $image->jpeg;
-file_write "$config_parms{data_dir}$image_file", $jpeg;
+file_write "$config_parms{html_alias_cache}$image_file", $jpeg;
 
-return $image_file if $file_name_only;
-return &mime_header($image_file, 1, length $jpeg) . $jpeg;
+return "/cache".$image_file if $file_name_only;
+return &mime_header("/cache".$image_file, 1, length $jpeg) . $jpeg;
diff --git a/web/bin/button2.pl b/web/bin/button2.pl
index da5cda189..270125887 100644
--- a/web/bin/button2.pl
+++ b/web/bin/button2.pl
@@ -78,15 +78,15 @@
 $ImageFile =~ s/^\$//;    # Drop leading blank on object name
 $ImageFile =~ s/ *$//;    # Drop trailing blanks
 $ImageFile =~ s/ /_/g;    # Blanks in file names are nasty
-$ImageFile = "/cache/$ImageFile.$ButtonType";
+$ImageFile = "/$ImageFile.$ButtonType";
 
 print "$ScriptName: Cache file should be $config_parms{data_dir}/$ImageFile\n" if $Debug{$ScriptName};
 
 # We hit the cache, so we give back the image and exit
-if ( -f "$config_parms{data_dir}/$ImageFile" ) {
-   print "$ScriptName: Hit cached file $config_parms{data_dir}/$ImageFile\n" if $Debug{$ScriptName};
-   my $data = file_read("$config_parms{data_dir}$ImageFile");
-   return &mime_header( $ImageFile, 1, length $data ) . $data;
+if ( -f "$config_parms{html_alias_cache}/$ImageFile" ) {
+   print "$ScriptName: Hit cached file $config_parms{html_alias_cache}/$ImageFile\n" if $Debug{$ScriptName};
+   my $data = file_read("$config_parms{html_alias_cache}$ImageFile");
+   return &mime_header( "/cache".$ImageFile, 1, length $data ) . $data;
 }
 print "$ScriptName: Cache file not found\n" if $Debug{$ScriptName};
 
@@ -306,13 +306,13 @@
    }
    my $ButtonFile = $GDTemplate->$ButtonType();
    if ( $ButtonOK ) {
-   print "$ScriptName: Writing button to cache: $config_parms{data_dir}/$ImageFile\n" if $Debug{$ScriptName};
-   file_write( "$config_parms{data_dir}/$ImageFile", $ButtonFile );
+   print "$ScriptName: Writing button to cache: $config_parms{html_alias_cache}/$ImageFile\n" if $Debug{$ScriptName};
+   file_write( "$config_parms{html_alias_cache}/$ImageFile", $ButtonFile );
    } else {
-   print "$ScriptName: Button $config_parms{data_dir}/$ImageFile not written to cache\n";
+   print "$ScriptName: Button $config_parms{html_alias_cache}/$ImageFile not written to cache\n";
    }
 
-   return &mime_header( $ImageFile, 1, length $ButtonFile ) . $ButtonFile;
+   return &mime_header( "/cache".$ImageFile, 1, length $ButtonFile ) . $ButtonFile;
 }
 else {
    print "$ScriptName: Error generating image\n";
diff --git a/web/bin/resizephoto.pl b/web/bin/resizephoto.pl
index 8f81c03fb..dc5c97492 100644
--- a/web/bin/resizephoto.pl
+++ b/web/bin/resizephoto.pl
@@ -20,7 +20,7 @@
 my $img;
 my $nocache = 0;
 #$nocache = 1;
-$image_file = "$config_parms{data_dir}/cache/$image_file.jpg";
+$image_file = "$config_parms{html_alias_cache}/$image_file.jpg";
 unless (-e "$image_file" or $nocache) {
 	$url = $config_parms{html_alias_photos} .$url;
 	my $image = Image::Resize->new($url);
diff --git a/web/cache/empty_file.txt b/web/cache/empty_file.txt
deleted file mode 100644
index ef89395af..000000000
--- a/web/cache/empty_file.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-
-This is an empty file :)
-
-Put here to make sure unzip programs will re-created this directory.
-

From 0098ae6d48219175bbdb51dddc8c58ccbbc2a88a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 18:47:40 -0700
Subject: [PATCH 184/330] Insteon_Thermo_i2: Remove Extra Space

---
 lib/Insteon_PLM.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index 70688b02b..dd6315f74 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -402,7 +402,6 @@ sub _send_cmd {
          		$self->_set_timeout('command', $cmd_timeout); # a commmand needs to be PLM ack'd w/i 3 seconds or it gets dropped
                 }
         }
-
 	my $is_extended = ($message->can('command_type') && $message->command_type eq "insteon_ext_send") ? 1 : 0;
 	if (length($command) != (Insteon::MessageDecoder::insteon_cmd_len(substr($command,0,4), 0, $is_extended)*2)){
 		&::print_log( "[Insteon_PLM]: ERROR!! Command sent to PLM " . lc($command) 

From 8cbe4a9c002c7dd6322fb53efef8ba140c288815 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 9 Oct 2013 19:41:50 -0700
Subject: [PATCH 185/330] Insteon_TriggerLinc: Add Initial Support for
 TriggerLinc Devices

Basically just a copy of code for RemoteLincs, however, TriggerLincs support even fewer commands so much of the code was cut down.

I put the code in the Security.pm file as these are ostensible security devices, however as noted above, these are very similar to RemoteLincs.  Although, they are not that dissimilar from Motion sensors which are also in this file.

I don't own a TriggerLinc so this coding is all done blind.

Thanks to @JaredF for his testing work.

Closes #245
---
 lib/Insteon/Security.pm | 216 +++++++++++++++++++++++++++++++++++++++-
 lib/read_table_A.pl     |   6 ++
 2 files changed, 221 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/Security.pm b/lib/Insteon/Security.pm
index ede4466e3..fe97e4014 100644
--- a/lib/Insteon/Security.pm
+++ b/lib/Insteon/Security.pm
@@ -703,5 +703,219 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+=head1 B<Insteon::TriggerLinc>
+
+=head2 SYNOPSIS
+
+Configuration:
+	
+In user code:
+
+   use Insteon::TriggerLinc;
+   $trigger = new Insteon::TriggerLinc('12.34.56:01',$myPLM);
+
+In items.mht:
+
+   INSTEON_TRIGGERLINC, 12.34.56:01, $trigger, $trigger_group
+
+=head2 DESCRIPTION
+
+Provides support for Insteon TriggerLinc devices.  These are relatively simple
+devices that provide open and closed messages but not much else. Other than the 
+awake time, there are no other software configurable options.
+
+NOTE: There is a hardware configurable option which allows ON messages to be sent
+as group 1 and OFF messages to be sent as group 2.  If you enable this function
+you will likely want to define and link the group 2 object by replacing ":01" 
+with ":02" in the above examples.
+
+=head3 Link Management
+
+As battery operated devices, these devices are generally asleep.  If you want
+MH to manage the links on these devices you need to wake them up, generally this
+involves holding down the set button until the light flashes.
+
+Alternatively, if you set the awake time sufficiently high MH will be able to 
+initiate a communication with these devices for that many seconds after there
+is activity (open/close) from these devices.  This of course comes at the 
+expense of additional battery usage.
+
+=head2 INHERITS
+
+L<Insteon::BaseDevice|Insteon::BaseInsteon/Insteon::BaseDevice>, 
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::TriggerLinc;
+
+use strict;
+use Insteon::BaseInsteon;
+
+@Insteon::TriggerLinc::ISA = ('Insteon::BaseDevice','Insteon::DeviceController');
+
+my %message_types = (
+	%Insteon::BaseDevice::message_types
+);
+
+=item C<new()>
+
+Instantiates a new object.
+
 =cut
-1
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+
+	my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
+        $$self{message_types} = \%message_types;
+	bless $self,$class;
+	return $self;
+}
+
+=item C<set(state[,setby,response])>
+
+Handles messages received from the device.  Calls C<set_receive()>.
+
+=cut
+
+sub set
+{
+	my ($self,$p_state,$p_setby,$p_response) = @_;
+	return if &main::check_for_tied_filters($self, $p_state);
+
+	# Override any set_with_timer requests
+	if ($$self{set_timer}) {
+		&Timer::unset($$self{set_timer});
+		delete $$self{set_timer};
+	}
+
+        my $setby_name = $p_setby;
+        $setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
+	&::print_log("[Insteon::TriggerLinc] " . $self->get_object_name()
+		. "::set_receive($p_state, $setby_name)") if $main::Debug{insteon};
+	$self->set_receive($p_state,$p_setby);
+	return;
+}
+
+=item C<set_awake_time([0-255 seconds])>
+
+Sets the amount of time, in seconds, that the TriggerLinc will remain "awake" 
+after sending a command.  While awake, the device can be queried by MH such as 
+with scan link table or sync links.
+
+=cut
+
+sub set_awake_time {
+	my ($self, $awake) = @_;
+	$awake = sprintf("%02x", $awake);
+	my $root = $self->get_root();
+	my $extra = '000102' . $awake . '0000000000000000000000';
+	$$root{_ext_set_get_action} = "set";
+	my $message = new Insteon::InsteonMessage('insteon_ext_send', $root, 'extended_set_get', $extra);
+	$root->_send_cmd($message);
+	return;
+}
+
+=item C<get_extended_info()>
+
+Requests the status of various settings on the device.  Currently this is only
+used to obtain the awake time.  If the device is awake, the awake time setting 
+will be printed to the log.
+
+=cut
+
+sub get_extended_info {
+	my ($self,$no_retry) = @_;
+	my $root = $self->get_root();
+	my $extra = '000100000000000000000000000000';
+	$$root{_ext_set_get_action} = "get";
+	my $message = new Insteon::InsteonMessage('insteon_ext_send', $root, 'extended_set_get', $extra);
+	if ($no_retry){
+		$message->retry_count(1);
+	}
+	$root->_send_cmd($message);
+	return;
+}
+
+=item C<_process_message()>
+
+Checks for and handles unique TriggerLinc messages. 
+All other messages are transferred to L<Insteon::BaseObject::_process_message()|Insteon::BaseInsteon/Insteon::BaseObject>.
+
+=cut
+
+sub _process_message {
+	my ($self,$p_setby,%msg) = @_;
+	my $clear_message = 0;
+	my $root = $self->get_root();
+	my $pending_cmd = ($$self{_prior_msg}) ? $$self{_prior_msg}->command : $msg{command};
+	my $ack_setby = (ref $$self{m_status_request_pending}) ? $$self{m_status_request_pending} : $p_setby;
+	if ($msg{is_ack} && $self->_is_info_request($pending_cmd,$ack_setby,%msg)) {
+		$clear_message = 1;
+		$$self{m_status_request_pending} = 0;
+		$self->_process_command_stack(%msg);
+	}
+	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
+		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
+		#If this was a get request don't clear until data packet received
+		main::print_log("[Insteon::TriggerLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $main::Debug{insteon};
+		if ($$self{_ext_set_get_action} eq 'set'){
+			main::print_log("[Insteon::TriggerLinc] Clearing active message") if $main::Debug{insteon};
+			$clear_message = 1;
+			$$self{_ext_set_get_action} = undef;
+			$self->_process_command_stack(%msg);	
+		}
+	}
+	elsif ($msg{command} eq "extended_set_get" && $msg{is_extended}) {
+		if (substr($msg{extra},0,6) eq "000001") {
+			$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
+			#D3 = Awake Time;
+			my $awake = (hex(substr($msg{extra}, 6, 2)));
+			main::print_log("[Insteon::TriggerLinc] The awake seconds ".
+				"for device ". $self->get_object_name . " is set to: ".
+				$awake);
+			$clear_message = 1;
+			$self->_process_command_stack(%msg);
+		} else {
+			main::print_log("[Insteon::TriggerLinc] WARN: Corrupt Extended "
+				."Set/Get Data Received for ". $self->get_object_name) if $main::Debug{insteon};
+		}
+	}
+	else {
+		$clear_message = $self->SUPER::_process_message($p_setby,%msg);
+	}
+	return $clear_message;
+}
+
+sub is_responder
+{
+   return 0;
+}
+
+=back
+
+=head2 INI PARAMETERS
+
+None.
+
+=head2 AUTHOR
+
+Kevin Robert Keegan
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+1;
diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index 8e28ae6c0..2cf4ab553 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -140,6 +140,12 @@ sub read_table_A {
         $other = join ', ', (map {"'$_'"} @other); # Quote data
         $object = "Insteon::MotionSensor(\'$address\', $other)";
     }
+    elsif($type eq "INSTEON_TRIGGERLINC") {
+        require Insteon::Security;
+        ($address, $name, $grouplist, @other) = @item_info;
+        $other = join ', ', (map {"'$_'"} @other); # Quote data
+        $object = "Insteon::TriggerLinc(\'$address\', $other)";
+    }
     elsif($type eq "INSTEON_IOLINC") {
         require Insteon::IOLinc;
         ($address, $name, $grouplist, @other) = @item_info;

From 9bc0a24fc489bb243f75df9d865ff2bf8f29bb98 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Thu, 10 Oct 2013 18:26:52 -0400
Subject: [PATCH 186/330] Fix web_hook parameter passing, commonly used in
 Audrey speech.

---
 code/common/speech_clash.pl | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/code/common/speech_clash.pl b/code/common/speech_clash.pl
index 032d089bd..dfa66cf7f 100644
--- a/code/common/speech_clash.pl
+++ b/code/common/speech_clash.pl
@@ -38,41 +38,46 @@
 sub speak_clash_stub {
    my ($ref) = @_;
    &print_log("Clash control stub called!") if $main::Debug{voice};
-   if (1 == &Voice_Text::is_speaking() && $$ref{to_file} eq '') {
+   if (1 == &Voice_Text::is_speaking() && $ref->{to_file} eq '') {
       if ($main::Debug{voice}) {
-         $$ref{clash_retry}=0 unless $$ref{clash_retry};
-         $$ref{clash_retry}++; #To track how many loops are made
-	 &print_log("SPEAK CLASH($$ref{clash_retry}): Delaying speech call for " . $$ref{text} . "\n");
+         $ref->{clash_retry}=0 unless $ref->{clash_retry};
+         $ref->{clash_retry}++; #To track how many loops are made
+	 &print_log("SPEECH_CLASH($ref->{clash_retry}): Delaying speech call for " . $ref->{text} . "\n");
       }
-      $$ref{nolog}=1;       #To stop MH from logging the speech again
+      $ref->{nolog}=1;       #To stop MH from logging the speech again
+      delete($ref->{web_hook});
+      delete($ref->{audreySpeakRooms});
 
 #Method One:
       my $parmstxt;
       my ($pkey,$pval);
+      
       while (($pkey,$pval) = each(%{$ref})) {
          $parmstxt.=', ' if $parmstxt;
 			# WLA: quote the text, otherwise if the spoken text contains a ' character we
 			# get an error message
          $parmstxt .= "$pkey => q($pval)";
       }
-      &print_log("CLASH Parameters: $parmstxt") if $main::Debug{voice};
-      &run_after_delay($sc_delay, "speak($parmstxt)");
+      &print_log("SPEECH_CLASH Parameters: $parmstxt") if $main::Debug{voice};
+      &run_after_delay($sc_delay, "speak(".$parmstxt.")");
 
 #Method Two - Doesn't work :(
 #      run_after_delay $sc_delay, sub {&speak(%{$ref})}; #Doesn't work :(
 
-      $$ref{no_speak}=1;    #To stop MH from speaking this time around
+      $ref->{no_speak}=1;    #To stop MH from speaking this time around
       return;
    }
 
-   if ($$ref{clash_retry}) {
-      &print_log("SPEAK CLASH: Resolved, continuing speech.");# if $main::Debug{voice};
+   if ($ref->{clash_retry}) {
+      &print_log("SPEECH_CLASH: Resolved, continuing speech.");# if $main::Debug{voice};
       $is_speaking=0;
       $is_speaking_flag=0;
    }
 }
-
-&Speak_parms_add_hook(\&speak_clash_stub) if $Reload;
+if ($Reload) {
+    print_log("SPEECH_CLASH: Hooking into speech events");
+    &Speak_parms_add_hook(\&speak_clash_stub);
+}
 
 =begin comment
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@

From 0236d3e34285859e6ff8cf3f55ddcf78124fd34f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 10 Oct 2013 17:27:00 -0700
Subject: [PATCH 187/330] Insteon_ApplianceLink: Add DeviceController to Allow
 for Sync_Links

Closes #271
---
 lib/Insteon/Lighting.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index fd33381f1..561a7cdc8 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -431,6 +431,7 @@ Provides support for the Insteon ApplianceLinc.
 =head2 INHERITS
 
 L<Insteon::BaseLight|Insteon::Lighting/Insteon::BaseLight>
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
 
 =head2 METHODS
 
@@ -443,7 +444,7 @@ package Insteon::ApplianceLinc;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::ApplianceLinc::ISA = ('Insteon::BaseLight');
+@Insteon::ApplianceLinc::ISA = ('Insteon::BaseLight','Insteon::DeviceController');
 
 =item C<new()>
 

From c0c7abf43fdef57742f43d3a56433c42d9a7f77e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 10 Oct 2013 17:27:00 -0700
Subject: [PATCH 188/330] Insteon_Scene_Builder: Make Sure a Controller Exists
 Before Creating a Scene

If no contoller existed, prior code would throw a recoverable error.

This addition prevents the error and provides a readable error message in the print_log
---
 lib/read_table_A.pl | 64 +++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index 8e28ae6c0..872305324 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -1071,42 +1071,44 @@ sub read_table_finish_A {
     foreach my $scene (sort keys %scene_build_responders) {
         $code .= "\n#SCENE_BUILD Definition for scene: $scene\n";
 
-        #Doesn't work because object technically doesn't exist yet. Is it even 
-        #necessary to limit to ICONTROLLER's?
-        #my $object = &get_object_by_name($scene);
-        #if(defined($object) and $object->isa("Insteon::InterfaceController")) {
-
         if($objects{$scene}) {
-            #Since an INSTEON_ICONTROLLER exists with the same name as the scene, 
-            #make it a controller of the scene, too.
+            #Since an object exists with the same name as the scene, 
+            #make it a controller of the scene, too. Hopefully it can be a controller
             $scene_build_controllers{$scene}{$scene}="1";
         }
 
         #Loop through the controller hash
-        foreach my $scene_controller (keys $scene_build_controllers{$scene}) {
-            if ($objects{$scene_controller}) {
-            	#Make a link to each responder in the responder hash
-                while (my ($scene_responder, $responder_data) = each($scene_build_responders{$scene})) {
-                    my ($on_level, $ramp_rate) = split(',', $responder_data);
-
-                    if (($objects{$scene_responder}) and ($scene_responder ne $scene_controller)) {
-                        if ($on_level) {
-                            if ($ramp_rate) {
-                                $code .= sprintf "\$%-35s -> add(\$%s,'%s','%s');\n",
-                                    $scene_controller, $scene_responder, $on_level, $ramp_rate;
-                            } else {
-                                $code .= sprintf "\$%-35s -> add(\$%s,'%s');\n", 
-                                    $scene_controller, $scene_responder, $on_level;
-                            }
-                        } else {
-                            $code .= sprintf "\$%-35s -> add(\$%s);\n", $scene_controller, $scene_responder;
-                        }
-                    }
-                }
-
-            } else {
-                print "\nThere is no object called $scene_controller defined.  Ignoring SCENE_BUILD entry.\n";
-            }
+        if (exists $scene_build_controllers{$scene}){
+	        foreach my $scene_controller (keys $scene_build_controllers{$scene}) {
+	            if ($objects{$scene_controller}) {
+	            	#Make a link to each responder in the responder hash
+	                while (my ($scene_responder, $responder_data) = each($scene_build_responders{$scene})) {
+	                    my ($on_level, $ramp_rate) = split(',', $responder_data);
+	
+	                    if (($objects{$scene_responder}) and ($scene_responder ne $scene_controller)) {
+	                        if ($on_level) {
+	                            if ($ramp_rate) {
+	                                $code .= sprintf "\$%-35s -> add(\$%s,'%s','%s');\n",
+	                                    $scene_controller, $scene_responder, $on_level, $ramp_rate;
+	                            } else {
+	                                $code .= sprintf "\$%-35s -> add(\$%s,'%s');\n", 
+	                                    $scene_controller, $scene_responder, $on_level;
+	                            }
+	                        } else {
+	                            $code .= sprintf "\$%-35s -> add(\$%s);\n", $scene_controller, $scene_responder;
+	                        }
+	                    }
+	                }
+	
+	            } else {
+	                ::print_log("[Read_Table_A] ERROR: There is no object ".
+	                	"called $scene_controller defined.  Ignoring SCENE_BUILD entry.");
+	            }
+	        }
+        } 
+        else {
+        	::print_log("[Read_Table_A] ERROR: There is no controller ".
+	                "defined for $scene.  Ignoring SCENE_BUILD entry.");
         }
     }
     return $code;

From b0c32815c78faa3ada3172b5c191736948ce5584 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Thu, 10 Oct 2013 21:19:16 -0400
Subject: [PATCH 189/330] Add audrey documentation, clean up code, adjust debug
 clauses on several lines

---
 code/common/pa_control.pl | 83 ++++++++++++++++++++++++++++++++-------
 lib/PAobj.pm              | 43 ++++++++++++++------
 2 files changed, 98 insertions(+), 28 deletions(-)

diff --git a/code/common/pa_control.pl b/code/common/pa_control.pl
index da32500e7..b12884b8d 100644
--- a/code/common/pa_control.pl
+++ b/code/common/pa_control.pl
@@ -48,11 +48,13 @@
 $pactrl->init() if $Startup or $Reload;
 
 # Hooks to flag which rooms to turn on based on "rooms=" parm in speak command
-&Speak_parms_add_hook(\&pa_parms_stub) if $Reload;
-&Speak_pre_add_hook(\&pa_control_stub) if $Reload;
-&Play_parms_add_hook(\&pa_parms_stub)  if $Reload;
-&Play_pre_add_hook(\&pa_control_stub)  if $Reload;
-
+if ($Reload) {
+    print_log("PA: Hooking into speech events");
+    &Speak_parms_add_hook(\&pa_parms_stub);
+    &Speak_pre_add_hook(\&pa_control_stub);
+    &Play_parms_add_hook(\&pa_parms_stub);
+    &Play_pre_add_hook(\&pa_control_stub);
+}
 if (said $v_pa_test) {
     my $state = $v_pa_test->{state};
     $v_pa_test->respond('app=pa Testing PA...');
@@ -65,7 +67,7 @@
     my $state = $v_pa_speakers->{state};
     $v_pa_speakers->respond("app=pa Turning speakers $state...");
     $state = ($state eq 'on') ? ON : OFF;
-    print "PA: Turning speakers $state\n" if $Debug{pa};
+    print_log("PA: Turning speakers $state") if $Debug{pa};
     $pactrl->set('allspeakers',$state,'unmuted');
 }
 
@@ -85,7 +87,7 @@ sub pa_parms_stub {
     my %pa_zones = $pactrl->get_pa_zones();
     push(@{$parms->{web_hook}},\&pa_web_hook) if $pa_zones{audrey} ne '';
 
-    print "PA: parms_stub set results: $results\n" if $Debug{pa} >=2;
+    print_log("PA: parms_stub set results: $results") if $Debug{pa} >=2;
     
 }
 
@@ -103,9 +105,9 @@ sub pa_control_stub {
     return if $mode eq 'mute' or $mode eq 'offline';
 
     my $rooms = $parms{rooms};
-    print "PA: control_stub: rooms=$rooms, mode=$mode\n" if $Debug{pa};
+    print_log("PA: control_stub: rooms=$rooms, mode=$mode") if $Debug{pa};
     my $results = $pactrl->audio_hook(ON,%parms);
-    print "PA: control_stub set results: $results\n" if $Debug{pa} >=2;
+    print_log("PA: control_stub set results: $results") if $Debug{pa} >=2;
     set $pa_speaker_timer $pa_timer if $results;
     return $results;
 }
@@ -119,7 +121,7 @@ sub pa_web_hook {
           #Turn off speakers when MH says it's done speaking/playing
 if (state_now $mh_speakers eq OFF) {
     unset $pa_speaker_timer;
-    print "PA: Turning speakers off\n" if $Debug{pa};
+    print_log("PA: Turning speakers off") if $Debug{pa};
     $pactrl->audio_hook(OFF,'normal');
 }
 
@@ -127,7 +129,7 @@ sub pa_web_hook {
 $pa_speaker_timer = new Timer;
 set $pa_speaker_timer 60 if state_now $mh_speakers eq ON;
 if (expired $pa_speaker_timer) {
-    print "PA: Timer expired. Forcing PA speakers off.\n" if $Debug{pa};
+    print_log("PA: Timer expired. Forcing PA speakers off.") if $Debug{pa};
     set $mh_speakers OFF;
 }
 
@@ -137,7 +139,7 @@ sub pa_web_hook {
 Example pa.mht file:
 
 #
-#Type Address	Name			Groups               		Serial   Other
+#Type Address	Name			Groups               		Serial   Type
 #
 PA,	AA,		kitchen,		all|default|mainfloor,		weeder, wdio
 PA,	AB,		server,		all|basement,			weeder, wdio
@@ -146,16 +148,17 @@ sub pa_web_hook {
 PA,	objname,	living,		all|mainfloor,				, object
 PA,	192.168.0.1,family,		all|mainfloor,				, xap
 PA,	192.168.0.2,dining,		all|mainfloor,				, xpl
+PA,	192.168.0.3,table,		all|mainfloor,				, audrey
 
 
 Type:        "PA", constant. This must be there.
 
 Address:     Address or Object name.
-             If Other is "object", then this should be an object name that can accept an ON or OFF
+             If Type is "object", then this should be an object name that can accept an ON or OFF
              For Weeder, 2 characters. First character is the weeder address, the second is the pin
                if the command to turn on the pin you want is: BHC, then the Address is: BC
              For X10, the X10 address of the (likely) relay device.
-             For xAP and xPL, use the IP address or hostname of the target device.
+             For xAP, xPL and audrey, use the IP address or hostname of the target device.
              For "object", use the name of the object (without the $). You may use anything that
                responds ON and OFF set commands. Tested with and Insteon device.
 
@@ -174,7 +177,57 @@ sub pa_web_hook {
              The default is "weeder". Note that this can be changed with an INI parm.
 
 Other:       Optional. Sets the type of PA control. Defaults to 'wdio'. Available options are:
-             wdio,wdio_old,X10,xpl,xap,object
+             wdio,wdio_old,X10,xpl,xap,audrey,object
 
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+=begin Audrey Config
+
+Exerpt from audreyspeak.pl
+
+You must make certain modifications to your Audrey, as follows:
+
+- Update the software and obtain root shell access capabilities (this
+  should be available by using Bruce's CF card image or by following
+  instructions available on the internet.)
+
+- Open the Audrey's web server to outside http requests
+  1) Start the "Root Shell"
+  2) type: cd /config
+  3) type: cp rm-apps rm-apps.copy
+  4) type: vi rm-apps
+     You'll be in the editor, editing the "rm-apps" file
+     About the 14th line down is "rb,/kojak/kojak-slinger, -c -e -s -i 127.1"
+     You need to delete the "-i 127.1" from the line.
+     To do this, place the cursor under the space right after the "-s"
+     Type the "x" key to start deleting from the line.
+     The line should end up looking like this:
+     "rb,/kojak/kojak-slinger, -c -e -s"
+     If you need to start over type a colon to get to the vi command line
+     At the colon prompt type "q!" and hit "enter" (this quits without saving)
+     If it looks good then at the colon prompt type "wq" to save changes
+     Now restart the Audrey by unplugging it, waiting 30 seconds and
+     plugging it back in.
+
+- Install playsound_noph and it's DLL
+  1) Grab the zip file from http://www.planetwebb.com/audrey/
+  2) Place playsound_noph    on the Audrey in /nto/photon/bin/
+  3) Place soundfile_noph.so on the Audrey in /nto/photon/dll/
+
+- Install mhspeak.shtml on the Audrey
+  1) Start the "Root Shell"
+  2) type: cd /data/XML
+  3) type: ftp blah.com mhspeak.shtml
+
+     The MHSPEAK.SHTML file placed on the Audrey should contain the following:
+
+     <html>
+     <head>
+     <title>Shell</title>
+     </head>
+     <body>
+     <!--#config cmdecho="OFF" -->
+     <!--#exec cmd="playsound_noph $QUERY_STRING &" -->
+     </body>
+     </html>
+
 =cut
diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index f75832ffe..b9c3e6e6a 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -68,7 +68,7 @@ sub init {
     for my $room (@speakers) {
         my $ref = &::get_object_by_name("pa_$room");
         my $type = $ref->get_type();
-        &::print_log("PAobj: init: room=$room, zonetype=$type");
+        &::print_log("PAobj: init: room=$room, zonetype=$type") if $main::Debug{pa};
         $pa_zone_types{$type}++ unless $pa_zone_types{$type};
         
         if($type eq 'wdio') {
@@ -91,12 +91,12 @@ sub init {
         }
     }
     
-    &::print_log("PAobj: speakers_wdio: $#speakers_wdio") if $main::Debug{pa} || $#speakers_wdio gt -1;
-    &::print_log("PAobj: speakers_x10: $#speakers_x10") if $main::Debug{pa} || $#speakers_x10 gt -1;
-    &::print_log("PAobj: speakers_xap: $#speakers_xap") if $main::Debug{pa} || $#speakers_xap gt -1;
-    &::print_log("PAobj: speakers_xpl: $#speakers_xpl") if $main::Debug{pa} || $#speakers_xpl gt -1;
-    &::print_log("PAobj: speakers_obj: $#speakers_obj") if $main::Debug{pa} || $#speakers_obj gt -1;
-    &::print_log("PAobj: speakers_audrey: $#speakers_audrey") if $main::Debug{pa} || $#speakers_audrey gt -1;
+    &::print_log("PAobj: speakers_wdio: $#speakers_wdio") if $main::Debug{pa};# || $#speakers_wdio gt -1;
+    &::print_log("PAobj: speakers_x10: $#speakers_x10") if $main::Debug{pa};# || $#speakers_x10 gt -1;
+    &::print_log("PAobj: speakers_xap: $#speakers_xap") if $main::Debug{pa};# || $#speakers_xap gt -1;
+    &::print_log("PAobj: speakers_xpl: $#speakers_xpl") if $main::Debug{pa};# || $#speakers_xpl gt -1;
+    &::print_log("PAobj: speakers_obj: $#speakers_obj") if $main::Debug{pa};# || $#speakers_obj gt -1;
+    &::print_log("PAobj: speakers_audrey: $#speakers_audrey") if $main::Debug{pa};# || $#speakers_audrey gt -1;
 
     if ($#speakers_wdio > -1) {
         $self->init_weeder(@speakers_wdio);
@@ -152,7 +152,7 @@ sub prep_parms
     @speakers = $self->get_speakers('') if $#speakers == -1;
     &::print_log("PAobj: Proposed rooms: ".join(', ', @speakers)) if $main::Debug{pa} >=2;
     @speakers = $self->get_speakers_speakable($parms->{mode},@speakers);
-    &::print_log("PAobj: Will speak in rooms: ".join(', ', @speakers)) if $main::Debug{pa};
+    &::print_log("PAobj: Will speak in rooms: ".join(', ', @speakers));
     
     $parms->{pa_zones} = join(',', @speakers);
     
@@ -241,11 +241,20 @@ sub audio_hook
     $results = $self->set_xpl($state,\@speakers_xpl,\%voiceparms) 	if $#speakers_xpl > -1;
     $results = $self->set_obj($state,@speakers_obj) 			if $#speakers_obj > -1;
     
+    &::print_log("PAobj: set results: $results") if $main::Debug{pa};
     select undef, undef, undef, $$self{pa_delay} if $results;
-    &::print_log("PAobj: set results: $results");
     
     $results=0;
-    if($pa_zones{wdio} ne '') {$results=1;print_log('------> wdio detected, talking...');}
+    if(
+        lc $state eq 'on'
+        && (
+            $pa_zones{wdio} ne ''
+            || $pa_zones{x10} ne ''
+            || $pa_zones{obj} ne ''
+        )
+    ) {
+        $results=1;
+    }
 
     return $results;
 }
@@ -253,7 +262,7 @@ sub audio_hook
 sub web_hook
 {
     my ($self,$parms) = @_;
-    &::print_log("PAobj: web_hook! Audrey: " . $pa_zones{audrey});
+    &::print_log("PAobj: web_hook! Audrey: " . $pa_zones{audrey}) if $main::Debug{pa};
     return unless $pa_zones{audrey} ne '';
     my $results=0;
     my @speakers_audrey=split(',', $pa_zones{audrey});
@@ -267,10 +276,12 @@ sub set_obj
 {
     my ($self,$state,@speakers) = @_;
     for my $room (@speakers) {
-        &::print_log("PAobj: set_obj: " . $room . " / " . $state) if $main::Debug{pa} >=2;
         my $ref = &::get_object_by_name("pa_$room");
         if ($ref) {
+            &::print_log("PAobj: set_obj: " . $room . " / " . $state) if $main::Debug{pa} >=2;
             $ref->set($state);
+        } else {
+            &::print_log("PAobj: Unable to locate object for: pa_$room");
         }
     }
 }
@@ -287,6 +298,8 @@ sub set_audrey
         if ($refobj) {
             &::print_log("PAobj: set_audrey: " . $room . " / " . $speakFile) if $main::Debug{pa} >=2;
             $refobj->play($speakFile);
+        } else {
+            &::print_log("PAobj: Unable to locate object for: pa_$room");
         }
     }
 }
@@ -304,6 +317,8 @@ sub set_x10
             my ($id) = $ref->get_address();
             &::print_log("PAobj: set_x10 ID: $id, State: $state, Room: $room") if $main::Debug{pa} >=2;
             $refobj->set($state);
+        } else {
+            &::print_log("PAobj: Unable to locate object for: pa_$room");
         }
     }
 }
@@ -363,6 +378,8 @@ sub set_weeder
             $weeder_ref{$card}='' unless $weeder_ref{$card};
             $weeder_ref{$card} .= $id;
             &::print_log("PAobj: card: $card, id: $id, Room: $room") if $main::Debug{pa} >=2;
+        } else {
+            &::print_log("PAobj: Unable to locate object for: pa_$room");
         }
     }
 
@@ -510,7 +527,7 @@ sub get_speakers_speakable
 sub get_pa_zones
 {
     my ($self) = @_;
-    &::print_log("PAobj: get_pa_zones");# if $main::Debug{pa} >=3;
+    &::print_log("PAobj: get_pa_zones") if $main::Debug{pa} >=3;
     return %pa_zones;
 }
 

From 0a7b4f621b48d65e11cdc1751a976bdea528ae02 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 10 Oct 2013 18:25:37 -0700
Subject: [PATCH 190/330] Insteon_i2CS_Linking: Clear Awaiting Ack Flag on
 All-Link-Complete

If flag not cleared, all messages to that device will stall
---
 lib/Insteon_PLM.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index 0dc156830..ff2af022e 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -751,6 +751,8 @@ sub _parse_data {
 					::print_log("[Insteon::Insteon_PLM] problem w/ success callback: $@") if $@;
 				package Insteon::BaseObject;
 			}
+			#Clear awaiting_ack flag
+			$self->active_message->setby->_process_command_stack(0);
                         $self->clear_active_message();
 		}
                 elsif ($parsed_prefix eq $prefix{all_link_clean_failed} and ($message_length == 12))

From f6b096250c4988f784f8df5a7bdbc3ecceaa96c7 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Thu, 10 Oct 2013 21:32:21 -0400
Subject: [PATCH 191/330] Add comments to audreyspeak.pl, pointing people to
 pa_control.pl.

---
 code/common/audreyspeak.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/common/audreyspeak.pl b/code/common/audreyspeak.pl
index f35145bb3..d7471c29a 100644
--- a/code/common/audreyspeak.pl
+++ b/code/common/audreyspeak.pl
@@ -13,6 +13,13 @@
 
  1.0 Original version by Tim Doyle <tim@greenscourt.com> - 9/10/2002
 
+*********************************************************************
+*This script is now deprecated, as support for Audrey has been added
+*to the PAobj object. Enable pa_control.pl and follow examples to
+*add audrey zones to your pa.mht file. Example:
+*PA,	192.168.0.1,family,	all|mainfloor,		, audrey
+*********************************************************************
+
 This script allows MisterHouse to capture and send speech and played
 wav files to an Audrey unit. The original version was based upon Keith
 Webb's work outlined in his email of 12/23/01.

From ae81eaa1e4e382df78833ca919244851c0f2bf1e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 10 Oct 2013 18:53:38 -0700
Subject: [PATCH 192/330] Insteon_Thermostat: Add Voice Command for Sync Time

Generate Voice Commands needed to be called after the thermo version is set
---
 lib/Insteon.pm            |  2 +-
 lib/Insteon/Thermostat.pm | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 67c3d5610..9038ff491 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -1193,8 +1193,8 @@ sub _active_interface
       &main::Reload_post_add_hook(\&Insteon::BaseInterface::poll_all, 1);
       $init_complete = 0;
       &main::MainLoop_pre_add_hook(\&Insteon::init, 1);
-      &main::Reload_post_add_hook(\&Insteon::generate_voice_commands, 1);
       &main::Reload_post_add_hook(\&Insteon::check_thermo_versions, 1);
+      &main::Reload_post_add_hook(\&Insteon::generate_voice_commands, 1);
    }
    $$self{active_interface} = $interface if $interface;
    return $$self{active_interface};
diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index 8c9109817..f224d0484 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -1178,6 +1178,30 @@ sub _poll_humid_setpoints{
 	$self->_send_cmd($message);
 }
 
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds},
+        'sync time' => "$object_name->sync_time()"
+    );
+    return \%voice_cmds;
+}
+
 package Insteon::Thermo_mode;
 use strict;
 

From aac169be5eb4b1358bd6194ba78ab8cd71e5fd98 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 10 Oct 2013 19:50:08 -0700
Subject: [PATCH 193/330] Insteon: Enabling Link_To_Interfaces for Child
 Objects in BaseDevice

Enabled group and data3 determination if not specified.

Based off of Insteon_I2CS_Linking Branch so as not to require a manual merge.  Need to merge that branch first.

Closed #274
---
 lib/Insteon/BaseInsteon.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index f465feef7..f7334ea69 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1377,8 +1377,8 @@ the device.
 sub link_to_interface
 {
 	my ($self,$p_group, $p_data3, $step) = @_;
-	my $group = $p_group;
-	$group = '01' unless $group;
+	$p_group = $self->group unless (defined $p_group);
+	$p_data3 = $self->group unless (defined $p_data3);
 	my $success_callback_prefix = $self->get_object_name."->link_to_interface(\"$p_group\",\"$p_data3\",";
 	my $success_callback = "";
 	my $failure_callback = '::print_log("[Insteon::BaseInsteon] Error: The Link_To_Interface '.
@@ -1392,7 +1392,7 @@ sub link_to_interface
 		}
 		case (1) { #Add Link from object->PLM
 			$success_callback = $success_callback_prefix . "\"2\")";
-			my %link_info = ( object => $self->interface, group => $group, is_controller => 1,
+			my %link_info = ( object => $self->interface, group => $p_group, is_controller => 1,
 				callback => "$success_callback", failure_callback=> "$failure_callback");
 			$link_info{data3} = $p_data3 if $p_data3;
 		        if ($self->_aldb) {
@@ -1406,7 +1406,7 @@ sub link_to_interface
 		}
 		case (2){ #Add Link from PLM->object
 			$success_callback = $success_callback_prefix . "\"3\")";
-			my $link_info = "deviceid=" . lc $self->device_id . " group=$group is_controller=0 " .
+			my $link_info = "deviceid=" . lc $self->device_id . " group=$p_group is_controller=0 " .
 				"callback=$success_callback failure_callback=$failure_callback";	
 		        $self->interface->add_link($link_info);
 		}

From e2a0da9b1713cbd6f381a98c02ae2da9ab2b6989 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 10 Oct 2013 19:53:23 -0700
Subject: [PATCH 194/330] Insteon: Remove Unneeded Link_to_Interface Routine in
 DeviceController

No longer needed as all functions are condensed into BaseDevice link_to_interface function.
---
 lib/Insteon/BaseInsteon.pm | 45 --------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index f7334ea69..41bf0d512 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -3376,51 +3376,6 @@ sub request_status
 	}
 }
 
-=item C<link_to_interface([group,data3])>
-
-If a controller link from the device to the interface does not exist, this will
-create that link on the device.
-
-Next, if a responder link from the device to the interface does not exist on the 
-interface, this will create that link on the interface.
-
-The group is the group on the device that is the controller, such as a button on
-a keypad link.  It will default to 01.
-
-Data3 is optional and is used to set the Data3 value in the controller link on 
-the device.
-
-=cut
-
-sub link_to_interface
-{
-	my ($self, $p_group, $p_data3) = @_;
-	my $group = $p_group;
-	$group = $self->group unless $group;
-	# get the surrogate device for this if group is not '01'
-	if ($self->group ne '01') {
-		my $surrogate_obj = &Insteon::get_object($self->device_id,'01');
-		if ($p_data3) {
-			$surrogate_obj->link_to_interface($group,$p_data3);
-		} elsif ($surrogate_obj->isa('Insteon::KeyPadLincRelay') or $surrogate_obj->isa('Insteon::KeyPadLinc')) {
-			$surrogate_obj->link_to_interface($group,$self->group);
-		} else {
-			$surrogate_obj->link_to_interface($group);
-		}
-		# next, if the link is a keypadlinc, then create the reverse link to permit
-		# control over the button's light
-		if ($surrogate_obj->isa('Insteon::KeyPadLincRelay') or $surrogate_obj->isa('Insteon::KeyPadLinc')) {
-
-		}
-	} else {
-		if ($p_data3) {
-			$self->SUPER::link_to_interface($group, $p_data3);
-		} else {
-			$self->SUPER::link_to_interface($group);
-		}
-	}
-}
-
 =item C<unlink_to_interface([group])>
 
 Will delete the contoller link from the device to the interface if such a link exists.

From 7036d311fd4f232e009820ed7cdca4ba45c6ffbb Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Fri, 11 Oct 2013 10:59:13 -0400
Subject: [PATCH 195/330] Roll back $parms->{mode} use, interferred with
 Voice_Text.pm when using cepstral swift for voice

---
 code/common/pa_control.pl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/common/pa_control.pl b/code/common/pa_control.pl
index b12884b8d..c0475412a 100644
--- a/code/common/pa_control.pl
+++ b/code/common/pa_control.pl
@@ -73,14 +73,15 @@
 
 sub pa_parms_stub {
     my ($parms) = @_;
-    unless ($parms->{mode}) {
+    my $mode = $parms->{mode};
+    unless ($mode) {
         if (defined $mode_mh) { # *** Outdated (?)
-            $parms->{mode} = state $mode_mh;
+            $mode = state $mode_mh;
         } else {
-            $parms->{mode} = $Save{mode};
+            $mode = $Save{mode};
         }
     }
-    return if $parms->{mode} eq 'mute' or $parms->{mode} eq 'offline';
+    return if $mode eq 'mute' or $mode eq 'offline';
     
     my $results = $pactrl->prep_parms($parms);
     

From 2b6c6a223e39c0698de594ac82bad52dd020f21e Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Fri, 11 Oct 2013 12:06:17 -0400
Subject: [PATCH 196/330] Fix so web_file is only used when needed. Clean up a
 little standardize on arrow notation for parms.

---
 code/common/pa_control.pl | 21 +++++++++------------
 lib/PAobj.pm              |  2 +-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/code/common/pa_control.pl b/code/common/pa_control.pl
index c0475412a..5f9c87b11 100644
--- a/code/common/pa_control.pl
+++ b/code/common/pa_control.pl
@@ -81,31 +81,28 @@ sub pa_parms_stub {
             $mode = $Save{mode};
         }
     }
+    $parms->{pa_mode} = $mode;
     return if $mode eq 'mute' or $mode eq 'offline';
     
     my $results = $pactrl->prep_parms($parms);
-    
     my %pa_zones = $pactrl->get_pa_zones();
-    push(@{$parms->{web_hook}},\&pa_web_hook) if $pa_zones{audrey} ne '';
+
+    if (defined $pa_zones{audrey} && $pa_zones{audrey} ne '') {
+        print_log("PA: audrey zone detected, hooking via web_hook. (".$pa_zones{audrey}.")") if $Debug{pa};
+        push(@{$parms->{web_hook}},\&pa_web_hook);
+    }
 
     print_log("PA: parms_stub set results: $results") if $Debug{pa} >=2;
     
 }
 
 sub pa_control_stub {
-    my (%parms) = @_;
+    my ($parms) = @_;
     my @pazones;
-    my $mode = $parms{mode};
-#    unless ($mode) {
-#        if (defined $mode_mh) { # *** Outdated (?)
-#            $mode = state $mode_mh;
-#        } else {
-#            $mode = $Save{mode};
-#        }
-#    }
+    my $mode = $parms->{pa_mode};
     return if $mode eq 'mute' or $mode eq 'offline';
 
-    my $rooms = $parms{rooms};
+    my $rooms = $parms->{rooms};
     print_log("PA: control_stub: rooms=$rooms, mode=$mode") if $Debug{pa};
     my $results = $pactrl->audio_hook(ON,%parms);
     print_log("PA: control_stub set results: $results") if $Debug{pa} >=2;
diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index b9c3e6e6a..1e2d00033 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -202,7 +202,7 @@ sub prep_parms
     $pa_zones{obj}=join(',',@speakers_obj);
     $pa_zones{audrey}=join(',',@speakers_audrey);
     
-    $parms->{web_file}="web_file";# if $#speakers_wdio gt -1;
+    $parms->{web_file}="web_file" if $#speakers_audrey gt -1;
     
     if(
         1

From 041f1785cbacd457d57d7775456bd2d4b183e6b7 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 11 Oct 2013 17:27:00 -0700
Subject: [PATCH 197/330] Insteon: Fix BaseDevice Unlink_to_Interface for use
 with Subgroup Objects

Used a similar step method as found in link_to_interface to make the code more readable

Removed DeviceController unlink_to_interface routine as no longer needed
---
 lib/Insteon/BaseInsteon.pm | 102 +++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 54 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 41bf0d512..242de1914 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1477,34 +1477,59 @@ a keypad link.  It will default to 01.
 
 sub unlink_to_interface
 {
-	my ($self,$p_group) = @_;
-	my $group = $p_group;
-	$group = '01' unless $group;
-	my $callback_instance = $self->interface->get_object_name;
-	my $callback_info = "deviceid=" . lc $self->device_id . " group=$group is_controller=0";
-        if ($self->_aldb) {
-	   $self->_aldb->delete_link(object => $self->interface, group => $group, is_controller => 1,
-		callback => "$callback_instance->delete_link('$callback_info')");
-        }
-        else
-        {
-           &main::print_log("[BaseInsteon] This item " . $self->get_object_name .
-              " does not have an ALDB object.  Unlinking is not permitted.");
-        }
+	my ($self,$p_group,$step) = @_;
+	$p_group = $self->group unless $p_group;
+	# get the surrogate device for this if group is not '01'
+	if ($self->group ne '01') {
+		$self = &Insteon::get_object($self->device_id,'01');
+	}
+	#It is possible to nest all of the callbacks in at once, but the quoting
+	#becomes very complicated and happers readability
+	my $success_callback_prefix = $self->get_object_name."->unlink_to_interface('$p_group',";
+	my $success_callback = "";
+	my $failure_callback = "::print_log('[Insteon::BaseInsteon] ERROR: Unlink_To_Interface ".
+		"failed for device: ".$self->get_object_name."')";
+	$step = 0 if ($step eq '');
+	switch ($step){
+		case (0) {
+		        if ($self->_aldb) {
+		        	$success_callback = $success_callback_prefix . "'1')";
+				$self->_aldb->delete_link(object => $self->interface, 
+					group => $p_group, 
+					data3=> $p_group, is_controller => 1,
+					callback => $success_callback,
+					failure_callback=> $failure_callback);
+		        }
+		        else
+		        {
+		           &main::print_log("[BaseInsteon] This item " . $self->get_object_name .
+		              " does not have an ALDB object.  Unlinking is not permitted.");
+		        }
+		}
+		case (1) {
+			$success_callback = $success_callback_prefix . "'2')";
+			$self->interface->delete_link(
+				deviceid => lc $self->device_id, 
+				group=> $p_group, is_controller=>0,
+				callback=>$success_callback,
+				failure_callback=>$failure_callback);
+		}
+		case (2) {
+			::print_log("[Insteon::BaseInsteon] Unlink_To_Interface".
+				" successfully completed for device "
+				. $self->get_object_name);
+		}
+	}
 }
 
 =item C<enter_linking_mode(group, success_callback, failure_callback)>
 
-BETA -- Can be used to create the initial link with i2cs devices.  i1 devices
-will not respond to this command.  In the future, this will be incorporated into a
-one-step process -- BETA
-
-Places the object into linking mode as if you had held down the set button on 
-the device.  To create a link wherein the PLM is the controller, first run the 
-PLM voice command "initiate link as controller". Then run this command.  Finally,
-run the voice command "scan link table" on this device.
+Places an i2 object into linking mode as if you had held down the set button on 
+the device.  i1 objects will not respond to this command.  This is needed to 
+link i2CS devices that will not respond without a manual link. 
 
-The group argument is optional and not needed for group 01.
+This process is included as part of the link_to_interface voice command and 
+should not need to be called seperately.
 
 Returns: nothing
 
@@ -3376,37 +3401,6 @@ sub request_status
 	}
 }
 
-=item C<unlink_to_interface([group])>
-
-Will delete the contoller link from the device to the interface if such a link exists.
-
-Next, will delete the responder link from the device to the interface on the 
-interface, if such a link exists.
-
-The group is the group on the device that is the controller, such as a button on
-a keypad link.  It will default to 01.
-
-=cut
-
-sub unlink_to_interface
-{
-	my ($self,$p_group) = @_;
-	my $group = $p_group;
-	$group = $self->group unless $group;
-	# get the surrogate device for this if group is not '01'
-	if ($self->group ne '01') {
-		my $surrogate_obj = &Insteon::get_object($self->device_id,'01');
-		$surrogate_obj->unlink_to_interface($group);
-		# next, if the link is a keypadlinc, then delete the reverse link to permit
-		# control over the button's light
-		if ($surrogate_obj->isa('Insteon::KeyPadLincRelay') or $surrogate_obj->isa('Insteon::KeyPadLinc')) {
-
-		}
-	} else {
-		$self->SUPER::unlink_to_interface($group);
-	}
-}
-
 =back
 
 =head2 AUTHOR

From 179ef284d38eaabe21bfb0e7a03c32f2b8fb07ba Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 11 Oct 2013 17:37:00 -0700
Subject: [PATCH 198/330] Insteon: Reset ALDB Scan Time on Completed Successful
 Scan Only

Previously we reset when we started a scan

Now we reset when a scan has completed successfully and each time when the device tells us that the ALDB Delta has not changed.

We also reset if serial query_aldb_delta requests are received in less than 2 seconds.  This allows for sequentail aldb actions without slowing down to send a request to the device for its ALDB Delta when it is unlikely that it changed.
---
 lib/Insteon/AllLinkDatabase.pm | 4 ++--
 lib/Insteon/BaseInsteon.pm     | 2 ++
 lib/Insteon_PLM.pm             | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index ea238256c..6ad2f9568 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -152,6 +152,8 @@ sub query_aldb_delta
 		#if we just did a aldb_query less than 2 seconds ago, don't repeat
 		&::print_log("[Insteon::AllLinkDatabase] The link table for "
 			. $self->{device}->get_object_name . " is in sync.");
+		#Further extend Scan Time in case of serial aldb requests
+		$self->scandatetime(&main::get_tickcount);
 		if (defined $self->{_aldb_unchanged_callback}) {
 			package main;
 			my $callback = $self->{_aldb_unchanged_callback};
@@ -288,7 +290,6 @@ sub scan_link_table
 	$$self{_mem_activity} = 'scan';
 	$$self{_success_callback} = ($success_callback) ? $success_callback : undef;
 	$$self{_failure_callback} = ($failure_callback) ? $failure_callback : undef;
-	$self->scandatetime(&main::get_tickcount);
 	$self->health('out-of-sync'); # allow acknowledge to set otherwise
 	if($self->isa('Insteon::ALDB_i1')) {
 		$self->_peek('0FF8',0);
@@ -2715,7 +2716,6 @@ Sends the request for the first alllink entry on the PLM.
 sub get_first_alllink
 {
 	my ($self) = @_;
-        $self->scandatetime(&main::get_tickcount);
         $self->health('out-of-sync'); # set as corrupt and allow acknowledge to set otherwise
 	$$self{device}->queue_message(new Insteon::InsteonMessage('all_link_first_rec', $$self{device}));
 }
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 7e857a6d3..ee7a5e403 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -675,6 +675,8 @@ sub _is_info_request
 			if ($self->_aldb->aldb_delta() eq $msg{cmd_code}){
 				&::print_log("[Insteon::BaseObject] The link table for "
 					. $self->{object_name} . " is in sync.");
+				#Link Table Scan Successful, Record Current Time
+				$self->_aldb->scandatetime(&main::get_tickcount);
 				if (defined $self->_aldb->{_aldb_unchanged_callback}) {
 					$callback = $self->_aldb->{_aldb_unchanged_callback};
 					$self->_aldb->{_aldb_unchanged_callback} = undef;
diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index dd6315f74..27b2b4b70 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -567,6 +567,7 @@ sub _parse_data {
                                                 {
                                                 	$self->_aldb->health("good");
                                                 }
+                                                $self->_aldb->scandatetime(&main::get_tickcount);
 						&::print_log("[Insteon_PLM] " . $self->get_object_name 
 							. " completed link memory scan: status: " . $self->_aldb->health())
 							if $main::Debug{insteon};

From 0746d3a4c1c912364a1352cc4a18ad0fef4f0d19 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 11 Oct 2013 17:37:00 -0700
Subject: [PATCH 199/330] Insteon: Link_to_Interface will add Surrogate Links
 if they Exist

Surrogate links allow the KPL light buttons to be directly controlled from MH.  In the future other similar surrogates may exist.

The Link_to_Interface routine now syncs these links if a surrogate is defined.

Also cut out the duplicate logic in Link_to_Interface_i2CS and instead sent the callbacks to Link_to_Interface since the functions are the same after the initial link.
---
 lib/Insteon/BaseInsteon.pm | 49 +++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 242de1914..d9fe111c4 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1410,7 +1410,32 @@ sub link_to_interface
 				"callback=$success_callback failure_callback=$failure_callback";	
 		        $self->interface->add_link($link_info);
 		}
-		case (3){
+		case (3){ #Add surrogate link on device if surrogate exists
+			if (ref $$self{surrogate}){
+				$success_callback = $success_callback_prefix . "\"4\")";
+				my $surrogate_group = $$self{surrogate}->group;
+				my %link_info = ( object => $self->interface, 
+					group => $surrogate_group, is_controller => 0,
+					callback => "$success_callback", 
+					failure_callback=> "$failure_callback",
+					data3 => $p_group);
+				$self->_aldb->add_link(%link_info);
+			} else {
+				::print_log('[Insteon::BaseInsteon] Link_To_Interface successfully completed'.
+					' for device ' .$self->get_object_name);	
+			}
+		}
+		case (4){ #Add surrogate link on PLM if surrogate exists
+			$success_callback = $success_callback_prefix . "\"5\")";
+			my $surrogate_group = $$self{surrogate}->group;
+			my %link_info = ( deviceid=> lc $self->device_id, 
+				group => $surrogate_group, is_controller => 1,
+				callback => "$success_callback", 
+				failure_callback=> "$failure_callback",
+				data3 => $surrogate_group);
+			$self->interface->add_link(%link_info);
+		}
+		case (5){
 			::print_log('[Insteon::BaseInsteon] Link_To_Interface successfully completed'.
 				' for device ' .$self->get_object_name);			
 		}
@@ -1445,21 +1470,11 @@ sub link_to_interface_i2cs
 			$self->enter_linking_mode($p_group, $success_callback, $failure_callback);	
 		}
 		case (2) { #Scan device to get an accurate link table
-			$success_callback = $success_callback_prefix . "'3')";
+			#return to normal link_to_interface routine if successful
+			$success_callback_prefix = $self->get_object_name."->link_to_interface('$p_group','$p_data3',";
+			$success_callback = $success_callback_prefix . "'2')";
 			$self->scan_link_table($success_callback, $failure_callback);
 		}
-		case (3) { #Add link from device->PLM
-			$success_callback = $success_callback_prefix . "'4')";
-			my $group = $p_group;
-			$group = '01' unless $group;
-			my $link_info = "deviceid=" . lc $self->device_id . " group=$group is_controller=0 ".
-				"callback=$success_callback failure_callback=$failure_callback";
-			$self->interface->add_link("$link_info");
-		}
-		case (4) {
-			::print_log('[Insteon::BaseInsteon] Link_To_Interface_I2CS successfully completed'.
-				' for device ' .$self->get_object_name);
-		}
 	}
 }
 
@@ -1479,7 +1494,7 @@ sub unlink_to_interface
 {
 	my ($self,$p_group,$step) = @_;
 	$p_group = $self->group unless $p_group;
-	# get the surrogate device for this if group is not '01'
+	# get the root device for this if group is not '01'
 	if ($self->group ne '01') {
 		$self = &Insteon::get_object($self->device_id,'01');
 	}
@@ -1491,7 +1506,7 @@ sub unlink_to_interface
 		"failed for device: ".$self->get_object_name."')";
 	$step = 0 if ($step eq '');
 	switch ($step){
-		case (0) {
+		case (0) { #Delete link on the device
 		        if ($self->_aldb) {
 		        	$success_callback = $success_callback_prefix . "'1')";
 				$self->_aldb->delete_link(object => $self->interface, 
@@ -1506,7 +1521,7 @@ sub unlink_to_interface
 		              " does not have an ALDB object.  Unlinking is not permitted.");
 		        }
 		}
-		case (1) {
+		case (1) { #Delete link on the PLM
 			$success_callback = $success_callback_prefix . "'2')";
 			$self->interface->delete_link(
 				deviceid => lc $self->device_id, 

From 52b065349cf092b610a51e45bdeb108b60c4fb51 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 11 Oct 2013 17:47:00 -0700
Subject: [PATCH 200/330] Insteon: Add Delete All-Link Record Descriptor

Minor addition.
---
 lib/Insteon/MessageDecoder.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/MessageDecoder.pm b/lib/Insteon/MessageDecoder.pm
index a324ec269..a456dbc25 100644
--- a/lib/Insteon/MessageDecoder.pm
+++ b/lib/Insteon/MessageDecoder.pm
@@ -660,7 +660,8 @@ sub plm_decode {
 						      '01'=>'Find Next All-Link Record',
 						      '20'=>'Update/Add All-Link Record',
 						      '40'=>'Update/Add Controller All-Link Record',
-						      '41'=>'Update/Add Responder All-Link Record');
+						      '41'=>'Update/Add Responder All-Link Record',
+						      '80'=>'Delete All-Link Record');
 				$plm_message .= sprintf("%20s: (",'Control code').substr($plm_string,4,2).") ".$control_string{substr($plm_string,4,2)}."\n";
 				$plm_message .= sprintf("%20s: ",'All-Link Flags').substr($plm_string,6,2)."\n";
 				my $flags = hex(substr($plm_string,6,2));

From 48d154c86229ec8247edfe91f59a0f70d8bae597 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 11 Oct 2013 17:47:00 -0700
Subject: [PATCH 201/330] Insteon: Delete Surrogate Links in
 Unlink_to_Interface

The companion function to the recently added feature in Link_to_Interface

Removed root finding code, as _aldb always returns the root object
---
 lib/Insteon/BaseInsteon.pm | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index d9fe111c4..4fd3f8eb7 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1494,10 +1494,6 @@ sub unlink_to_interface
 {
 	my ($self,$p_group,$step) = @_;
 	$p_group = $self->group unless $p_group;
-	# get the root device for this if group is not '01'
-	if ($self->group ne '01') {
-		$self = &Insteon::get_object($self->device_id,'01');
-	}
 	#It is possible to nest all of the callbacks in at once, but the quoting
 	#becomes very complicated and happers readability
 	my $success_callback_prefix = $self->get_object_name."->unlink_to_interface('$p_group',";
@@ -1529,7 +1525,33 @@ sub unlink_to_interface
 				callback=>$success_callback,
 				failure_callback=>$failure_callback);
 		}
-		case (2) {
+		case (2){ #Delete surrogate link on device if surrogate exists
+			if (ref $$self{surrogate}){
+				$success_callback = $success_callback_prefix . "'3')";
+				my $surrogate_group = $$self{surrogate}->group;
+				my %link_info = ( object => $self->interface, 
+					group => $surrogate_group, is_controller => 0,
+					callback => "$success_callback", 
+					failure_callback=> "$failure_callback",
+					data3 => $p_group);
+				$self->_aldb->delete_link(%link_info);
+			} else {
+				::print_log("[Insteon::BaseInsteon] Unlink_To_Interface".
+					" successfully completed for device "
+					. $self->get_object_name);	
+			}
+		}
+		case (3){ #Delete surrogate link on PLM if surrogate exists
+			$success_callback = $success_callback_prefix . "'4')";
+			my $surrogate_group = $$self{surrogate}->group;
+			my %link_info = ( deviceid=> lc $self->device_id, 
+				group => $surrogate_group, is_controller => 1,
+				callback => "$success_callback", 
+				failure_callback=> "$failure_callback",
+				data3 => $surrogate_group);
+			$self->interface->delete_link(%link_info);
+		}
+		case (4) {
 			::print_log("[Insteon::BaseInsteon] Unlink_To_Interface".
 				" successfully completed for device "
 				. $self->get_object_name);

From de01e76f324e94e9b4c072b72a277b522bbcfb8b Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 11 Oct 2013 17:57:00 -0700
Subject: [PATCH 202/330] Insteon_RemoteLinc: Remove Arcane Reference to
 is_battery_low

Routine was removed in favor of child battery object
---
 lib/Insteon/Controller.pm | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index 20b081bcb..f18a4bda0 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -264,15 +264,6 @@ sub _process_message {
 			{
 				$$root{battery_object}->set_receive($voltage, $root);
 			}
-			if ($self->_is_battery_low($voltage)){
-				main::print_log("[Insteon::RemoteLinc] The battery level ".
-					"is below the set threshold running low battery event.");
-				package main;
-					eval $$root{low_battery_event};
-					::print_log("[Insteon::RemoteLinc] " . $self->{device}->get_object_name . ": error during low battery event eval $@")
-						if $@;
-				package Insteon::RemoteLinc;
-			}
 			$clear_message = 1;
 			$self->_process_command_stack(%msg);
 		} else {

From a50529e8ebb00775412df9df2107f2ef5e15f343 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 11 Oct 2013 18:23:12 -0700
Subject: [PATCH 203/330] Insteon_RemoteLinc: Fix for Setting Linked Devices

Needed to set DeviceController as the primary, this underscores the need to get rid of that package.
---
 lib/Insteon/Controller.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index f18a4bda0..871ed28b6 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -54,7 +54,7 @@ package Insteon::RemoteLinc;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::RemoteLinc::ISA = ('Insteon::BaseDevice','Insteon::DeviceController');
+@Insteon::RemoteLinc::ISA = ('Insteon::DeviceController','Insteon::BaseDevice');
 
 my %message_types = (
 	%Insteon::BaseDevice::message_types,

From 8e1602cb15c66fc6cfb3486e773dd8f58ec7c8a6 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 11 Oct 2013 18:48:41 -0700
Subject: [PATCH 204/330] Insteon: Add Is Deaf Routine for Battery Devices

Closed #279
---
 lib/Insteon/AllLinkDatabase.pm |  8 ++++----
 lib/Insteon/BaseInsteon.pm     | 18 ++++++++++++++++++
 lib/Insteon/Controller.pm      |  1 +
 lib/Insteon/Security.pm        |  2 ++
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index aa47c807b..8d2ff2926 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -421,7 +421,7 @@ sub delete_orphan_links
         # first, make sure that the health of ALDB is ok
         if ($self->health ne 'good')
         {
-        	if ($$self{device}->isa('Insteon::RemoteLinc') or $$self{device}->isa('Insteon::MotionSensor'))
+        	if (!$self->is_deaf)
                 {
         		&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: ignoring link from deaf device: $selfname");
 
@@ -588,7 +588,7 @@ sub delete_orphan_links
 			}
                         else # is a non-PLM device
                         {
-                        	if ($linked_device->isa('Insteon::RemoteLinc') or $linked_device->isa('Insteon::MotionSensor'))
+                        	if (!$self->is_deaf)
                                 {
                                 	&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: ignoring link from $selfname to 'deaf' device: " . $linked_device->get_object_name);
                                 }
@@ -754,7 +754,7 @@ sub delete_orphan_links
                                                         	{
 									$member = $member->get_root;
 								}
-                        					if ($member->isa('Insteon::RemoteLinc') or $member->isa('Insteon::MotionSensor'))
+                        					if (!$self->is_deaf)
                                                         	{
                                                                		&::print_log("[Insteon::AllLinkDatabase] ignoring link from " . $link->get_object_name . " to " .
                                                                		$member->get_object_name);
@@ -2830,7 +2830,7 @@ sub delete_orphan_links
 						}
 						if ($member->isa('Insteon::BaseDevice'))
                                                 {
-                                                	if ($member->isa('Insteon::RemoteLinc') or $member->isa('Insteon::MotionSensor'))
+                                                	if (!$self->is_deaf)
                                                         {
                                                                &::print_log("[Insteon::ALDB_PLM] ignoring link from PLM to " .
                                                                		$member->get_object_name);
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 43717c4ca..9c6250448 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1260,6 +1260,7 @@ sub new
     $$self{hops_left_count} = 0;
     $$self{max_hops_count} = 0;
     $$self{outgoing_hop_count} = 0;
+	$$self{is_deaf} = 0;
 
 	return $self;
 }
@@ -1308,6 +1309,23 @@ sub set_receive
 	$self->SUPER::set_receive($p_state, $p_setby, $p_response);
 }
 
+=item C<is_deaf()>
+
+Returns true if the device must be awake in order to respond to messages.  Most
+devices are not deaf, currently devices that are deaf are battery operated
+devices such as the Motion Sensor, RemoteLinc and TriggerLinc.
+
+At the BaseObject level all devices are defined as deaf.  Objects which inherit
+BaseObject should redefine is_deaf as necessary.
+
+=cut
+
+sub is_deaf
+{
+	my ($self) = @_;
+	return $$self{is_deaf};
+}
+
 =item C<is_controller()>
 
 Returns true if the device is a controller.
diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index 871ed28b6..1d2e18299 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -79,6 +79,7 @@ sub new
 		$$self{queue_timer} = new Timer;
 	}
 	bless $self,$class;
+	$$self{is_deaf} = 1;
 	return $self;
 }
 
diff --git a/lib/Insteon/Security.pm b/lib/Insteon/Security.pm
index fe97e4014..65f4d3484 100644
--- a/lib/Insteon/Security.pm
+++ b/lib/Insteon/Security.pm
@@ -126,6 +126,7 @@ sub new
 		$$self{queue_timer} = new Timer;
 	}
 	bless $self,$class;
+	$$self{is_deaf} = 1;
 	return $self;
 }
 
@@ -775,6 +776,7 @@ sub new
 	my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
         $$self{message_types} = \%message_types;
 	bless $self,$class;
+	$$self{is_deaf} = 1;
 	return $self;
 }
 

From 4b7e268950740e16453f0712ca8d31cc1f3bc182 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 11 Oct 2013 18:55:35 -0700
Subject: [PATCH 205/330] Insteon: Add is_deaf Check to Sync Links, Fix Dumb
 Typo

Fix Delete Orphans Logic, had that backwards.
---
 lib/Insteon.pm                 | 7 +++----
 lib/Insteon/AllLinkDatabase.pm | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index fa01d60d6..0a5afe9a1 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -400,9 +400,8 @@ sub scan_all_linktables
         	{
         		my $candidate_object = $_;
         		if ($candidate_object->is_root and
-                		!($candidate_object->isa('Insteon::RemoteLinc')
-                		or $candidate_object->isa('Insteon::InterfaceController')
-                       		or $candidate_object->isa('Insteon::MotionSensor')))
+                		!($self->is_deaf
+                		or $candidate_object->isa('Insteon::InterfaceController')))
                 	{
 		       		push @_scan_devices, $candidate_object;
                 		&main::print_log("[Scan all linktables] INFO1: "
@@ -511,7 +510,7 @@ sub sync_all_links
 	# iterate over all registered objects and compare whether the link tables match defined scene linkages in known Insteon_Links
 	for my $obj (&Insteon::find_members('Insteon::BaseController'))
 	{
-        	if ($obj->isa('Insteon::RemoteLinc') or $obj->isa('Insteon::MotionSensor'))
+        	if ($self->is_deaf)
                 {
                 	&main::print_log("[Sync all links] Ignoring links from 'deaf' device: " . $obj->get_object_name);
                 }
diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 8d2ff2926..9d35b4005 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -421,7 +421,7 @@ sub delete_orphan_links
         # first, make sure that the health of ALDB is ok
         if ($self->health ne 'good')
         {
-        	if (!$self->is_deaf)
+        	if ($self->is_deaf)
                 {
         		&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: ignoring link from deaf device: $selfname");
 
@@ -588,7 +588,7 @@ sub delete_orphan_links
 			}
                         else # is a non-PLM device
                         {
-                        	if (!$self->is_deaf)
+                        	if ($self->is_deaf)
                                 {
                                 	&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: ignoring link from $selfname to 'deaf' device: " . $linked_device->get_object_name);
                                 }
@@ -754,7 +754,7 @@ sub delete_orphan_links
                                                         	{
 									$member = $member->get_root;
 								}
-                        					if (!$self->is_deaf)
+                        					if ($self->is_deaf)
                                                         	{
                                                                		&::print_log("[Insteon::AllLinkDatabase] ignoring link from " . $link->get_object_name . " to " .
                                                                		$member->get_object_name);
@@ -2830,7 +2830,7 @@ sub delete_orphan_links
 						}
 						if ($member->isa('Insteon::BaseDevice'))
                                                 {
-                                                	if (!$self->is_deaf)
+                                                	if ($self->is_deaf)
                                                         {
                                                                &::print_log("[Insteon::ALDB_PLM] ignoring link from PLM to " .
                                                                		$member->get_object_name);

From 726997a580288967850fc9cd316d9a0760771ed3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 11 Oct 2013 19:01:16 -0700
Subject: [PATCH 206/330] Insteon: Not All References are to Self

Reminder to self: don't use find and replace
---
 lib/Insteon.pm                 | 2 +-
 lib/Insteon/AllLinkDatabase.pm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 0a5afe9a1..ced96dbdb 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -510,7 +510,7 @@ sub sync_all_links
 	# iterate over all registered objects and compare whether the link tables match defined scene linkages in known Insteon_Links
 	for my $obj (&Insteon::find_members('Insteon::BaseController'))
 	{
-        	if ($self->is_deaf)
+        	if ($obj->is_deaf)
                 {
                 	&main::print_log("[Sync all links] Ignoring links from 'deaf' device: " . $obj->get_object_name);
                 }
diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 9d35b4005..003db8636 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -588,7 +588,7 @@ sub delete_orphan_links
 			}
                         else # is a non-PLM device
                         {
-                        	if ($self->is_deaf)
+                        	if ($linked_device->is_deaf)
                                 {
                                 	&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: ignoring link from $selfname to 'deaf' device: " . $linked_device->get_object_name);
                                 }
@@ -754,7 +754,7 @@ sub delete_orphan_links
                                                         	{
 									$member = $member->get_root;
 								}
-                        					if ($self->is_deaf)
+                        					if ($member->is_deaf)
                                                         	{
                                                                		&::print_log("[Insteon::AllLinkDatabase] ignoring link from " . $link->get_object_name . " to " .
                                                                		$member->get_object_name);
@@ -2830,7 +2830,7 @@ sub delete_orphan_links
 						}
 						if ($member->isa('Insteon::BaseDevice'))
                                                 {
-                                                	if ($self->is_deaf)
+                                                	if ($member->is_deaf)
                                                         {
                                                                &::print_log("[Insteon::ALDB_PLM] ignoring link from PLM to " .
                                                                		$member->get_object_name);

From f6762440a0796149ecad68fdd94cef6147bad24a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 11 Oct 2013 19:03:32 -0700
Subject: [PATCH 207/330] Insteon: One More Typo

---
 lib/Insteon.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index ced96dbdb..e55ee7961 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -400,7 +400,7 @@ sub scan_all_linktables
         	{
         		my $candidate_object = $_;
         		if ($candidate_object->is_root and
-                		!($self->is_deaf
+                		!($candidate_object->is_deaf
                 		or $candidate_object->isa('Insteon::InterfaceController')))
                 	{
 		       		push @_scan_devices, $candidate_object;

From 61aa33484fe83fc577120f678aa5ac62a5f577da Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Sat, 12 Oct 2013 01:40:07 -0400
Subject: [PATCH 208/330] Don't need to set volume if in mute or offline mode.

---
 code/common/mh_sound.pl | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/code/common/mh_sound.pl b/code/common/mh_sound.pl
index c6a33e735..66411b192 100644
--- a/code/common/mh_sound.pl
+++ b/code/common/mh_sound.pl
@@ -21,9 +21,9 @@
 $mh_speakers_timer = new Timer;
 $Info{Volume_Control} = 'Command Line' if $Reload and $config_parms{volume_master_get_cmd} and $config_parms{volume_master_set_cmd};
 
-
-                                # Allow for default volume control. Reset on startup.
-
+################################################
+# Allow for default volume control. Reset on startup.
+################################################
 &set_volume_master_wrapper($mh_volume->{state}) if $Startup and defined $mh_volume->{state}; #noloop
 &set_volume_wav($config_parms{volume_wav_default_volume}) if $Startup and defined $config_parms{volume_wav_default_volume}; #noloop
 
@@ -161,7 +161,7 @@ sub set_volume_wav {
     #return $volume_wav_previous;
 }
 
-                                # Set hooks so set_volume is called whenever speak or play is called
+# Set hooks so set_volume is called whenever speak or play is called
 &Speak_pre_add_hook(\&set_volume_pre_hook) if $Reload;
 &Play_pre_add_hook (\&set_volume_pre_hook) if $Reload;
 
@@ -179,6 +179,7 @@ sub set_volume_pre_hook {
 
     undef $volume_wav_previous;
     my $volume = $parms{volume};
+    my $mode = $parms{mode};
 
 	# *** Oops the following line is wrong--mh_volume is linked to mixer
 	# Not to be used as the default for playing WAV's, speaking, etc.
@@ -186,6 +187,15 @@ sub set_volume_pre_hook {
     #$volume = $mh_volume->{state} unless $volume;
     return unless $volume;
 
+    unless ($mode) {
+        if (defined $mode_mh) { # *** Outdated (?)
+            $mode = state $mode_mh;
+        } else {
+            $mode = $Save{mode};
+        }
+    }
+    return if $mode eq 'mute' or $mode eq 'offline';
+
                                 # Set a timer since we can not detect when a wav file is done
     if ($parms{time}) {
        set $mh_speakers_timer $parms{time}, '&put_volume_back(1)'; # flag to say WAV did it!
@@ -193,22 +203,21 @@ sub set_volume_pre_hook {
 
 
     if ($parms{time} or ($parms{text} and $Voice_Text::VTxt_version ne 'msv5')) {
-        print_log "Setting wav volume to $volume";
+	print_log "Setting wav volume to $volume";
 	$volume = 100 if $volume > 100;
 
-        $volume_wav_previous = &set_volume_wav($volume);
-
+	$volume_wav_previous = &set_volume_wav($volume);
+        
 	if($parms{mhvolume}) {
 		$volume_master_changed=1;
-		&set_volume_master_wrapper($parms{mhvolume});
+        	&set_volume_master_wrapper($parms{mhvolume});
 	}
 
     }
 }
 
 
-
-                                # Allow for a pre-speak/play wav file
+# Allow for a pre-speak/play wav file
 &Speak_pre_add_hook(\&sound_pre_speak) if $Reload and $config_parms{sound_pre_speak};
 &Play_pre_add_hook (\&sound_pre_play)  if $Reload and $config_parms{sound_pre_play};
 
@@ -219,7 +228,7 @@ sub sound_pre_speak {
 
 # ***  Config parm for this pause!
 
-    #&sleep_time(400);           # So the TTS engine doesn't grab the sound card first
+    #&sleep_time(400); # So the TTS engine doesn't grab the sound card first
 }
 sub sound_pre_play {
     my %parms = @_;
@@ -228,7 +237,7 @@ sub sound_pre_play {
 }
 
 
-                                # Allow for restarting of TTS engine
+# Allow for restarting of TTS engine
 $restart_tts = new Voice_Cmd 'Restart the TTS engine';
 $restart_tts-> set_info('This will restart the voice Text To Speech engine, in case it died for some reason');
 

From b4d1a92371f42d6ba3d16f21190b4e5027162734 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 12 Oct 2013 15:19:31 -0700
Subject: [PATCH 209/330] Insteon: Rework Set Routine in BaseObject

The old routine contained a lot of unnecessary logic that made it difficult to parse.  Indeed, I am not sure I understand everything that it was doing.

A number of functions which were handled by the set routine in BaseDevice were also copied over.
---
 lib/Insteon/BaseInsteon.pm | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 43717c4ca..f7c8225eb 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -354,23 +354,16 @@ sub set
 
                 my $setby_name = $p_setby;
                 $setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
-		if (ref $p_setby and (($p_setby eq $self->interface())
-			or (($p_setby->isa('Insteon::BaseObject'))
-                        and (($p_setby eq $self)
-			or (&main::set_by_to_target($p_setby) eq $self->interface)))))
-		{
-			# don't reset the object w/ the same state if set from the interface
-			return if (lc $p_state eq lc $self->state) and $self->is_acknowledged
-				and not(($p_setby->isa('Insteon::BaseObject') and ($p_setby eq $self)));
+		if (ref $p_setby and ($p_setby eq $self))
+		{ #If set by device, update MH state
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
-				. "::set($p_state, $setby_name)") if $main::Debug{insteon};
+				. "::set_receive($p_state, $setby_name)") if $main::Debug{insteon};
 			$self->set_receive($p_state,$p_setby,$p_response) if defined $p_state;
-		} else {
+			my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
+			$self->set_linked_devices($link_state);
+		} else { # Not called by device, send set command
                         my $message = $self->derive_message($p_state);
                         $self->_send_cmd($message);
-
-#			$self->_send_cmd(command => $p_state,
-#				type => (($self->isa('Insteon::Insteon_Link') and !($self->is_root)) ? 'alllink' : 'standard'));
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name() . "::set($p_state, $setby_name)")
 				if $main::Debug{insteon};
 			$self->is_acknowledged(0);
@@ -379,7 +372,6 @@ sub set
 			$$self{pending_response} = $p_response;
 	}
 		$self->level($p_state) if ($self->isa("Insteon::BaseDevice") && $self->can('level')); # update the level value
-#		$self->SUPER::set($p_state,$p_setby,$p_response) if defined $p_state;
 	} else {
 		&::print_log("[Insteon::BaseObject] failed state validation with state=$p_state");
 	}

From 453eba54b2d69e9dcbbacb44275c0732a39d4e73 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 12 Oct 2013 15:22:45 -0700
Subject: [PATCH 210/330] Insteon: Result of Request Status Call BaseObject
 Set_Receive

---
 lib/Insteon/BaseInsteon.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index f7c8225eb..2a01079bf 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -635,11 +635,11 @@ sub _is_info_request
 			. "hops left: $msg{hopsleft}") if $main::Debug{insteon};
 		$self->level($ack_on_level) if $self->can('level'); # update the level value
 		if ($ack_on_level == 0) {
-			$self->SUPER::set('off', $ack_setby);
+			$self->set_receive('off', $ack_setby);
 		} elsif ($ack_on_level > 0 and !($self->isa('Insteon::DimmableLight'))) {
-			$self->SUPER::set('on', $ack_setby);
+			$self->set_receive('on', $ack_setby);
 		} else {
-			$self->SUPER::set($ack_on_level . '%', $ack_setby);
+			$self->set_receive($ack_on_level . '%', $ack_setby);
 		}
 		# if this were a scene controller, then also propogate the result to all members
 		my $callback;

From e9654526f2bc9aa0eef988e4a7fb828e2d5ac27c Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 12 Oct 2013 15:26:04 -0700
Subject: [PATCH 211/330] Insteon: Change calls from DeviceController to
 BaseObject Set

---
 lib/Insteon/IOLinc.pm   |  2 +-
 lib/Insteon/Lighting.pm | 11 +++++------
 lib/Insteon/Security.pm |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/Insteon/IOLinc.pm b/lib/Insteon/IOLinc.pm
index 2983a61b9..6a104e1ee 100755
--- a/lib/Insteon/IOLinc.pm
+++ b/lib/Insteon/IOLinc.pm
@@ -174,7 +174,7 @@ sub set
 	}
 	else {
 		my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
-		$self->Insteon::BaseDevice::set($link_state, $p_setby, $p_respond);
+		$self->SUPER::set($link_state, $p_setby, $p_respond);
 		#$$self{momentary_timer}->set(int($$self{momentary_time/10), '$self->Generic_Item::set('off')');
 	}
 	return;
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index 561a7cdc8..b4fe5bf69 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -476,7 +476,7 @@ sub set
 
 	my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
 
-	return $self->Insteon::BaseDevice::set($link_state, $p_setby, $p_respond);
+	return $self->SUPER::set($link_state, $p_setby, $p_respond);
 }
 
 =back
@@ -626,7 +626,7 @@ sub set
 
 	my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
 
-	return $self->Insteon::DeviceController::set($link_state, $p_setby, $p_respond);
+	return $self->SUPER::set($link_state, $p_setby, $p_respond);
 }
 
 =back
@@ -710,7 +710,7 @@ sub set
 {
 	my ($self, $p_state, $p_setby, $p_respond) = @_;
 
-	return $self->Insteon::DeviceController::set($p_state, $p_setby, $p_respond);
+	return $self->SUPER::set($p_state, $p_setby, $p_respond);
 }
 
 =back
@@ -833,8 +833,7 @@ sub set
 	}
 	else
 	{
-		$link_state = $p_state if $self->can('level');
-		return $self->Insteon::DeviceController::set($link_state, $p_setby, $p_respond);
+		return $self->SUPER::set($link_state, $p_setby, $p_respond);
 	}
 
 	return 0;
@@ -1101,7 +1100,7 @@ sub set
 {
 	my ($self, $p_state, $p_setby, $p_respond) = @_;
 	if ($self->is_root()){
-		return $self->Insteon::DeviceController::set($p_state, $p_setby, $p_respond);
+		return $self->SUPER::set($p_state, $p_setby, $p_respond);
 	} else {
 		if ($self->_is_valid_state($p_state)) {
 			# always reset the is_locally_set property unless set_by is the device
diff --git a/lib/Insteon/Security.pm b/lib/Insteon/Security.pm
index fe97e4014..b549b8c99 100644
--- a/lib/Insteon/Security.pm
+++ b/lib/Insteon/Security.pm
@@ -141,7 +141,7 @@ sub set
 
 	my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
 
-	return $self->Insteon::DeviceController::set($link_state, $p_setby, $p_respond);
+	return $self->SUPER::set($link_state, $p_setby, $p_respond);
 }
 
 =item C<get_extended_info()>

From 3b92ec45fbba8b5ba190f61ce379cc0ad81b2554 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 12 Oct 2013 15:27:21 -0700
Subject: [PATCH 212/330] Insteon: Remove DeviceController Set Routine

---
 lib/Insteon/BaseInsteon.pm | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 2a01079bf..ee7b78a21 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -3365,28 +3365,6 @@ sub new
 	return $self;
 }
 
-=item C<set(state[,setby,response])>
-
-If C<Insteon::BaseController::set> returns a true value returns that.
-
-Else, calls C<Insteon::BaseObject::set> and returns 0
-
-=cut
-
-sub set
-{
-	my ($self, $p_state, $p_setby, $p_respond) = @_;
-
-	my $rslt_code = $self->Insteon::BaseController::set($p_state, $p_setby, $p_respond);
-	return $rslt_code if $rslt_code;
-
-	my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
-
-	$self->Insteon::BaseObject::set((($self->is_root) ? $p_state : $link_state), $p_setby, $p_respond);
-
-	return 0;
-}
-
 =item C<request_status([requestor])>
 
 Requests the current status of the device and calls C<set()> on the response.  

From 1d964fef6acf7219c8dec528a4769fccaa23c1ce Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 12 Oct 2013 15:40:09 -0700
Subject: [PATCH 213/330] Add Details for Set_By_To_Target Routine

A confusing routine that took me a while to decode.
---
 docs/mh.pod | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/mh.pod b/docs/mh.pod
index 6f994c7a6..f2dfb1f97 100644
--- a/docs/mh.pod
+++ b/docs/mh.pod
@@ -398,6 +398,22 @@ The list of modules that are not items is L<here|::modules>.
 
 =over
 
+=item set_by_to_target
+
+Checks to see if identified device is already in the chain of set_by devices.  
+Basically identifies never ending loops of setting objects.  
+
+Returns: 
+
+If no_strip is set to true:
+
+The original object which initiated this action, OR the same set_by
+object if it appears in the set_by list already.
+
+If no_strip is set to false or undef:
+
+Undef, unless would return something which is not an object, then it returns 
+the text preceding a [, such as web, email, ...
 
 =item add_sound
 

From 965c2d0db9c6c74e99626842df80e58d1bd8bc44 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 12 Oct 2013 16:29:07 -0700
Subject: [PATCH 214/330] Insteon: Remove or Condense Unnecessary Set Routines

Many devices had their own set routines that duplicated the functionality of the BaseObject routine.
---
 lib/Insteon/Controller.pm | 28 ++++----------------
 lib/Insteon/IOLinc.pm     |  3 ---
 lib/Insteon/Lighting.pm   | 54 ---------------------------------------
 lib/Insteon/Security.pm   | 34 +++++-------------------
 4 files changed, 11 insertions(+), 108 deletions(-)

diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index 871ed28b6..1c06d25f6 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -84,38 +84,20 @@ sub new
 
 =item C<set(state[,setby,response])>
 
-Handles messages received from the device.  Ignores attempts to set the same state
-in less than 1 second.  (This can likely be removed as the same process exists
-now in BaseInsteon set_receive.)  If this is not a duplicate message calls 
-C<set_receive()>.
+Handles messages received from the device.  Calls C<set_receive()>.
 
 =cut
 
 sub set
 {
 	my ($self,$p_state,$p_setby,$p_response) = @_;
-	return if &main::check_for_tied_filters($self, $p_state);
-
-	# Override any set_with_timer requests
-	if ($$self{set_timer}) {
-		&Timer::unset($$self{set_timer});
-		delete $$self{set_timer};
-	}
-
-	# if it can't be controlled (i.e., a responder), then don't send out any signals
-	# motion sensors seem to get multiple fast reports; don't trigger on both
-        my $setby_name = $p_setby;
-        $setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
-	if (not defined($self->get_idle_time) or $self->get_idle_time > 1 or $self->state ne $p_state) {
-		&::print_log("[Insteon::RemoteLinc] " . $self->get_object_name()
-			. "::set_receive($p_state, $setby_name)") if $main::Debug{insteon};
+	if (ref $p_setby && $p_setby eq $self){
 		$self->set_receive($p_state,$p_setby);
-	} else {
+	}
+	else {
 		&::print_log("[Insteon::RemoteLinc] " . $self->get_object_name()
-			. "::set_receive($p_state, $setby_name) deferred due to repeat within 1 second")
-			if $main::Debug{insteon};
+			. " is not a responder and cannot be set to a state.");
 	}
-	return;
 }
 
 =item C<set_awake_time([0-255 seconds])>
diff --git a/lib/Insteon/IOLinc.pm b/lib/Insteon/IOLinc.pm
index 6a104e1ee..721b244c0 100755
--- a/lib/Insteon/IOLinc.pm
+++ b/lib/Insteon/IOLinc.pm
@@ -152,8 +152,6 @@ and control the relay state.
 sub set
 {
 	my ($self, $p_state, $p_setby, $p_respond) = @_;
-	#Commands sent by the IOLinc itself represent the sensor
-	#Commands sent by MH to IOLinc represent the relay
 	if (ref $p_setby && $p_setby->isa('Insteon::BaseObject') && $p_setby->equals($self)){
 		my $curr_milli = sprintf('%.0f', &main::get_tickcount);
 		my $window = 1000;
@@ -175,7 +173,6 @@ sub set
 	else {
 		my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
 		$self->SUPER::set($link_state, $p_setby, $p_respond);
-		#$$self{momentary_timer}->set(int($$self{momentary_time/10), '$self->Generic_Item::set('off')');
 	}
 	return;
 }
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index b4fe5bf69..c15511e50 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -461,24 +461,6 @@ sub new
 	return $self;
 }
 
-=item C<set(state[,setby,response])>
-
-Handles setting and receiving states from the device.
-
-NOTE - Maybe this should be moved to BaseLight, or something farther up the stack?
-The only thing this routine does is convert p_state with derive_link_state.
-
-=cut
-
-sub set
-{
-	my ($self, $p_state, $p_setby, $p_respond) = @_;
-
-	my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
-
-	return $self->SUPER::set($link_state, $p_setby, $p_respond);
-}
-
 =back
 
 =head2 AUTHOR
@@ -611,24 +593,6 @@ sub new
 	return $self;
 }
 
-=item C<set(state[,setby,response])>
-
-Handles setting and receiving states from the device.
-
-NOTE - Maybe this should be moved to BaseLight, or something farther up the stack?
-The only thing this routine does is convert p_state with derive_link_state.
-
-=cut
-
-sub set
-{
-	my ($self, $p_state, $p_setby, $p_respond) = @_;
-
-	my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
-
-	return $self->SUPER::set($link_state, $p_setby, $p_respond);
-}
-
 =back
 
 =head2 AUTHOR
@@ -695,24 +659,6 @@ sub new
 	return $self;
 }
 
-=item C<set(state[,setby,response])>
-
-Handles setting and receiving states from the device.
-
-NOTE - This is just silly, the only thing this routine does is push the set 
-command to the L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController> 
-class.  Simply reording the class 
-inheritance of this object would remove the need to do this.
-
-=cut
-
-sub set
-{
-	my ($self, $p_state, $p_setby, $p_respond) = @_;
-
-	return $self->SUPER::set($p_state, $p_setby, $p_respond);
-}
-
 =back
 
 =head2 AUTHOR
diff --git a/lib/Insteon/Security.pm b/lib/Insteon/Security.pm
index b549b8c99..531159f0c 100644
--- a/lib/Insteon/Security.pm
+++ b/lib/Insteon/Security.pm
@@ -129,21 +129,6 @@ sub new
 	return $self;
 }
 
-=item C<set(state[,setby,response])>
-
-Handles setting and receiving states from the device.
-
-=cut
-
-sub set
-{
-	my ($self, $p_state, $p_setby, $p_respond) = @_;
-
-	my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
-
-	return $self->SUPER::set($link_state, $p_setby, $p_respond);
-}
-
 =item C<get_extended_info()>
 
 Only available for Motion Sensor Version 2 models.
@@ -787,20 +772,13 @@ Handles messages received from the device.  Calls C<set_receive()>.
 sub set
 {
 	my ($self,$p_state,$p_setby,$p_response) = @_;
-	return if &main::check_for_tied_filters($self, $p_state);
-
-	# Override any set_with_timer requests
-	if ($$self{set_timer}) {
-		&Timer::unset($$self{set_timer});
-		delete $$self{set_timer};
+	if (ref $p_setby && $p_setby eq $self){
+		$self->set_receive($p_state,$p_setby);
+	}
+	else {
+		&::print_log("[Insteon::TriggerLinc] " . $self->get_object_name()
+			. " is not a responder and cannot be set to a state.");
 	}
-
-        my $setby_name = $p_setby;
-        $setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
-	&::print_log("[Insteon::TriggerLinc] " . $self->get_object_name()
-		. "::set_receive($p_state, $setby_name)") if $main::Debug{insteon};
-	$self->set_receive($p_state,$p_setby);
-	return;
 }
 
 =item C<set_awake_time([0-255 seconds])>

From 10da6c84416952be21ead2d4c61b0bc5a1bc3d2c Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 12 Oct 2013 18:25:38 -0700
Subject: [PATCH 215/330] Insteon: Only Call Success_Callback if Active_Message
 Exists

---
 lib/Insteon/BaseInterface.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index a461b284a..3842c5692 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -718,7 +718,7 @@ sub on_extended_insteon_received
                    	}
 		   	&::print_log("[Insteon::BaseInterface] Processing message for " . $object->get_object_name) if $main::Debug{insteon} >=3;
 			if($object->_process_message($self, %msg)) {
-				if ($self->active_message->success_callback){
+				if (ref $self->active_message && $self->active_message->success_callback){
 					main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
 						. $self->active_message->success_callback) if $main::Debug{insteon} >= 4;
 					package main;

From aaa64e8e71a26f4a990313330bf30a14d3367c62 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Sat, 12 Oct 2013 23:41:45 -0400
Subject: [PATCH 216/330] Start changes to make sure only the desired speakers
 are on, even if they were on before starting speech.

---
 code/common/pa_control.pl |  8 +++---
 lib/PAobj.pm              | 55 +++++++++++++++++++++------------------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/code/common/pa_control.pl b/code/common/pa_control.pl
index 5f9c87b11..74e23e55c 100644
--- a/code/common/pa_control.pl
+++ b/code/common/pa_control.pl
@@ -97,14 +97,14 @@ sub pa_parms_stub {
 }
 
 sub pa_control_stub {
-    my ($parms) = @_;
+    my (%parms) = @_;
     my @pazones;
-    my $mode = $parms->{pa_mode};
+    my $mode = $parms{pa_mode};
     return if $mode eq 'mute' or $mode eq 'offline';
 
-    my $rooms = $parms->{rooms};
+    my $rooms = $parms{rooms};
     print_log("PA: control_stub: rooms=$rooms, mode=$mode") if $Debug{pa};
-    my $results = $pactrl->audio_hook(ON,%parms);
+    my $results = $pactrl->audio_hook(ON,\%parms);
     print_log("PA: control_stub set results: $results") if $Debug{pa} >=2;
     set $pa_speaker_timer $pa_timer if $results;
     return $results;
diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index 1e2d00033..0862edbd8 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -98,6 +98,13 @@ sub init {
     &::print_log("PAobj: speakers_obj: $#speakers_obj") if $main::Debug{pa};# || $#speakers_obj gt -1;
     &::print_log("PAobj: speakers_audrey: $#speakers_audrey") if $main::Debug{pa};# || $#speakers_audrey gt -1;
 
+    $pa_zones{all}{wdio}=join(',',@speakers_wdio);
+    $pa_zones{all}{x10}=join(',',@speakers_x10);
+    $pa_zones{all}{xap}=join(',',@speakers_xap);
+    $pa_zones{all}{xpl}=join(',',@speakers_xpl);
+    $pa_zones{all}{obj}=join(',',@speakers_obj);
+    $pa_zones{all}{audrey}=join(',',@speakers_audrey);
+
     if ($#speakers_wdio > -1) {
         $self->init_weeder(@speakers_wdio);
         return 0 unless %pa_weeder_max_port;
@@ -195,22 +202,22 @@ sub prep_parms
     &::print_log("PAobj: speakers_audrey: $#speakers_audrey") if $main::Debug{pa}  >=2 || $#speakers_audrey gt -1;
 
     
-    $pa_zones{wdio}=join(',',@speakers_wdio);
-    $pa_zones{x10}=join(',',@speakers_x10);
-    $pa_zones{xap}=join(',',@speakers_xap);
-    $pa_zones{xpl}=join(',',@speakers_xpl);
-    $pa_zones{obj}=join(',',@speakers_obj);
-    $pa_zones{audrey}=join(',',@speakers_audrey);
+    $pa_zones{active}{wdio}=join(',',@speakers_wdio);
+    $pa_zones{active}{x10}=join(',',@speakers_x10);
+    $pa_zones{active}{xap}=join(',',@speakers_xap);
+    $pa_zones{active}{xpl}=join(',',@speakers_xpl);
+    $pa_zones{active}{obj}=join(',',@speakers_obj);
+    $pa_zones{active}{audrey}=join(',',@speakers_audrey);
     
     $parms->{web_file}="web_file" if $#speakers_audrey gt -1;
     
     if(
         1
-        && $pa_zones{wdio} eq ''
-        && $pa_zones{x10} eq ''
-        && $pa_zones{xap} eq ''
-        && $pa_zones{xpl} eq ''
-        && $pa_zones{obj} eq ''
+        && $pa_zones{active}{wdio} eq ''
+        && $pa_zones{active}{x10} eq ''
+        && $pa_zones{active}{xap} eq ''
+        && $pa_zones{active}{xpl} eq ''
+        && $pa_zones{active}{obj} eq ''
         
     ) {
         $$parms{to_file}='/dev/null';
@@ -226,16 +233,16 @@ sub audio_hook
     my $results = 0;
 #    my @speakers = split(',', $voiceparms{pa_zones});
 
-    my @speakers_wdio=split(',',$pa_zones{wdio});
-    my @speakers_x10=split(',',$pa_zones{x10});
-    my @speakers_xap=split(',',$pa_zones{xap});
-    my @speakers_xpl=split(',',$pa_zones{xpl});
-    my @speakers_obj=split(',',$pa_zones{obj});
+    my @speakers_wdio=split(',',$pa_zones{active}{wdio});
+    my @speakers_x10=split(',',$pa_zones{active}{x10});
+    my @speakers_xap=split(',',$pa_zones{active}{xap});
+    my @speakers_xpl=split(',',$pa_zones{active}{xpl});
+    my @speakers_obj=split(',',$pa_zones{active}{obj});
     
     #TODO: Properly handle $results across multiple types
     #TODO: Break up the wdio zones based on serial port, in case there are more than one.
     $results=0;
-    $results = $self->set_weeder($state,'weeder',@speakers_wdio) 			if $#speakers_wdio > -1;
+    $results = $self->set_weeder($state,'weeder',@speakers_wdio) 	if $#speakers_wdio > -1;
     $results = $self->set_x10($state,@speakers_x10) 			if $#speakers_x10 > -1;
     $results = $self->set_xap($state,\@speakers_xap,\%voiceparms) 	if $#speakers_xap > -1;	
     $results = $self->set_xpl($state,\@speakers_xpl,\%voiceparms) 	if $#speakers_xpl > -1;
@@ -248,9 +255,9 @@ sub audio_hook
     if(
         lc $state eq 'on'
         && (
-            $pa_zones{wdio} ne ''
-            || $pa_zones{x10} ne ''
-            || $pa_zones{obj} ne ''
+            $pa_zones{active}{wdio} ne ''
+            || $pa_zones{active}{x10} ne ''
+            || $pa_zones{active}{obj} ne ''
         )
     ) {
         $results=1;
@@ -262,10 +269,10 @@ sub audio_hook
 sub web_hook
 {
     my ($self,$parms) = @_;
-    &::print_log("PAobj: web_hook! Audrey: " . $pa_zones{audrey}) if $main::Debug{pa};
-    return unless $pa_zones{audrey} ne '';
+    &::print_log("PAobj: web_hook! Audrey: " . $pa_zones{active}{audrey}) if $main::Debug{pa};
+    return unless $pa_zones{active}{audrey} ne '';
     my $results=0;
-    my @speakers_audrey=split(',', $pa_zones{audrey});
+    my @speakers_audrey=split(',', $pa_zones{active}{audrey});
     
     $results = $self->set_audrey($parms->{web_file},@speakers_audrey);
     
@@ -469,8 +476,6 @@ sub get_speakers
                 for my $grouproom ($ref->list) {
                     $grouproom = $grouproom->get_object_name;
                     $grouproom =~ s/^\$pa_//;
-                    $grouproom =~ s/^\$paxpl_//;
-                    $grouproom =~ s/^\$paxap_//;
                     &::print_log("PAobj:  - member: $grouproom") if $main::Debug{pa} >=2;
                     push(@pazones, $grouproom);
                 }

From 1965326b8e1e360e0c2124890d4bcaead6637227 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 10:12:38 -0700
Subject: [PATCH 217/330] Insteon: All_Link Cleanup Check for Active Message

Before calling setby on the active_message, make sure that an active message exists.
---
 lib/Insteon_PLM.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index c97637985..9181f3d85 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -815,7 +815,7 @@ sub _parse_data {
                         	my $message_to_string = ($self->active_message) ? $self->active_message->to_string() : "";
 				&::print_log("[Insteon_PLM] Received all-link cleanup success: $message_to_string")
                                 	if $main::Debug{insteon};
-				if (ref $self->active_message->setby){
+				if (ref $self->active_message && ref $self->active_message->setby){
 					my $object = $self->active_message->setby;
 					$object->is_acknowledged(1);
 					$object->_process_command_stack();

From 43c38bac46bf64ba267452b9464c0d9cc1ace4bc Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 10:34:55 -0700
Subject: [PATCH 218/330] Insteon: Define Derive_Link_State for All Objects

Rather than testing and running derive_link_state only if a device is not_dimmable, call derive_link_state for all objects.

BaseObject::Derive_Link_State remains the same

DimmableLight::Derive_Link_State will return on,off, or 0%-100% from the input link_state.

Remove all logic which selectively ran derive_link_state
---
 lib/Insteon/BaseInsteon.pm | 14 ++++++--------
 lib/Insteon/Lighting.pm    | 23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index ee7b78a21..ed8a19392 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -53,8 +53,8 @@ state of either ON or OFF.
 
 sub derive_link_state
 {
-	my ($p_state) = @_;
-
+	my ($self, $p_state) = @_;
+	$p_state = $self if !(ref $self); #Old code made direct calls
 	my $link_state = 'on';
 	if ($p_state eq 'off' or $p_state eq 'off_fast')
 	{
@@ -359,8 +359,7 @@ sub set
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
 				. "::set_receive($p_state, $setby_name)") if $main::Debug{insteon};
 			$self->set_receive($p_state,$p_setby,$p_response) if defined $p_state;
-			my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
-			$self->set_linked_devices($link_state);
+			$self->set_linked_devices($p_state);
 		} else { # Not called by device, send set command
                         my $message = $self->derive_message($p_state);
                         $self->_send_cmd($message);
@@ -3119,6 +3118,8 @@ sub set_linked_devices
 					# remember the current state to support resume
 					$$self{members}{$member_ref}{resume_state} = $light->state;
 					$member->manual($light, $ramp_rate);
+					$local_state = $light->derive_link_state($local_state) 
+						if $light->can('derive_link_state');
 					$light->set_receive($local_state,$self);
 				}
 				else
@@ -3133,10 +3134,7 @@ sub set_linked_devices
 				$$self{members}{$member_ref}{resume_state} = $member->state;
 			# if they are Insteon_Device objects, then simply set_receive their state to
 			#   the member on level
-                        	if (!($member->isa('Insteon::DimmableLight')) and $member->isa('Insteon::BaseLight'))
-                                {
-                                	$local_state =  &Insteon::BaseObject::derive_link_state($local_state);
-                                }
+ 				$local_state = $member->derive_link_state($local_state);
 				$member->set_receive($local_state,$self);
 			}
 		}
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index c15511e50..f4091b6e7 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -165,6 +165,29 @@ my %ramp_h2n = (
 						'1f' =>    .1
 );
 
+=item C<derive_link_state([state])>
+
+Overrides routine in BaseObject. Takes the various states available to insteon 
+devices and returns a derived state of on, off, or 0%-100%.
+
+=cut
+
+sub derive_link_state
+{
+	my ($self, $p_state) = @_;
+	my $link_state = 'on';
+	if ($p_state eq 'off' or $p_state eq 'off_fast')
+	{
+		$link_state = 'off';
+	}
+	elsif ($p_state =~ /\d+%?/)
+	{
+		$p_state =~ /(\d+)%?/;
+		$link_state = $1 . '%';
+	}
+	return $link_state;
+}
+
 =item C<convert_ramp(ramp_seconds)>
 
 Takes ramp_seconds in numeric seconds and returns the hexadecimal value of that 

From 3ca90371d2c7920a75e3cf820db0b15117504124 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 10:39:05 -0700
Subject: [PATCH 219/330] Insteon: Call Set on Status_Request Response

Necessary in order to cause set_linked_devices to run
---
 lib/Insteon/BaseInsteon.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index ed8a19392..7161da741 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -354,8 +354,9 @@ sub set
 
                 my $setby_name = $p_setby;
                 $setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
-		if (ref $p_setby and ($p_setby eq $self))
-		{ #If set by device, update MH state
+		if (ref $p_setby and (($p_setby eq $self) or ($p_setby eq $self->interface)))
+		{ #If set by device, update MH state,
+		  #If set by interface, this was a status_request response
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
 				. "::set_receive($p_state, $setby_name)") if $main::Debug{insteon};
 			$self->set_receive($p_state,$p_setby,$p_response) if defined $p_state;
@@ -634,11 +635,11 @@ sub _is_info_request
 			. "hops left: $msg{hopsleft}") if $main::Debug{insteon};
 		$self->level($ack_on_level) if $self->can('level'); # update the level value
 		if ($ack_on_level == 0) {
-			$self->set_receive('off', $ack_setby);
+			$self->set('off', $ack_setby);
 		} elsif ($ack_on_level > 0 and !($self->isa('Insteon::DimmableLight'))) {
-			$self->set_receive('on', $ack_setby);
+			$self->set('on', $ack_setby);
 		} else {
-			$self->set_receive($ack_on_level . '%', $ack_setby);
+			$self->set($ack_on_level . '%', $ack_setby);
 		}
 		# if this were a scene controller, then also propogate the result to all members
 		my $callback;

From 93368b4d2ccc51ebec4831f251b24a4c1dacaed3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 10:41:02 -0700
Subject: [PATCH 220/330] Insteon: Condense Not_Responser Set Routines

Add logic to BaseObject::Set to test is_responder before trying to send set command.
---
 lib/Insteon/BaseInsteon.pm | 24 +++++++++++++++---------
 lib/Insteon/Controller.pm  | 18 ------------------
 lib/Insteon/Security.pm    | 18 ------------------
 3 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 7161da741..a61944be8 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -362,15 +362,21 @@ sub set
 			$self->set_receive($p_state,$p_setby,$p_response) if defined $p_state;
 			$self->set_linked_devices($p_state);
 		} else { # Not called by device, send set command
-                        my $message = $self->derive_message($p_state);
-                        $self->_send_cmd($message);
-			&::print_log("[Insteon::BaseObject] " . $self->get_object_name() . "::set($p_state, $setby_name)")
-				if $main::Debug{insteon};
-			$self->is_acknowledged(0);
-			$$self{pending_state} = $p_state;
-			$$self{pending_setby} = $p_setby;
-			$$self{pending_response} = $p_response;
-	}
+			if ($self->is_responder){
+	                        my $message = $self->derive_message($p_state);
+	                        $self->_send_cmd($message);
+				&::print_log("[Insteon::BaseObject] " . $self->get_object_name() . "::set($p_state, $setby_name)")
+					if $main::Debug{insteon};
+				$self->is_acknowledged(0);
+				$$self{pending_state} = $p_state;
+				$$self{pending_setby} = $p_setby;
+				$$self{pending_response} = $p_response;
+			} 
+			else {
+				::print_log("[Insteon::BaseObject] " . $self->get_object_name()
+					. " is not a responder and cannot be set to a state.");	
+			}
+		}
 		$self->level($p_state) if ($self->isa("Insteon::BaseDevice") && $self->can('level')); # update the level value
 	} else {
 		&::print_log("[Insteon::BaseObject] failed state validation with state=$p_state");
diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index 1c06d25f6..5d99ce27e 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -82,24 +82,6 @@ sub new
 	return $self;
 }
 
-=item C<set(state[,setby,response])>
-
-Handles messages received from the device.  Calls C<set_receive()>.
-
-=cut
-
-sub set
-{
-	my ($self,$p_state,$p_setby,$p_response) = @_;
-	if (ref $p_setby && $p_setby eq $self){
-		$self->set_receive($p_state,$p_setby);
-	}
-	else {
-		&::print_log("[Insteon::RemoteLinc] " . $self->get_object_name()
-			. " is not a responder and cannot be set to a state.");
-	}
-}
-
 =item C<set_awake_time([0-255 seconds])>
 
 Only available for RemoteLinc 2 models.
diff --git a/lib/Insteon/Security.pm b/lib/Insteon/Security.pm
index 531159f0c..58a05acc6 100644
--- a/lib/Insteon/Security.pm
+++ b/lib/Insteon/Security.pm
@@ -763,24 +763,6 @@ sub new
 	return $self;
 }
 
-=item C<set(state[,setby,response])>
-
-Handles messages received from the device.  Calls C<set_receive()>.
-
-=cut
-
-sub set
-{
-	my ($self,$p_state,$p_setby,$p_response) = @_;
-	if (ref $p_setby && $p_setby eq $self){
-		$self->set_receive($p_state,$p_setby);
-	}
-	else {
-		&::print_log("[Insteon::TriggerLinc] " . $self->get_object_name()
-			. " is not a responder and cannot be set to a state.");
-	}
-}
-
 =item C<set_awake_time([0-255 seconds])>
 
 Sets the amount of time, in seconds, that the TriggerLinc will remain "awake" 

From 05b10542e4442acab8ff45df0195602ee08de9b1 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 10:42:30 -0700
Subject: [PATCH 221/330] Insteon: Simplify Link_State Determination in
 Set_Linked_Devices

Makes the code easier to read.

Also allows for non standard link_states (0%-100%) to be passed to linked devices.
---
 lib/Insteon/BaseInsteon.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index a61944be8..c09069cc9 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -3103,12 +3103,12 @@ sub set_linked_devices
 		foreach my $member_ref (keys %{$$self{members}})
 		{
 			my $member = $$self{members}{$member_ref}{object};
-			my $on_state = $$self{members}{$member_ref}{on_level};
-			$on_state = '100%' unless $on_state;
-			my $local_state = $on_state;
-			$local_state = 'on' if $local_state eq '100%'
-				&& $member->isa('Insteon::BaseDevice') && !($member->is_root);
-			$local_state = 'off' if $local_state eq '0%' or $link_state eq 'off';
+			# If controller is on, set member to stored on_level
+			# else set to controller value
+			my $local_state = $$self{members}{$member_ref}{on_level};
+			$local_state = 'on' unless $local_state;
+			$local_state = $link_state if (lc $link_state ne 'on');
+			
 			if ($member->isa('Light_Item'))
 			{
 			# if they are Light_Items, then set their on_dim attrib to the member on level

From de355de2d601a1bab326947258fd57ea19e99eaf Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 10:51:58 -0700
Subject: [PATCH 222/330] Insteon: Condense Is_Responder Routines

Individual object routines are not needed, just set the flag on creating the object.
---
 lib/Insteon/Controller.pm |  6 +-----
 lib/Insteon/Security.pm   | 18 ++----------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index 5d99ce27e..cf221055e 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -79,6 +79,7 @@ sub new
 		$$self{queue_timer} = new Timer;
 	}
 	bless $self,$class;
+	$$self{is_responder} = 0;
 	return $self;
 }
 
@@ -241,11 +242,6 @@ sub _process_message {
 	return $clear_message;
 }
 
-sub is_responder
-{
-   return 0;
-}
-
 =back
 
 =head2 AUTHOR
diff --git a/lib/Insteon/Security.pm b/lib/Insteon/Security.pm
index 58a05acc6..91a26b363 100644
--- a/lib/Insteon/Security.pm
+++ b/lib/Insteon/Security.pm
@@ -126,6 +126,7 @@ sub new
 		$$self{queue_timer} = new Timer;
 	}
 	bless $self,$class;
+	$$self{is_responder} = 0;
 	return $self;
 }
 
@@ -462,17 +463,6 @@ sub _process_message {
 	return $clear_message;
 }
 
-=item C<is_responder()>
-
-Always returns 0.
-
-=cut
-
-sub is_responder
-{
-   return 0;
-}
-
 =item C<get_voice_cmds>
 
 Returns a hash of voice commands where the key is the voice command name and the
@@ -760,6 +750,7 @@ sub new
 	my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
         $$self{message_types} = \%message_types;
 	bless $self,$class;
+	$$self{is_responder} = 0;
 	return $self;
 }
 
@@ -853,11 +844,6 @@ sub _process_message {
 	return $clear_message;
 }
 
-sub is_responder
-{
-   return 0;
-}
-
 =back
 
 =head2 INI PARAMETERS

From 87c60d53cc35e2f8f6c94361b332f7691c7955a1 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 11:08:07 -0700
Subject: [PATCH 223/330] Insteon: Remove Unnecessary Code from Set Routine

Bright and Dim are not valid states for non-dimmable devices and will be rejected.

Toggle state rewritten to be much more condensed.
---
 lib/Insteon/BaseInsteon.pm | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index c09069cc9..ab6392624 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -336,20 +336,9 @@ sub set
 		# always reset the is_locally_set property unless set_by is the device
 		$$self{m_is_locally_set} = 0 unless ref $p_setby and $p_setby eq $self;
 
-		# handle invalid state for non-dimmable devices
-		if (($p_state eq 'dim' or $p_state eq 'bright') and !($self->isa('Insteon::DimmableLight'))) {
-			$p_state = 'on';
-		}
-                elsif ($p_state eq 'toggle')
+		if ($p_state eq 'toggle')
                 {
-                	if ($self->state eq 'on')
-                        {
-                        	$p_state = 'off';
-                        }
-                        elsif ($self->state eq 'off')
-                        {
-                        	$p_state = 'on';
-                        }
+                	$p_state = ($self->state eq 'on')? 'off' : 'on';
                 }
 
                 my $setby_name = $p_setby;
@@ -377,7 +366,7 @@ sub set
 					. " is not a responder and cannot be set to a state.");	
 			}
 		}
-		$self->level($p_state) if ($self->isa("Insteon::BaseDevice") && $self->can('level')); # update the level value
+		$self->level($p_state) if $self->can('level'); # update the level value
 	} else {
 		&::print_log("[Insteon::BaseObject] failed state validation with state=$p_state");
 	}

From 0119aa65ffdb19bcbbe9fba587cdedc1f5002101 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 11:19:38 -0700
Subject: [PATCH 224/330] Insteon: Remove Unnecessary Set Subs in
 BaseController and InterfaceController

InterfaceController will defer to BaseObject

No need for routine in BaseController
---
 lib/Insteon/BaseInsteon.pm | 45 --------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index ab6392624..7f5efed12 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -3050,31 +3050,6 @@ sub _process_sync_queue {
 	}
 }
 
-=item C<set(state[,setby,response])>
-
-Returns -1 if setby was set by this object.
-
-Returns -1 if setby a tied_filter.
-
-Otherwise calls C<set_linked_devices> and returns 0.
-
-=cut
-
-sub set
-{
-	my ($self, $p_state, $p_setby, $p_respond) = @_;
-	# prevent reciprocal setby loops
-	return -1 if (ref $p_setby and ($p_setby ne $self) and $p_setby->can('get_set_by') and
-           $p_setby->{set_by} eq $self);
-	return -1 if &main::check_for_tied_filters($self, $p_state);
-
-	my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
-
-	$self->set_linked_devices($link_state);
-
-	return 0;
-}
-
 =item C<set_linked_devices(state)>
 
 Checks each linked member of device.  If the linked member is a C<light_item>, 
@@ -3452,26 +3427,6 @@ sub new
 	return $self;
 }
 
-=item C<set(state[,setby,response])>
-
-If C<Insteon::BaseController::set> returns a true value returns that.
-
-Else, calls C<Insteon::BaseObject::set> and returns 0
-
-=cut
-
-sub set
-{
-	my ($self, $p_state, $p_setby, $p_respond) = @_;
-
-	my $rslt_code = $self->Insteon::BaseController::set($p_state, $p_setby, $p_respond);
-	return $rslt_code if $rslt_code;
-
-	$self->Insteon::BaseObject::set($p_state, $p_setby, $p_respond);
-
-	return 0;
-}
-
 sub is_root
 {
    return 0;

From 7bce2ea9651c6b32d73084d004960950298c5f59 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 13:05:43 -0700
Subject: [PATCH 225/330] Insteon: Hijack is_Acknowledged for
 InterfaceController

InterfaceController is different in that when its state is set by an outside object, MH needs to update the linked devices.  By moving this to is_acknowledged, the states of the linked devices will only be updated if the scene command was successfull.

Is_responder also always needs to be set to true for interfacecontroller even though it is not a root device.
---
 lib/Insteon/BaseInsteon.pm | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 625e56a27..d15a3104e 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -423,6 +423,7 @@ sub set_receive
 			"less than $window milliseconds") if $main::Debug{insteon}; 
 	} else {
 		$$self{set_milliseconds} = $curr_milli;
+		$self->level($p_state) if $self->can('level'); # update the level value
 		$self->SUPER::set($p_state, $p_setby, $p_response);
 	}
 }
@@ -1284,20 +1285,6 @@ sub rate
 	return $$self{rate};
 }
 
-=item C<set_receive(state[,setby,response])>
-
-Updates the device's level if it can level, then calls 
-C<Insteon::BaseObject::set_receive()>.
-
-=cut
-
-sub set_receive
-{
-	my ($self, $p_state, $p_setby, $p_response) = @_;
-	$self->level($p_state) if $self->can('level'); # update the level value
-	$self->SUPER::set_receive($p_state, $p_setby, $p_response);
-}
-
 =item C<is_controller()>
 
 Returns true if the device is a controller.
@@ -3430,11 +3417,32 @@ sub new
 	return $self;
 }
 
+
+#Otherwise BaseController will call Generic_Item::Set
+sub set
+{
+	my ($self,$p_state,$p_setby,$p_response) = @_;
+	$self->Insteon::BaseObject::set($p_state,$p_setby,$p_response);	
+}
+
 sub is_root
 {
    return 0;
 }
 
+sub is_responder {
+	return 1;
+}
+
+# For IFaceControllers, need to call set_linked_devices
+sub is_acknowledged {
+	my ($self, $p_ack) = @_;
+	if ($p_ack) {
+		$self->set_linked_devices($$self{pending_state}) if defined $$self{pending_state};	
+	}
+	return $self->Insteon::BaseObject::is_acknowledged($p_ack);
+}
+
 =item C<get_voice_cmds>
 
 Returns a hash of voice commands where the key is the voice command name and the

From 2a75b3beae30e41f14d1448b3b553e2e3e159abc Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 14:04:06 -0700
Subject: [PATCH 226/330] Insteon:Simply Set Routine in KeypadLinc

---
 lib/Insteon/Lighting.pm | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index f4091b6e7..4d05f04a8 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -777,36 +777,20 @@ subordinate buttons.
 sub set
 {
 	my ($self, $p_state, $p_setby, $p_respond) = @_;
-
-	my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
-
-	if (!($self->is_root))
+	if (!($self->is_root) and !(ref $p_setby && $p_setby eq $self))
 	{
-		my $rslt_code = $self->Insteon::BaseController::set($p_state, $p_setby, $p_respond);
-		return $rslt_code if $rslt_code;
-
-		if (ref $p_setby and $p_setby->isa('Insteon::BaseDevice'))
-		{
-			$self->Insteon::BaseObject::set($p_state, $p_setby, $p_respond);
-		}
-		elsif (ref $$self{surrogate} && ($$self{surrogate}->isa('Insteon::InterfaceController')))
-		{
-			$$self{surrogate}->set($link_state, $p_setby, $p_respond)
-				unless ref $p_setby and $p_setby eq $self;
+		if (ref $$self{surrogate} && ($$self{surrogate}->isa('Insteon::InterfaceController'))) {
+			$$self{surrogate}->set($p_state, $p_setby, $p_respond);
 		}
-		else
-		{
-			&::print_log("[Insteon::KeyPadLinc] You may not directly attempt to set a keypadlinc's button "
-				. "unless you have defined a reverse link with the \"surrogate\" keyword");
+		else {
+			::print_log("[Insteon::KeyPadLinc] You may not directly attempt to set a keypadlinc's button "
+				."unless you have defined a reverse link with the \"surrogate\" keyword");
 		}
 	}
 	else
 	{
-		return $self->SUPER::set($link_state, $p_setby, $p_respond);
+		return $self->SUPER::set($p_state, $p_setby, $p_respond);
 	}
-
-	return 0;
-
 }
 
 =item C<update_flags(flags)>

From 2049a85d4031e56bcc3935e5348c5cf4c73beb06 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 14:47:31 -0700
Subject: [PATCH 227/330] Insteon: Replace Set Sub with Derive_Message in
 FanLinc

Trying to keep the code in the two set routines in sync is just asking for trouble.

Derive Message allows MH to insert a specialized message into the set command.
---
 lib/Insteon/Lighting.pm | 69 ++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 43 deletions(-)

diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index 4d05f04a8..ca5942e08 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -1042,53 +1042,36 @@ sub new
 	return $self;
 }
 
-=item C<set(state[,setby,response])>
+=item C<derive_message([command,extra])>
 
-Handles setting and receiving states from the device and specifically its 
-fan object.
+Generates set commands for the fan, light requests are passed to BaseObject
 
 =cut
 
-sub set
+sub derive_message
 {
-	my ($self, $p_state, $p_setby, $p_respond) = @_;
-	if ($self->is_root()){
-		return $self->SUPER::set($p_state, $p_setby, $p_respond);
-	} else {
-		if ($self->_is_valid_state($p_state)) {
-			# always reset the is_locally_set property unless set_by is the device
-			$$self{m_is_locally_set} = 0 unless ref $p_setby and $p_setby eq $self;
-
-			# handle invalid state for non-dimmable devices
-			my $level = $p_state;
-			if ($p_state eq 'dim' or $p_state eq 'bright') {
-				$p_state = 'on';
-			}
-			elsif ($p_state eq 'toggle')
-			{
-				$p_state = 'off' if ($self->state eq 'on');
-				$p_state = 'on' if ($self->state eq 'off');
-			}
-			$level = '00' if ($p_state eq 'off');
-			$level = 'ff' if ($p_state eq 'on');
-			# Setting Fan Level
-			my $setby_name = $p_setby;
-			$setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
-			my $parent = $self->get_root();
-			$level = ::Insteon::DimmableLight::convert_level($level) if ($level ne '00' && $level ne 'ff');
-			my $extra = $level ."0200000000000000000000000000";
-			my $message = new Insteon::InsteonMessage('insteon_ext_send', $parent, 'on', $extra);
-			$parent->_send_cmd($message);
-			::print_log("[Insteon::FanLinc] " . $self->get_object_name() . "::set($p_state, $setby_name)")
-				if $main::Debug{insteon};
-			$self->is_acknowledged(0);
-			$$self{pending_state} = $p_state;
-			$$self{pending_setby} = $p_setby;
-			$$self{pending_response} = $p_respond;
-			$$parent{child_pending_state} = $self->group();
-		} else {
-			::print_log("[Insteon::FanLinc] failed state validation with state=$p_state");
-		}	
+	my ($self, $p_command, $p_extra) = @_;
+	if ($self->is_root){
+		$self->SUPER::derive_message($self, $p_command, $p_extra);
+	} 
+	else {
+		my $level;
+	
+		#msg id
+		my ($command, $subcommand) = split(/:/, $p_command, 2);
+		$command=lc($command);
+		
+		if ($command eq 'on')
+		{
+			$command='100';
+		} 
+		elsif ($command eq 'off'){
+			$command = '00';
+		}
+		$command = ::Insteon::DimmableLight::convert_level($command);
+		my $extra = $command ."0200000000000000000000000000";
+		my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'on', $extra);
+		return $message;
 	}
 }
 
@@ -1131,7 +1114,7 @@ sub _is_info_request
 	if ($$parent{child_status_request_pending}) {
 		$is_info_request++;
 		my $child_obj = Insteon::get_object($self->device_id, '02');
-		my $child_state = &Insteon::BaseObject::derive_link_state(hex($msg{extra}));
+		my $child_state = $child_obj->derive_link_state(hex($msg{extra}));
 		&::print_log("[Insteon::FanLinc] received status for " .
 			$child_obj->{object_name} . " of: $child_state "
 			. "hops left: $msg{hopsleft}") if $main::Debug{insteon};

From 10954bb5d9c46284ce8bd89025692da737078fc4 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 15:14:17 -0700
Subject: [PATCH 228/330] Insteon: Remove Set Routine from Thermo_i2CS

Trying to keep the code in the routine in sync with the BaseObject code is a bad idea.

Instead just tie_events to each of the subgroup objects
---
 lib/Insteon/Thermostat.pm | 58 ++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index f224d0484..f7a6eef45 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -192,6 +192,7 @@ sub new {
    $self->restore_data('temp','mode','fan_mode','heat_sp','cool_sp');
    $$self{m_pending_setpoint} = undef;
    $$self{message_types} = \%message_types;
+   $$self{is_responder} = 0; 
    return $self;
 }
 
@@ -585,33 +586,18 @@ sub init {
 	$$self{message_types} = \%message_types;
 	#Set saved state unique to i2CS devices
 	$self->restore_data('humid', 'cooling', 'heating', 'humidifying', 'dehumidifying', 'high_humid_sp', 'low_humid_sp');
-}
-
-sub set {
-	my ($self, $p_state, $p_setby, $p_respond) = @_;
-	my $root = $self->get_root();
-	if (!(ref $p_setby) || !($p_setby->equals($self))) {
-		::print_log("[Insteon::Thermo_i2CS] Sorry, you cannot control the ".
-			"thermostat in this manner.  Please read the documentation ".
-			"for Insteon::Thermostat for help.");
-		return;
+	if ($self->group eq 01){
+		$self -> tie_event ('$object->_cooling("$state")');
 	}
-	#Update the root object state
-	my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
-	if ($self->group eq '01'){
-		$root->_cooling($link_state);
-	} 
 	elsif ($self->group eq '02') {
-		$root->_heating($link_state);
+		$self -> tie_event ('$object->_heating("$state")');
 	}
 	elsif ($self->group eq '03') {
-		$root->_dehumidifying($link_state);
+		$self -> tie_event ('$object->_dehumidifying("$state")');
 	}
 	elsif ($self->group eq '04') {
-		$root->_humidifying($link_state);
+		$self -> tie_event ('$object->_humidifying("$state")');
 	}
-	#Update the status of linked devices
-	$self->set_linked_devices($link_state);
 }
 
 sub sync_links{
@@ -994,35 +980,39 @@ sub _humid {
 
 sub _cooling {
 	my ($self,$p_state) = @_;
-	$$self{cooling} = $p_state;
-	$self->set_receive('status_change');
-	return $$self{cooling};
+	my $root = $self->get_root();
+	$$root{cooling} = $p_state;
+	$root->set_receive('status_change');
+	return $$root{cooling};
 }
 
 sub _heating {
 	my ($self,$p_state) = @_;
-	$$self{heating} = $p_state;
-	$self->set_receive('status_change');
-	return $$self{heating};
+	my $root = $self->get_root();
+	$$root{heating} = $p_state;
+	$root->set_receive('status_change');
+	return $$root{heating};
 }
 
 
 sub _dehumidifying {
 	my ($self,$p_state) = @_;
-	if ($p_state ne $$self{dehumidifying}) {
-		$$self{dehumidifying} = $p_state;
-		$self->set_receive('status_change');
+	my $root = $self->get_root();
+	if ($p_state ne $$root{dehumidifying}) {
+		$$root{dehumidifying} = $p_state;
+		$root->set_receive('status_change');
 	}
-	return $$self{dehumidifying};
+	return $$root{dehumidifying};
 }
 
 sub _humidifying {
 	my ($self,$p_state) = @_;
-	if ($p_state ne $$self{humidifying}) {
-		$$self{humidifying} = $p_state;
-		$self->set_receive('status_change');
+	my $root = $self->get_root();
+	if ($p_state ne $$root{humidifying}) {
+		$$root{humidifying} = $p_state;
+		$root->set_receive('status_change');
 	}
-	return $$self{humidifying};
+	return $$root{humidifying};
 }
 
 sub _high_humid_sp {

From 748459138751b1af9b2c5ad037dd92b3fc95c730 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 15:19:31 -0700
Subject: [PATCH 229/330] Insteon: Cleanup Set Routine in IOLinc

No way to avoid hijacking BaseObject::Set
---
 lib/Insteon/IOLinc.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/Insteon/IOLinc.pm b/lib/Insteon/IOLinc.pm
index 721b244c0..814ff0fa3 100755
--- a/lib/Insteon/IOLinc.pm
+++ b/lib/Insteon/IOLinc.pm
@@ -152,7 +152,7 @@ and control the relay state.
 sub set
 {
 	my ($self, $p_state, $p_setby, $p_respond) = @_;
-	if (ref $p_setby && $p_setby->isa('Insteon::BaseObject') && $p_setby->equals($self)){
+	if (ref $p_setby && $p_setby->can('equals') && $p_setby->equals($self)){
 		my $curr_milli = sprintf('%.0f', &main::get_tickcount);
 		my $window = 1000;
 		if ($p_state eq $$self{child_state} &&
@@ -171,7 +171,6 @@ sub set
 		}
 	}
 	else {
-		my $link_state = &Insteon::BaseObject::derive_link_state($p_state);
 		$self->SUPER::set($link_state, $p_setby, $p_respond);
 	}
 	return;

From 2c250fc7fff84560c0e9fd64348ee264f11d382f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 15:25:45 -0700
Subject: [PATCH 230/330] Insteon: Remove BaseController:Derive_Message Routine

It did absolutely nothing
---
 lib/Insteon/BaseInsteon.pm | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index d15a3104e..ea86dc812 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -3199,22 +3199,6 @@ sub initiate_linking_as_controller
 	$self->interface()->initiate_linking_as_controller($p_group, $success_callback, $failure_callback);
 }
 
-=item C<derive_message([command,extra])>
-
-Generates and returns a basic on/off message from a command.
-
-=cut
-
-sub derive_message
-{
-	my ($self, $p_state, $p_extra) = @_;
-	if ($self->is_root) {
-		return $self->Insteon::BaseObject::derive_message($p_state, $p_extra);
-	} else {
-		return $self->Insteon::BaseObject::derive_message($p_state, $p_extra);
-	}
-}
-
 =item C<find_members([type])>
 
 Returns a list of objects that are members of device.  If type is specified, only

From da5e03e2c7c9a0d437d082e82a1aa489fb735d34 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 15:28:43 -0700
Subject: [PATCH 231/330] Insteon: Replace leading spaces with tabs in
 BaseObject::Set

---
 lib/Insteon/BaseInsteon.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index ea86dc812..e137c82aa 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -337,12 +337,12 @@ sub set
 		$$self{m_is_locally_set} = 0 unless ref $p_setby and $p_setby eq $self;
 
 		if ($p_state eq 'toggle')
-                {
-                	$p_state = ($self->state eq 'on')? 'off' : 'on';
-                }
+		{
+			$p_state = ($self->state eq 'on')? 'off' : 'on';
+		}
 
-                my $setby_name = $p_setby;
-                $setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
+		my $setby_name = $p_setby;
+		$setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
 		if (ref $p_setby and (($p_setby eq $self) or ($p_setby eq $self->interface)))
 		{ #If set by device, update MH state,
 		  #If set by interface, this was a status_request response
@@ -352,8 +352,8 @@ sub set
 			$self->set_linked_devices($p_state);
 		} else { # Not called by device, send set command
 			if ($self->is_responder){
-	                        my $message = $self->derive_message($p_state);
-	                        $self->_send_cmd($message);
+				my $message = $self->derive_message($p_state);
+				$self->_send_cmd($message);
 				&::print_log("[Insteon::BaseObject] " . $self->get_object_name() . "::set($p_state, $setby_name)")
 					if $main::Debug{insteon};
 				$self->is_acknowledged(0);

From de89b40a152bce0646c030e43b0243be4a52adb1 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 15:38:01 -0700
Subject: [PATCH 232/330] Insteon: Fix Small Bug in IOLinc

---
 lib/Insteon/IOLinc.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/IOLinc.pm b/lib/Insteon/IOLinc.pm
index 814ff0fa3..f40537757 100755
--- a/lib/Insteon/IOLinc.pm
+++ b/lib/Insteon/IOLinc.pm
@@ -171,7 +171,7 @@ sub set
 		}
 	}
 	else {
-		$self->SUPER::set($link_state, $p_setby, $p_respond);
+		$self->SUPER::set($p_state, $p_setby, $p_respond);
 	}
 	return;
 }

From c6cf214d1863a60c47bec52aa9e79f8a15c4137a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 13 Oct 2013 20:10:28 -0700
Subject: [PATCH 233/330] Insteon: Use Relative State Change on Manual Dimming

Determine relative percentage change based on interval between start and stop manual changes

Set device's state based on relative change, no longer request state after change, cuts down on excess messages

Set linked device states based on relative change, this permits more accurate representation of dimming of a scene with varying on_levels.  For Example, imagine a Scene where Light1 is linked to Light2 such that Light2's on_level is 75%.

After the scene is turned on, Light1 is then manually dimmed by 15%, Light2 will then dim by 15% as well and its state will be updated.

The resulting states would be Light1 85% and Light2 60%.
---
 lib/Insteon/BaseInsteon.pm | 62 ++++++++++++++++++++++++++++++--------
 lib/Insteon/Message.pm     |  2 ++
 2 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index e137c82aa..330825171 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -346,10 +346,22 @@ sub set
 		if (ref $p_setby and (($p_setby eq $self) or ($p_setby eq $self->interface)))
 		{ #If set by device, update MH state,
 		  #If set by interface, this was a status_request response
+			$self->set_linked_devices($p_state);
+			if ($p_state =~ /^([+-])(\d+)/) {
+				#This is a relative state
+				my $rel_state;
+				$rel_state = -$2 if ($1 eq '-');
+				$rel_state = +$2 if ($1 eq '+');
+				my $curr_state = '100';
+				$curr_state = '0' if ($self->state eq 'off');
+				$curr_state = $1 if $self->state =~ /(\d{1,3})/;
+				$p_state = $curr_state + $rel_state;
+				$p_state = 100 if ($p_state > 100);
+				$p_state = 0 if ($p_state < 0);
+			}
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
 				. "::set_receive($p_state, $setby_name)") if $main::Debug{insteon};
 			$self->set_receive($p_state,$p_setby,$p_response) if defined $p_state;
-			$self->set_linked_devices($p_state);
 		} else { # Not called by device, send set command
 			if ($self->is_responder){
 				my $message = $self->derive_message($p_state);
@@ -865,10 +877,19 @@ sub _process_message
 	}
         elsif ($msg{command} eq 'start_manual_change')
         {
-		# do nothing; although, maybe anticipate change? we should always get a stop
+		$$self{manual_direction} = $msg{extra};
+		$$self{manual_start} = ::get_tickcount() - (($msg{maxhops}-$msg{hopsleft})*50);
 	} elsif ($msg{command} eq 'stop_manual_change') {
-		# request status so that the final state can be known
-		$self->request_status($self);
+		# Determine percent change based on time interval
+		my $finish_time = &main::get_tickcount - (($msg{maxhops}-$msg{hopsleft})*50);
+		my $total_time = $finish_time - $$self{manual_start};
+		my $percent_change = int($total_time / 42);
+		if ($$self{manual_direction} eq '00') {
+			$percent_change = "-".$percent_change;
+		} else {
+			$percent_change = "+".$percent_change;
+		}
+		$self->set($percent_change, $self);
 	} elsif ($msg{command} eq 'read_write_aldb') {
 		if ($self->_aldb){
 			$clear_message = $self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
@@ -1000,7 +1021,7 @@ sub _is_valid_state
 	my ($msg, $substate) = split(/:/, $state, 2);
 	$msg=lc($msg);
 
-	if ($msg=~/^([1]?[0-9]?[0-9])/)
+	if ($msg=~/^[+-]?([1]?[0-9]?[0-9])/)
 	{
 		if ($1 < 1) {
 			$msg='off';
@@ -3060,8 +3081,27 @@ sub set_linked_devices
 			# If controller is on, set member to stored on_level
 			# else set to controller value
 			my $local_state = $$self{members}{$member_ref}{on_level};
-			$local_state = 'on' unless $local_state;
-			$local_state = $link_state if (lc $link_state ne 'on');
+			$local_state = '100' unless $local_state;
+			
+			if (lc $link_state ne 'on'){
+				# Not setting member to default
+				if ($link_state =~ /^([+-])(\d+)/) {
+					#This is a relative state
+					my $rel_state;
+					$rel_state = -$2 if ($1 eq '-');
+					$rel_state = +$2 if ($1 eq '+');
+					my $curr_state = '100';
+					$curr_state = '0' if ($member->state eq 'off');
+					$curr_state = $1 if $member->state =~ /(\d{1,3})/;
+					$local_state = $curr_state + $rel_state;
+					$local_state = 100 if ($local_state > 100);
+					$local_state = 0 if ($local_state < 0);
+				} 
+				else {
+					#An absolute state
+					$local_state = $link_state;
+				}
+			}
 			
 			if ($member->isa('Light_Item'))
 			{
@@ -3091,17 +3131,15 @@ sub set_linked_devices
 			}
 			elsif ($member->isa('Insteon::BaseDevice'))
 			{
-			# remember the current state to support resume
+				# remember the current state to support resume
 				$$self{members}{$member_ref}{resume_state} = $member->state;
-			# if they are Insteon_Device objects, then simply set_receive their state to
-			#   the member on level
+				# if they are Insteon_Device objects, then simply set_receive their state to
+				#   the member on level
  				$local_state = $member->derive_link_state($local_state);
 				$member->set_receive($local_state,$self);
 			}
 		}
 	}
-
-
 }
 
 =item C<set_with_timer(state, time, return_state, additional_return_states)>
diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index fea11d116..38e4e43fd 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -434,6 +434,8 @@ sub command_to_hash
                 {
 			$msg{type} = 'alllink';
 			$msg{group} = substr($p_state,10,2);
+			$msg{extra} = substr($p_state,16,2) 
+				if (length($p_state) >= 18);
 		}
                 else
                 {

From 9232a5b3b3b5f617ce312741cb20b0cfd715ed79 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Mon, 14 Oct 2013 21:12:26 -0400
Subject: [PATCH 234/330] Added support for the aviosys USB Power 8840 relay
 board

---
 lib/PAobj.pm        | 63 +++++++++++++++++++++++++++++++++++++--------
 lib/read_table_A.pl |  6 ++++-
 2 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index 0862edbd8..e79680945 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -63,7 +63,7 @@ sub init {
     $self->check_group('default');
 
     my @speakers = $self->get_speakers('allspeakers');
-    my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl,@speakers_audrey);
+    my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl,@speakers_audrey,@speakers_aviosys);
 
     for my $room (@speakers) {
         my $ref = &::get_object_by_name("pa_$room");
@@ -89,21 +89,27 @@ sub init {
         if($type eq 'audrey') {
             push(@speakers_audrey,$room);
         }
+        if($type eq 'aviosys') {
+            push(@speakers_aviosys,$room);
+        }
     }
     
     &::print_log("PAobj: speakers_wdio: $#speakers_wdio") if $main::Debug{pa};# || $#speakers_wdio gt -1;
     &::print_log("PAobj: speakers_x10: $#speakers_x10") if $main::Debug{pa};# || $#speakers_x10 gt -1;
     &::print_log("PAobj: speakers_xap: $#speakers_xap") if $main::Debug{pa};# || $#speakers_xap gt -1;
     &::print_log("PAobj: speakers_xpl: $#speakers_xpl") if $main::Debug{pa};# || $#speakers_xpl gt -1;
-    &::print_log("PAobj: speakers_obj: $#speakers_obj") if $main::Debug{pa};# || $#speakers_obj gt -1;
     &::print_log("PAobj: speakers_audrey: $#speakers_audrey") if $main::Debug{pa};# || $#speakers_audrey gt -1;
+    &::print_log("PAobj: speakers_aviosys: $#speakers_aviosys") if $main::Debug{pa};# || $#speakers_aviosys gt -1;
+    &::print_log("PAobj: speakers_obj: $#speakers_obj") if $main::Debug{pa};# || $#speakers_obj gt -1;
+
 
     $pa_zones{all}{wdio}=join(',',@speakers_wdio);
     $pa_zones{all}{x10}=join(',',@speakers_x10);
     $pa_zones{all}{xap}=join(',',@speakers_xap);
     $pa_zones{all}{xpl}=join(',',@speakers_xpl);
-    $pa_zones{all}{obj}=join(',',@speakers_obj);
     $pa_zones{all}{audrey}=join(',',@speakers_audrey);
+    $pa_zones{all}{aviosys}=join(',',@speakers_aviosys);
+    $pa_zones{all}{obj}=join(',',@speakers_obj);
 
     if ($#speakers_wdio > -1) {
         $self->init_weeder(@speakers_wdio);
@@ -163,7 +169,7 @@ sub prep_parms
     
     $parms->{pa_zones} = join(',', @speakers);
     
-    my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl,@speakers_audrey);
+    my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl,@speakers_audrey,@speakers_aviosys);
 
     for my $room (@speakers) {
         my $ref = &::get_object_by_name("pa_$room");
@@ -184,30 +190,36 @@ sub prep_parms
             &::print_log("PAobj: speakers_xpl: Adding $room") if $main::Debug{pa} >=3;
             push(@speakers_xpl,$room);
         }
-        if($type eq 'object') {
-            &::print_log("PAobj: speakers_object: Adding $room") if $main::Debug{pa} >=3;
-            push(@speakers_obj,$room);
-        }
         if($type eq 'audrey') {
             &::print_log("PAobj: speakers_audrey: Adding $room") if $main::Debug{pa} >=3;
             push(@speakers_audrey,$room);
         }
+        if($type eq 'aviosys') {
+            &::print_log("PAobj: speakers_aviosys: Adding $room") if $main::Debug{pa} >=3;
+            push(@speakers_aviosys,$room);
+        }
+        if($type eq 'object') {
+            &::print_log("PAobj: speakers_object: Adding $room") if $main::Debug{pa} >=3;
+            push(@speakers_obj,$room);
+        }
     }
     
     &::print_log("PAobj: speakers_wdio: $#speakers_wdio") if $main::Debug{pa}  >=2 || $#speakers_wdio gt -1;
     &::print_log("PAobj: speakers_x10: $#speakers_x10") if $main::Debug{pa}  >=2 || $#speakers_x10 gt -1;
     &::print_log("PAobj: speakers_xap: $#speakers_xap") if $main::Debug{pa}  >=2 || $#speakers_xap gt -1;
     &::print_log("PAobj: speakers_xpl: $#speakers_xpl") if $main::Debug{pa}  >=2 || $#speakers_xpl gt -1;
-    &::print_log("PAobj: speakers_obj: $#speakers_obj") if $main::Debug{pa}  >=2 || $#speakers_obj gt -1;
     &::print_log("PAobj: speakers_audrey: $#speakers_audrey") if $main::Debug{pa}  >=2 || $#speakers_audrey gt -1;
+    &::print_log("PAobj: speakers_aviosys: $#speakers_aviosys") if $main::Debug{pa}  >=2 || $#speakers_aviosys gt -1;
+    &::print_log("PAobj: speakers_obj: $#speakers_obj") if $main::Debug{pa}  >=2 || $#speakers_obj gt -1;
 
     
     $pa_zones{active}{wdio}=join(',',@speakers_wdio);
     $pa_zones{active}{x10}=join(',',@speakers_x10);
     $pa_zones{active}{xap}=join(',',@speakers_xap);
     $pa_zones{active}{xpl}=join(',',@speakers_xpl);
-    $pa_zones{active}{obj}=join(',',@speakers_obj);
     $pa_zones{active}{audrey}=join(',',@speakers_audrey);
+    $pa_zones{active}{aviosys}=join(',',@speakers_aviosys);
+    $pa_zones{active}{obj}=join(',',@speakers_obj);
     
     $parms->{web_file}="web_file" if $#speakers_audrey gt -1;
     
@@ -217,6 +229,7 @@ sub prep_parms
         && $pa_zones{active}{x10} eq ''
         && $pa_zones{active}{xap} eq ''
         && $pa_zones{active}{xpl} eq ''
+        && $pa_zones{active}{aviosys} eq ''
         && $pa_zones{active}{obj} eq ''
         
     ) {
@@ -237,15 +250,17 @@ sub audio_hook
     my @speakers_x10=split(',',$pa_zones{active}{x10});
     my @speakers_xap=split(',',$pa_zones{active}{xap});
     my @speakers_xpl=split(',',$pa_zones{active}{xpl});
+    my @speakers_aviosys=split(',',$pa_zones{active}{aviosys});
     my @speakers_obj=split(',',$pa_zones{active}{obj});
     
     #TODO: Properly handle $results across multiple types
-    #TODO: Break up the wdio zones based on serial port, in case there are more than one.
+    #TODO: Break up the wdio and aviosys zones based on serial port, in case there are more than one.
     $results=0;
     $results = $self->set_weeder($state,'weeder',@speakers_wdio) 	if $#speakers_wdio > -1;
     $results = $self->set_x10($state,@speakers_x10) 			if $#speakers_x10 > -1;
     $results = $self->set_xap($state,\@speakers_xap,\%voiceparms) 	if $#speakers_xap > -1;	
     $results = $self->set_xpl($state,\@speakers_xpl,\%voiceparms) 	if $#speakers_xpl > -1;
+    $results = $self->set_aviosys($state,'aviosys',@speakers_aviosys) 	if $#speakers_aviosys > -1;
     $results = $self->set_obj($state,@speakers_obj) 			if $#speakers_obj > -1;
     
     &::print_log("PAobj: set results: $results") if $main::Debug{pa};
@@ -257,6 +272,7 @@ sub audio_hook
         && (
             $pa_zones{active}{wdio} ne ''
             || $pa_zones{active}{x10} ne ''
+            || $pa_zones{active}{aviosys} ne ''
             || $pa_zones{active}{obj} ne ''
         )
     ) {
@@ -453,6 +469,31 @@ sub get_weeder_string
     return $card . "W$weeder_code";
 }
 
+sub set_aviosys
+{
+    my ($self,$state,$aviosys_port,@speakers) = @_;
+    my $aviosysref = {'on' => {'1' => '!','2' => '#','3' => '%','4' => '&','5' => '(','6' => '_','7' => '{','8' => '}' },'off' => {'1' => '@','2' => '$','3' => '^','4' => '*','5' => ')','6' => '-','7' => '[','8' => ']'}};
+    my %aviosys_ref;
+    my $aviosys_command='';
+    for my $room (@speakers) {
+        &::print_log("PAobj: set_aviosys: " . $room . " / " . $state) if $main::Debug{pa} >=3;
+        my $ref = &::get_object_by_name('pa_'.$room);
+        if ($ref) {
+            my ($id) = $ref->get_address();
+            $aviosys_command .= $aviosysref->{$state}{$id};
+            &::print_log("PAobj: port: $id, Room: $room") if $main::Debug{pa} >=2;
+        } else {
+            &::print_log("PAobj: Unable to locate object for: pa_$room");
+        }
+    }
+
+    return 0 unless $aviosys_command;
+    &::print_log("PAobj: Sending $aviosys_command to the aviosys card") if $main::Debug{pa};
+    #$aviosys_command =~ s/\\r/\r/g;
+    #&Serial_Item::send_serial_data($aviosys_port, $aviosys_command) if $main::Serial_Ports{$aviosys_port}{object};
+    return 1;
+}
+
 sub get_speakers
 {
     my ($self,$rooms) = @_;
diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index f924d1343..fb3282303 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -573,6 +573,10 @@ sub read_table_A {
             $code .= sprintf "\$%-35s -> target_address('%s');\n",$name.'_obj',$address;
             $code .= sprintf "\$%-35s -> class_name('%s');\n",$name.'_obj',$serial;
             $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n",$name,$name.'_obj';
+        } elsif (lc $pa_type eq 'aviosys') {
+            my $aviosysref = {'on' => {'1' => '!','2' => '#','3' => '%','4' => '&','5' => '(','6' => '_','7' => '{','8' => '}' },'off' => {'1' => '@','2' => '$','3' => '^','4' => '*','5' => ')','6' => '-','7' => '[','8' => ']'}};
+            $code .= sprintf "\$%-35s = new Serial_Item('%s','on','%s');\n",$name.'_obj',$aviosysref->{'on'}{$address},$serial;
+            $code .= sprintf "\$%-35s -> add ('%s','off');\n",$name.'_obj',$aviosysref->{'off'}{$address};
         } else {
             print "\nUnrecognized .mht entry for PA: $record\n";
             return;
@@ -1134,4 +1138,4 @@ sub read_table_A {
 # Revision 1.3  2000/10/01 23:29:40  winter
 # - 2.29 release
 #
-#
\ No newline at end of file
+#

From 19e06d14f11c11a15dc2186068de9a2363b83162 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Mon, 14 Oct 2013 22:34:33 -0400
Subject: [PATCH 235/330] Add support for multiple serial ports for weeder and
 aviosys. Fix erroneous code comment.

---
 lib/PAobj.pm | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index e79680945..eceac04fd 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -244,23 +244,39 @@ sub audio_hook
 {
     my ($self,$state,%voiceparms) = @_;
     my $results = 0;
-#    my @speakers = split(',', $voiceparms{pa_zones});
 
-    my @speakers_wdio=split(',',$pa_zones{active}{wdio});
+    my (%speakers_aviosys,%speakers_wdio);
     my @speakers_x10=split(',',$pa_zones{active}{x10});
     my @speakers_xap=split(',',$pa_zones{active}{xap});
     my @speakers_xpl=split(',',$pa_zones{active}{xpl});
-    my @speakers_aviosys=split(',',$pa_zones{active}{aviosys});
     my @speakers_obj=split(',',$pa_zones{active}{obj});
-    
+
     #TODO: Properly handle $results across multiple types
-    #TODO: Break up the wdio and aviosys zones based on serial port, in case there are more than one.
+
     $results=0;
-    $results = $self->set_weeder($state,'weeder',@speakers_wdio) 	if $#speakers_wdio > -1;
     $results = $self->set_x10($state,@speakers_x10) 			if $#speakers_x10 > -1;
     $results = $self->set_xap($state,\@speakers_xap,\%voiceparms) 	if $#speakers_xap > -1;	
     $results = $self->set_xpl($state,\@speakers_xpl,\%voiceparms) 	if $#speakers_xpl > -1;
-    $results = $self->set_aviosys($state,'aviosys',@speakers_aviosys) 	if $#speakers_aviosys > -1;
+
+    for my $room (split(',',$pa_zones{active}{aviosys})) {
+        my $ref = &::get_object_by_name('pa_'.$room);
+	my $serial=$ref->get_serial();
+        &::print_log("PAobj: aviosys serial: " . $room . " / " . $serial) if $main::Debug{pa} >=3;
+        push(@{$speakers_aviosys{$serial}},$room);
+    }
+    foreach my $serial (keys(%speakers_aviosys)) {
+        $results = $self->set_aviosys($state,$serial,@{$speakers_aviosys{$serial}});
+    }
+    for my $room (split(',',$pa_zones{active}{wdio})) {
+        my $ref = &::get_object_by_name('pa_'.$room);
+	my $serial=$ref->get_serial();
+        &::print_log("PAobj: wdio serial: " . $room . " / " . $serial) if $main::Debug{pa} >=3;
+        push(@{$speakers_wdio{$serial}},$room);
+    }
+    foreach my $serial (keys(%speakers_wdio)) {
+        $results = $self->set_weeder($state,$serial,@{$speakers_wdio{$serial}});
+    }
+
     $results = $self->set_obj($state,@speakers_obj) 			if $#speakers_obj > -1;
     
     &::print_log("PAobj: set results: $results") if $main::Debug{pa};
@@ -490,7 +506,7 @@ sub set_aviosys
     return 0 unless $aviosys_command;
     &::print_log("PAobj: Sending $aviosys_command to the aviosys card") if $main::Debug{pa};
     #$aviosys_command =~ s/\\r/\r/g;
-    #&Serial_Item::send_serial_data($aviosys_port, $aviosys_command) if $main::Serial_Ports{$aviosys_port}{object};
+    &Serial_Item::send_serial_data($aviosys_port, $aviosys_command) if $main::Serial_Ports{$aviosys_port}{object};
     return 1;
 }
 

From fd3270da684ac159371cc3242dd39728d343309f Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Tue, 15 Oct 2013 13:21:24 -0400
Subject: [PATCH 236/330] Added debug print_log calls for serial port loops

---
 lib/PAobj.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index eceac04fd..68603e594 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -265,6 +265,7 @@ sub audio_hook
         push(@{$speakers_aviosys{$serial}},$room);
     }
     foreach my $serial (keys(%speakers_aviosys)) {
+        &::print_log("PAobj: calling set for aviosys serial port: $serial") if $main::Debug{pa} >=3;
         $results = $self->set_aviosys($state,$serial,@{$speakers_aviosys{$serial}});
     }
     for my $room (split(',',$pa_zones{active}{wdio})) {
@@ -274,6 +275,7 @@ sub audio_hook
         push(@{$speakers_wdio{$serial}},$room);
     }
     foreach my $serial (keys(%speakers_wdio)) {
+        &::print_log("PAobj: calling set for wdio serial port: $serial") if $main::Debug{pa} >=3;
         $results = $self->set_weeder($state,$serial,@{$speakers_wdio{$serial}});
     }
 

From 8ffe6d00f6fbbc4efaba46ffac52a1a24ba23335 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 15 Oct 2013 17:37:00 -0700
Subject: [PATCH 237/330] Insteon: Move Relative State Conversion to Derive
 Link State Function

Cuts down on duplication of code
---
 lib/Insteon/BaseInsteon.pm | 44 +++++++++++---------------------------
 lib/Insteon/Lighting.pm    | 11 ++++++++++
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 330825171..1f5f10720 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -55,6 +55,17 @@ sub derive_link_state
 {
 	my ($self, $p_state) = @_;
 	$p_state = $self if !(ref $self); #Old code made direct calls
+	#Convert Relative State to Absolute State
+	if ($p_state =~ /^([+-])(\d+)/) {
+		my $rel_state = $1 . $2;
+		my $curr_state = '100';
+		$curr_state = '0' if ($self->state eq 'off');
+		$curr_state = $1 if $self->state =~ /(\d{1,3})/;
+		$p_state = $curr_state + $rel_state;
+		$p_state = 'on' if ($p_state > 0);
+		$p_state = 'off' if ($p_state <= 0);
+	}
+	
 	my $link_state = 'on';
 	if ($p_state eq 'off' or $p_state eq 'off_fast')
 	{
@@ -347,18 +358,7 @@ sub set
 		{ #If set by device, update MH state,
 		  #If set by interface, this was a status_request response
 			$self->set_linked_devices($p_state);
-			if ($p_state =~ /^([+-])(\d+)/) {
-				#This is a relative state
-				my $rel_state;
-				$rel_state = -$2 if ($1 eq '-');
-				$rel_state = +$2 if ($1 eq '+');
-				my $curr_state = '100';
-				$curr_state = '0' if ($self->state eq 'off');
-				$curr_state = $1 if $self->state =~ /(\d{1,3})/;
-				$p_state = $curr_state + $rel_state;
-				$p_state = 100 if ($p_state > 100);
-				$p_state = 0 if ($p_state < 0);
-			}
+			$p_state = $self->derive_link_state($p_state);
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
 				. "::set_receive($p_state, $setby_name)") if $main::Debug{insteon};
 			$self->set_receive($p_state,$p_setby,$p_response) if defined $p_state;
@@ -3083,26 +3083,6 @@ sub set_linked_devices
 			my $local_state = $$self{members}{$member_ref}{on_level};
 			$local_state = '100' unless $local_state;
 			
-			if (lc $link_state ne 'on'){
-				# Not setting member to default
-				if ($link_state =~ /^([+-])(\d+)/) {
-					#This is a relative state
-					my $rel_state;
-					$rel_state = -$2 if ($1 eq '-');
-					$rel_state = +$2 if ($1 eq '+');
-					my $curr_state = '100';
-					$curr_state = '0' if ($member->state eq 'off');
-					$curr_state = $1 if $member->state =~ /(\d{1,3})/;
-					$local_state = $curr_state + $rel_state;
-					$local_state = 100 if ($local_state > 100);
-					$local_state = 0 if ($local_state < 0);
-				} 
-				else {
-					#An absolute state
-					$local_state = $link_state;
-				}
-			}
-			
 			if ($member->isa('Light_Item'))
 			{
 			# if they are Light_Items, then set their on_dim attrib to the member on level
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index ca5942e08..a4e23830a 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -175,6 +175,17 @@ devices and returns a derived state of on, off, or 0%-100%.
 sub derive_link_state
 {
 	my ($self, $p_state) = @_;
+	#Convert Relative State to Absolute State
+	if ($p_state =~ /^([+-])(\d+)/) {
+		my $rel_state = $1 . $2;
+		my $curr_state = '100';
+		$curr_state = '0' if ($self->state eq 'off');
+		$curr_state = $1 if $self->state =~ /(\d{1,3})/;
+		$p_state = $curr_state + $rel_state;
+		$p_state = 100 if ($p_state > 100);
+		$p_state = 0 if ($p_state < 0);
+	}
+	
 	my $link_state = 'on';
 	if ($p_state eq 'off' or $p_state eq 'off_fast')
 	{

From fd29fe67be8e936e45211baafa7f050b1e09883f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 15 Oct 2013 17:38:00 -0700
Subject: [PATCH 238/330] Insteon: Move DeviceController Down in Inheritance

Otherwise calling the set commands on these objects results in calling the Generic_Item::Set command.
---
 lib/Insteon/Controller.pm | 2 +-
 lib/Insteon/Irrigation.pm | 2 +-
 lib/Insteon/Security.pm   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index cf221055e..368de52ae 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -54,7 +54,7 @@ package Insteon::RemoteLinc;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::RemoteLinc::ISA = ('Insteon::DeviceController','Insteon::BaseDevice');
+@Insteon::RemoteLinc::ISA = ('Insteon::BaseDevice','Insteon::DeviceController');
 
 my %message_types = (
 	%Insteon::BaseDevice::message_types,
diff --git a/lib/Insteon/Irrigation.pm b/lib/Insteon/Irrigation.pm
index 50633d7a9..1bd7209f4 100755
--- a/lib/Insteon/Irrigation.pm
+++ b/lib/Insteon/Irrigation.pm
@@ -59,7 +59,7 @@ use Insteon::BaseInsteon;
 
 package Insteon::Irrigation;
 
-@Insteon::Irrigation::ISA = ('Insteon::DeviceController','Insteon::BaseDevice');
+@Insteon::Irrigation::ISA = ('Insteon::BaseDevice','Insteon::DeviceController');
 
 our %message_types = (
 	%Insteon::BaseDevice::message_types,
diff --git a/lib/Insteon/Security.pm b/lib/Insteon/Security.pm
index 91a26b363..a51be4db7 100644
--- a/lib/Insteon/Security.pm
+++ b/lib/Insteon/Security.pm
@@ -108,7 +108,7 @@ package Insteon::MotionSensor;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::MotionSensor::ISA = ('Insteon::DeviceController','Insteon::BaseDevice');
+@Insteon::MotionSensor::ISA = ('Insteon::BaseDevice', 'Insteon::DeviceController');
 
 =item C<new()>
 

From f159e820edd64985aa89b9b35229dfc13a3669fe Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 15 Oct 2013 17:39:00 -0700
Subject: [PATCH 239/330] Insteon: Fix Typos and Remove a Few Excess Items

Convert @lights[0] code to $lights[0] to get rid of perl warning.

Add space in a debug print log.

Ger rid of unnecessary if statement.
---
 lib/Insteon/BaseInsteon.pm   | 6 +++---
 lib/Insteon/BaseInterface.pm | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 1f5f10720..a5d73dcc5 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -361,7 +361,7 @@ sub set
 			$p_state = $self->derive_link_state($p_state);
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
 				. "::set_receive($p_state, $setby_name)") if $main::Debug{insteon};
-			$self->set_receive($p_state,$p_setby,$p_response) if defined $p_state;
+			$self->set_receive($p_state,$p_setby,$p_response);
 		} else { # Not called by device, send set command
 			if ($self->is_responder){
 				my $message = $self->derive_message($p_state);
@@ -3095,7 +3095,7 @@ sub set_linked_devices
 				my @lights = $member->find_members('Insteon::BaseDevice');
 				if (@lights)
 				{
-					my $light = @lights[0];
+					my $light = $lights[0];
 					# remember the current state to support resume
 					$$self{members}{$member_ref}{resume_state} = $light->state;
 					$member->manual($light, $ramp_rate);
@@ -3175,7 +3175,7 @@ sub update_members
 			# if they are Light_Items, then locate the Light_Item's Insteon_Device member
 				my @lights = $member->find_members('Insteon::BaseDevice');
 				if (@lights) {
-					$device = @lights[0];
+					$device = $lights[0];
 				}
 			} elsif ($member->isa('Insteon::BaseDevice')) {
 				$device = $member;
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 3842c5692..5d0faf805 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -616,7 +616,7 @@ sub on_standard_insteon_received
                                                 else
                                                 {
                                                 	&main::print_log("[Insteon::BaseInterface] ERROR: received cleanup message from "
-                                                             . $setby_object->get_object_name . "that does not correspond to a valid PLM group. Corrupted message is assumed "
+                                                             . $setby_object->get_object_name . " that does not correspond to a valid PLM group. Corrupted message is assumed "
                                                              . "and will be skipped! Was group " . $msg{extra});
                                                     $setby_object->corrupt_count_log(1) if $setby_object->can('corrupt_count_log');
                                                 }

From e9264c8124b7939c23fb6c92562a88105b4e1797 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 15 Oct 2013 17:42:00 -0700
Subject: [PATCH 240/330] Insteon: Call Derive_Link_State on Passed State in
 Set_Linked_Devices

Prior commit inserted a bug where the state of linked devices was always set to on.
---
 lib/Insteon/BaseInsteon.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index a5d73dcc5..a9fb6eab3 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -3099,8 +3099,9 @@ sub set_linked_devices
 					# remember the current state to support resume
 					$$self{members}{$member_ref}{resume_state} = $light->state;
 					$member->manual($light, $ramp_rate);
-					$local_state = $light->derive_link_state($local_state) 
-						if $light->can('derive_link_state');
+					if ($light->can('derive_link_state') && lc $link_state ne 'on'){
+						$local_state = $light->derive_link_state($link_state);
+					}
 					$light->set_receive($local_state,$self);
 				}
 				else
@@ -3115,7 +3116,9 @@ sub set_linked_devices
 				$$self{members}{$member_ref}{resume_state} = $member->state;
 				# if they are Insteon_Device objects, then simply set_receive their state to
 				#   the member on level
- 				$local_state = $member->derive_link_state($local_state);
+				if (lc $link_state ne 'on'){
+ 					$local_state = $member->derive_link_state($link_state);
+				}
 				$member->set_receive($local_state,$self);
 			}
 		}

From 6e1c3d0f847352a42f0ed977f8fb0c68d52215eb Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 15 Oct 2013 17:43:00 -0700
Subject: [PATCH 241/330] Insteon: Set Device Before Setting Linked Devices;
 Don't Set Linked Devices on PLM Status Request

Need to set the main device state first before setting linked devices, otherwise you can get set_by loop errors if you have a three way controller.

Don't change the state of linked devices if the PLM requested the status. As turning off the linked devices would not always make sense.
---
 lib/Insteon/BaseInsteon.pm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index a9fb6eab3..c4e909cc5 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -354,15 +354,21 @@ sub set
 
 		my $setby_name = $p_setby;
 		$setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
-		if (ref $p_setby and (($p_setby eq $self) or ($p_setby eq $self->interface)))
+		if (ref $p_setby and $p_setby eq $self)
 		{ #If set by device, update MH state,
-		  #If set by interface, this was a status_request response
+			my $derived_state = $self->derive_link_state($p_state);
+			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
+				. "::set_receive($derived_state, $setby_name)") if $main::Debug{insteon};
+			$self->set_receive($derived_state,$p_setby,$p_response);
 			$self->set_linked_devices($p_state);
-			$p_state = $self->derive_link_state($p_state);
+		} 
+		elsif (ref $p_setby and $p_setby eq $self->interface) 
+		{ #If set by interface, this was a manual status_request response
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
 				. "::set_receive($p_state, $setby_name)") if $main::Debug{insteon};
 			$self->set_receive($p_state,$p_setby,$p_response);
-		} else { # Not called by device, send set command
+		}
+		else { # Not called by device, send set command
 			if ($self->is_responder){
 				my $message = $self->derive_message($p_state);
 				$self->_send_cmd($message);

From a8f31f33058ca0fd8b00d9aaf7fe48949dce40f1 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Tue, 15 Oct 2013 23:24:11 -0400
Subject: [PATCH 242/330] Embed speech clash resolution into pa_control.pl.
 Works better and speaks more reliably in desired rooms, due to correcting a
 race condition.

---
 code/common/pa_control.pl | 48 +++++++++++++++++++++++++++++++--------
 lib/PAobj.pm              | 19 ++++++++++++++--
 2 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/code/common/pa_control.pl b/code/common/pa_control.pl
index 74e23e55c..3418fb753 100644
--- a/code/common/pa_control.pl
+++ b/code/common/pa_control.pl
@@ -35,7 +35,9 @@
 
 #noloop=start
 my $pa_delay	= $config_parms{pa_delay};
+my $pa_clash_delay = $config_parms{pa_clash_delay};
 my $pa_timer	= $config_parms{pa_timer};
+$pa_clash_delay	= 1		unless $pa_clash_delay;
 $pa_delay	= 0.5		unless $pa_delay;
 $pa_timer	= 60		unless $pa_timer;
 $pactrl = new PAobj();
@@ -83,17 +85,42 @@ sub pa_parms_stub {
     }
     $parms->{pa_mode} = $mode;
     return if $mode eq 'mute' or $mode eq 'offline';
-    
-    my $results = $pactrl->prep_parms($parms);
-    my %pa_zones = $pactrl->get_pa_zones();
 
-    if (defined $pa_zones{audrey} && $pa_zones{audrey} ne '') {
-        print_log("PA: audrey zone detected, hooking via web_hook. (".$pa_zones{audrey}.")") if $Debug{pa};
-        push(@{$parms->{web_hook}},\&pa_web_hook);
-    }
+    if($pactrl->active(1)) {
+        my $results = $pactrl->prep_parms($parms);
+        my %pa_zones = $pactrl->get_pa_zones();
+
+        if (defined $pa_zones{audrey} && $pa_zones{audrey} ne '') {
+            print_log("PA: audrey zone detected, hooking via web_hook. (".$pa_zones{audrey}.")") if $Debug{pa};
+            push(@{$parms->{web_hook}},\&pa_web_hook);
+        }
+
+        print_log("PA: parms_stub set results: $results") if $Debug{pa} >=2;
+
+    } else {
+        #MH is already speaking, and other PA zones are already active. Delay speech.
+        if ($main::Debug{voice}) {
+            $$parms{clash_retry}=0 unless $$parms{clash_retry};
+            &print_log("PA SPEECH CLASH($$parms{clash_retry}): Delaying speech call for " . $$parms{text} . "\n") unless $$parms{clash_retry} lt 1;
+            $$parms{clash_retry}++; #To track how many loops are made
+        }
+        $$parms{nolog}=1;       #To stop MH from logging the speech again
+
+        my $parmstxt;
+        my ($pkey,$pval);
+        while (($pkey,$pval) = each(%{$parms})) {
+            $parmstxt.=', ' if $parmstxt;
+            $parmstxt .= "$pkey => q($pval)";
+        }
+        &print_log("PA SPEECH CLASH Parameters: $parmstxt") if $main::Debug{voice} && $$parms{clash_retry} eq 0;
+        &run_after_delay($pa_clash_delay, "speak($parmstxt)");
 
-    print_log("PA: parms_stub set results: $results") if $Debug{pa} >=2;
-    
+        $$parms{no_speak}=1;    #To stop MH from speaking this time around
+        return;
+    }
+    if ($$parms{clash_retry}) {
+        &print_log("PA SPEECH CLASH: Resolved, continuing speech.");
+    }
 }
 
 sub pa_control_stub {
@@ -121,6 +148,7 @@ sub pa_web_hook {
     unset $pa_speaker_timer;
     print_log("PA: Turning speakers off") if $Debug{pa};
     $pactrl->audio_hook(OFF,'normal');
+    $pactrl->active(0);
 }
 
           #Setup Fail-safe speaker shutoff
@@ -139,7 +167,7 @@ sub pa_web_hook {
 #
 #Type Address	Name			Groups               		Serial   Type
 #
-PA,	AA,		kitchen,		all|default|mainfloor,		weeder, wdio
+PA,	AA,		kitchen,	all|default|mainfloor,		weeder, wdio
 PA,	AB,		server,		all|basement,			weeder, wdio
 PA,	AG,		master,		all|default|upstairs,		weeder2, wdio_old
 PA,	B12,		garage,		all|outside,				, X10
diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index 68603e594..8091f851c 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -33,6 +33,8 @@ package PAobj;
 
 @PAobj::ISA = ('Generic_Item');
 
+my $active;
+
 sub last_char
 {
     my ($self,$string) = @_;
@@ -61,6 +63,7 @@ sub init {
         return 0;
     }
     $self->check_group('default');
+    $self->active(0);
 
     my @speakers = $self->get_speakers('allspeakers');
     my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl,@speakers_audrey,@speakers_aviosys);
@@ -113,7 +116,6 @@ sub init {
 
     if ($#speakers_wdio > -1) {
         $self->init_weeder(@speakers_wdio);
-        return 0 unless %pa_weeder_max_port;
     }
     if ($pa_zone_types{'x10'}) {
         &::print_log("PAobj: x10 PA type initialized...") if $main::Debug{pa};
@@ -154,10 +156,23 @@ sub init_weeder
     %pa_weeder_max_port = %weeder_max;
 }
 
+sub active
+{
+    my ($self,$setactive) = @_;
+    &::print_log("PAobj: setactive: active: $active / set: $setactive\n") if $main::Debug{pa} >=4;
+    return $active unless defined $setactive;
+    if($active && $setactive) {
+        &::print_log("PAobj: Cannot make active, already active\n") if $main::Debug{pa} >=3;
+        return 0;
+    }
+    &::print_log("PAobj: setting active to: ".$setactive."\n") if $main::Debug{pa} >=3;
+    $active=$setactive;
+    return 1;
+}
+
 sub prep_parms
 {
     my ($self,$parms) = @_;
-    #my $self = {};
     &::print_log("PAobj: delay: $$self{pa_delay}\n") if $main::Debug{pa} >=3;
     &::print_log("PAobj: set,mode: " . $parms->{mode} . ",rooms: " . $parms->{rooms}) if $main::Debug{pa} >=3;
 

From de9e7d88d50e2aa5f8085dda8a7fb77a47665542 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Wed, 16 Oct 2013 00:35:57 -0400
Subject: [PATCH 243/330] Clean up lib/Audrey_Play.pm, add proper description.

---
 lib/Audrey_Play.pm | 73 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 63 insertions(+), 10 deletions(-)

diff --git a/lib/Audrey_Play.pm b/lib/Audrey_Play.pm
index 550739e14..78cdc48e0 100644
--- a/lib/Audrey_Play.pm
+++ b/lib/Audrey_Play.pm
@@ -8,19 +8,23 @@ B<Audrey_Play> - This object can be used to play sound files on the Audrey.
 
 =head1 SYNOPSIS
 
+Created for use with PAobj.pm, but can be used separately.
 
-blah blah
-
+=head1 DESCRIPTION
 
+Tells an Audrey to download and play a file, already in the data/web folder,
+by passing the name of the file. The Audrey must be modified to respond to
+this request.
 
-=head1 DESCRIPTION
+$audrey1 = new Audrey_Play('192.168.0.11');
+#Create file data/web/tempfile.wav - perhaps by speaking to a file?
+my $speakFile = 'tempfile.wav';
+$audrey1->play($speakFile);
 
 =head1 INHERITS
 
 B<Generic_Item>
 
-=head1 METHODS
-
 =over
 
 =cut
@@ -29,10 +33,6 @@ B<Generic_Item>
 
 my $address;
 
-sub Init {
-    #&::MainLoop_pre_add_hook(  \&Weather_Item::check_weather, 1 );
-}
-
 =item C<new($ip)>
 
 $ip is the IP address of the Audrey.
@@ -62,4 +62,57 @@ sub play {
    &::run("get_url -quiet http://" . $self->{address} . "/mhspeak.shtml?http://" . $MHWeb . "/" . $web_file . " /dev/null");
 }
 
-1;
\ No newline at end of file
+1;
+
+#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+=begin Audrey Config
+
+Exerpt from audreyspeak.pl
+
+You must make certain modifications to your Audrey, as follows:
+
+- Update the software and obtain root shell access capabilities (this
+  should be available by using Bruce's CF card image or by following
+  instructions available on the internet.)
+
+- Open the Audrey's web server to outside http requests
+  1) Start the "Root Shell"
+  2) type: cd /config
+  3) type: cp rm-apps rm-apps.copy
+  4) type: vi rm-apps
+     You'll be in the editor, editing the "rm-apps" file
+     About the 14th line down is "rb,/kojak/kojak-slinger, -c -e -s -i 127.1"
+     You need to delete the "-i 127.1" from the line.
+     To do this, place the cursor under the space right after the "-s"
+     Type the "x" key to start deleting from the line.
+     The line should end up looking like this:
+     "rb,/kojak/kojak-slinger, -c -e -s"
+     If you need to start over type a colon to get to the vi command line
+     At the colon prompt type "q!" and hit "enter" (this quits without saving)
+     If it looks good then at the colon prompt type "wq" to save changes
+     Now restart the Audrey by unplugging it, waiting 30 seconds and
+     plugging it back in.
+
+- Install playsound_noph and it's DLL
+  1) Grab the zip file from http://www.planetwebb.com/audrey/
+  2) Place playsound_noph    on the Audrey in /nto/photon/bin/
+  3) Place soundfile_noph.so on the Audrey in /nto/photon/dll/
+
+- Install mhspeak.shtml on the Audrey
+  1) Start the "Root Shell"
+  2) type: cd /data/XML
+  3) type: ftp blah.com mhspeak.shtml
+
+     The MHSPEAK.SHTML file placed on the Audrey should contain the following:
+
+     <html>
+     <head>
+     <title>Shell</title>
+     </head>
+     <body>
+     <!--#config cmdecho="OFF" -->
+     <!--#exec cmd="playsound_noph $QUERY_STRING &" -->
+     </body>
+     </html>
+
+=cut

From 6c8cc5ee4a2a21b58186dd80556204e239f79cd3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 16 Oct 2013 17:30:00 -0700
Subject: [PATCH 244/330] Insteon: Add Subaddress to PLM ALDB Linkkey

Add subaddress to linkkey in low level PLM aldb functions, has_, add_ and delete_link
---
 lib/Insteon/AllLinkDatabase.pm | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index aa47c807b..d1f21b0fd 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -2968,7 +2968,11 @@ sub delete_link
 	my $deviceid = ($insteon_object) ? $insteon_object->device_id : $link_parms{deviceid};
 	my $group = $link_parms{group};
 	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
-	my $linkkey = lc $deviceid . $group . (($is_controller) ? '1' : '0');
+	my $subaddress = (defined $link_parms{data3}) ? $link_parms{data3} : '00';
+	if ($subaddress eq '00' || $subaddress eq '01'){
+		$subaddress = '';
+	}
+	my $linkkey = lc $deviceid . $group . $is_controller . $subaddress;
 	if (defined $$self{aldb}{$linkkey})
         {
 		my $cmd = '80'
@@ -2990,7 +2994,8 @@ sub delete_link
 	}
         else
         {
-		&::print_log("[Insteon::ALDB_PLM] no entry in linktable could be found for linkkey: $linkkey");
+		&::print_log("[Insteon::ALDB_PLM] no entry in linktable could be found for: ".
+		"deviceid=$device_id, group=$group, is_controller=$is_controller, subaddress=$subaddress"
 		if ($link_parms{callback})
                 {
 			package main;
@@ -3036,12 +3041,16 @@ sub add_link
 		$device_id = lc $insteon_object->device_id;
 	}
 	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
+	my $subaddress = (defined $link_parms{data3}) ? $link_parms{data3} : '00';
+	if ($subaddress eq '00' || $subaddress eq '01'){
+		$subaddress = '';
+	}
 	# first, confirm that the link does not already exist
-	my $linkkey = lc $device_id . $group . $is_controller;
+	my $linkkey = lc $device_id . $group . $is_controller . $subaddress;
 	if (defined $$self{aldb}{$linkkey})
         {
 		&::print_log("[Insteon::ALDB_PLM] WARN: attempt to add link to PLM that already exists! "
-			. "deviceid=" . $device_id . ", group=$group, is_controller=$is_controller");
+			. "deviceid=$device_id, group=$group, is_controller=$is_controller, subaddress=$subaddress");
 		if ($link_parms{callback})
                 {
 			package main;
@@ -3099,9 +3108,14 @@ or false if it does not.  Generally called as part of C<delete_orphan_links()>.
 sub has_link
 {
 	my ($self, $insteon_object, $group, $is_controller, $subaddress) = @_;
-        # note, subaddress is IGNORED!!
 	my $key = lc $insteon_object->device_id . $group . $is_controller;
-	return (defined $$self{aldb}{$key}) ? 1 : 0;
+	$subaddress = '00' unless $subaddress;
+	# append the data3 value (controller = group, responder = 00); 
+	if (!($subaddress eq '00' or $subaddress eq '01'))
+        {
+		$key .= $subaddress;
+	}
+	return (defined $$self{aldb}{$key});
 }
 
 =back

From 9c2177d964a6b0580cf31de8f002f059d76a71e4 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 16 Oct 2013 17:35:00 -0700
Subject: [PATCH 245/330] Insteon: Add Subaddress to PLM Linkkey When Restoring
 ALDB on Restart

Plus cleanup spacing/tabs in routine
---
 lib/Insteon/AllLinkDatabase.pm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index d1f21b0fd..59c895d3a 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -2628,25 +2628,28 @@ sub restore_linktable
 {
 	my ($self, $links) = @_;
 	if ($links)
-        {
+	{
 		foreach my $link_section (split(/\|/,$links))
-                {
+		{
 			my %link_record = ();
 			my $deviceid = '';
 			my $groupid = '01';
 			my $is_controller = 0;
 			foreach my $link_record (split(/,/,$link_section))
-                        {
+			{
 				my ($key,$value) = split(/=/,$link_record);
 				$deviceid = $value if ($key eq 'deviceid');
 				$groupid = $value if ($key eq 'group');
 				$is_controller = $value if ($key eq 'is_controller');
+				$subaddress = $value if ($key eq 'data3');
 				$link_record{$key} = $value if $key and defined($value);
 			}
-			my $linkkey = $deviceid . $groupid . $is_controller;
+			if ($subaddress eq '00' || $subaddress eq '01'){
+				$subaddress = '';
+			}
+			my $linkkey = $deviceid . $groupid . $is_controller . $subaddress;
 			%{$$self{aldb}{lc $linkkey}} = %link_record;
 		}
-#		$self->log_alllink_table();
 	}
 }
 

From ddaa9487d8ef015f17315a76e3889fd37c49e0ab Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 16 Oct 2013 17:36:00 -0700
Subject: [PATCH 246/330] Insteon: PLM Delete_Orphans: Responder Data3 on
 Device is Responder Button/Group

Should not be the data3 value from the PLM since data3 on PLM is now the PLM scene number
---
 lib/Insteon/AllLinkDatabase.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 59c895d3a..a7065998e 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -2828,7 +2828,7 @@ sub delete_orphan_links
 							my @lights = $member->find_members('Insteon::BaseLight');
 							if (@lights)
                                                         {
-								$member = @lights[0]; # pick the first
+								$member = $lights[0]; # pick the first
 							}
 						}
 						if ($member->isa('Insteon::BaseDevice'))
@@ -2851,7 +2851,7 @@ sub delete_orphan_links
                                                         	{
 									# at this point, the forward link is ok; but, only if the reverse
 									# link also exists.  So, check:
-									if ($member->has_link($self, $group, 0, $data3))
+									if ($member->has_link($self, $group, 0, $linkmember->group))
                                                                 	{
 										$is_invalid = 0;
 									}
@@ -2867,6 +2867,7 @@ sub delete_orphan_links
 					if ($is_invalid)
                                         {
 						# then, there is a good chance that a reciprocal link exists; if so, delet it too
+						# KRK Need to delete ALL responder links regardless of data3
 						if ($device->has_link($self,$group,0, $data3))
                                                 {
                                                 	if ($audit_mode)
@@ -2886,6 +2887,7 @@ sub delete_orphan_links
 								push @{$$self{delete_queue}}, \%delete_req;
                                                         }
 						}
+						# KRK Why are we not deleting the invalid PLM link here?
 					}  # if $is_invalid
 				} # else
 			}

From 37b7f30031135ec85e59c525734e82a5cc6c47e9 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 16 Oct 2013 17:42:00 -0700
Subject: [PATCH 247/330] Insteon: Cleanup Coding Errors and Debug Log Lines

---
 lib/Insteon/AllLinkDatabase.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index a7065998e..3464a3bd0 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -371,7 +371,7 @@ sub delete_link
 		if ($address)
 		{
 			&main::print_log("[Insteon::AllLinkDatabase] Now deleting link [0x$address] with the following data"
-				. " deviceid=$deviceid, groupid=$groupid, is_controller=$is_controller");
+				. " deviceid=$deviceid, groupid=$groupid, is_controller=$is_controller, subaddress=$subaddress");
 			# now, alter the flags byte such that the in_use flag is set to 0
 			$$self{_mem_activity} = 'delete';
 			$$self{pending_aldb}{deviceid} = lc $deviceid;
@@ -389,7 +389,7 @@ sub delete_link
 		{
 			&main::print_log('[Insteon::AllLinkDatabase] WARN: (' . $$self{device}->get_object_name 
 				. ') attempt to delete link that does not exist!'
-				. " deviceid=$deviceid, groupid=$groupid, is_controller=$is_controller");
+				. " deviceid=$deviceid, groupid=$groupid, is_controller=$is_controller, subaddress=$subaddress");
 			if ($link_parms{callback})
 			{
 				package main;
@@ -1056,7 +1056,7 @@ sub add_link
 		&::print_log("[Insteon::AllLinkDatabase] WARN: attempt to add link to " 
 			. $$self{device}->get_object_name 
 			. " that already exists! object=" . $insteon_object->get_object_name 
-			. ", group=$group, is_controller=$is_controller");
+			. ", group=$group, is_controller=$is_controller, subaddress=$subaddress");
 		if ($link_parms{callback})
                 {
 			package main;
@@ -1083,7 +1083,7 @@ sub add_link
 		$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
                 if ($address)
                 {
-			&::print_log("[Insteon::AllLinkDatabase] DEBUG2: adding link record " . $$self{device}->get_object_name
+			&::print_log("[Insteon::AllLinkDatabase] DEBUG2: adding link record to " . $$self{device}->get_object_name
 				. " light level controlled by " . $insteon_object->get_object_name
 		       		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate")
                                 if $main::Debug{insteon} >= 2;
@@ -1112,7 +1112,7 @@ sub add_link
                          {
 				package main;
 				eval ($$self{_success_callback});
-				&::print_log("[Insteon::AllLinkDatabase] WARN1: Error encountered during ack callback: " . $@)
+				&::print_log("[Insteon::AllLinkDatabase] WARN1: Error encountered during callback: " . $@)
 			 		if $@ and $main::Debug{insteon} >= 1;
 			 	package Insteon::AllLinkDatabase;
                          }
@@ -2635,6 +2635,7 @@ sub restore_linktable
 			my $deviceid = '';
 			my $groupid = '01';
 			my $is_controller = 0;
+			my $subaddress = '';
 			foreach my $link_record (split(/,/,$link_section))
 			{
 				my ($key,$value) = split(/=/,$link_record);
@@ -3000,7 +3001,7 @@ sub delete_link
         else
         {
 		&::print_log("[Insteon::ALDB_PLM] no entry in linktable could be found for: ".
-		"deviceid=$device_id, group=$group, is_controller=$is_controller, subaddress=$subaddress"
+		"deviceid=$deviceid, group=$group, is_controller=$is_controller, subaddress=$subaddress");
 		if ($link_parms{callback})
                 {
 			package main;

From 01dc1c8ddc697e0edf7b9804f896e794afcd03c7 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 16 Oct 2013 22:12:04 -0700
Subject: [PATCH 248/330] Insteon: Initial Rewrite of Delete Orphans

---
 lib/Insteon/AllLinkDatabase.pm | 557 ++++++++++-----------------------
 1 file changed, 160 insertions(+), 397 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 3464a3bd0..74172a80d 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -418,417 +418,180 @@ sub delete_orphan_links
 	my $selfname = $$self{device}->get_object_name;
 	my $num_deleted = 0;
 
-        # first, make sure that the health of ALDB is ok
-        if ($self->health ne 'good')
-        {
-        	if ($$self{device}->isa('Insteon::RemoteLinc') or $$self{device}->isa('Insteon::MotionSensor'))
-                {
-        		&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: ignoring link from deaf device: $selfname");
-
-                }
-                else
-                {
-        		&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping $selfname because health: "
-                		. $self->health . ". Please rescan this device!!")
-                       		if ($self->health ne 'empty');
-                }
+	# first, make sure that the health of ALDB is ok
+	if ($self->health ne 'good') {
+		if ($$self{device}->isa('Insteon::RemoteLinc') or $$self{device}->isa('Insteon::MotionSensor')) {
+			&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: ignoring link from deaf device: $selfname");
+	
+		} 
+		else {
+			&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping $selfname because health: "
+				. $self->health . ". Please rescan this device!!")
+				if ($self->health ne 'empty');
+		}
 		$self->_process_delete_queue();
-                return;
-        }
+		return;
+	}
 
-	for my $linkkey (keys %{$$self{aldb}})
-        {
-		if ($linkkey ne 'empty' and $linkkey ne 'duplicates')
-                {
-			my $deviceid = lc $$self{aldb}{$linkkey}{deviceid};
-			next unless $deviceid;
-			my $group = $$self{aldb}{$linkkey}{group};
-			my $is_controller = $$self{aldb}{$linkkey}{is_controller};
-			my $data3 = $$self{aldb}{$linkkey}{data3};
-                        # $device is the object that is referenced by the ALDB record's deviceid
-			my $linked_device = ($deviceid eq lc $$self{device}->interface->device_id) ? $$self{device}->interface
-					: &Insteon::get_object($deviceid,'01');
-			if (!($linked_device))
-                        {
-                        	# no device is known by mh with the ALDB record's deviceid
-                        	if ($audit_mode)
-                                {
-					&::print_log("[Insteon::AllLinkDatabase] (AUDIT) " . $selfname . " now deleting orphaned link w/ details: "
-						. (($is_controller) ? "controller" : "responder")
-						. ", deviceid=$deviceid, group=$group");
-                                }
-                                else
-                                {
-			       		my %delete_req = (deviceid => $deviceid,
-                                        		group => $group,
-                                                        is_controller => $is_controller,
+	# Loop through device's ALDB table
+	for my $linkkey (keys %{$$self{aldb}}) {
+		#Skip empty addresses
+		next if ($linkkey eq 'empty');
+		
+		#Delete duplicate entries
+		if ($linkkey eq 'duplicates') {
+			my @duplicate_addresses = ();
+			push @duplicate_addresses, @{$$self{aldb}{duplicates}};
+			my $address = pop @duplicate_addresses;
+			while ($address)
+			{
+				if ($audit_mode)
+				{
+					&::print_log("[Insteon::AllLinkDatabase] (AUDIT) Delete orphan because duplicate found "
+						. "$selfname, address=$address");
+				}
+				else
+				{
+					my %delete_req = (address => $address,
 							callback => "$selfname->_aldb->_process_delete_queue()",
-                                                        data3 => $data3,
-                                                        cause => "no device could be found");
-			       		push @{$$self{delete_queue}}, \%delete_req;
-                                }
+							cause => "duplicate record found");
+					push @{$$self{delete_queue}}, \%delete_req;
+					$num_deleted++;
+				}
+				$address = pop @duplicate_addresses;
 			}
-                        elsif ($linked_device->isa("Insteon::BaseInterface") and $is_controller)
-                        {
-				# ignore since this is just a link back to the PLM
+			next; #for linkkey
+		}
+
+		# Initialize Variables
+		my $deviceid = lc $$self{aldb}{$linkkey}{deviceid};
+		my $linked_device;
+		if ($deviceid eq lc $$self{device}->interface->device_id) {
+			$linked_device = $$self{device}->interface;
+		} else {
+			$linked_device = Insteon::get_object($deviceid,'01');
+		}
+		my $group = $$self{aldb}{$linkkey}{group};
+		my $is_controller = $$self{aldb}{$linkkey}{is_controller};
+		my $data3 = $$self{aldb}{$linkkey}{data3};
+		my $plm_scene;
+
+		#Is the linked device defined in MH?
+		if (!($linked_device)) {
+			my %delete_req = (deviceid => $deviceid,
+				group => $group,
+				is_controller => $is_controller,
+				callback => "$selfname->_aldb->_process_delete_queue()",
+				data3 => $data3,
+				cause => "no device could with $deviceid could be found");
+			push @{$$self{delete_queue}}, \%delete_req;
+		} 
+		
+		#Is the device deaf?
+		elsif ($linked_device->isa('Insteon::RemoteLinc') or $linked_device->isa('Insteon::MotionSensor')) {
+			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: "
+				."ignoring link from $selfname to 'deaf' device: " . $linked_device->get_object_name);
+		}
+		
+		# Is the ALDB Cache of the linked device healthy?
+		elsif ($linked_device->_aldb->health ne 'good' && $linked_device->_aldb->health ne 'empty') {
+			&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping check for reciprocal links from "
+				. $linked_device->get_object_name . " because health: "
+				. $linked_device->_aldb->health . ". Please rescan this device!!");
+		}
+		
+		# Ignore Controller Links to the PLM
+		elsif ($linked_device->isa("Insteon::BaseInterface") and $is_controller) {
+			# ignore since this is just a link back to the PLM
+		}
+		
+		# Does a reciprocal responder link exist?
+		elsif (!($is_controller && $linked_device->has_link($$self{device},$group,1, $group))) {
+			my $cause = "Linked device does not have a link pointing back to device ";
+			my %delete_req = (deviceid => $deviceid,
+				group => $group,
+				is_controller => $is_controller,
+				callback => "$selfname->_aldb->_process_delete_queue()",
+				object => $linked_device,
+				data3 => $data3,
+				cause => $cause);
+			push @{$$self{delete_queue}}, \%delete_req;
+			$num_deleted++;
+		}
+
+		# Does this PLM Scene exist
+		elsif ($linked_device->isa("Insteon::BaseInterface") and !$is_controller) {
+			$plm_scene = &Insteon::get_object('000000', $group);
+			if ($group eq '01' || $group eq '00') {
+				#ignore manual responder link to PLM group 01 or 00 required for I2CS devices
+				main::print_log("[Insteon::AllLinkDatabase] DEBUG2 Ignoring orphan responder link from "
+					. $selfname . " to PLM for group 01 or 00") if $main::Debug{insteon} >= 2;
 			}
-                        elsif ($linked_device->isa("Insteon::BaseInterface")) # and is a RESPONDER!!
-                        {
-				# does the PLM have a corresponding controlled link to $self?  If not, the delete this responder link
-				if (!($linked_device->has_link($$self{device},$group,1)))
-                                {
-                                	if ($audit_mode)
-                                        {
-                                        	my $plm_scene = &Insteon::get_object('000000',$group);
-						&::print_log("[Insteon::AllLinkDatabase] (AUDIT) Now deleting orphaned responder link in "
-                                                	. $$self{device}->get_object_name
-                                                        . (($data3 eq '00' or $data3 eq '01') ? "" : " [button:" . $data3 . "]")
-                                                	. " because PLM does not have a corresponding controller record "
-                                                	. "with group ($group)." . (($plm_scene && ref $plm_scene) ? " Please resync "
-                                                        . $plm_scene->get_object_name . " before re-running in non-audit mode to restore PLM side"
-                                                        : ""));
-                                        }
-                                        else
-                                        {
-				       		my %delete_req = (deviceid => $deviceid,
-                                                		group => $group,
-                                                                is_controller => $is_controller,
-								callback => "$selfname->_aldb->_process_delete_queue()",
-                                                                object => $linked_device,
-                                                                data3 => $data3,
-                                                        	cause => 'PLM does not have a link pointing back to device');
-						push @{$$self{delete_queue}}, \%delete_req;
-						$num_deleted++;
-                                        }
-				}
-                                else
-                                {
-					# is there an entry in the items.mht that corresponds to this link?
-                                	# find the corresponding PLM scene that has this group
-					my $plm_link = &Insteon::get_object('000000', $group);
-					if ($plm_link)
-                                        {
-						my $is_invalid = 1;
-                                                # now, iterate over the PLM scene members to see if a match exists
-						foreach my $member_ref (keys %{$$plm_link{members}})
-                                                {
-							my $member = $$plm_link{members}{$member_ref}{object};
-							if ($member->isa('Light_Item'))
-                                                        {
-								my @lights = $member->find_members('Insteon::BaseLight');
-								if (@lights)
-                                                                {
-									$member = $lights[0]; # pick the first
-								}
-							}
-							if ($member->device_id eq $$self{device}->device_id)
-                                                        {
-								if ($data3 eq '00' or (lc $data3 eq lc $member->group))
-                                                                {
-									$is_invalid = 0;
-							       		last;
-								}
-							}
-						}
-						if ($is_invalid)
-                                                {
-                                                	if ($audit_mode)
-                                                        {
-                                                        	my $button_msg = "";
-                                                                if ($data3 ne '00' and $data3 ne '01')
-                                                                {
-                                                                       ## to-do - validate that $data3 is <= 8 for all 8 key devices
-                                                                       $button_msg = " [button:" . $data3 . "]";
-                                                                }
-								&::print_log("[Insteon::AllLinkDatabase] (AUDIT) Delete orphan responder link from "
-                                                                	. $selfname . $button_msg
-                                                			. " to PLM because no SCENE_MEMBER entry could be found "
-                                                                        . "in items.mht for INSTEON_ICONTROLLER: "
-                                                                        . $plm_link->get_object_name);
-                                                        }
-                                                        else
-                                                        {
-								my %delete_req = (deviceid => $deviceid, group => $group, is_controller => $is_controller,
-									callback => "$selfname->_aldb->_process_delete_queue()", object => $linked_device,
-									cause => "no link is defined for the plm controlled scene", data3 => $data3);
-						       		push @{$$self{delete_queue}}, \%delete_req;
-								$num_deleted++;
-                                                        }
-						}
-					}
-                                        else
-                                        {    # no corresponding PLM link found in items.mht
-						if ($group eq '01' || $group eq '00') {
-							#ignore manual responder link to PLM group 01 or 00 required for I2CS devices
-							main::print_log("[Insteon::AllLinkDatabase] DEBUG2 Ignoring orphan responder link from "
-								. $selfname . " to PLM for group 01 or 00") if $main::Debug{insteon} >= 2;
-						}
-						elsif ($audit_mode)
-                                                {
-                                                        my $button_msg = "";
-                                                        if ($data3 ne '00' and $data3 ne '01')
-                                                        {
-                                                                ## to-do - validate that $data3 is <= 8 for all 8 key devices
-                                                                $button_msg = " [button:" . $data3 . "]";
-                                                        }
-							&::print_log("[Insteon::AllLinkDatabase] (AUDIT) Delete orphan responder link from "
-                                				. $selfname . $button_msg . " to PLM because to PLM contoller exists for group:$group");
-                                                }
-                                                else
-                                                {
-							# delete the link since it doesn't exist
-							my %delete_req = (deviceid => $deviceid, group => $group, is_controller => $is_controller,
-								callback => "$selfname->_aldb->_process_delete_queue()", object => $linked_device,
-								cause => "no plm link could be found", data3 => $data3);
-							push @{$$self{delete_queue}}, \%delete_req;
-							$num_deleted++;
-                                                }
-					}
-                                }
+			elsif !(ref $plm_scene) {
+				# delete the link since it doesn't exist
+				my %delete_req = (deviceid => $deviceid, group => $group, is_controller => $is_controller,
+					callback => "$selfname->_aldb->_process_delete_queue()", object => $linked_device,
+					cause => "no plm scene for this group could be found", data3 => $data3);
+				push @{$$self{delete_queue}}, \%delete_req;
+				$num_deleted++;
 			}
-                        else # is a non-PLM device
-                        {
-                        	if ($linked_device->isa('Insteon::RemoteLinc') or $linked_device->isa('Insteon::MotionSensor'))
-                                {
-                                	&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: ignoring link from $selfname to 'deaf' device: " . $linked_device->get_object_name);
-                                }
-                                # make sure that the health of the device's ALDB is ok
-        			elsif ($linked_device->_aldb->health ne 'good')
-       				{
-        				&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping check for reciprocal links from "
-                                        	. $linked_device->get_object_name . " because health: "
-                				. $linked_device->_aldb->health . ". Please rescan this device!!")
-                				if ($linked_device->_aldb->health ne 'empty');
-        			}
-                                else
-                                {
-                               		# does the device fail to have a reciprocal link?
-                                	if (!($linked_device->has_link($self,$group,($is_controller) ? 0:1, $data3)))
-                                	{
-                                        	# this may be a case of an impartial link (not yet bidirectional)
-                                        	# BUT... if is_controller and $device is not a member of $$self{device}
-                                                #        if not is_controller and $$self{device} is not a member of $device,
-                                                #        then the dangling link needs to be deleted
-                                		if ($audit_mode)
-                                        	{
-                                        		if ($is_controller)
-                                                	{
-                                                        	# reference_object is the controller that is referenced by this ALDB's deviceid and the group
-                                                		my $reference_object = &Insteon::get_object($$self{device}->device_id, $group);
-                                                                # reverse_object is the responder referenced by the ALDB link and it's data3 content
-                                                		my $reverse_object = &Insteon::get_object($linked_device->device_id, ($data3 eq '00') ? '01' : $data3);
-                                                        	if (ref $reference_object and ref $reverse_object and
-                                                                	$reference_object->isa("Insteon::BaseController") and
-                                                                        $reference_object->has_member($reverse_object))
-                                                                {
-                                                			&::print_log("[Insteon::AllLinkDatabase] (AUDIT) WARNING: no reciprocal link defined for: "
-                                        				. $reference_object->get_object_name . " as controller and " . $reverse_object->get_object_name
-                                                                	. ". Please sync links with the " . $reverse_object->get_object_name . " device;"
-                                                                	. " this link will not be deleted.");
-                                                                }
-                                                                else
-                                                                {
-                                                			&::print_log("[Insteon::AllLinkDatabase] (AUDIT) Deleting link defined for: "
-                                        				. $$self{device}->get_object_name
-                                                			. "($group) as controller and "
-                                        				. $linked_device->get_object_name .  "(" . (($data3 eq '00') ? '01' : $data3) . ")"
-                                                                	. " because no reciprocal link exists!"
-							       		);
-                                                                }
-                                                	}
-                                                	else # is a responder
-                                                	{
-                                                        	# reference_object is the responder that is referenced by this ALDB's deviceid
-                                                                #   and the ALDB link's data3
-                                                		my $reference_object = &Insteon::get_object($$self{device}->device_id,
-                                                                                         ($data3 eq '00') ? '01' : $data3);
-                                                                # reverse_object is the controller referenced by the ALDB link and the group
-                                                		my $reverse_object = &Insteon::get_object($linked_device->device_id, $group );
-                                                        	if (ref $reference_object and ref $reverse_object and $reverse_object->isa("Insteon::BaseController") and $reverse_object->has_member($reference_object))
-                                                                {
-                                                			&::print_log("[Insteon::AllLinkDatabase] (AUDIT) WARNING: no reverse link defined for: "
-                                        				. $reference_object->get_object_name
-                                                			. " as responder and "
-                                        				. $reverse_object->get_object_name
-                                                                	. ". Please sync links with the applicable device; this link will not be deleted."
-									);
-                                                		}
-                                                                else
-                                                                {
-                                                			&::print_log("[Insteon::AllLinkDatabase] (AUDIT) Deleting link defined for: "
-                                        				. $$self{device}->get_object_name
-                                                			. "(" . (($data3 eq '00') ? '01' : $data3) . ") as responder and "
-                                        				. $linked_device->get_object_name . "($group)"
-                                                                	. " because no reverse links exists!"
-									);
-                                                                }
-                                                        }
-                                        	}
-                                        	else  # non-audit mode
-                                        	{
-                                        		if ($is_controller)
-                                                	{
-                                                		my $reference_object = &Insteon::get_object($$self{device}->device_id, $group);
-                                                		my $reverse_object = &Insteon::get_object($linked_device->device_id, ($data3 eq '00') ? '01' : $data3);
-                                                        	if (ref $reference_object and ref $reverse_object and $reverse_object->isa("Insteon::BaseController") and $reverse_object->has_member($reference_object))
-                                                                {
-                                                			&::print_log("[Insteon::AllLinkDatabase] WARNING: no reciprocal link defined for: "
-                                        				. $reference_object->get_object_name
-                                                			. " as controller and "
-                                        				. $reverse_object->get_object_name
-                                                                	. ". Please sync links with the applicable device; this link will not be deleted."
-							       		);
-                                                                }
-                                                                else
-                                                                {
-                                                			&::print_log("[Insteon::AllLinkDatabase] Deleting link defined for: "
-                                        				. $$self{device}->get_object_name
-                                                			. "($group) as controller and "
-                                        				. $linked_device->get_object_name .  "(" . (($data3 eq '00') ? '01' : $data3) . ")"
-                                                                	. " because no reciprocal link exists!"
-							       		);
-					       				my %delete_req = (deviceid => $deviceid,
-                                                                        		group => $group,
-                                                                                        is_controller => $is_controller,
-											callback => "$selfname->_process_delete_queue()",
-                                                                                        object => $linked_device,
-											cause => "no link to the device could be found",
-                                                                                        data3 => $data3);
-					       				push @{$$self{delete_queue}}, \%delete_req;
-									$num_deleted++;
-                                                                }
-                                                	}
-                                                	else # is a responder
-                                                	{
-                                                		my $reference_object = &Insteon::get_object($$self{device}->device_id, ($data3 eq '00') ? '01' : $data3);
-                                                		my $reverse_object = &Insteon::get_object($linked_device->device_id, $group );
-                                                        	if (ref $reference_object and ref $reverse_object and $reverse_object->isa("Insteon::BaseController") and $reverse_object->has_member($reference_object))
-                                                                {
-                                                			&::print_log("[Insteon::AllLinkDatabase] WARNING: no reverse link defined for: "
-                                        				. $reference_object->get_object_name
-                                                			. " as responder and "
-                                        				. $reverse_object->get_object_name
-                                                                	. ". Please sync links with the applicable device; this link will not be deleted."
-									);
-                                                                }
-                                                                else
-                                                                {
-                                                			&::print_log("[Insteon::AllLinkDatabase] Deleting link defined for: "
-                                        				. $$self{device}->get_object_name
-                                                			. "(" . (($data3 eq '00') ? '01' : $data3) . ") as responder and "
-                                        				. $linked_device->get_object_name . "($group)"
-                                                                	. " because no reverse links exists!"
-									);
-					       				my %delete_req = (deviceid => $deviceid,
-                                                                        		group => $group,
-                                                                                        is_controller => $is_controller,
-											callback => "$selfname->_process_delete_queue()",
-                                                                                        object => $linked_device,
-											cause => "no link to the device could be found",
-                                                                                        data3 => $data3);
-					       				push @{$$self{delete_queue}}, \%delete_req;
-									$num_deleted++;
-                                                                }
-                                                	}
-                                        	}
+		}
+
+		#Does recip link exist?
+		elsif (!($linked_device->has_link($self,$group,($is_controller) ? 0:1, $data3))) {
+			my %delete_req = (deviceid => $deviceid,
+				group => $group,
+				is_controller => $is_controller,
+				callback => "$selfname->_process_delete_queue()",
+				object => $linked_device,
+				cause => "no link to the device could be found",
+				data3 => $data3);
+			push @{$$self{delete_queue}}, \%delete_req;
+			$num_deleted++;
+		}
+
+		# Does MHT entry exist?
+		else {
+			my $is_invalid = 1;
+			my $controller_object;
+			if (ref $plm_scne) {
+				$controller_object = $plm_scene;
+			} 
+			elsif ($is_controller) {
+				$controller_object = Insteon::get_object($$self{device}->device_id,$group);
+			} 
+			else {
+				$controller_object = Insteon::get_object($linked_device->device_id,$group);
+			}
+			
+			# now, iterate over the controller object members to see if a match exists
+			foreach my $member_ref (keys %{$$controller_object{members}}) {
+				my $member = $$controller_object{members}{$member_ref}{object};
+				if ($member->isa('Light_Item')) {
+					my @lights = $member->find_members('Insteon::BaseLight');
+					if (@lights) {
+						$member = $lights[0]; # pick the first
+					}
+				}
+				if ($member->device_id eq $$self{device}->device_id) {
+					if ($data3 eq '00' or (lc $data3 eq lc $member->group)) {
+						$is_invalid = 0;
+						last;
 					}
-                                	else # device does have reciprocal link
-                                	{
-				       		my $is_invalid = 1;
-						my $link = ($is_controller) ? &Insteon::get_object($$self{device}->device_id,$group)
-						: &Insteon::get_object($linked_device->device_id,$group);
-						if ($link)
-                                        	{
-							foreach my $member_ref (keys %{$$link{members}})
-                                                	{
-						       		my $member = $$link{members}{$member_ref}{object};
-								if ($member->isa('Light_Item'))
-                                                        	{
-									my @lights = $member->find_members('Insteon::BaseLight');
-							       		if (@lights)
-                                                                	{
-										$member = $lights[0]; # pick the first
-									}
-								}
-								if ($member->isa('Insteon::BaseDevice') && !($member->is_root))
-                                                        	{
-									$member = $member->get_root;
-								}
-                        					if ($member->isa('Insteon::RemoteLinc') or $member->isa('Insteon::MotionSensor'))
-                                                        	{
-                                                               		&::print_log("[Insteon::AllLinkDatabase] ignoring link from " . $link->get_object_name . " to " .
-                                                               		$member->get_object_name);
-                                                               		$is_invalid = 0;
-                                                        	}
-                                                       		elsif ($member->isa('Insteon::BaseDevice') && !($is_controller)
-                                                        		&& ($member->device_id eq $$self{device}->device_id))
-                                                        	{
-									$is_invalid = 0;
-									last;
-								}
-                                                        	elsif ($member->isa('Insteon::BaseDevice') && $is_controller
-                                                        		&& ($member->device_id eq $linked_device->device_id))
-                                                		{
-									$is_invalid = 0;
-									last;
-								}
-							} # foreach
-						}
-						if ($is_invalid)
-                                       		{
-                                        		if ($audit_mode)
-                                                	{
-								&::print_log("[Insteon::AllLinkDatabase] (AUDIT) Delete orphan because no reverse link could be found "
-                                        			. $linked_device->get_object_name .
-                                                		" details: "
-								. (($is_controller) ? "controller" : "responder")
-								. ", deviceid=$deviceid, group=$group, data=$data3");
-                                                	}
-                                                	else
-                                                	{
-					       			my %delete_req = (deviceid => $deviceid,
-                                                                		group => $group,
-                                                                                is_controller => $is_controller,
-										callback => "$selfname->_aldb->_process_delete_queue()",
-                                                                                object => $linked_device,
-						       				cause => "no reverse link could be found",
-                                                                                data3 => $data3);
-						       		push @{$$self{delete_queue}}, \%delete_req;
-						       		$num_deleted++;
-                                                	}
-						}
-                                        }
 				}
 			}
-		}
-                elsif ($linkkey eq 'duplicates')
-                {
-                	my @duplicate_addresses = ();
-                        push @duplicate_addresses, @{$$self{aldb}{duplicates}};
-			my $address = pop @duplicate_addresses;
-			while ($address)
-                        {
-                        	if ($audit_mode)
-                                {
-					&::print_log("[Insteon::AllLinkDatabase] (AUDIT) Delete orphan because duplicate found "
-                                        	. "$selfname, address=$address");
-                                }
-                                else
-                                {
-			       		my %delete_req = (address => $address,
-							callback => "$selfname->_aldb->_process_delete_queue()",
-							cause => "duplicate record found");
+			if ($is_invalid) {
+				my %delete_req = (deviceid => $deviceid, group => $group, is_controller => $is_controller,
+					callback => "$selfname->_aldb->_process_delete_queue()", object => $linked_device,
+					cause => "this link is not defined in the MHT file", data3 => $data3);
 					push @{$$self{delete_queue}}, \%delete_req;
 					$num_deleted++;
-                                }
-				$address = pop @duplicate_addresses;
 			}
 		}
 	}
-        if (!($audit_mode))
-        {
-        	&::print_log("[Insteon::AllLinkDatabase] ## Begin processing delete queue for: $selfname");
-        }
+	if (!($audit_mode)) {
+		&::print_log("[Insteon::AllLinkDatabase] ## Begin processing delete queue for: $selfname");
+	}
 	$self->_process_delete_queue();
 }
 

From 2b356d6149f2bdda9c2425923a14a904a9f13c4c Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 16 Oct 2013 22:42:00 -0700
Subject: [PATCH 249/330] Insteon: Complete Rewrite of Delete_Orphans in
 AllLinkDatabase

---
 lib/Insteon/AllLinkDatabase.pm | 264 +++++++++++++++------------------
 1 file changed, 121 insertions(+), 143 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 74172a80d..d7fe34028 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -404,9 +404,13 @@ sub delete_link
 
 =item C<delete_orphan_links()>
 
-Reviews the cached version of all of the ALDBs and based on this review removes
-links from this device which are not present in the mht file, not defined in the 
-code, or links which are only half-links..
+Reviews the cached version of the link database for the device and removes
+links from THIS device which are not present in the mht file, link to non-existant
+devices, or which are only half-links.
+
+Since this routine only processes this device, it is best to run the voice 
+command 'delete all orphan links' from the interface so that all devices are 
+scanned and processed.
 
 =cut
 
@@ -416,181 +420,155 @@ sub delete_orphan_links
 	@{$$self{delete_queue}} = (); # reset the work queue
 	$$self{delete_queue_processed} = 0;
 	my $selfname = $$self{device}->get_object_name;
-	my $num_deleted = 0;
 
 	# first, make sure that the health of ALDB is ok
 	if ($self->health ne 'good') {
-		if ($$self{device}->isa('Insteon::RemoteLinc') or $$self{device}->isa('Insteon::MotionSensor')) {
-			&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: ignoring link from deaf device: $selfname");
-	
+		if ($$self{device}->is_deaf) {
+			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Will not scan deaf device: $selfname");
 		} 
+		elsif ($self->health ne 'empty'){
+			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Skipping $selfname, it has no links");
+		}
 		else {
-			&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping $selfname because health: "
-				. $self->health . ". Please rescan this device!!")
-				if ($self->health ne 'empty');
+			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping $selfname because health: "
+				. $self->health . ". Please rescan the link table of this device and rerun delete "
+				. "orphans if necessary");
 		}
 		$self->_process_delete_queue();
 		return;
 	}
 
-	# Loop through device's ALDB table
-	for my $linkkey (keys %{$$self{aldb}}) {
-		#Skip empty addresses
-		next if ($linkkey eq 'empty');
+	# Loop through the device's ALDB table
+	LINKKEY: for my $linkkey (keys %{$$self{aldb}}) {
+		# Skip empty addresses
+		next LINKKEY if ($linkkey eq 'empty');
 		
-		#Delete duplicate entries
+		# Delete duplicate entries
 		if ($linkkey eq 'duplicates') {
-			my @duplicate_addresses = ();
-			push @duplicate_addresses, @{$$self{aldb}{duplicates}};
-			my $address = pop @duplicate_addresses;
-			while ($address)
-			{
-				if ($audit_mode)
-				{
-					&::print_log("[Insteon::AllLinkDatabase] (AUDIT) Delete orphan because duplicate found "
-						. "$selfname, address=$address");
-				}
-				else
-				{
-					my %delete_req = (address => $address,
-							callback => "$selfname->_aldb->_process_delete_queue()",
-							cause => "duplicate record found");
-					push @{$$self{delete_queue}}, \%delete_req;
-					$num_deleted++;
-				}
-				$address = pop @duplicate_addresses;
+			push my @duplicate_addresses, @{$$self{aldb}{duplicates}};
+			foreach (@duplicate_addresses) {
+				my %delete_req = (address => $_,
+					callback => "$selfname->_aldb->_process_delete_queue()",
+					cause => "it is a duplicate record");
+				push @{$$self{delete_queue}}, \%delete_req;
 			}
-			next; #for linkkey
+			next LINKKEY;
 		}
 
 		# Initialize Variables
-		my $deviceid = lc $$self{aldb}{$linkkey}{deviceid};
-		my $linked_device;
-		if ($deviceid eq lc $$self{device}->interface->device_id) {
-			$linked_device = $$self{device}->interface;
-		} else {
-			$linked_device = Insteon::get_object($deviceid,'01');
-		}
-		my $group = $$self{aldb}{$linkkey}{group};
-		my $is_controller = $$self{aldb}{$linkkey}{is_controller};
-		my $data3 = $$self{aldb}{$linkkey}{data3};
-		my $plm_scene;
-
-		#Is the linked device defined in MH?
+		my ($linked_device, $plm_scene, $controller_object, $link_defined,
+			$controller_id, $linked_id, $responder_id, $link_data3,
+			$linked_group);
+		my $group 		= lc $$self{aldb}{$linkkey}{group};
+		my $is_controller 	= $$self{aldb}{$linkkey}{is_controller};
+		my $data3 		= lc $$self{aldb}{$linkkey}{data3};
+		my $deviceid 		= lc $$self{aldb}{$linkkey}{deviceid};
+		my $self_id		= lc $$self{device}->device_id;
+		my $interface_id	= lc $$self{device}->interface->device_id;
+		$linked_device = Insteon::get_object($deviceid,'01');
+		$linked_device = $$self{device}->interface if ($deviceid eq $interface_id);
+		my %delete_req = (deviceid => $deviceid,
+			group => $group,
+			is_controller => $is_controller,
+			callback => "$selfname->_aldb->_process_delete_queue()",
+			data3 => $data3);
+
+		# Is the linked device defined in MH?
 		if (!($linked_device)) {
-			my %delete_req = (deviceid => $deviceid,
-				group => $group,
-				is_controller => $is_controller,
-				callback => "$selfname->_aldb->_process_delete_queue()",
-				data3 => $data3,
-				cause => "no device could with $deviceid could be found");
+			$delete_req{cause} = "no device with deviceid: $deviceid could be found";
 			push @{$$self{delete_queue}}, \%delete_req;
+			next LINKKEY;
 		} 
+
+		# IF a PLM Scene, is the PLM Scene defined in MH?
+		if ($linked_device->isa("Insteon::BaseInterface") and !$is_controller) {
+			$plm_scene = &Insteon::get_object('000000', $group);
+			if ($group eq '01' || $group eq '00') {
+				::print_log("[Insteon::AllLinkDatabase] DEBUG2 Ignoring orphan responder link from "
+					. $selfname . " to PLM for group 01 or 00") if $main::Debug{insteon} >= 2;
+				next LINKKEY;
+			}
+			elsif (!ref $plm_scene) {
+				$delete_req{cause} = "no plm scene for this group could be found";
+				push @{$$self{delete_queue}}, \%delete_req;
+				next LINKKEY;
+			}
+		}
+
+		# Is this link defined in MH?
+		# First define variables based on type of link
+		$linked_id = $linked_device->device_id;
+		$controller_id = ($is_controller) ? $self_id : $linked_id;
+		$responder_id = ($is_controller) ? $linked_id : $self_id;
+		$controller_object = Insteon::get_object($controller_id,$group);
+		$controller_object = $plm_scene if (ref $plm_scene);
 		
-		#Is the device deaf?
-		elsif ($linked_device->isa('Insteon::RemoteLinc') or $linked_device->isa('Insteon::MotionSensor')) {
+		# Second, iterate over the controller object members to find the link definition
+		MEMBERS: foreach my $member_ref (keys %{$$controller_object{members}}) {
+			my $member = $$controller_object{members}{$member_ref}{object};
+			if ($member->isa('Light_Item')) {
+				my @lights = $member->find_members('Insteon::BaseLight');
+				$member = $lights[0] if (@lights); # pick the first
+			}
+			# For resp, D3 = resp group; For cont, D3 = cont group
+			$link_data3 = ($is_controller) ? $group : $member->group;
+			if ($member->device_id eq $responder_id && 
+			($data3 eq '00' or ($data3 eq $link_data3))) {
+				$link_defined = 1;
+				#Identify the linked device's group for use later
+				$linked_group = ($is_controller) ? $member->group : $group;
+				last MEMBERS;
+			}
+		}
+
+		# Third, delete link if not defined
+		if (!$link_defined){
+			$delete_req{cause} = "link is not defined in MisterHouse";
+			push @{$$self{delete_queue}}, \%delete_req;
+			next LINKKEY;
+		}
+
+		# Ignore links to deaf devices
+		if ($linked_device->is_deaf) {
 			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: "
 				."ignoring link from $selfname to 'deaf' device: " . $linked_device->get_object_name);
+			next LINKKEY;
 		}
 		
-		# Is the ALDB Cache of the linked device healthy?
-		elsif ($linked_device->_aldb->health ne 'good' && $linked_device->_aldb->health ne 'empty') {
-			&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping check for reciprocal links from "
-				. $linked_device->get_object_name . " because health: "
+		# Ignore links to unhealthy devices 
+		if ($linked_device->_aldb->health ne 'good' && $linked_device->_aldb->health ne 'empty') {
+			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping check for reciprocal links from "
+				. $linked_device->get_object_name . " because aldb health of that device is "
 				. $linked_device->_aldb->health . ". Please rescan this device!!");
+			next LINKKEY;
 		}
 		
 		# Ignore Controller Links to the PLM
-		elsif ($linked_device->isa("Insteon::BaseInterface") and $is_controller) {
+		if ($linked_device->isa("Insteon::BaseInterface") and $is_controller) {
 			# ignore since this is just a link back to the PLM
-		}
-		
-		# Does a reciprocal responder link exist?
-		elsif (!($is_controller && $linked_device->has_link($$self{device},$group,1, $group))) {
-			my $cause = "Linked device does not have a link pointing back to device ";
-			my %delete_req = (deviceid => $deviceid,
-				group => $group,
-				is_controller => $is_controller,
-				callback => "$selfname->_aldb->_process_delete_queue()",
-				object => $linked_device,
-				data3 => $data3,
-				cause => $cause);
-			push @{$$self{delete_queue}}, \%delete_req;
-			$num_deleted++;
-		}
-
-		# Does this PLM Scene exist
-		elsif ($linked_device->isa("Insteon::BaseInterface") and !$is_controller) {
-			$plm_scene = &Insteon::get_object('000000', $group);
-			if ($group eq '01' || $group eq '00') {
-				#ignore manual responder link to PLM group 01 or 00 required for I2CS devices
-				main::print_log("[Insteon::AllLinkDatabase] DEBUG2 Ignoring orphan responder link from "
-					. $selfname . " to PLM for group 01 or 00") if $main::Debug{insteon} >= 2;
-			}
-			elsif !(ref $plm_scene) {
-				# delete the link since it doesn't exist
-				my %delete_req = (deviceid => $deviceid, group => $group, is_controller => $is_controller,
-					callback => "$selfname->_aldb->_process_delete_queue()", object => $linked_device,
-					cause => "no plm scene for this group could be found", data3 => $data3);
-				push @{$$self{delete_queue}}, \%delete_req;
-				$num_deleted++;
-			}
+			next LINKKEY;
 		}
 
-		#Does recip link exist?
-		elsif (!($linked_device->has_link($self,$group,($is_controller) ? 0:1, $data3))) {
-			my %delete_req = (deviceid => $deviceid,
-				group => $group,
-				is_controller => $is_controller,
-				callback => "$selfname->_process_delete_queue()",
-				object => $linked_device,
-				cause => "no link to the device could be found",
-				data3 => $data3);
+		# Does a reciprocal link exist?
+		if ($linked_device->has_link($$self{device},$group,($is_controller) ? 0 : 1, $linked_group)) {
+			$delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name;
 			push @{$$self{delete_queue}}, \%delete_req;
-			$num_deleted++;
 		}
 
-		# Does MHT entry exist?
-		else {
-			my $is_invalid = 1;
-			my $controller_object;
-			if (ref $plm_scne) {
-				$controller_object = $plm_scene;
-			} 
-			elsif ($is_controller) {
-				$controller_object = Insteon::get_object($$self{device}->device_id,$group);
-			} 
-			else {
-				$controller_object = Insteon::get_object($linked_device->device_id,$group);
-			}
-			
-			# now, iterate over the controller object members to see if a match exists
-			foreach my $member_ref (keys %{$$controller_object{members}}) {
-				my $member = $$controller_object{members}{$member_ref}{object};
-				if ($member->isa('Light_Item')) {
-					my @lights = $member->find_members('Insteon::BaseLight');
-					if (@lights) {
-						$member = $lights[0]; # pick the first
-					}
-				}
-				if ($member->device_id eq $$self{device}->device_id) {
-					if ($data3 eq '00' or (lc $data3 eq lc $member->group)) {
-						$is_invalid = 0;
-						last;
-					}
-				}
-			}
-			if ($is_invalid) {
-				my %delete_req = (deviceid => $deviceid, group => $group, is_controller => $is_controller,
-					callback => "$selfname->_aldb->_process_delete_queue()", object => $linked_device,
-					cause => "this link is not defined in the MHT file", data3 => $data3);
-					push @{$$self{delete_queue}}, \%delete_req;
-					$num_deleted++;
-			}
-		}
+	} # /LINKKEY Loop
+	foreach (@{$$self{delete_queue}}){
+		my %delete_req = %{$_};
+		my $audit_text = "(AUDIT)" if ($audit_mode);
+		my $log_text = "[Insteon::AllLinkDatabase] $audit_text Deleting the following link on $selfname because ";
+		$log_text .= $delete_req{cause} . "\n";
+		delete $delete_req{cause};
+		$log_text .= "$_ = $delete_req{$_}" for (keys %delete_req); 
+	}
+	if ($audit_mode) {
+		@{$$self{delete_queue}} = ();
 	}
-	if (!($audit_mode)) {
-		&::print_log("[Insteon::AllLinkDatabase] ## Begin processing delete queue for: $selfname");
+	else {
+		::print_log("[Insteon::AllLinkDatabase] ## Begin processing delete queue for: $selfname");
 	}
 	$self->_process_delete_queue();
 }

From a41986080c1ab7a764ebd89f74424a2b4004c4c8 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 16 Oct 2013 23:23:00 -0700
Subject: [PATCH 250/330] Insteon: Fix Bugs, Typos, Enable Backwards
 Compatability with Old Data3

Backwards compatability is just for testing purposes, will be removed eventually.
---
 lib/Insteon/AllLinkDatabase.pm | 50 ++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 995825826..cf4415938 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -458,7 +458,7 @@ sub delete_orphan_links
 		# Initialize Variables
 		my ($linked_device, $plm_scene, $controller_object, $link_defined,
 			$controller_id, $linked_id, $responder_id, $link_data3,
-			$linked_group);
+			$linked_group, $self_subgroup, $linked_subgroup);
 		my $group 		= lc $$self{aldb}{$linkkey}{group};
 		my $is_controller 	= $$self{aldb}{$linkkey}{is_controller};
 		my $data3 		= lc $$self{aldb}{$linkkey}{data3};
@@ -467,6 +467,7 @@ sub delete_orphan_links
 		my $interface_id	= lc $$self{device}->interface->device_id;
 		$linked_device = Insteon::get_object($deviceid,'01');
 		$linked_device = $$self{device}->interface if ($deviceid eq $interface_id);
+		$self_subgroup = Insteon::get_object($self_id, $group) if ($is_controller);
 		my %delete_req = (deviceid => $deviceid,
 			group => $group,
 			is_controller => $is_controller,
@@ -474,7 +475,7 @@ sub delete_orphan_links
 			data3 => $data3);
 
 		# Is the linked device defined in MH?
-		if (!($linked_device)) {
+		if (! ref $linked_device) {
 			$delete_req{cause} = "no device with deviceid: $deviceid could be found";
 			push @{$$self{delete_queue}}, \%delete_req;
 			next LINKKEY;
@@ -495,9 +496,9 @@ sub delete_orphan_links
 			}
 		}
 
-		# Is this link defined in MH?
+		# Is this link defined in MH? 4-Step Process
 		# First define variables based on type of link
-		$linked_id = $linked_device->device_id;
+		$linked_id = lc $linked_device->device_id;
 		$controller_id = ($is_controller) ? $self_id : $linked_id;
 		$responder_id = ($is_controller) ? $linked_id : $self_id;
 		$controller_object = Insteon::get_object($controller_id,$group);
@@ -512,16 +513,24 @@ sub delete_orphan_links
 			}
 			# For resp, D3 = resp group; For cont, D3 = cont group
 			$link_data3 = ($is_controller) ? $group : $member->group;
-			if ($member->device_id eq $responder_id && 
-			($data3 eq '00' or ($data3 eq $link_data3))) {
+			# 00 and 01 likely only neede for old design  OLD
+			if (lc($member->device_id) eq $responder_id && 
+			($data3 eq '00' or $data3 eq '01' or ($data3 eq $link_data3))) {
 				$link_defined = 1;
 				#Identify the linked device's group for use later
 				$linked_group = ($is_controller) ? $member->group : $group;
+				#Only needed to support OLD method
+				$linked_subgroup = $member;
 				last MEMBERS;
-			}
+			} 
+		}
+		
+		# Third, is this a controller link from the device to the PLM
+		if ($is_controller && $deviceid eq $interface_id && ref $self_subgroup){
+			$link_defined = 1;
 		}
 
-		# Third, delete link if not defined
+		# Fourth, delete link if not defined
 		if (!$link_defined){
 			$delete_req{cause} = "link is not defined in MisterHouse";
 			push @{$$self{delete_queue}}, \%delete_req;
@@ -529,7 +538,7 @@ sub delete_orphan_links
 		}
 
 		# Ignore links to deaf devices
-		if ($linked_device->is_deaf) {
+		if (! $linked_device->isa("Insteon_PLM") && $linked_device->is_deaf) {
 			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: "
 				."ignoring link from $selfname to 'deaf' device: " . $linked_device->get_object_name);
 			next LINKKEY;
@@ -550,10 +559,19 @@ sub delete_orphan_links
 		}
 
 		# Does a reciprocal link exist?
-		if ($linked_device->has_link($$self{device},$group,($is_controller) ? 0 : 1, $linked_group)) {
-			$delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name;
-			push @{$$self{delete_queue}}, \%delete_req;
+		# Temp OLD compatibility fix for data3, delete to #END to upgrade
+		if (($linked_device eq $$self{device}->interface) &&
+		 (!$$self{device}->isa('Insteon::KeyPadLincRelay'))){
+			$linked_group = '00';
 		}
+		if ($$self{device}->isa('Insteon::KeyPadLincRelay')){
+			$linked_group = $linked_subgroup->group;
+		}
+		#END
+		if (! $linked_device->has_link($$self{device},$group,($is_controller) ? 0 : 1, $linked_group)) {
+			$delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name . " linked_group $linked_group";
+			push @{$$self{delete_queue}}, \%delete_req;
+		} 
 
 	} # /LINKKEY Loop
 	foreach (@{$$self{delete_queue}}){
@@ -561,8 +579,12 @@ sub delete_orphan_links
 		my $audit_text = "(AUDIT)" if ($audit_mode);
 		my $log_text = "[Insteon::AllLinkDatabase] $audit_text Deleting the following link on $selfname because ";
 		$log_text .= $delete_req{cause} . "\n";
-		delete $delete_req{cause};
-		$log_text .= "$_ = $delete_req{$_}" for (keys %delete_req); 
+		PRINT: for (keys %delete_req) {
+			next PRINT if ($_ eq 'cause');
+			next PRINT if ($_ eq 'callback');
+			$log_text .= "$_ = $delete_req{$_}; ";
+		}
+		::print_log($log_text);
 	}
 	if ($audit_mode) {
 		@{$$self{delete_queue}} = ();

From efdefe437194057d8df984ad465bf912da15b85d Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Thu, 17 Oct 2013 20:03:55 -0400
Subject: [PATCH 251/330] Fix typo in description of base device's is_deaf
 default.

---
 lib/Insteon/BaseInsteon.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 9c6250448..18c5e18f5 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1315,8 +1315,8 @@ Returns true if the device must be awake in order to respond to messages.  Most
 devices are not deaf, currently devices that are deaf are battery operated
 devices such as the Motion Sensor, RemoteLinc and TriggerLinc.
 
-At the BaseObject level all devices are defined as deaf.  Objects which inherit
-BaseObject should redefine is_deaf as necessary.
+At the BaseObject level all devices are defined as not deaf.  Objects which
+inherit BaseObject should redefine is_deaf as necessary.
 
 =cut
 

From 1de0a6e2574496e84bf1307dfb616caae008701d Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 17 Oct 2013 18:36:30 -0700
Subject: [PATCH 252/330] Insteon: Condense Insteon_PLM Delete_Orphans in
 AllLinkDatabase

No need to have two seperate functions.
---
 lib/Insteon/AllLinkDatabase.pm | 199 ++++++++-------------------------
 1 file changed, 45 insertions(+), 154 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index cf4415938..75c12fb71 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -458,16 +458,23 @@ sub delete_orphan_links
 		# Initialize Variables
 		my ($linked_device, $plm_scene, $controller_object, $link_defined,
 			$controller_id, $linked_id, $responder_id, $link_data3,
-			$linked_group, $self_subgroup, $linked_subgroup);
+			$linked_group, $self_subgroup, $linked_subgroup, $interface_id,
+			$link_subgroup);
 		my $group 		= lc $$self{aldb}{$linkkey}{group};
 		my $is_controller 	= $$self{aldb}{$linkkey}{is_controller};
 		my $data3 		= lc $$self{aldb}{$linkkey}{data3};
 		my $deviceid 		= lc $$self{aldb}{$linkkey}{deviceid};
 		my $self_id		= lc $$self{device}->device_id;
-		my $interface_id	= lc $$self{device}->interface->device_id;
+		if ($$self{device}->isa('Insteon_PLM')){
+			$interface_id	= $self_id;
+		} 
+		else {
+			$interface_id	= lc $$self{device}->interface->device_id;
+		}
 		$linked_device = Insteon::get_object($deviceid,'01');
 		$linked_device = $$self{device}->interface if ($deviceid eq $interface_id);
 		$self_subgroup = Insteon::get_object($self_id, $group) if ($is_controller);
+		$link_subgroup = Insteon::get_object($deviceid, $group) if (!$is_controller);
 		my %delete_req = (deviceid => $deviceid,
 			group => $group,
 			is_controller => $is_controller,
@@ -481,12 +488,19 @@ sub delete_orphan_links
 			next LINKKEY;
 		} 
 
-		# IF a PLM Scene, is the PLM Scene defined in MH?
-		if ($linked_device->isa("Insteon::BaseInterface") and !$is_controller) {
+		# IF link is a PLM Scene, is the PLM Scene defined in MH?
+		if (($linked_device->isa("Insteon::BaseInterface") and !$is_controller)||
+		($$self{device}->isa("Insteon::BaseInterface") and $is_controller)) {
 			$plm_scene = &Insteon::get_object('000000', $group);
 			if ($group eq '01' || $group eq '00') {
-				::print_log("[Insteon::AllLinkDatabase] DEBUG2 Ignoring orphan responder link from "
-					. $selfname . " to PLM for group 01 or 00") if $main::Debug{insteon} >= 2;
+				my $not_plm_name;
+				if ($linked_device->isa("Insteon::BaseInterface")){
+					$not_plm_name = $selfname;
+				} else {
+					$not_plm_name = $linked_device->get_object_name;
+				}
+				::print_log("[Insteon::AllLinkDatabase] DEBUG2 Ignoring link between PLM and $not_plm_name "
+					."for group 01 or 00") if $main::Debug{insteon} >= 2;
 				next LINKKEY;
 			}
 			elsif (!ref $plm_scene) {
@@ -496,14 +510,13 @@ sub delete_orphan_links
 			}
 		}
 
-		# Is this link defined in MH? 4-Step Process
+		# Is this link defined in MH? 5-Step Process
 		# First define variables based on type of link
 		$linked_id = lc $linked_device->device_id;
 		$controller_id = ($is_controller) ? $self_id : $linked_id;
 		$responder_id = ($is_controller) ? $linked_id : $self_id;
 		$controller_object = Insteon::get_object($controller_id,$group);
 		$controller_object = $plm_scene if (ref $plm_scene);
-		
 		# Second, iterate over the controller object members to find the link definition
 		MEMBERS: foreach my $member_ref (keys %{$$controller_object{members}}) {
 			my $member = $$controller_object{members}{$member_ref}{object};
@@ -513,7 +526,11 @@ sub delete_orphan_links
 			}
 			# For resp, D3 = resp group; For cont, D3 = cont group
 			$link_data3 = ($is_controller) ? $group : $member->group;
-			# 00 and 01 likely only neede for old design  OLD
+			# 00 and 01 likely only neede for old design OLD delete to END
+			if ($member->group ne '01') {
+				$link_data3 = $member->group;
+			}
+			#END
 			if (lc($member->device_id) eq $responder_id && 
 			($data3 eq '00' or $data3 eq '01' or ($data3 eq $link_data3))) {
 				$link_defined = 1;
@@ -524,21 +541,28 @@ sub delete_orphan_links
 				last MEMBERS;
 			} 
 		}
-		
-		# Third, is this a controller link from the device to the PLM
+
+		# Third, is this a controller link from the device to the PLM?
 		if ($is_controller && $deviceid eq $interface_id && ref $self_subgroup){
 			$link_defined = 1;
 		}
 
-		# Fourth, delete link if not defined
+		# Fourth, is this a responder link on the PLM from a device?
+		if (!$is_controller && $self_id eq $interface_id && ref $link_subgroup){
+			$link_defined = 1;
+			$linked_group = '00';
+			$linked_group = $group if ($group ne '01');
+		}
+
+		# Fifth, delete link if not defined
 		if (!$link_defined){
-			$delete_req{cause} = "link is not defined in MisterHouse";
+			$delete_req{cause} = "link is not defined in MisterHouse $linkkey";
 			push @{$$self{delete_queue}}, \%delete_req;
 			next LINKKEY;
 		}
 
 		# Ignore links to deaf devices
-		if (! $linked_device->isa("Insteon_PLM") && $linked_device->is_deaf) {
+		if (! $linked_device->isa('Insteon_PLM') && $linked_device->is_deaf) {
 			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: "
 				."ignoring link from $selfname to 'deaf' device: " . $linked_device->get_object_name);
 			next LINKKEY;
@@ -560,7 +584,7 @@ sub delete_orphan_links
 
 		# Does a reciprocal link exist?
 		# Temp OLD compatibility fix for data3, delete to #END to upgrade
-		if (($linked_device eq $$self{device}->interface) &&
+		if (($linked_device eq Insteon::active_interface) &&
 		 (!$$self{device}->isa('Insteon::KeyPadLincRelay'))){
 			$linked_group = '00';
 		}
@@ -568,8 +592,8 @@ sub delete_orphan_links
 			$linked_group = $linked_subgroup->group;
 		}
 		#END
-		if (! $linked_device->has_link($$self{device},$group,($is_controller) ? 0 : 1, $linked_group)) {
-			$delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name . " linked_group $linked_group";
+		if (! $linked_device->has_link($$self{device},$group,($is_controller) ? 0 : 1, lc $linked_group)) {
+			$delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name . " linked_group $linked_group linkkey $linkkey";
 			push @{$$self{delete_queue}}, \%delete_req;
 		} 
 
@@ -592,7 +616,9 @@ sub delete_orphan_links
 	else {
 		::print_log("[Insteon::AllLinkDatabase] ## Begin processing delete queue for: $selfname");
 	}
-	$self->_process_delete_queue();
+	if (!$$self{device}->isa('Insteon_PLM')) {
+		$self->_process_delete_queue();
+	}
 }
 
 sub _process_delete_queue {
@@ -2521,142 +2547,7 @@ sub delete_orphan_links
         &::print_log("[Insteon::ALDB_PLM] #### NOW BEGINNING DELETE ORPHAN LINKS ####");
 
 	@{$$self{delete_queue}} = (); # reset the work queue
-	my $selfname = $$self{device}->get_object_name;
-	my $num_deleted = 0;
-	foreach my $linkkey (keys %{$$self{aldb}})
-        {
-		my $deviceid = lc $$self{aldb}{$linkkey}{deviceid};
-		my $group = $$self{aldb}{$linkkey}{group};
-		my $is_controller = $$self{aldb}{$linkkey}{is_controller};
-		my $data3 = $$self{aldb}{$linkkey}{data3};
-		my $device = &Insteon::get_object($deviceid,'01');
-		# if a PLM link (regardless of responder or controller) exists to a device that is not known, then delete
-		if (!($device))
-                {
-                	if ($audit_mode)
-                        {
-                        &::print_log("[Insteon::ALDB_PLM] (AUDIT) Delete Orphan Link to non-existant deviceid: " .
-                                $deviceid . "; group:$group; "
-                                . (($is_controller) ? "controller; data:$data3" : "responder"))
-                                if $main::Debug{insteon};
-                        }
-                        else
-                        {
-				my %delete_req = (deviceid => $deviceid, group => $group, is_controller => $is_controller,
-					callback => "$selfname->_aldb->_process_delete_queue(1)",
-					linkdevice => $self, data3 => $data3);
-				push @{$$self{delete_queue}}, \%delete_req;
-                        }
-		}
-                else
-                {
-			my $is_invalid = 1;
-			my $link = undef;
-			if ($is_controller)
-                        {
-				# then, this is a PLM defined link; and, we won't care about responder links as we assume
-				# they're ok given that they reference known devices
-				$link = &Insteon::get_object('000000',$group);
-				if (!($link))
-                                {
-					# a reference in the PLM's linktable does not match a scene member target
-					if ($group eq '01' || $group eq '00') {
-						#ignore manual controller link from PLM group 01 or 00 to device required for I2CS devices
-						main::print_log("[Insteon::ALDB_PLM] DEBUG2 Ignoring orphan PLM controller(01 or 00) link to "
-							. $device->get_object_name() ) if $main::Debug{insteon} >= 2;
-					}
-					elsif ($audit_mode)
-                                        {
-	                                        &::print_log("[Insteon::ALDB_PLM] (AUDIT) Delete Orphan PLM controller link ($group) to: "
-                                                        . $device->get_object_name() . "($data3)")
-                                                        if $main::Debug{insteon};
-                                        }
-                                        else
-                                        {
-				       		my %delete_req = (object => $device, group => $group, is_controller => 1,
-								callback => "$selfname->_aldb->_process_delete_queue(1)",
-								linkdevice => $self, data3 => $data3);
-						push @{$$self{delete_queue}}, \%delete_req;
-					}
-				}
-                                else
-                                {
-					# iterate over all of the members of the Insteon_Link item
-					foreach my $member_ref (keys %{$$link{members}})
-                                        {
-						my $member = $$link{members}{$member_ref}{object};
-						# member will correspond to a scene member item
-						# and, if it is a light item, then get the real device
-						if ($member->isa('Light_Item'))
-                                                {
-							my @lights = $member->find_members('Insteon::BaseLight');
-							if (@lights)
-                                                        {
-								$member = $lights[0]; # pick the first
-							}
-						}
-						if ($member->isa('Insteon::BaseDevice'))
-                                                {
-                                                	if ($member->is_deaf)
-                                                        {
-                                                               &::print_log("[Insteon::ALDB_PLM] ignoring link from PLM to " .
-                                                               		$member->get_object_name);
-                                                               $is_invalid = 0;
-                                                        }
-                                                        else
-                                                        {
-						       		my $linkmember = $member;
-								# make sure that this is a root device
-								if (!($member->is_root))
-                                                        	{
-									$member = $member->get_root;
-								}
-								if (lc $member->device_id eq $$self{aldb}{$linkkey}{deviceid})
-                                                        	{
-									# at this point, the forward link is ok; but, only if the reverse
-									# link also exists.  So, check:
-									if ($member->has_link($self, $group, 0, $linkmember->group))
-                                                                	{
-										$is_invalid = 0;
-									}
-							       		last;
-								}
-                                                        }
-						}
-                                                else
-                                                {
-							$is_invalid = 0;
-						}
-					} # foreach $$link{members}
-					if ($is_invalid)
-                                        {
-						# then, there is a good chance that a reciprocal link exists; if so, delet it too
-						# KRK Need to delete ALL responder links regardless of data3
-						if ($device->has_link($self,$group,0, $data3))
-                                                {
-                                                	if ($audit_mode)
-                                                        {
-                                                                &::print_log("[Insteon::ALDB_PLM] (AUDIT) Delete orphan controller link from PLM to "
-                                                                	. $device->get_object_name()
-                                                			. " because no SCENE_MEMBER entry could be found "
-                                                                        . "in items.mht for INSTEON_ICONTROLLER: "
-                                                                        . $link->get_object_name());
-
-                                                        }
-                                                        else
-                                                        {
-						       		my %delete_req = (object => $device, group => $group, is_controller => 1,
-							       		callback => "$selfname->_aldb->_process_delete_queue(1)",
-									linkdevice => $self, data3 => $data3);
-								push @{$$self{delete_queue}}, \%delete_req;
-                                                        }
-						}
-						# KRK Why are we not deleting the invalid PLM link here?
-					}  # if $is_invalid
-				} # else
-			}
-		}
-	}
+	$self->SUPER::delete_orphan_links($audit_mode);
 
 	$$self{delete_queue_processed} = 0; # reset the counter
 

From 474679738606aff38822ffb6f44c443c01a46d77 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 17 Oct 2013 21:13:39 -0700
Subject: [PATCH 253/330] Insteon: Rewrite of Sync_Links to Make it More
 Readable

Plus set data3 to the proper value

And clean up perl warnings
---
 lib/Insteon/AllLinkDatabase.pm |   2 +-
 lib/Insteon/BaseInsteon.pm     | 372 ++++++++++++++-------------------
 2 files changed, 159 insertions(+), 215 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 75c12fb71..b5fcb5e9d 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -584,7 +584,7 @@ sub delete_orphan_links
 
 		# Does a reciprocal link exist?
 		# Temp OLD compatibility fix for data3, delete to #END to upgrade
-		if (($linked_device eq Insteon::active_interface) &&
+		if (($linked_device eq Insteon::active_interface()) &&
 		 (!$$self{device}->isa('Insteon::KeyPadLincRelay'))){
 			$linked_group = '00';
 		}
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 7a575d43d..1bfaa1291 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2819,243 +2819,187 @@ MisterHouse will add the link.
 If audit_mode is true, MisterHouse will print the actions it would have taken to 
 the log, but will not take any actions.
 
+The process does the following 5 checks in order:
+
+ 1. Does a controller link exist for Device-> PLM
+ 2. Does a responder link exist on the PLM
+
+it then loops through all of the links defined for a device and checks:
+
+ 3. Does the responder link exist
+ 4. Is the responder link accurate
+ 5. Does the controller link on this device exist
+
 =cut
 
 sub sync_links
 {
 	my ($self, $audit_mode, $callback, $failure_callback) = @_;
+	
+	# Intialize Variables
 	@{$$self{sync_queue}} = (); # reset the work queue
 	$$self{sync_queue_callback} = ($callback) ? $callback : undef;
+	my $subaddress = $self->group;
+	my $self_link_name = $self->get_object_name;
 	my $insteon_object = $self->interface;
-	if (!($self->isa('Insteon::InterfaceController')))
-        {
+	my $interface_object = Insteon::active_interface();
+	my $interface_name = $interface_object->get_object_name;
+	if (!($self->isa('Insteon::InterfaceController'))) {
 		$insteon_object = &Insteon::get_object($self->device_id,'01');
-		if (!(defined($insteon_object)))
-                {
-			&main::print_log("[Insteon::BaseController] WARN!! A device w/ insteon address: " . $self->device_id . ":01 could not be found. "
-				. "Please double check your items.mht file.");
-		}
+		&main::print_log("[Insteon::BaseController] WARN!! A device w/ insteon address: " . $self->device_id . ":01 could not be found. "
+			. "Please double check your items.mht file.") if (!(defined($insteon_object)));
 	}
-	my $self_link_name = $self->get_object_name;
-	# abort if $insteon_object doesn't exist
+
+	# Abort if $insteon_object doesn't exist
 	$self->_process_sync_queue() unless $insteon_object;
-	if ($$self{members})
-        {
-		foreach my $member_ref (keys %{$$self{members}})
-                {
-			my $member = $$self{members}{$member_ref}{object};
-			# find real device if member is a Light_Item
-			if ($member->isa('Light_Item'))
-                        {
-				my @children = $member->find_members('Insteon::BaseDevice');
-				$member = $children[0];
+	
+	# 1. Does a controller link exist for Device-> PLM
+	if (!($self->isa('Insteon::InterfaceController') && 
+	$insteon_object->has_link($self->interface,$self->group,1,$subaddress))) {
+		my %link_req = ( member => $insteon_object, cmd => 'add', object => $self->interface,
+			group => $self->group, is_controller => 1,
+			callback => "$self_link_name->_process_sync_queue()",
+			data3 => $subaddress);
+		$link_req{cause} = "Adding controller record from $self_link_name to $interface_name";
+		$link_req{data3} = $self->group;
+		push @{$$self{sync_queue}}, \%link_req;
+	}
+		
+	# 2. Does a responder link exist on the PLM
+	if (!($self->isa('Insteon::InterfaceController') &&
+	$self->interface->has_link($insteon_object,$self->group,0,'00'))) {
+		my %link_req = ( member => $self->interface, cmd => 'add', object => $insteon_object,
+			group => $self->group, is_controller => 0,
+			callback => "$self_link_name->_process_sync_queue()",
+			data3 => '00');
+		$link_req{cause} = "Adding responder record to $interface_name from $self_link_name";
+		push @{$$self{sync_queue}}, \%link_req;
+	}
+
+	if (!$$self{members}) {
+		#No members to sync
+		$self->_process_sync_queue();
+	}
+
+	# Loop members
+	foreach my $member_ref (keys %{$$self{members}}) {
+		my $member = $$self{members}{$member_ref}{object};
+		
+		# find real device if member is a Light_Item
+		if ($member->isa('Light_Item')) {
+			my @children = $member->find_members('Insteon::BaseDevice');
+			$member = $children[0];
+		}
+		
+		#Initialize Loop Variables
+		my $member_name = $member->get_object_name;
+		my $member_root = $member->get_root;
+		my $requires_update = 0;
+		my $has_link = 1;
+		my $cause;
+		my $tgt_on_level = $$self{members}{$member_ref}{on_level};
+		$tgt_on_level = '100' unless defined $tgt_on_level;
+		my $tgt_ramp_rate = $$self{members}{$member_ref}{ramp_rate};
+		$tgt_ramp_rate = '0' unless defined $tgt_ramp_rate;
+		$tgt_on_level =~ s/(\d+)%?/$1/;
+		$tgt_ramp_rate =~ s/(\d)s?/$1/;
+		my $resp_aldbkey = lc $insteon_object->device_id . $self->group . '0';
+		if ($member->group ne '01') {
+			$resp_aldbkey .= $member->group;
+		}
+
+		# 3. Does the responder link exist
+		if (!$member_root->has_link($insteon_object, $self->group, 0, $member->group)){
+			my %link_req = ( member => $member, cmd => 'add', object => $insteon_object,
+				group => $self->group, is_controller => 0,
+				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
+				callback => "$self_link_name->_process_sync_queue()",
+				data3 => $member->group);
+			push @{$$self{sync_queue}}, \%link_req;
+			$has_link = 0;
+		}
+		
+		# 4. Is the responder link accurate
+		if ($member->isa('Insteon::DimmableLight') && $has_link) {
+			my $member_aldb = $member->_aldb;
+			my $data1 = $$member_aldb{aldb}{$resp_aldbkey}{data1};
+			my $data2 = $$member_aldb{aldb}{$resp_aldbkey}{data2};
+			my $cur_on_level = hex($data1)/2.55;
+			my $raw_cur_ramp_rate = $data2;
+			my $raw_tgt_ramp_rate = Insteon::DimmableLight::convert_ramp($tgt_ramp_rate);
+			if ($raw_cur_ramp_rate ne $raw_tgt_ramp_rate) {
+				$requires_update = 1;
+				$cause .= "Ramp rate ";
 			}
-			my $linkmember = $member;
-			# find real device if member's group is not '01'; for example, cross-linked KeypadLincs
-			if ($member->group ne '01')
-                        {
-				$member = &Insteon::get_object($member->device_id,'01');
+			elsif ($cur_on_level != $tgt_on_level){
+				$requires_update = 1;
+				$cause .= "On level ";
 			}
-			my $tgt_on_level = $$self{members}{$member_ref}{on_level};
-			$tgt_on_level = '100%' unless defined $tgt_on_level;
-
-			my $tgt_ramp_rate = $$self{members}{$member_ref}{ramp_rate};
-			$tgt_ramp_rate = '0' unless defined $tgt_ramp_rate;
-			# first, check existance for each link; if found, then perform an update (unless link is to PLM)
-			# if not, then add the link
-			if ($member->has_link($insteon_object, $self->group, 0, $linkmember->group))
-                        {
-				# TO-DO: only update link if the on_level and ramp_rate are different
-				my $requires_update = 0;
-				$tgt_on_level =~ s/(\d+)%?/$1/;
-				$tgt_ramp_rate =~ s/(\d)s?/$1/;
-				my $aldbkey = lc $insteon_object->device_id . $self->group . '0';
-				if (($member->isa('Insteon::KeyPadLincRelay') or $member->isa('Insteon::KeyPadLinc'))
-                                	 and $linkmember->group ne '01') {
-					$aldbkey .= $linkmember->group;
-				}
-				if (!($member->isa('Insteon::DimmableLight')))
-                                {
-                                	my $member_aldb = $member->_aldb;
-					if ($tgt_on_level >= 1 and $$member_aldb{aldb}{$aldbkey}{data1} ne 'ff')
-                                        {
-						$requires_update = 1;
-						$tgt_on_level = 100;
-					}
-                                        elsif ($tgt_on_level == 0 and $$member_aldb{aldb}{$aldbkey}{data1} ne '00')
-                                        {
-						$requires_update = 1;
-					}
-					if ($$member_aldb{aldb}{$aldbkey}{data2} ne '00')
-                                        {
-						$tgt_ramp_rate = 0;
-					}
-				}
-                                else
-                                {
-                                	my $member_aldb = $member->_aldb;
-					$tgt_ramp_rate = 0.1 unless $tgt_ramp_rate;
-					my $link_on_level = hex($$member_aldb{aldb}{$aldbkey}{data1})/2.55;
-					my $raw_ramp_rate = $$member_aldb{aldb}{$aldbkey}{data2};
-					my $raw_tgt_ramp_rate = &Insteon::DimmableLight::convert_ramp($tgt_ramp_rate);
-					if (($raw_ramp_rate ne $raw_tgt_ramp_rate) && ($raw_ramp_rate ne '00' and $raw_tgt_ramp_rate ne '1f'))
-                                        {
-						$requires_update = 1;
-                                                &::print_log("[Insteon::BaseController] DEBUG: flagging " . $self->get_object_name
-                                                	. " for update because existing ramp rate ($raw_ramp_rate) != target ($raw_tgt_ramp_rate)")
-							if $main::Debug{insteon};
-
-					}
-                                        elsif (($link_on_level > $tgt_on_level + 1) or ($link_on_level < $tgt_on_level -1))
-                                        {
-						$requires_update = 1;
-                                                &::print_log("[Insteon::BaseController] DEBUG: flagging " . $self->get_object_name
-                                                	. " for update because existing on level ($link_on_level) != target ($tgt_on_level)")
-							if $main::Debug{insteon};
-					}
-				}
-				if ($requires_update)
-                                {
-                                	if ($audit_mode)
-                                        {
-                                               &::print_log("[Insteon::BaseController] (AUDIT) - updating responder record to "
-                                               		. $member->get_object_name . " for "
-                                               		. $insteon_object->get_object_name . " with group:" . $self->group
-                                                        . "; on_level:$tgt_on_level; ramp_rate:$tgt_ramp_rate");
-                                        }
-                                        else
-                                        {
-						my %link_req = ( member => $member, cmd => 'update', object => $insteon_object,
-							group => $self->group, is_controller => 0,
-							on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
-							callback => "$self_link_name->_process_sync_queue()" );
-						# set data3 is device is a KeypadLinc
-						if ($member->isa('Insteon::KeyPadLincRelay') or $member->isa('Insteon::KeyPadLinc'))
-                                        	{
-							$link_req{data3} = $linkmember->group;
-						}
-						main::print_log("[Insteon::BaseController] DEBUG4: queuing update for responder record to "
-							. $member->get_object_name . " for "
-							. $insteon_object->get_object_name . " with group:" . $self->group
-							. "; on_level:$tgt_on_level; ramp_rate:$tgt_ramp_rate")
-							if $main::Debug{insteon} >= 4;
-				       		push @{$$self{sync_queue}}, \%link_req;
-                                        }
-				}
+		}
+		elsif ($has_link){
+			my $member_aldb = $member->_aldb;
+			my $data1 = $$member_aldb{aldb}{$resp_aldbkey}{data1};
+			my $data2 = $$member_aldb{aldb}{$resp_aldbkey}{data2};
+			if ($tgt_on_level >= 1 and $data1 ne 'ff') {
+				$requires_update = 1;
+				$tgt_on_level = 100;
+				$cause .= "On level ";
 			}
-                        else
-                        {
-                        	if ($audit_mode)
-                                {
-                                	&::print_log("[Insteon::BaseController] (AUDIT) - adding responder record to "
-                                        	. $member->get_object_name . " for "
-                                        	. $insteon_object->get_object_name . " with group:" . $self->group
-                                                . "; on_level:$tgt_on_level; ramp_rate:$tgt_ramp_rate");
-                                }
-                                else
-                                {
-					my %link_req = ( member => $member, cmd => 'add', object => $insteon_object,
-						group => $self->group, is_controller => 0,
-						on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
-				       		callback => "$self_link_name->_process_sync_queue()" );
-			       		# set data3 is device is a KeypadLinc
-					if ($member->isa('Insteon::KeyPadLincRelay') or $member->isa('Insteon::KeyPadLinc'))
-                                	{
-						$link_req{data3} = $linkmember->group;
-					}
-					main::print_log("[Insteon::BaseController] DEBUG4: queuing add for responder record to "
-						. $member->get_object_name . " for "
-						. $insteon_object->get_object_name . " with group:" . $self->group
-						. "; on_level:$tgt_on_level; ramp_rate:$tgt_ramp_rate")
-						if $main::Debug{insteon} >= 4;
-					push @{$$self{sync_queue}}, \%link_req;
-                                }
+			elsif ($tgt_on_level == 0 and $data1 ne '00') {
+				$requires_update = 1;
+				$cause .= "On level ";
 			}
-			if (!($insteon_object->has_link($member, $self->group, 1, $linkmember->group)))
-                        {
-                        	if ($audit_mode)
-                                {
-                                	&::print_log("[Insteon::BaseController] (AUDIT) - adding controller record to "
-                                        	. $insteon_object->get_object_name . " for " . $member->get_object_name
-                                                . " with group:" . $self->group);
-                                }
-                                else
-                                {
-			       		my %link_req = ( member => $insteon_object, cmd => 'add', object => $member,
-						group => $self->group, is_controller => 1,
-						callback => "$self_link_name->_process_sync_queue()" );
-			       		# set data3 is device is a KeypadLinc
-					if ($member->isa('Insteon::KeyPadLincRelay') or $member->isa('Insteon::KeyPadLinc'))
-                                	{
-						$link_req{data3} = $linkmember->group;
-					}
-					main::print_log("[Insteon::BaseController] DEBUG4: queuing add for controller record to "
-						. $insteon_object->get_object_name . " for " . $member->get_object_name 
-						. " with group:" . $self->group) if $main::Debug{insteon} >= 4;
-					push @{$$self{sync_queue}}, \%link_req;
-                                }
+			if ($data2 ne '00') {
+				$requires_update = 1;
+				$tgt_ramp_rate = 0;
+				$cause .= "Ramp rate ";
 			}
 		}
-	}
-	# if not a plm controlled link, then confirm that a link back to the plm exists
-	if (!($self->isa('Insteon::InterfaceController')))
-        {
-		my $subaddress = ($self->isa('Insteon::KeyPadLincRelay') or $self->isa('Insteon::KeyPadLinc')) ? $self->group : '00';
-		#Make sure this device has a controller link to the PLM
-		if (!($insteon_object->has_link($self->interface,$self->group,1,$subaddress)))
-                {
-                	if ($audit_mode)
-                        {
-                               	&::print_log("[Insteon::BaseController] (AUDIT) - adding controller record to "
-                                	. $insteon_object->get_object_name . " for "
-                                       	. $self->interface->get_object_name . " with group:" . $self->group);
-                        }
-                        else
-                        {
-		       		my %link_req = ( member => $insteon_object, cmd => 'add', object => $self->interface,
-					group => $self->group, is_controller => 1,
-					callback => "$self_link_name->_process_sync_queue()" );
-				$link_req{data3} = $self->group if $insteon_object->isa('Insteon::KeyPadLincRelay') or $insteon_object->isa('Insteon::KeyPadLinc');
-				main::print_log("[Insteon::BaseController] DEBUG4: queuing add for controller record to "
-					. $insteon_object->get_object_name . " for "
-					. $self->interface->get_object_name . " with group:" . $self->group)
-					if $main::Debug{insteon} >= 4;
-				push @{$$self{sync_queue}}, \%link_req;
-                        }
-		}
-		#Make sure the PLM has a responder link to this device
-		if (!($self->interface->has_link($insteon_object,$self->group,0,$subaddress)))
-                {
-                	if ($audit_mode)
-                        {
-                               	&::print_log("[Insteon::BaseController] (AUDIT) - adding responder record to "
-                                	. $self->interface->get_object_name . " for "
-                                       	. $insteon_object->get_object_name . " with group:" . $self->group);
-                        }
-                        else
-                        {
-				my %link_req = ( member => $self->interface, cmd => 'add', object => $insteon_object,
-					group => $self->group, is_controller => 0,
-			       		callback => "$self_link_name->_process_sync_queue()" );
-				main::print_log("[Insteon::BaseController] DEBUG4: queuing add for responder record to "
-					. $self->interface->get_object_name . " for "
-					. $insteon_object->get_object_name . " with group:" . $self->group)
-					if $main::Debug{insteon} >= 4;
-				push @{$$self{sync_queue}}, \%link_req;
-                        }
+		if ($requires_update) {
+			my %link_req = ( member => $member, cmd => 'update', object => $insteon_object,
+				group => $self->group, is_controller => 0,
+				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
+				callback => "$self_link_name->_process_sync_queue()",
+				data3 => $member->group);
+			$link_req{cause} = "Updating responder record on $member_name "
+				. "to fix $cause";
+			push @{$$self{sync_queue}}, \%link_req;
+		}
+
+		# 5. Does the controller link on this device exist
+		if (!($insteon_object->has_link($member, $self->group, 1, $subaddress))) {
+			my %link_req = ( member => $insteon_object, cmd => 'add', object => $member,
+				group => $self->group, is_controller => 1,
+				callback => "$self_link_name->_process_sync_queue()",
+				data3 => $subaddress);
+			$link_req{cause} = "Adding controller record to $self_link_name for $member_name";
+			push @{$$self{sync_queue}}, \%link_req;
 		}
 	}
+	
 	my $num_sync_queue = @{$$self{sync_queue}};
 	if (!($num_sync_queue))
-        {
+	{
 		&::print_log("[Insteon::BaseController] Nothing to do when syncing links for " . $self->get_object_name)
 			if $main::Debug{insteon};
 	}
+	foreach (@{$$self{sync_queue}}){
+		my %sync_req = %{$_};
+		my $audit_text = "(AUDIT)" if ($audit_mode);
+		my $log_text = "[Insteon::BaseController] $audit_text $sync_req{cmd}ing the following link on $self_link_name because ";
+		$log_text .= $sync_req{cause} . "\n";
+		PRINT: for (keys %sync_req) {
+			next PRINT if ($_ eq 'cause');
+			next PRINT if ($_ eq 'callback');
+			$log_text .= "$_ = $sync_req{$_}; ";
+		}
+		::print_log($log_text);
+	}
+	if ($audit_mode) {
+		@{$$self{sync_queue}} = ();
+	}
+	
 	$self->_process_sync_queue();
-
-	# TO-DO: consult links table to determine if any "orphaned links" refer to this device; if so, then delete
-	# WARN: can't immediately do this as the link tables aren't finalized on the above operations
-	#    until the end of the actual insteon memory poke sequences; therefore, may need to handle separately
 }
 
 sub _process_sync_queue {
@@ -3144,7 +3088,7 @@ sub set_linked_devices
 				my @lights = $member->find_members('Insteon::BaseDevice');
 				if (@lights)
 				{
-					my $light = @lights[0];
+					my $light = $lights[0];
 					# remember the current state to support resume
 					$$self{members}{$member_ref}{resume_state} = $light->state;
 					$member->manual($light, $ramp_rate);
@@ -3227,7 +3171,7 @@ sub update_members
 			# if they are Light_Items, then locate the Light_Item's Insteon_Device member
 				my @lights = $member->find_members('Insteon::BaseDevice');
 				if (@lights) {
-					$device = @lights[0];
+					$device = $lights[0];
 				}
 			} elsif ($member->isa('Insteon::BaseDevice')) {
 				$device = $member;

From b767b795ef3f9ec2a5507854a5a9322c2476fd2e Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Fri, 18 Oct 2013 00:16:55 -0400
Subject: [PATCH 254/330] Initial rework of insteon debugging

---
 lib/Insteon.pm                 |  12 ++--
 lib/Insteon/AllLinkDatabase.pm | 110 ++++++++++++++++-----------------
 lib/Insteon/BaseInsteon.pm     |  99 +++++++++++++++++------------
 lib/Insteon/BaseInterface.pm   |  53 ++++++++++------
 lib/Insteon/Controller.pm      |  10 +--
 lib/Insteon/IOLinc.pm          |  18 +++---
 lib/Insteon/Irrigation.pm      |   8 +--
 lib/Insteon/Lighting.pm        |   6 +-
 lib/Insteon/Message.pm         |  17 +++++
 lib/Insteon/Security.pm        |  14 ++---
 lib/Insteon/Thermostat.pm      |  48 +++++++-------
 lib/Insteon_PLM.pm             |  58 ++++++++---------
 12 files changed, 252 insertions(+), 201 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 9038ff491..369b8e225 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -407,7 +407,7 @@ sub scan_all_linktables
 		       		push @_scan_devices, $candidate_object;
                 		&main::print_log("[Scan all linktables] INFO1: "
                         		. $candidate_object->get_object_name
-                        		. " will be scanned.") if $main::Debug{insteon} >= 1;
+                        		. " will be scanned.") if $candidate_object->debuglevel(1);
         		}
                 	else
                 	{
@@ -1076,13 +1076,13 @@ sub check_all_aldb_versions
 		{
 			main::print_log("[Insteon] DEBUG4 Checking aldb version for "
 				. $ALDB_device->get_object_name()
-				. " ($count of $ALDB_cnt)") if ($main::Debug{insteon} >= 4);
+				. " ($count of $ALDB_cnt)") if ($ALDB_device->debuglevel(4));
 			$ALDB_device->check_aldb_version();
 		} else
 		{
 			main::print_log("[Insteon] DEBUG4 " . $ALDB_device->get_object_name
 				. " does not have its own aldb ($count of $ALDB_cnt)")
-				if ($main::Debug{insteon} >= 4);
+				if ($ALDB_device->debuglevel(4));
 		}
 	}
 	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices completed") if ($main::Debug{insteon} >= 4);
@@ -1100,18 +1100,18 @@ sub check_thermo_versions
 			$thermo_device->get_root()->engine_version eq "I2CS"){
 			main::print_log("[Insteon] DEBUG4 Setting thermostat "
 				. $thermo_device->get_object_name() . " to i2CS") 
-			if ($main::Debug{insteon} >= 4);
+			if ($thermo_device->debuglevel(4));
 			bless $thermo_device, 'Insteon::Thermo_i2CS';
 			$thermo_device->init();
 		}
 		else {
 			main::print_log("[Insteon] DEBUG4 Setting thermostat "
 				. $thermo_device->get_object_name() . " to i1") 
-			if ($main::Debug{insteon} >= 4);
+			if ($thermo_device->debuglevel(4));
 			bless $thermo_device, 'Insteon::Thermo_i1';
 		}
 	}
-	#main::print_log("[Insteon] DEBUG4 Checking thermostat version of all devices completed") if ($main::Debug{insteon} >= 4);	
+	#main::print_log("[Insteon] DEBUG4 Checking thermostat version of all devices completed") if ($self->debuglevel(4));	
 }
 
 =back
diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index aa47c807b..f1f5721d8 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -145,7 +145,7 @@ sub query_aldb_delta
 			$self->{_aldb_changed_callback} = undef;
 			eval ($callback);
 			&::print_log("[Insteon::AllLinkDatabase] " . $self->{device}->get_object_name . ": error during scan callback $@")
-				if $@ and $main::Debug{insteon};
+				if $@ and $self->debuglevel();
 			package Insteon::AllLinkDatabase;
 		}
         } elsif ($action eq "check" && ((&main::get_tickcount - $self->scandatetime()) <= 2000)){
@@ -160,7 +160,7 @@ sub query_aldb_delta
 			$self->{_aldb_unchanged_callback} = undef;
 			eval ($callback);
 			&::print_log("[Insteon::AllLinkDatabase] " . $self->{device}->get_object_name . ": error during scan callback $@")
-				if $@ and $main::Debug{insteon};
+				if $@ and $self->debuglevel();
 			package Insteon::AllLinkDatabase;
 		}
         } else {
@@ -209,7 +209,7 @@ sub restore_string
 			}
 			$aldb .= $record;
 		}
-#		&::print_log("[AllLinkDataBase] aldb restore string: $aldb") if $main::Debug{insteon};
+#		&::print_log("[AllLinkDataBase] aldb restore string: $aldb") if $self->debuglevel();
 		if (defined $self->scandatetime)
                 {
 			$restore_string .= $$self{device}->get_object_name . "->_aldb->scandatetime(q~" . $self->scandatetime . "~) if "
@@ -337,7 +337,7 @@ sub delete_link
 			package main;
 			eval($link_parms{callback});
 			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
-				if $@ and $main::Debug{insteon};
+				if $@ and $self->debuglevel();
 			package Insteon::AllLinkDatabase;
 		}
 	} elsif ($link_parms{address} && $link_parms{aldb_check} eq "ok")
@@ -395,7 +395,7 @@ sub delete_link
 				package main;
 				eval($link_parms{callback});
 				&::print_log("[Insteon::AllLinkDatabase] error encountered during delete_link callback: " . $@)
-					if $@ and $main::Debug{insteon};
+					if $@ and $self->debuglevel();
 				package Insteon::AllLinkDataBase;
 			}
 		}
@@ -561,7 +561,7 @@ sub delete_orphan_links
 						if ($group eq '01' || $group eq '00') {
 							#ignore manual responder link to PLM group 01 or 00 required for I2CS devices
 							main::print_log("[Insteon::AllLinkDatabase] DEBUG2 Ignoring orphan responder link from "
-								. $selfname . " to PLM for group 01 or 00") if $main::Debug{insteon} >= 2;
+								. $selfname . " to PLM for group 01 or 00") if $self->debuglevel(2);
 						}
 						elsif ($audit_mode)
                                                 {
@@ -857,7 +857,7 @@ sub _process_delete_queue {
         else
         {
         	&::print_log("[Insteon::AllLinkDatabase] Nothing else to do for " . $$self{device}->get_object_name . " after deleting "
-                	. $$self{delete_queue_processed} . " links") if $main::Debug{insteon};
+                	. $$self{delete_queue_processed} . " links") if $self->debuglevel();
 		$$self{device}->interface->_aldb->_process_delete_queue($$self{delete_queue_processed});
 	}
 }
@@ -978,10 +978,10 @@ sub get_first_empty_address
 		}
 		$first_address = ($high_address > 0) ? sprintf('%04x', $high_address - 8) : 0;
 		main::print_log("[Insteon::AllLinkDatabase] DEBUG4: No empty link entries; using next lowest link address ["
-			.$first_address."]") if $main::Debug{insteon} >= 4;
+			.$first_address."]") if $self->debuglevel(4);
 	} else {
 		main::print_log("[Insteon::AllLinkDatabase] DEBUG4: Found empty address ["
-			.$first_address."] in empty array") if $main::Debug{insteon} >= 4;
+			.$first_address."] in empty array") if $self->debuglevel(4);
 	}
 
         return $first_address;
@@ -1047,7 +1047,7 @@ sub add_link
 			package main;
 			eval($link_parms{callback});
 			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
-				if $@ and $main::Debug{insteon};
+				if $@ and $self->debuglevel();
 			package Insteon::AllLinkDatabase;
 		}
 	}
@@ -1063,7 +1063,7 @@ sub add_link
 			eval($link_parms{callback});
 			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " 
 				. $$self{device}->get_object_name . ":" . $@)
-				if $@ and $main::Debug{insteon};
+				if $@ and $self->debuglevel();
 			package Insteon::AllLinkDatabase;
 		}
 	}
@@ -1086,7 +1086,7 @@ sub add_link
 			&::print_log("[Insteon::AllLinkDatabase] DEBUG2: adding link record " . $$self{device}->get_object_name
 				. " light level controlled by " . $insteon_object->get_object_name
 		       		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate")
-                                if $main::Debug{insteon} >= 2;
+                                if $self->debuglevel(2);
 			my ($data1, $data2);
 			if($link_parms{is_controller}) {
 				$data1 = '03';  #application retries == 3
@@ -1106,14 +1106,14 @@ sub add_link
                         	. $$self{device}->get_object_name
 				. " does not have a record of the first empty ALDB record."
                                 . " Please rescan this device's link table")
-                                if $main::Debug{insteon};
+                                if $self->debuglevel();
 
                          if ($$self{_success_callback})
                          {
 				package main;
 				eval ($$self{_success_callback});
 				&::print_log("[Insteon::AllLinkDatabase] WARN1: Error encountered during ack callback: " . $@)
-			 		if $@ and $main::Debug{insteon} >= 1;
+			 		if $@ and $self->debuglevel(1);
 			 	package Insteon::AllLinkDatabase;
                          }
                 }
@@ -1145,7 +1145,7 @@ sub update_link
 	my $ramp_rate = $link_parms{ramp_rate};
 	$ramp_rate =~ s/(\d)s?/$1/;
 	&::print_log("[Insteon::AllLinkDatabase] updating " . $$self{device}->get_object_name . " light level controlled by " . $insteon_object->get_object_name
-		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate") if $main::Debug{insteon};
+		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate") if $self->debuglevel();
 	my $data1 = &Insteon::DimmableLight::convert_level($on_level);
 	my $data2 = ($$self{device}->isa('Insteon::DimmableLight')) ? &Insteon::DimmableLight::convert_ramp($ramp_rate) : '00';
 	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
@@ -1171,7 +1171,7 @@ sub update_link
 			package main;
 			eval($link_parms{callback});
 			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
-				if $@ and $main::Debug{insteon};
+				if $@ and $self->debuglevel();
 			package Insteon::AllLinkDatabase;
 		}
 	}
@@ -1185,14 +1185,14 @@ sub update_link
 		&::print_log("[Insteon::AllLinkDatabase] ERROR: updating link record failed because "
 			. $$self{device}->get_object_name
 			. " does not have an existing ALDB entry key=$key")
-			if $main::Debug{insteon};
+			if $self->debuglevel();
 
 		if ($$self{_success_callback})
 		{
 			package main;
 			eval ($$self{_success_callback});
 			&::print_log("[Insteon::AllLinkDatabase] WARN1: Error encountered during ack callback: " . $@)
-				if $@ and $main::Debug{insteon} >= 1;
+				if $@ and $self->debuglevel(1);
 			package Insteon::AllLinkDatabase;
 		}
 	}
@@ -1580,7 +1580,7 @@ sub _on_peek
         my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'peek');
 	if ($msg{is_extended}) {
 		&::print_log("[Insteon::ALDB_i1]: extended peek for " . $$self{device}->{object_name}
-		. " is " . $msg{extra}) if $main::Debug{insteon};
+		. " is " . $msg{extra}) if $self->debuglevel();
 	}
         else
         {
@@ -1632,7 +1632,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
 				my $flag = hex($msg{extra});
 				$$self{pending_aldb}{inuse} = ($flag & 0x80) ? 1 : 0;
 				$$self{pending_aldb}{is_controller} = ($flag & 0x40) ? 1 : 0;
@@ -1662,7 +1662,7 @@ sub _on_peek
                                         }
 
 					&::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name . " completed link memory scan")
-						if $main::Debug{insteon};
+						if $self->debuglevel();
 					$self->health("good");
 					# Put the new ALDB Delta into memory
 					$self->query_aldb_delta('set');
@@ -1712,7 +1712,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
 				$$self{pending_aldb}{group} = lc $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_devhi';
@@ -1732,7 +1732,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
 				$$self{pending_aldb}{deviceid} = lc $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_devmid';
@@ -1753,7 +1753,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
 				$$self{pending_aldb}{deviceid} .= lc $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_devlo';
@@ -1774,7 +1774,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
 				$$self{pending_aldb}{deviceid} .= lc $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_data1';
@@ -1797,7 +1797,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
 				$$self{_mem_action} = 'aldb_data2';
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{pending_aldb}{data1} = $msg{extra};
@@ -1820,7 +1820,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
 				$$self{pending_aldb}{data2} = $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_data3';
@@ -1843,7 +1843,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
 				$$self{pending_aldb}{data3} = $msg{extra};
 
                         	if ($$self{_stress_test_act}){
@@ -1925,7 +1925,7 @@ sub _on_peek
 		else {
 		::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name 
 			. ": unhandled _mem_action=".$$self{_mem_action})
-			if $main::Debug{insteon};
+			if $self->debuglevel();
 		}
 	}
 }
@@ -2008,7 +2008,7 @@ sub _write_link
 		if (($$self{device}->isa('Insteon::KeyPadLincRelay') or $$self{device}->isa('Insteon::KeyPadLinc')) and ($data3 eq '00'))
                 {
 			&::print_log("[Insteon::ALDB_i1] setting data3 to " . $$self{device}->group . " for this keypadlinc")
-				if $main::Debug{insteon};
+				if $self->debuglevel();
 			$data3 = $$self{device}->group;
 		}
 		$$self{pending_aldb}{data3} = (defined $data3) ? lc $data3 : '00';
@@ -2024,7 +2024,7 @@ sub _write_link
 			package main;
 			eval ($$self{_success_callback});
 			&::print_log("[Insteon::ALDB_i1] WARN1: Error encountered during ack callback: " . $@)
-		 		if $@ and $main::Debug{insteon} >= 1;
+		 		if $@ and $self->debuglevel(1);
 		 	package Insteon::ALDB_i1;
                 }
 	}
@@ -2132,7 +2132,7 @@ sub on_read_write_aldb
 	&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 		. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
 		. lc $msg{extra} . " for _mem_activity=".$$self{_mem_activity}
-		 ." _mem_action=". $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
+		 ." _mem_action=". $$self{_mem_action}) if  $self->debuglevel(3);
 
 	if ($$self{_mem_action} eq 'aldb_i2read')
 	{
@@ -2144,12 +2144,12 @@ sub on_read_write_aldb
 			$$self{_mem_action} = 'aldb_i2readack';
 			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received ack")
-				if  $main::Debug{insteon} >= 3;
+				if  $self->debuglevel(3);
 		} else {
 			#otherwise just ignore the message because it is out of sequence
 			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] ack not received. "
-				. "ignoring message") if  $main::Debug{insteon} >= 3;
+				. "ignoring message") if  $self->debuglevel(3);
 		}
 		
 	}
@@ -2158,14 +2158,14 @@ sub on_read_write_aldb
 		if($msg{is_ack}) {
 			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received duplicate ack. Ignoring.")
-				if  $main::Debug{insteon} >= 3;
+				if  $self->debuglevel(3);
 				$clear_message = 0;
 		} elsif(length($msg{extra})<30)
 		{
 			&::print_log("[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed: "
 				. $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
+				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
 			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
 			#can't clear message, if valid message doesn't arrive
 			#resend logic will kick in
@@ -2176,7 +2176,7 @@ sub on_read_write_aldb
 				. " address received did not match address requested: "
 				. $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $main::Debug{insteon} >= 3;
+				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
 			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
 			#can't clear message, if valid message doesn't arrive
 			#resend logic will kick in
@@ -2194,7 +2194,7 @@ sub on_read_write_aldb
 			if (lc $$self{_mem_msb} eq '00' and lc $$self{_mem_lsb} eq '00')
 			{
 				main::print_log("[Insteon::ALDB_i2] DEBUG4: Start of scan; initializing aldb structure") 
-					if  $main::Debug{insteon} >= 4;
+					if  $self->debuglevel(4);
 				# reinit the aldb hash as there will be a new one
 				$$self{aldb} = undef;
 				# reinit the empty address list
@@ -2236,10 +2236,10 @@ sub on_read_write_aldb
 					. $$self{device}->get_object_name
 					. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
 					. lc $msg{extra} . " for " .  $$self{_mem_action}) 
-					if(($$self{pending_aldb}{inuse}) and $main::Debug{insteon} >= 3);
+					if(($$self{pending_aldb}{inuse}) and $self->debuglevel(3));
 				main::print_log("[Insteon::ALDB_i2] DEBUG4: scan done; adding last address ["
 					. $$self{_mem_msb} . $$self{_mem_lsb} ."] to empty array") 
-					if  $main::Debug{insteon} >= 4;
+					if  $self->debuglevel(4);
 				$self->add_empty_address($$self{_mem_msb} . $$self{_mem_lsb});
 				# scan done; clear out state flags
 				$$self{_mem_action} = undef;
@@ -2256,7 +2256,7 @@ sub on_read_write_aldb
 
 				&::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name 
 					. " completed link memory scan: status: " . $self->health())
-					if $main::Debug{insteon};
+					if $self->debuglevel();
 				$self->health("good");
 				# Put the new ALDB Delta into memory
 				$self->query_aldb_delta('set');
@@ -2267,7 +2267,7 @@ sub on_read_write_aldb
 				{
 					main::print_log("[Insteon::ALDB_i2] DEBUG4: inuse flag == false; adding address ["
 						. $$self{_mem_msb} . $$self{_mem_lsb} ."] to empty array") 
-						if  $main::Debug{insteon} >= 4;
+						if  $self->debuglevel(4);
 					$self->add_empty_address($$self{pending_aldb}{address});
 				}
 				else
@@ -2293,14 +2293,14 @@ sub on_read_write_aldb
 					{
 						main::print_log("[Insteon::ALDB_i2] DEBUG4: duplicate link found; adding address ["
 							. $$self{_mem_msb} . $$self{_mem_lsb} ."] to duplicates array") 
-							if  $main::Debug{insteon} >= 4;
+							if  $self->debuglevel(4);
 						$self->add_duplicate_link_address($$self{pending_aldb}{address});
 					}
 					else
 					{
 						main::print_log("[Insteon::ALDB_i2] DEBUG4: active link found; adding address ["
 							. $$self{_mem_msb} . $$self{_mem_lsb} ."] to aldb") 
-							if  $main::Debug{insteon} >= 4;
+							if  $self->debuglevel(4);
 						%{$$self{aldb}{$aldbkey}} = %{$$self{pending_aldb}};
 					}
 				}
@@ -2340,7 +2340,7 @@ sub on_read_write_aldb
 			$$self{pending_aldb} = undef;
 			main::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name 
 				. " link write completed for [".$$self{aldb}{$aldbkey}{address}."]")
-				if $main::Debug{insteon} >= 3;
+				if $self->debuglevel(3);
 			$self->health("good");
 			# Put the new ALDB Delta into memory
 			$self->query_aldb_delta('set');
@@ -2373,7 +2373,7 @@ sub on_read_write_aldb
 	{
 		main::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name 
 			. ": unhandled _mem_action=".$$self{_mem_action})
-			if $main::Debug{insteon};
+			if $self->debuglevel();
 		$clear_message = 0;
 	}
 	return $clear_message;
@@ -2420,7 +2420,7 @@ sub _write_link
 		if (($$self{device}->isa('Insteon::KeyPadLincRelay') or $$self{device}->isa('Insteon::KeyPadLinc')) and ($data3 eq '00'))
                 {
 			&::print_log("[Insteon::ALDB_i2] setting data3 to " . $$self{device}->group . " for this keypadlinc")
-				if $main::Debug{insteon};
+				if $self->debuglevel();
 			$data3 = $$self{device}->group;
 		}
 		$$self{pending_aldb}{data3} = (defined $data3) ? lc $data3 : '00';
@@ -2441,7 +2441,7 @@ sub _write_link
 			package main;
 			eval ($$self{_success_callback});
 			&::print_log("[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: " . $@)
-		 		if $@ and $main::Debug{insteon} >= 1;
+		 		if $@ and $self->debuglevel(1);
 		 	package Insteon::ALDB_i2;
                 }
 	}
@@ -2491,7 +2491,7 @@ sub _write_delete
 			package main;
 			eval ($$self{_success_callback});
 			&::print_log("[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: " . $@)
-		 		if $@ and $main::Debug{insteon} >= 1;
+		 		if $@ and $self->debuglevel(1);
 		 	package Insteon::ALDB_i2;
                 }
 	}
@@ -2771,7 +2771,7 @@ sub delete_orphan_links
                         &::print_log("[Insteon::ALDB_PLM] (AUDIT) Delete Orphan Link to non-existant deviceid: " .
                                 $deviceid . "; group:$group; "
                                 . (($is_controller) ? "controller; data:$data3" : "responder"))
-                                if $main::Debug{insteon};
+                                if $self->debuglevel();
                         }
                         else
                         {
@@ -2796,13 +2796,13 @@ sub delete_orphan_links
 					if ($group eq '01' || $group eq '00') {
 						#ignore manual controller link from PLM group 01 or 00 to device required for I2CS devices
 						main::print_log("[Insteon::ALDB_PLM] DEBUG2 Ignoring orphan PLM controller(01 or 00) link to "
-							. $device->get_object_name() ) if $main::Debug{insteon} >= 2;
+							. $device->get_object_name() ) if $self->debuglevel(2);
 					}
 					elsif ($audit_mode)
                                         {
 	                                        &::print_log("[Insteon::ALDB_PLM] (AUDIT) Delete Orphan PLM controller link ($group) to: "
                                                         . $device->get_object_name() . "($data3)")
-                                                        if $main::Debug{insteon};
+                                                        if $self->debuglevel();
                                         }
                                         else
                                         {
@@ -2926,7 +2926,7 @@ sub _process_delete_queue {
 					. (($delete_req{is_controller}) ? "controller($delete_req{data3})" : "responder")
 					. ", " . (($delete_req{object}) ? "object=" . $delete_req{object}->get_object_name
 					: "deviceid=$delete_req{deviceid}") . ", group=$delete_req{group}")
-					if $main::Debug{insteon};
+					if $self->debuglevel();
 				$self->delete_link(%delete_req);
 			}
                         elsif ($delete_req{linkdevice})
@@ -2996,7 +2996,7 @@ sub delete_link
 			package main;
 			eval ($link_parms{callback});
 			&::print_log("[Insteon_PLM] error in add link callback: " . $@)
-				if $@ and $main::Debug{insteon};
+				if $@ and $self->debuglevel();
 			package Insteon_PLM;
 		}
 	}
@@ -3047,7 +3047,7 @@ sub add_link
 			package main;
 			eval ($link_parms{callback});
 			&::print_log("[Insteon::ALDB_PLM] error in add link callback: " . $@)
-				if $@ and $main::Debug{insteon};
+				if $@ and $self->debuglevel();
 			package Insteon_PLM;
 		}
 	}
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index f4b63ef8a..ea31a20e2 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -183,7 +183,7 @@ sub device_id
 
 Used to store and return the associated group of a device.
 
-If provided, stores group as the device's group.
+If provided, stores group as the device group.
 
 =cut
 
@@ -194,6 +194,23 @@ sub group
 	return $$self{m_group};
 }
 
+=item C<debuglevel([level])>
+
+Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
+
+=cut
+
+sub debuglevel
+{
+	my ($self, $debug_level) = @_;
+	$debug_level = 1 unless $debug_level;
+	my $objname = lc $self->get_object_name;
+	&::print_log("debuglevel: Processing debug for object $objname ... " . $main::Debug{$objname}) if $main::Debug{insteon} >= 5;
+	return 1 if $main::Debug{insteon} >= $debug_level;
+	return 1 if $main::Debug{$objname} >= $debug_level;
+  return 0;
+}
+
 =item C<timeout_factor($float)>
 
 Changes the amount of time MH will wait to receive a response from a device before
@@ -262,7 +279,7 @@ sub default_hop_count
 	unshift(@{$$self{hop_array}}, $$self{default_hop_count}) if (!defined(@{$$self{hop_array}}));
 	if (defined($hop_count)){
 		::print_log("[Insteon::BaseObject] DEBUG3: Adding hop count of " . $hop_count . " to hop_array of "
-			. $self->get_object_name) if $main::Debug{insteon} >= 3;
+			. $self->get_object_name) if $self->debuglevel(3);
 		unshift(@{$$self{hop_array}}, $hop_count) 
 	}
 	pop(@{$$self{hop_array}}) if (scalar(@{$$self{hop_array}}) >20);
@@ -315,7 +332,7 @@ sub equals
 
 =item C<set(state[,setby,response])>
 
-Used to set the device's state.  If called by device or a device linked to device, 
+Used to set the device state.  If called by device or a device linked to device, 
 calls C<set_receive()>.  If called by something 
 else, will send the command to the device.
 
@@ -363,7 +380,7 @@ sub set
 			return if (lc $p_state eq lc $self->state) and $self->is_acknowledged
 				and not(($p_setby->isa('Insteon::BaseObject') and ($p_setby eq $self)));
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
-				. "::set($p_state, $setby_name)") if $main::Debug{insteon};
+				. "::set($p_state, $setby_name)") if $self->debuglevel();
 			$self->set_receive($p_state,$p_setby,$p_response) if defined $p_state;
 		} else {
                         my $message = $self->derive_message($p_state);
@@ -372,7 +389,7 @@ sub set
 #			$self->_send_cmd(command => $p_state,
 #				type => (($self->isa('Insteon::Insteon_Link') and !($self->is_root)) ? 'alllink' : 'standard'));
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name() . "::set($p_state, $setby_name)")
-				if $main::Debug{insteon};
+				if $self->debuglevel();
 			$self->is_acknowledged(0);
 			$$self{pending_state} = $p_state;
 			$$self{pending_setby} = $p_setby;
@@ -416,7 +433,7 @@ sub is_acknowledged
 
 =item C<set_receive(state[,setby,response])>
 
-Updates the device's state in MisterHouse.  Triggers state_now, state_changed, and
+Updates the device state in MisterHouse.  Triggers state_now, state_changed, and
 state_final variables to update accordingly.  Which causes tie_events to occur.
 
 If state was set to the same state within the last 1 second, then this is ignored.
@@ -433,7 +450,7 @@ sub set_receive
 		&& ($curr_milli - $$self{set_milliseconds} < $window)){
 		::print_log("[Insteon::BaseObject] Ignoring duplicate set " . $p_state .
 			" state command for " . $self->get_object_name . " received in " .
-			"less than $window milliseconds") if $main::Debug{insteon}; 
+			"less than $window milliseconds") if $self->debuglevel(); 
 	} else {
 		$$self{set_milliseconds} = $curr_milli;
 		$self->SUPER::set($p_state, $p_setby, $p_response);
@@ -556,7 +573,7 @@ sub derive_message
 
 	# confirm that the resulting $msg is legitimate
 	if (!(defined($self->message_type_code($command)))) {
-		&::print_log("[Insteon::BaseInsteon] invalid state=$command") if $main::Debug{insteon};
+		&::print_log("[Insteon::BaseInsteon] invalid state=$command") if $self->debuglevel();
 		return undef;
 	}
 
@@ -640,7 +657,7 @@ sub _is_info_request
 		my $ack_on_level = sprintf("%d", int((hex($msg{extra}) * 100 / 255)+.5));
 		&::print_log("[Insteon::BaseObject] received status for " .
 			$self->{object_name} . " with on-level: $ack_on_level%, "
-			. "hops left: $msg{hopsleft}") if $main::Debug{insteon};
+			. "hops left: $msg{hopsleft}") if $self->debuglevel();
 		$self->level($ack_on_level) if $self->can('level'); # update the level value
 		if ($ack_on_level == 0) {
 			$self->SUPER::set('off', $ack_setby);
@@ -698,7 +715,7 @@ sub _is_info_request
 			package main;
 			eval ($callback);
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name . ": error during scan callback $@")
-				if $@ and $main::Debug{insteon};
+				if $@ and $self->debuglevel();
 			package Insteon::BaseObject;                		
 		}
 	}
@@ -709,7 +726,7 @@ sub _is_info_request
 		$self->engine_version($version);
 		&::print_log("[Insteon::BaseObject] received engine version for " 
 			. $self->{object_name} . " of $version. "
-			. "hops left: $msg{hopsleft}") if $main::Debug{insteon};
+			. "hops left: $msg{hopsleft}") if $self->debuglevel();
 	}
 	return $is_info_request;
 }
@@ -726,7 +743,7 @@ sub _process_message
 	# by Insteon_Link.
 
 	main::print_log("[Insteon::BaseObject] WARN: Message has invalid checksum")
-		if ($main::Debug{insteon} && !($msg{crc_valid}) 
+		if ($self->debuglevel() && !($msg{crc_valid}) 
 		&& $msg{is_extended} && $self->engine_version() eq 'I2CS');
 
 	my $clear_message = 0;
@@ -792,7 +809,7 @@ sub _process_message
 				if (!$corrupt_cmd){
 					$self->_process_command_stack(%msg);
 					&::print_log("[Insteon::BaseObject] received ping acknowledgement from " . $self->{object_name})
-						if $main::Debug{insteon};
+						if $self->debuglevel();
 					$self->ping();
 					$clear_message = 1;
 				}
@@ -801,7 +818,7 @@ sub _process_message
 				$corrupt_cmd = 1 if ($msg{cmd_code} ne $self->message_type_hex($pending_cmd));
 				if (!$corrupt_cmd){
 					&::print_log("[Insteon::BaseObject] received linking mode ACK from " . $self->{object_name})
-						if $main::Debug{insteon};
+						if $self->debuglevel();
 					$self->interface->_set_timeout('xmit', 2000);
 					$clear_message = 0;
 				}
@@ -818,7 +835,7 @@ sub _process_message
 				# signal receipt of message to the command stack in case commands are queued
 				$self->_process_command_stack(%msg);
 				&::print_log("[Insteon::BaseObject] received command/state (awaiting) acknowledge from " . $self->{object_name}
-					. ": $pending_cmd and data: $msg{extra}") if $main::Debug{insteon};
+					. ": $pending_cmd and data: $msg{extra}") if $self->debuglevel();
 			}
 		}
                 else
@@ -830,7 +847,7 @@ sub _process_message
 			$self->_process_command_stack(%msg);
 			&::print_log("[Insteon::BaseObject] received command/state acknowledge from " . $self->{object_name}
 				. ": " . (($msg{command}) ? $msg{command} : "(unknown)")
-				. " and data: $msg{extra}") if $main::Debug{insteon};
+				. " and data: $msg{extra}") if $self->debuglevel();
 		}
 		if ($corrupt_cmd) {
 			main::print_log("[Insteon::BaseObject] WARN: received a message from "
@@ -850,7 +867,7 @@ sub _process_message
 			. $self->get_nack_msg_for( $msg{extra} ) .") for " . $self->{object_name}
 			. ".  It may be unplugged, have a burned out bulb, or this may be a new I2CS "
 			. "type device that must first be manually linked to the PLM using the set button.") 
-			if $main::Debug{insteon};
+			if $self->debuglevel();
 		}
 		else 
 		{
@@ -864,7 +881,7 @@ sub _process_message
 		if($p_setby->active_message->failure_callback)
 		{
 			main::print_log("[Insteon::BaseObject] WARN: Now calling message failure callback: "
-				. $p_setby->active_message->failure_callback) if $main::Debug{insteon};
+				. $p_setby->active_message->failure_callback) if $self->debuglevel();
 			$self->failure_reason('NAK');
 			package main;
 			eval $p_setby->active_message->failure_callback;
@@ -899,7 +916,7 @@ sub _process_message
 			if ($msg{command} eq 'link_cleanup_report'){
 				if ($msg{extra} == 0){
 					::print_log("[Insteon::BaseObject] DEBUG Received AllLink Cleanup Success for "
-						. $self->{object_name}) if $main::Debug{insteon} >= 1;
+						. $self->{object_name}) if $self->debuglevel(1);
 				} else {
 					::print_log("[Insteon::BaseObject] WARN " . $msg{extra} . " Device(s) failed to "
 						. "acknowledge the command from " . $self->{object_name});
@@ -915,7 +932,7 @@ sub _process_message
 				my $timeout = (scalar(@links)+1) * 300;
 				::print_log("[Insteon::BaseObject] DEBUG3 Delaying any outgoing messages ". 
 					"by $timeout milliseconds to avoid collision with subsequent cleanup ".
-					"messages from " . $self->get_object_name) if ($main::Debug{insteon} >= 3);
+					"messages from " . $self->get_object_name) if ($self->debuglevel(3));
 				$self->interface->_set_timeout('xmit', $timeout);
 			}
                 }
@@ -924,14 +941,14 @@ sub _process_message
                 	if (($self->state eq $p_state or $self->state_final eq $p_state)
                 		and $$self{_pending_cleanup}){
 				::print_log("[Insteon::BaseObject] Ignoring Received Direct AllLink Cleanup Message for " 
-					. $self->{object_name} . " since AllLink Broadcast Message was Received.") if $main::Debug{insteon};
+					. $self->{object_name} . " since AllLink Broadcast Message was Received.") if $self->debuglevel();
                 	} else {
 				$self->set($p_state, $self);
 			}
 			$$self{_pending_cleanup} = 0;
 		} else {
 			main::print_log("[Insteon::BaseObject] Ignoring unsupported command from " 
-				. $self->{object_name}) if $main::Debug{insteon};
+				. $self->{object_name}) if $self->debuglevel();
 			$self->corrupt_count_log(1) if $self->can('corrupt_count_log');
                 }
 	}
@@ -994,11 +1011,11 @@ sub _process_command_stack
 			package main;
 			eval ($callback);
 			&::print_log("[Insteon::BaseObject] error in queue timer callback: " . $@)
-				if $@ and $main::Debug{insteon};
+				if $@ and $self->debuglevel();
 			package Insteon::BaseObject;
 		}
 	} else {
-#		&::print_log("[Insteon_Device] " . $self->get_object_name . " command queued but not yet sent; awaiting ack from prior command") if $main::Debug{insteon};
+#		&::print_log("[Insteon_Device] " . $self->get_object_name . " command queued but not yet sent; awaiting ack from prior command") if $self->debuglevel();
 	}
 }
 
@@ -1820,7 +1837,7 @@ sub delete_link
 
 =item C<scan_link_table()>
 
-Scans a device's link table and caches a copy.
+Scans a device link table and caches a copy.
 
 =cut
 
@@ -1931,7 +1948,7 @@ sub _get_engine_version_failure
 	my $failure_reason = $self->failure_reason();
 	
 	main::print_log("[Insteon::BaseDevice::_get_engine_version_failure] DEBUG4: "
-		."failure reason: $failure_reason") if $main::Debug{insteon} >= 4;
+		."failure reason: $failure_reason") if $self->debuglevel(4);
 	
 	if($failure_reason eq 'NAK')
 	{
@@ -1995,7 +2012,7 @@ sub ping
 			package main;
 			eval ($complete_callback);
 			&::print_log("[Insteon::BaseDevice] error in ping callback: " . $@)
-				if $@ and $main::Debug{insteon};
+				if $@ and $self->debuglevel();
 			package Insteon::BaseDevice;
 			delete $$self{ping_callback};
 		}
@@ -2098,7 +2115,7 @@ sub get_devcat
 
 =item C<firmware()>
 
-Sets and returns the device's firmware version.  Value can be obtained from the 
+Sets and returns the device firmware version.  Value can be obtained from the 
 device by calling C<get_devcat()>.
 
 =cut
@@ -2301,7 +2318,7 @@ sub stress_test
 			package main;
 			eval ($complete_callback);
 			&::print_log("[Insteon::BaseDevice] error in stress_test callback: " . $@)
-				if $@ and $main::Debug{insteon};
+				if $@ and $self->debuglevel();
 			package Insteon::BaseDevice;
 			delete $$self{stress_test_callback};
 		}
@@ -2616,7 +2633,7 @@ sub check_aldb_version
 	if ($new_version) {
 		main::print_log("[Insteon::BaseDevice] DEBUG4: aldb_version is "
 			.$self->_aldb->aldb_version()." but device is ".$engine_version.
-			".  Remapping aldb version to $new_version") if $main::Debug{insteon} >= 4;
+			".  Remapping aldb version to $new_version") if $self->debuglevel(4);
 		my $restore_string = '';
 		if ($self->_aldb) {
 			$restore_string = $self->_aldb->restore_string();
@@ -2633,7 +2650,7 @@ sub check_aldb_version
 		package main;
 		eval ($restore_string);
 		&::print_log("[Insteon::BaseDevice] error in eval creating ALDB object: " . $@)
-			if $@ and $main::Debug{insteon};
+			if $@ and $self->debuglevel();
 		package Insteon::BaseDevice;
 	}
 }
@@ -2885,7 +2902,7 @@ sub sync_links
 						$requires_update = 1;
                                                 &::print_log("[Insteon::BaseController] DEBUG: flagging " . $self->get_object_name
                                                 	. " for update because existing ramp rate ($raw_ramp_rate) != target ($raw_tgt_ramp_rate)")
-							if $main::Debug{insteon};
+							if $self->debuglevel();
 
 					}
                                         elsif (($link_on_level > $tgt_on_level + 1) or ($link_on_level < $tgt_on_level -1))
@@ -2893,7 +2910,7 @@ sub sync_links
 						$requires_update = 1;
                                                 &::print_log("[Insteon::BaseController] DEBUG: flagging " . $self->get_object_name
                                                 	. " for update because existing on level ($link_on_level) != target ($tgt_on_level)")
-							if $main::Debug{insteon};
+							if $self->debuglevel();
 					}
 				}
 				if ($requires_update)
@@ -2920,7 +2937,7 @@ sub sync_links
 							. $member->get_object_name . " for "
 							. $insteon_object->get_object_name . " with group:" . $self->group
 							. "; on_level:$tgt_on_level; ramp_rate:$tgt_ramp_rate")
-							if $main::Debug{insteon} >= 4;
+							if $self->debuglevel(4);
 				       		push @{$$self{sync_queue}}, \%link_req;
                                         }
 				}
@@ -2949,7 +2966,7 @@ sub sync_links
 						. $member->get_object_name . " for "
 						. $insteon_object->get_object_name . " with group:" . $self->group
 						. "; on_level:$tgt_on_level; ramp_rate:$tgt_ramp_rate")
-						if $main::Debug{insteon} >= 4;
+						if $self->debuglevel(4);
 					push @{$$self{sync_queue}}, \%link_req;
                                 }
 			}
@@ -2973,7 +2990,7 @@ sub sync_links
 					}
 					main::print_log("[Insteon::BaseController] DEBUG4: queuing add for controller record to "
 						. $insteon_object->get_object_name . " for " . $member->get_object_name 
-						. " with group:" . $self->group) if $main::Debug{insteon} >= 4;
+						. " with group:" . $self->group) if $self->debuglevel(4);
 					push @{$$self{sync_queue}}, \%link_req;
                                 }
 			}
@@ -3001,7 +3018,7 @@ sub sync_links
 				main::print_log("[Insteon::BaseController] DEBUG4: queuing add for controller record to "
 					. $insteon_object->get_object_name . " for "
 					. $self->interface->get_object_name . " with group:" . $self->group)
-					if $main::Debug{insteon} >= 4;
+					if $self->debuglevel(4);
 				push @{$$self{sync_queue}}, \%link_req;
                         }
 		}
@@ -3022,7 +3039,7 @@ sub sync_links
 				main::print_log("[Insteon::BaseController] DEBUG4: queuing add for responder record to "
 					. $self->interface->get_object_name . " for "
 					. $insteon_object->get_object_name . " with group:" . $self->group)
-					if $main::Debug{insteon} >= 4;
+					if $self->debuglevel(4);
 				push @{$$self{sync_queue}}, \%link_req;
                         }
 		}
@@ -3031,7 +3048,7 @@ sub sync_links
 	if (!($num_sync_queue))
         {
 		&::print_log("[Insteon::BaseController] Nothing to do when syncing links for " . $self->get_object_name)
-			if $main::Debug{insteon};
+			if $self->debuglevel();
 	}
 	$self->_process_sync_queue();
 
@@ -3058,7 +3075,7 @@ sub _process_sync_queue {
 		package main;
 		eval ($$self{sync_queue_callback});
 		&::print_log("[Insteon::BaseController] error in sync links callback: " . $@)
-			if $@ and $main::Debug{insteon};
+			if $@ and $self->debuglevel();
 		$$self{sync_queue_callback} = undef;
 		package Insteon::BaseController;
 	} else {
@@ -3218,7 +3235,7 @@ sub update_members
 				my %current_record = $device->get_link_record($self->device_id . $self->group);
 				if (%current_record) {
 					&::print_log("[Insteon::BaseController] remote record: $current_record{data1}")
-						if $::Debug{insteon};
+						if $self->debuglevel();
 				}
 			}
 		}
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 3842c5692..15f7e45b2 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -119,6 +119,23 @@ sub equals
         	return 0;
         }
 }
+
+=item C<debuglevel([level])>
+
+Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
+
+=cut
+
+sub debuglevel
+{
+	my ($self, $debug_level) = @_;
+	$debug_level = 1 unless $debug_level;
+	my $objname = lc $self->get_object_name;
+	&::print_log("debuglevel: Processing debug for object $objname ... " . $main::Debug{$objname}) if $main::Debug{insteon} >= 5;
+	return 1 if $main::Debug{insteon} >= $debug_level;
+	return 1 if $main::Debug{$objname} >= $debug_level;
+  return 0;
+ }
 
 =item C<_is_duplicate(cmd)>
 
@@ -296,7 +313,7 @@ sub queue_message
         	my $setby = $message->setby;
 		if ($self->_is_duplicate($message->interface_data) && !($message->isa('Insteon::X10Message')))
                 {
-			&main::print_log("[Insteon::BaseInterface] Attempt to queue command already in queue; skipping ...") if $main::Debug{insteon};
+			&main::print_log("[Insteon::BaseInterface] Attempt to queue command already in queue; skipping ...") if $self->debuglevel();
 		}
                 else
                 {
@@ -354,7 +371,7 @@ sub process_queue
                                	&::print_log("[Insteon::BaseInterface] WARN: number of retries ("
                                        	. $self->active_message->send_attempts
                 			. ") for " . $self->active_message->to_string()
-                                        . " exceeds limit.  Now moving on...") if $main::Debug{insteon};
+                                        . " exceeds limit.  Now moving on...") if $self->debuglevel();
                                 # !!!!!!!!! TO-DO - handle failure timeout ???
                                 my $failed_message = $self->active_message;
                                 # make sure to let the sending object know!!!
@@ -375,7 +392,7 @@ sub process_queue
 				if ($failed_message->failure_callback)
                                 {
                                        	&::print_log("[Insteon::BaseInterface] WARN: Message Timeout:  Now calling callback: " .
-                                               	$failed_message->failure_callback) if $main::Debug{insteon};
+                                               	$failed_message->failure_callback) if $self->debuglevel();
 					$failed_message->setby->failure_reason('timeout') 
 						if (defined($failed_message->setby) and $failed_message->setby->can('failure_reason'));
 		       			package main;
@@ -488,7 +505,7 @@ sub on_interface_info_received
 	my ($self) = @_;
 	&::print_log("[Insteon_PLM] PLM id: " . $self->device_id .
 		" firmware: " . $self->firmware)
-		if $main::Debug{insteon};
+		if $self->debuglevel();
         $self->clear_active_message();
 }
 
@@ -521,7 +538,7 @@ sub on_standard_insteon_received
 		#time has been required. Extra 50 millis helps prevent dupes
 		$wait_time = ($wait_time * 100) + 50;
 		$wait_message .= "delaying next transmit by $wait_time milliseconds to avoid collisions.";
-		::print_log($wait_message) if ($main::Debug{insteon} >= 3 && $wait_time > 50);
+		::print_log($wait_message) if ($self->debuglevel(3) && $wait_time > 50);
 		$self->_set_timeout('xmit', $wait_time);			
 
 		# get the matching object
@@ -536,13 +553,13 @@ sub on_standard_insteon_received
                 		$msg{command} = $object->message_type($msg{cmd_code});
 		      		&::print_log("[Insteon::BaseInterface] Received message from: ". $object->get_object_name
 		      			."; command: $msg{command}; type: $msg{type}; group: $msg{group}")
-                        		if (!($msg{is_ack} or $msg{is_nack})) and $main::Debug{insteon};
+                        		if (!($msg{is_ack} or $msg{is_nack})) and $self->debuglevel();
                    	}
                    	if ($msg{is_ack} or $msg{is_nack})
                    	{
 		      		main::print_log("[Insteon::BaseInterface] DEBUG3: PLM command:insteon_received; "
 		      			. "Device command:$msg{command}; type:$msg{type}; group: $msg{group}")
-                        		if $main::Debug{insteon} >=3;
+                        		if $self->debuglevel(3);
                         	# need to confirm that this message corresponds to the current active one before clearing it
                                 # TO-DO!!! This is a brute force and poor compare technique; needs to be replaced by full compare
                                 if ($self->active_message && ref $self->active_message->setby)
@@ -564,7 +581,7 @@ sub on_standard_insteon_received
 		   					if($object->_process_message($self, %msg)) {
 								if ($self->active_message->success_callback){
 									main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
-										. $self->active_message->success_callback) if $main::Debug{insteon} >= 4;
+										. $self->active_message->success_callback) if $self->debuglevel(4);
 									package main;
 										eval $self->active_message->success_callback;
 										::print_log("[Insteon::BaseInterface] problem w/ success callback: $@") if $@;
@@ -594,11 +611,11 @@ sub on_standard_insteon_received
 							if (($msg{extra} == $self->active_message->setby->group)){
                                                                 &main::print_log("[Insteon::BaseInterface] DEBUG3: Cleanup message received for scene "
                                                                 	. $object->get_object_name . " from " . $setby_object->get_object_name)
-                                                                	if $main::Debug{insteon} >= 3;
+                                                                	if $self->debuglevel(3);
 							} elsif ($self->active_message->command_type eq 'all_link_direct_cleanup' &&
 								lc($self->active_message->setby->device_id) eq $msg{source}) 
 							{
-								&::print_log("[Insteon::BaseInterface] DEBUG2: ALL-Linking Direct Completed with ". $self->active_message->setby->get_object_name) if $main::Debug{insteon} >= 2;
+								&::print_log("[Insteon::BaseInterface] DEBUG2: ALL-Linking Direct Completed with ". $self->active_message->setby->get_object_name) if $self->debuglevel(2);
 								$self->clear_active_message();
 							}
 							else {
@@ -607,7 +624,7 @@ sub on_standard_insteon_received
 								. $object->get_object_name . ", but group in recent message " 
 								. $msg{extra}. " did not match group in "
 								. "prior sent message group " . $self->active_message->setby->group) 
-									if $main::Debug{insteon} >= 3;
+									if $self->debuglevel(3);
                                 			}
                                 			# If ACK or NACK received then PLM is still working on the ALL Link Command
                                 			# Increase the command timeout to wait for next one
@@ -645,7 +662,7 @@ sub on_standard_insteon_received
                                                 #   then, the above cleanup handler would be run
                                                 &main::print_log("[Insteon::BaseInterface] DEBUG3: received cleanup message responding to "
                                                 	. "PLM controller group: $msg{extra}. Ignoring as this has already been processed")
-                                                        if $main::Debug{insteon} >= 3;
+                                                        if $self->debuglevel(3);
                                         }
                                         else
                                         {
@@ -698,7 +715,7 @@ sub on_extended_insteon_received
 		#time has been required. Extra 50 millis helps prevent dupes
 		$wait_time = ($wait_time * 200) + 50;
 		$wait_message .= "delaying next transmit by $wait_time milliseconds to avoid collisions.";
-		::print_log($wait_message) if ($main::Debug{insteon} >= 3 && $wait_time > 50);
+		::print_log($wait_message) if ($self->debuglevel(3) && $wait_time > 50);
 		$self->_set_timeout('xmit', $wait_time);
 
 		# get the matching object
@@ -713,14 +730,14 @@ sub on_extended_insteon_received
                 		$msg{command} = $object->message_type($msg{cmd_code});
 		      		main::print_log("[Insteon::BaseInterface] DEBUG: PLM command:insteon_ext_received; "
 		      			. "Device command:$msg{command}; type:$msg{type}; group: $msg{group}")
-                        		if( (!($msg{is_ack} or $msg{is_nack}) and $main::Debug{insteon}) 
-                        		or $main::Debug{insteon} >= 3);
+                        		if( (!($msg{is_ack} or $msg{is_nack}) and $self->debuglevel()) 
+                        		or $self->debuglevel(3));
                    	}
-		   	&::print_log("[Insteon::BaseInterface] Processing message for " . $object->get_object_name) if $main::Debug{insteon} >=3;
+		   	&::print_log("[Insteon::BaseInterface] Processing message for " . $object->get_object_name) if $self->debuglevel(3);
 			if($object->_process_message($self, %msg)) {
 				if (ref $self->active_message && $self->active_message->success_callback){
 					main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
-						. $self->active_message->success_callback) if $main::Debug{insteon} >= 4;
+						. $self->active_message->success_callback) if $self->debuglevel(4);
 					package main;
 						eval $self->active_message->success_callback;
 						::print_log("[Insteon::BaseInterface] problem w/ success callback: $@") if $@;
@@ -879,7 +896,7 @@ sub _is_duplicate_received {
             $object->default_hop_count($msg{maxhops}-$msg{hopsleft}) if $object->can('default_hop_count');
 		};
 		::print_log("[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
-			. $message_data . ", from $source.") if $main::Debug{insteon};
+			. $message_data . ", from $source.") if $self->debuglevel();
 	} else {
 		#Message was not in hash, so add it
 		$$self{received_commands}{$key} = $curr_milli + $delay;
diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index 871ed28b6..40dbed355 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -108,12 +108,12 @@ sub set
         $setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
 	if (not defined($self->get_idle_time) or $self->get_idle_time > 1 or $self->state ne $p_state) {
 		&::print_log("[Insteon::RemoteLinc] " . $self->get_object_name()
-			. "::set_receive($p_state, $setby_name)") if $main::Debug{insteon};
+			. "::set_receive($p_state, $setby_name)") if $self->debuglevel();
 		$self->set_receive($p_state,$p_setby);
 	} else {
 		&::print_log("[Insteon::RemoteLinc] " . $self->get_object_name()
 			. "::set_receive($p_state, $setby_name) deferred due to repeat within 1 second")
-			if $main::Debug{insteon};
+			if $self->debuglevel();
 	}
 	return;
 }
@@ -243,9 +243,9 @@ sub _process_message {
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
-		main::print_log("[Insteon::RemoteLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $main::Debug{insteon};
+		main::print_log("[Insteon::RemoteLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel();
 		if ($$self{_ext_set_get_action} eq 'set'){
-			main::print_log("[Insteon::RemoteLinc] Clearing active message") if $main::Debug{insteon};
+			main::print_log("[Insteon::RemoteLinc] Clearing active message") if $self->debuglevel();
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
 			$self->_process_command_stack(%msg);	
@@ -268,7 +268,7 @@ sub _process_message {
 			$self->_process_command_stack(%msg);
 		} else {
 			main::print_log("[Insteon::RemoteLinc] WARN: Corrupt Extended "
-				."Set/Get Data Received for ". $self->get_object_name) if $main::Debug{insteon};
+				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel();
 		}
 	}
 	else {
diff --git a/lib/Insteon/IOLinc.pm b/lib/Insteon/IOLinc.pm
index 2983a61b9..b6acd4d2a 100755
--- a/lib/Insteon/IOLinc.pm
+++ b/lib/Insteon/IOLinc.pm
@@ -160,11 +160,11 @@ sub set
 		if ($p_state eq $$self{child_state} &&
 			($curr_milli - $$self{child_set_milliseconds} < $window)) {
 			::print_log("[Insteon::IOLinc] Received duplicate ". $self->get_object_name
-				. " sensor " . $p_state . " message, ignoring.") if $main::Debug{insteon};
+				. " sensor " . $p_state . " message, ignoring.") if $self->debuglevel();
 		}
 		else {
 			::print_log("[Insteon::IOLinc] Received ". $self->get_object_name
-				. " sensor " . $p_state . " message.") if $main::Debug{insteon};
+				. " sensor " . $p_state . " message.") if $self->debuglevel();
 			$$self{child_state} = $p_state;
 			$$self{child_set_milliseconds} = $curr_milli;
 			if (ref $$self{child_sensor}){
@@ -217,7 +217,7 @@ sub _is_info_request
 		my $child_state = &Insteon::BaseObject::derive_link_state(hex($msg{extra}));
 		&::print_log("[Insteon::IOLinc] received status for " .
 			$self->get_object_name . "sensor of: $child_state "
-			. "hops left: $msg{hopsleft}") if $main::Debug{insteon};
+			. "hops left: $msg{hopsleft}") if $self->debuglevel();
 		$ack_setby = $$self{child_sensor} if ref $$self{child_sensor};
 		if (ref $$self{child_sensor}){
 			$$self{child_sensor}->set_receive($child_state, $ack_setby);
@@ -269,9 +269,9 @@ sub _process_message {
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
-		main::print_log("[Insteon::IOLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $main::Debug{insteon};
+		main::print_log("[Insteon::IOLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel();
 		if ($$self{_ext_set_get_action} eq 'set'){
-			main::print_log("[Insteon::IOLinc] Clearing active message") if $main::Debug{insteon};
+			main::print_log("[Insteon::IOLinc] Clearing active message") if $self->debuglevel();
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
 			$self->_process_command_stack(%msg);	
@@ -288,12 +288,12 @@ sub _process_message {
 			$self->_process_command_stack(%msg);
 		} else {
 			main::print_log("[Insteon::IOLinc] WARN: Corrupt Extended "
-				."Set/Get Data Received for ". $self->get_object_name) if $main::Debug{insteon};
+				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel();
 		}
 	}
 	elsif ($msg{command} eq "set_operating_flags" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		main::print_log("[Insteon::IOLinc] Acknowledged flag set for " . $self->get_object_name) if $main::Debug{insteon};
+		main::print_log("[Insteon::IOLinc] Acknowledged flag set for " . $self->get_object_name) if $self->debuglevel();
 		$clear_message = 1;
 		$self->_process_command_stack(%msg);
 	}
@@ -318,12 +318,12 @@ sub set_momentary_time
 	my $root = $self->get_root();
 	if ($momentary_time == 0){
 		::print_log("[Insteon::IOLinc] Setting " . $self->get_object_name . 
-			" to Latching Relay Mode." ) if $main::Debug{insteon};
+			" to Latching Relay Mode." ) if $self->debuglevel();
 	} 
 	elsif ($momentary_time <= 255) {
 		$momentary_time = 2 if $momentary_time == 1; #Can't set to 1
 		::print_log("[Insteon::IOLinc] Setting Momentary Time to $momentary_time " .
-			"tenths of a second for " . $self->get_object_name) if $main::Debug{insteon};
+			"tenths of a second for " . $self->get_object_name) if $self->debuglevel();
 	}
 	else {
 		::print_log("[Insteon::IOLinc] WARN Invalid Momentary Time of $momentary_time " .
diff --git a/lib/Insteon/Irrigation.pm b/lib/Insteon/Irrigation.pm
index 50633d7a9..32f7d34bb 100755
--- a/lib/Insteon/Irrigation.pm
+++ b/lib/Insteon/Irrigation.pm
@@ -128,7 +128,7 @@ sub set_valve {
    }
    unless ($cmd and $subcmd) {
       &::print_log("Insteon::Irrigation] ERROR: You must specify a valve number and a valid state (ON or OFF)")
-          if $main::Debug{insteon};
+          if $self->debuglevel();
       return;
    }
    my $message = new Insteon::InsteonMessage('insteon_send', $self, $cmd, $subcmd);
@@ -154,7 +154,7 @@ sub set_program {
    }
    unless ($cmd and $subcmd) {
       &::print_log("Insteon::Irrigation] ERROR: You must specify a program number and a valid state (ON or OFF)")
-          if $main::Debug{insteon};
+          if $self->debuglevel();
       return;
    }
    my $message = new Insteon::InsteonMessage('insteon_send', $self, $cmd, $subcmd);
@@ -257,7 +257,7 @@ sub _is_info_request {
         or $cmd eq 'sprinkler_program_off') {
       $is_info_request = 1;
       my $val = hex($msg{extra});
-      &::print_log("[Insteon::Irrigation] Processing data for $cmd with value: $val") if $main::Debug{insteon};
+      &::print_log("[Insteon::Irrigation] Processing data for $cmd with value: $val") if $self->debuglevel();
       $$self{'active_valve_id'} = ($val & 7) + 1;
       $$self{'active_program_number'} = (($val >> 3) & 3) + 1;
       $$self{'program_is_running'} = ($val >> 5) & 1;
@@ -265,7 +265,7 @@ sub _is_info_request {
       $$self{'valve_is_running'} = ($val >> 7) & 1;
       &::print_log("[Insteon::Irrigation] active_valve_id: $$self{'active_valve_id'},"
         . " valve_is_running: $$self{'valve_is_running'}, active_program: $$self{'active_program_number'},"
-        . " program_is_running: $$self{'program_is_running'}, pump_enabled: $$self{'pump_enabled'}") if $main::Debug{insteon};
+        . " program_is_running: $$self{'program_is_running'}, pump_enabled: $$self{'pump_enabled'}") if $self->debuglevel();
    }
    else {
       #Check if this was a generic info_request
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index 561a7cdc8..7f796c4ec 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -1128,7 +1128,7 @@ sub set
 			my $message = new Insteon::InsteonMessage('insteon_ext_send', $parent, 'on', $extra);
 			$parent->_send_cmd($message);
 			::print_log("[Insteon::FanLinc] " . $self->get_object_name() . "::set($p_state, $setby_name)")
-				if $main::Debug{insteon};
+				if $self->debuglevel();
 			$self->is_acknowledged(0);
 			$$self{pending_state} = $p_state;
 			$$self{pending_setby} = $p_setby;
@@ -1182,7 +1182,7 @@ sub _is_info_request
 		my $child_state = &Insteon::BaseObject::derive_link_state(hex($msg{extra}));
 		&::print_log("[Insteon::FanLinc] received status for " .
 			$child_obj->{object_name} . " of: $child_state "
-			. "hops left: $msg{hopsleft}") if $main::Debug{insteon};
+			. "hops left: $msg{hopsleft}") if $self->debuglevel();
 		$ack_setby = $$child_obj{m_status_request_pending} if ref $$child_obj{m_status_request_pending};
 		$child_obj->SUPER::set($child_state, $ack_setby);
 		delete($$parent{child_status_request_pending});
@@ -1213,7 +1213,7 @@ sub is_acknowledged
 		$$child_obj{pending_setby} = undef;
 		$$child_obj{pending_response} = undef;
 		$$parent{child_pending_state} = undef;
-		&::print_log("[Insteon::FanLinc] received command/state acknowledge from " . $child_obj->{object_name}) if $main::Debug{insteon};
+		&::print_log("[Insteon::FanLinc] received command/state acknowledge from " . $child_obj->{object_name}) if $self->debuglevel();
 		return $$self{is_acknowledged};
 	} else {
 		return $self->SUPER::is_acknowledged($p_ack);
diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index fea11d116..296791fc8 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -135,6 +135,23 @@ sub send_attempts
         }
         return $$self{send_attempts};
 }
+
+=item C<debuglevel([level])>
+
+Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
+
+=cut
+
+sub debuglevel
+{
+	my ($self, $debug_level) = @_;
+	$debug_level = 1 unless $debug_level;
+	my $objname = lc $self->get_object_name;
+	&::print_log("debuglevel: Processing debug for object $objname ... " . $main::Debug{$objname}) if $main::Debug{insteon} >= 5;
+	return 1 if $main::Debug{insteon} >= $debug_level;
+	return 1 if $main::Debug{$objname} >= $debug_level;
+  return 0;
+}
 
 =item C<setby(data)>
 
diff --git a/lib/Insteon/Security.pm b/lib/Insteon/Security.pm
index fe97e4014..88bf1ff59 100644
--- a/lib/Insteon/Security.pm
+++ b/lib/Insteon/Security.pm
@@ -405,7 +405,7 @@ sub _process_message {
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
-		main::print_log("[Insteon::MotionSensor] Extended Set/Get ACK Received for " . $self->get_object_name) if $main::Debug{insteon};
+		main::print_log("[Insteon::MotionSensor] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel();
 		if ($$self{_ext_set_get_action} eq 'set'){
 			if (defined($$root{_set_bit_action})){
 				::print_log("[Insteon::MotionSensor] Set of ".
@@ -413,7 +413,7 @@ sub _process_message {
 					$root->get_object_name);
 				$$root{_set_bit_action} = undef;
 			} else {
-				main::print_log("[Insteon::MotionSensor] Clearing active message") if $main::Debug{insteon};
+				main::print_log("[Insteon::MotionSensor] Clearing active message") if $self->debuglevel();
 			}
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
@@ -468,7 +468,7 @@ sub _process_message {
 			$self->_process_command_stack(%msg);
 		} else {
 			main::print_log("[Insteon::MotionSensor] WARN: Unknown Extended "
-				."Set/Get Data Message Received for ". $self->get_object_name) if $main::Debug{insteon};
+				."Set/Get Data Message Received for ". $self->get_object_name) if $self->debuglevel();
 		}
 	}
 	else {
@@ -798,7 +798,7 @@ sub set
         my $setby_name = $p_setby;
         $setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
 	&::print_log("[Insteon::TriggerLinc] " . $self->get_object_name()
-		. "::set_receive($p_state, $setby_name)") if $main::Debug{insteon};
+		. "::set_receive($p_state, $setby_name)") if $self->debuglevel();
 	$self->set_receive($p_state,$p_setby);
 	return;
 }
@@ -864,9 +864,9 @@ sub _process_message {
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
-		main::print_log("[Insteon::TriggerLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $main::Debug{insteon};
+		main::print_log("[Insteon::TriggerLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel();
 		if ($$self{_ext_set_get_action} eq 'set'){
-			main::print_log("[Insteon::TriggerLinc] Clearing active message") if $main::Debug{insteon};
+			main::print_log("[Insteon::TriggerLinc] Clearing active message") if $self->debuglevel();
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
 			$self->_process_command_stack(%msg);	
@@ -884,7 +884,7 @@ sub _process_message {
 			$self->_process_command_stack(%msg);
 		} else {
 			main::print_log("[Insteon::TriggerLinc] WARN: Corrupt Extended "
-				."Set/Get Data Received for ". $self->get_object_name) if $main::Debug{insteon};
+				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel();
 		}
 	}
 	else {
diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index f224d0484..bb7c840cc 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -214,7 +214,7 @@ Sets fan to 'on' or 'auto'
 sub fan{
 	my ($self, $state) = @_;
 	$state = lc($state);
-	main::print_log("[Insteon::Thermostat] Fan $state") if $main::Debug{insteon};
+	main::print_log("[Insteon::Thermostat] Fan $state") if $self->debuglevel();
 	my $fan;
 	if (($state eq 'on') or ($state eq 'fan_on')) {
 		$fan = '07';
@@ -235,7 +235,7 @@ Sets a new cool setpoint.
 =cut
 sub cool_setpoint{
 	my ($self, $temp) = @_;
-      main::print_log("[Insteon::Thermostat] Cool setpoint -> $temp") if $main::Debug{insteon};
+      main::print_log("[Insteon::Thermostat] Cool setpoint -> $temp") if $self->debuglevel();
       if($temp !~ /^\d+$/){
          main::print_log("[Insteon::Thermostat] ERROR: cool_setpoint $temp not numeric");
          return;
@@ -249,7 +249,7 @@ Sets a new heat setpoint.
 =cut
 sub heat_setpoint{
 	my ($self, $temp) = @_;
-	main::print_log("[Insteon::Thermostat] Heat setpoint -> $temp") if $main::Debug{insteon};
+	main::print_log("[Insteon::Thermostat] Heat setpoint -> $temp") if $self->debuglevel();
 	if($temp !~ /^\d+$/){
 		main::print_log("[Insteon::Thermostat] ERROR: heat_setpoint $temp not numeric");
 		return;
@@ -373,7 +373,7 @@ sub _is_info_request {
    my $is_info_request = ($cmd eq 'thermostat_get_zone_info') ? 1 : 0;
    if ($is_info_request) {
       my $val = $msg{extra};
-      main::print_log("[Insteon::Thermostat] Processing is_info_request for $cmd with value: $val") if $main::Debug{insteon}; 
+      main::print_log("[Insteon::Thermostat] Processing is_info_request for $cmd with value: $val") if $self->debuglevel(); 
       if ($$self{_zone_action} eq "temp") {
          $val = (hex $val) / 2; # returned value is twice the real value
          if (exists $$self{'temp'} and ($$self{'temp'} != $val)) {
@@ -419,21 +419,21 @@ sub _process_message
 	elsif ($msg{command} eq "thermostat_setpoint_cool" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermostat] Received ACK of cool setpoint ".
-			"for ". $self->get_object_name) if $main::Debug{insteon};	
+			"for ". $self->get_object_name) if $self->debuglevel();	
 		$self->_cool_sp((hex($msg{extra})/2));
 		$clear_message = 1;
 	}
 	elsif ($msg{command} eq "thermostat_setpoint_heat" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermostat] Received ACK of heat setpoint ".
-			"for ". $self->get_object_name) if $main::Debug{insteon};	
+			"for ". $self->get_object_name) if $self->debuglevel();	
 		$self->_heat_sp((hex($msg{extra})/2));
 		$clear_message = 1;
 	}
 	elsif ($$self{_zone_action} eq 'setpoint' && $$self{m_pending_setpoint}) {
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		# we got our cool setpoint in auto mode
-		main::print_log("[Insteon::Thermostat] Processing data for $msg{command} with value: $msg{extra}") if $main::Debug{insteon};
+		main::print_log("[Insteon::Thermostat] Processing data for $msg{command} with value: $msg{extra}") if $self->debuglevel();
 		my $val = (hex $msg{extra})/2;
 		$self->_cool_sp($val);
 		$$self{m_setpoint_pending} = 0;
@@ -497,7 +497,7 @@ Sets system mode to argument: 'off', 'heat', 'cool', 'auto', 'program_heat',
 sub mode{
 	my ($self, $state) = @_;
 	$state = lc($state);
-	main::print_log("[Insteon::Thermostat] Mode $state") if  $main::Debug{insteon};
+	main::print_log("[Insteon::Thermostat] Mode $state") if $self->debuglevel();
 	my $mode;
 	if ($state eq 'off') {
 		$mode = "09";
@@ -526,7 +526,7 @@ sub _is_info_request {
 	my $is_info_request;
 	if ($cmd eq 'thermostat_control' && $$self{_control_action} eq "mode") {
 		my $val = $msg{extra};
-		main::print_log("[Insteon::Thermo_i1] Processing is_info_request for $cmd with value: $val") if $main::Debug{insteon}; 
+		main::print_log("[Insteon::Thermo_i1] Processing is_info_request for $cmd with value: $val") if $self->debuglevel(); 
 		if ($val eq '00') {
 			$self->_mode('off');
 		} elsif ($val eq '01') {
@@ -733,16 +733,16 @@ sub _process_message {
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
-		main::print_log("[Insteon::Thermo_i2CS] Extended Set/Get ACK Received for " . $self->get_object_name) if $main::Debug{insteon};
+		main::print_log("[Insteon::Thermo_i2CS] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel();
 		if ($$self{_ext_set_get_action} eq 'set'){
-			main::print_log("[Insteon::Thermo_i2CS] Clearing active message") if $main::Debug{insteon};
+			main::print_log("[Insteon::Thermo_i2CS] Clearing active message") if $self->debuglevel();
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
 			$self->_process_command_stack(%msg);	
 		}
 		elsif ($$self{_ext_set_get_action} eq 'set_high_humid'){
 			main::print_log("[Insteon::Thermostat] Received ACK of high humid setpoint ".
-				"for ". $self->get_object_name) if $main::Debug{insteon};	
+				"for ". $self->get_object_name) if $self->debuglevel();	
 			$self->_high_humid_sp($$self{_high_humid_pending});
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
@@ -751,7 +751,7 @@ sub _process_message {
 		}
 		elsif ($$self{_ext_set_get_action} eq 'set_low_humid'){
 			main::print_log("[Insteon::Thermostat] Received ACK of low humid setpoint ".
-				"for ". $self->get_object_name) if $main::Debug{insteon};	
+				"for ". $self->get_object_name) if $self->debuglevel();	
 			$self->_low_humid_sp($$self{_low_humid_pending});
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
@@ -763,7 +763,7 @@ sub _process_message {
 		if (substr($msg{extra},0,4) eq "0201") {
 			$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 			main::print_log("[Insteon::Thermo_i2CS] Extended Set/Get Data ".
-				"Received for ". $self->get_object_name) if $main::Debug{insteon};
+				"Received for ". $self->get_object_name) if $self->debuglevel();
 			#0 = 2				#14 = Cool SP 
 			#2 = 1				#16 = humidity
 			#3 = day			#18 = temp in Celsius High byte
@@ -835,37 +835,37 @@ sub _process_message {
 		}
 		else {
 			main::print_log("[Insteon::Thermo_i2CS] WARN: Unknown Extended "
-				."Set/Get Data Received for ". $self->get_object_name) if $main::Debug{insteon};
+				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel();
 		}
 	}
 	elsif ($msg{command} eq "status_temp" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2CS] Received Temp Change Message ".
-			"from ". $self->get_object_name) if $main::Debug{insteon};	
+			"from ". $self->get_object_name) if $self->debuglevel();	
 		$self->hex_short_temp($msg{extra});
 	}
 	elsif ($msg{command} eq "status_mode" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2CS] Received Mode Change Message ".
-			"from ". $self->get_object_name) if $main::Debug{insteon};	
+			"from ". $self->get_object_name) if $self->debuglevel();	
 		$self->status_mode($msg{extra});
 	}
 	elsif ($msg{command} eq "status_cool" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2CS] Received Cool Setpoint Change Message ".
-			"from ". $self->get_object_name) if $main::Debug{insteon};	
+			"from ". $self->get_object_name) if $self->debuglevel();	
 		$self->hex_cool($msg{extra});
 	}
 	elsif ($msg{command} eq "status_humid" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2CS] Received Humidity Change Message ".
-			"from ". $self->get_object_name) if $main::Debug{insteon};	
+			"from ". $self->get_object_name) if $self->debuglevel();	
 		$self->hex_humid($msg{extra});
 	}
 	elsif ($msg{command} eq "status_heat" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2CS] Received Heat Setpoint Change Message ".
-			"from ". $self->get_object_name) if $main::Debug{insteon};	
+			"from ". $self->get_object_name) if $self->debuglevel();	
 		$self->hex_heat($msg{extra});
 	}
 	else {
@@ -879,7 +879,7 @@ sub _is_info_request {
 	my $is_info_request;
 	if ($cmd eq 'thermostat_control' && $$self{_control_action} eq "mode") {
 		my $val = $msg{extra};
-		main::print_log("[Insteon::Thermo_i2CS] Processing is_info_request for $cmd with value: $val") if $main::Debug{insteon}; 
+		main::print_log("[Insteon::Thermo_i2CS] Processing is_info_request for $cmd with value: $val") if $self->debuglevel(); 
 		if ($val eq '09') {
 			$self->_mode('Off');
 		} elsif ($val eq '04') {
@@ -1072,7 +1072,7 @@ Sets system mode to argument: 'off', 'heat', 'cool', 'auto', 'program_heat',
 sub mode{
 	my ($self, $state) = @_;
 	$state = lc($state);
-	main::print_log("[Insteon::Thermostat] Mode $state") if  $main::Debug{insteon};
+	main::print_log("[Insteon::Thermostat] Mode $state") if $self->debuglevel();
 	my $mode;
 	if ($state eq 'off') {
 		$mode = "09";
@@ -1120,7 +1120,7 @@ Sets the high humidity setpoint.
 =cut
 sub high_humid_setpoint {
 	my ($self, $value) = @_;
-	main::print_log("[Insteon::Thermo_i2CS] Setting high humid setpoint -> $value") if $main::Debug{insteon};
+	main::print_log("[Insteon::Thermo_i2CS] Setting high humid setpoint -> $value") if $self->debuglevel();
 	if($value !~ /^\d+$/){
 		main::print_log("[Insteon::Thermo_i2CS] ERROR: Setpoint $value not numeric");
 		return;
@@ -1144,7 +1144,7 @@ Sets the low humidity setpoint.
 =cut
 sub low_humid_setpoint {
 	my ($self, $value) = @_;
-	main::print_log("[Insteon::Thermo_i2CS] Setting low humid setpoint -> $value") if $main::Debug{insteon};
+	main::print_log("[Insteon::Thermo_i2CS] Setting low humid setpoint -> $value") if $self->debuglevel();
 	if($value !~ /^\d+$/){
 		main::print_log("[Insteon::Thermo_i2CS] ERROR: Setpoint $value not numeric");
 		return;
diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index 9181f3d85..019451663 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -218,7 +218,7 @@ sub check_for_data {
             		}
                 	else
                 	{
-               			&::print_log("[Insteon_PLM] DEBUG2: PLM command timer expired but no transmission in place.  Moving on...") if $main::Debug{insteon} >= 2;
+               			&::print_log("[Insteon_PLM] DEBUG2: PLM command timer expired but no transmission in place.  Moving on...") if $self->debuglevel(2);
 	       			$self->clear_active_message();
                			$self->process_queue();
             		}
@@ -390,7 +390,7 @@ sub _send_cmd {
         my $incurred_delay_time = $message->seconds_delayed;
         &main::print_log("[Insteon_PLM] DEBUG2: Sending " . $message->to_string . " incurred delay of "
         	. sprintf('%.2f',$incurred_delay_time) . " seconds; starting hop-count: "
-                . ((ref $message->setby && $message->setby->isa('Insteon::BaseObject')) ? $message->setby->default_hop_count : "?")) if $main::Debug{insteon} >= 2;
+                . ((ref $message->setby && $message->setby->isa('Insteon::BaseObject')) ? $message->setby->default_hop_count : "?")) if $self->debuglevel(2);
 
 	if ($message->isa('Insteon::X10Message')) { # is x10; so, be slow
         	$command = $prefix{x10_send} . $command;
@@ -412,8 +412,8 @@ sub _send_cmd {
 	} 
 	else
 	{
-		&::print_log( "[Insteon_PLM] DEBUG3: Sending  PLM raw data: ".lc($command)) if $main::Debug{insteon} >= 3;
-		&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($command)) if $main::Debug{insteon} >= 4;
+		&::print_log( "[Insteon_PLM] DEBUG3: Sending  PLM raw data: ".lc($command)) if $self->debuglevel(3);
+		&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($command)) if $self->debuglevel(4);
 		my $data = pack("H*",$command);
 		$main::Serial_Ports{$instance}{object}->write($data) if $main::Serial_Ports{$instance};
 	
@@ -442,7 +442,7 @@ sub _parse_data {
 	# it is possible that a fragment exists from a previous attempt; so, if it exists, prepend it
 	if ($$self{_data_fragment})
         {
-		&::print_log("[Insteon_PLM] DEBUG3: Prepending prior data fragment: $$self{_data_fragment}") if $main::Debug{insteon} >= 3;
+		&::print_log("[Insteon_PLM] DEBUG3: Prepending prior data fragment: $$self{_data_fragment}") if $self->debuglevel(3);
                 # maintain a copy of the parsed data fragment
 		$$self{_prior_data_fragment} = $$self{_data_fragment};
                 # append if not a repeat
@@ -456,7 +456,7 @@ sub _parse_data {
                 $$self{_prior_data_fragment} = '';
         }
 
-	&::print_log( "[Insteon_PLM] DEBUG3: Received PLM raw data: $data") if $main::Debug{insteon} >= 3;
+	&::print_log( "[Insteon_PLM] DEBUG3: Received PLM raw data: $data") if $self->debuglevel(3);
 
 	# begin by pulling out any PLM ack/nacks
 	my $prev_cmd = '';
@@ -492,7 +492,7 @@ sub _parse_data {
                         $entered_ack_loop = 1;
 			if ($parsed_data =~ /^($ackcmd)|($nackcmd)|($prefix{plm_info}\w{12}06)|($prefix{plm_info}\w{12}15)|($prefix{all_link_first_rec}15)|($prefix{all_link_next_rec}15)|($badcmd)$/)
                         {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $main::Debug{insteon} >= 4;
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
 				my $ret_code = substr($parsed_data,length($parsed_data)-2,2);
 				my $record_type = substr($parsed_data,0,4);
                                 my $message_data = substr($parsed_data,4,length($parsed_data)-4);
@@ -515,7 +515,7 @@ sub _parse_data {
 							package main;
 							eval ($self->active_message->success_callback);
 							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
-								if $@ and $main::Debug{insteon} >= 1;
+								if $@ and $self->debuglevel(1);
 							package Insteon_PLM;
                                         	}
                                                 # clear the active message because we're done
@@ -524,7 +524,7 @@ sub _parse_data {
                                         else
                                         {
                                         	&::print_log("[Insteon_PLM] DEBUG3: Received PLM acknowledge: "
-                                                	. $pending_message->to_string) if $main::Debug{insteon} >= 3;
+                                                	. $pending_message->to_string) if $self->debuglevel(3);
                                         }
 
                                         # X10 messages don't ACK back on the powerline, so clear them if the PLM acknowledges
@@ -552,7 +552,7 @@ sub _parse_data {
 							package main;
 							eval ($callback);
 							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
-								if $@ and $main::Debug{insteon} >= 1;
+								if $@ and $self->debuglevel(1);
 							package Insteon_PLM;	
                                                 }
 					}
@@ -579,7 +579,7 @@ sub _parse_data {
                                                 $self->_aldb->scandatetime(&main::get_tickcount);
 						&::print_log("[Insteon_PLM] " . $self->get_object_name 
 							. " completed link memory scan: status: " . $self->_aldb->health())
-							if $main::Debug{insteon};
+							if $self->debuglevel();
 						if ($$self{_mem_callback})
 						{
 							my $callback = $$self{_mem_callback};
@@ -587,7 +587,7 @@ sub _parse_data {
 							package main;
 							eval ($callback);
 							&::print_log("[Insteon_PLM] WARN1: Error encountered during nack callback: " . $@)
-								if $@ and $main::Debug{insteon} >= 1;
+								if $@ and $self->debuglevel(1);
 							package Insteon_PLM;
 						}
                                         }
@@ -637,7 +637,7 @@ sub _parse_data {
 							package main;
 							eval ($callback);
 							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
-								if $@ and $main::Debug{insteon} >= 1;
+								if $@ and $self->debuglevel(1);
 							package Insteon_PLM;
 						}
                                                 # clear the active message because we're done
@@ -665,7 +665,7 @@ sub _parse_data {
                         	# is $parsed_data an accidental anomoly? (there are other cases; but, this is a good start)
                                 if ($parsed_data =~ /^($prefix{insteon_send}\w{12}06)|($prefix{insteon_send}\w{12}15)$/)
                                 {
-					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $main::Debug{insteon} >= 4;
+					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
                                 	# first, parse the content to confirm that it could be a legitimate ACK
                                         my $unknown_deviceid = substr($parsed_data,4,6);
                                         my $unknown_msg_flags = substr($parsed_data,10,2);
@@ -710,10 +710,10 @@ sub _parse_data {
 	{
 		#ignore blanks.. the split does odd things
 		next if $parsed_data eq '';
-		&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $main::Debug{insteon} >= 4;
+		&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
 		if ($previous_parsed_data eq $parsed_data){
 			# guard against repeats
-			::print_log("[Insteon_PLM] DEBUG3: Dropped duplicate message: $parsed_data") if $main::Debug{insteon} >= 3; 
+			::print_log("[Insteon_PLM] DEBUG3: Dropped duplicate message: $parsed_data") if $self->debuglevel(3); 
 			next;
 		}
                 $previous_parsed_data = $parsed_data; # and, now reinitialize
@@ -737,16 +737,16 @@ sub _parse_data {
                 { #X10 Received
                        	my $x10_message = new Insteon::X10Message($parsed_data);
                         my $x10_data = $x10_message->get_formatted_data();
-			&::print_log("[Insteon_PLM] DEBUG3: received x10 data: $x10_data") if $main::Debug{insteon} >= 3;
+			&::print_log("[Insteon_PLM] DEBUG3: received x10 data: $x10_data") if $self->debuglevel(3);
 			&::process_serial_data($x10_data,undef,$self);
 		}
                 elsif ($parsed_prefix eq $prefix{all_link_complete} and ($message_length == 20))
                 { #ALL-Linking Completed
 			my $link_address = substr($message_data,4,6);
-			&::print_log("[Insteon_PLM] DEBUG2: ALL-Linking Completed with $link_address ($message_data)") if $main::Debug{insteon} >= 2;
+			&::print_log("[Insteon_PLM] DEBUG2: ALL-Linking Completed with $link_address ($message_data)") if $self->debuglevel(2);
 			if ($self->active_message->success_callback){
 				main::print_log("[Insteon::Insteon_PLM] DEBUG4: Now calling message success callback: "
-					. $self->active_message->success_callback) if $main::Debug{insteon} >= 4;
+					. $self->active_message->success_callback) if $self->debuglevel(4);
 				package main;
 					eval $self->active_message->success_callback;
 					::print_log("[Insteon::Insteon_PLM] problem w/ success callback: $@") if $@;
@@ -765,7 +765,7 @@ sub _parse_data {
                         	my $failure_device = substr($message_data,2,6);
 
 				&::print_log("[Insteon_PLM] DEBUG2: Received all-link cleanup failure from device: "
-                        		. "$failure_device and group: $failure_group") if $main::Debug{insteon} >= 2;
+                        		. "$failure_device and group: $failure_group") if $self->debuglevel(2);
                         
                         	my $failed_object = &Insteon::get_object($failure_device,'01');
                         	if (ref $failed_object){
@@ -779,13 +779,13 @@ sub _parse_data {
                         	}
 			} else {
 				&::print_log("[Insteon_PLM] DEBUG2: Received all-link cleanup failure."
-                        		. " But there is no pending message.") if $main::Debug{insteon} >= 2;
+                        		. " But there is no pending message.") if $self->debuglevel(2);
 			}
                         
 		}
                 elsif ($parsed_prefix eq $prefix{all_link_record} and ($message_length == 20))
                 { #ALL-Link Record Response
-			&::print_log("[Insteon_PLM] DEBUG2: ALL-Link Record Response:$message_data") if $main::Debug{insteon} >= 2;
+			&::print_log("[Insteon_PLM] DEBUG2: ALL-Link Record Response:$message_data") if $self->debuglevel(2);
 			$self->_aldb->parse_alllink($message_data);
         		# before doing the next, make sure that the pending command
                         #   (if it sitll exists) is pulled from the queue
@@ -804,7 +804,7 @@ sub _parse_data {
                         {
 				&::print_log("[Insteon_PLM] WARN1: All-link cleanup failure for scene: "
                                 	. $self->active_message->setby->get_object_name . ". Retrying in 1 second.")
-					if $main::Debug{insteon} >= 1;
+					if $self->debuglevel(1);
                                 $self->retry_active_message();
                                 # except that we should cause a bit of a delay to let things settle out
 				$self->_set_timeout('xmit', 1000);
@@ -814,7 +814,7 @@ sub _parse_data {
                         {
                         	my $message_to_string = ($self->active_message) ? $self->active_message->to_string() : "";
 				&::print_log("[Insteon_PLM] Received all-link cleanup success: $message_to_string")
-                                	if $main::Debug{insteon};
+                                	if $self->debuglevel();
 				if (ref $self->active_message && ref $self->active_message->setby){
 					my $object = $self->active_message->setby;
 					$object->is_acknowledged(1);
@@ -831,14 +831,14 @@ sub _parse_data {
 				if ($self->active_message){
 					my $nack_delay = ($::config_parms{Insteon_PLM_disable_throttling}) ? 0.3 : 1.0;
 					&::print_log("[Insteon_PLM] DEBUG3: Interface extremely busy. Resending command"
-						. " after delaying for $nack_delay second") if $main::Debug{insteon} >= 3;
+						. " after delaying for $nack_delay second") if $self->debuglevel(3);
 					$self->_set_timeout('xmit',$nack_delay * 1000);
 					$self->active_message->no_hop_increase(1);
                                 	$self->retry_active_message();
 					$process_next_command = 0;
 				} else {
 					&::print_log("[Insteon_PLM] DEBUG3: Interface extremely busy."
-						. " No message to resend.") if $main::Debug{insteon} >= 3;
+						. " No message to resend.") if $self->debuglevel(3);
 				}
 				$nack_count++;
 			}
@@ -847,7 +847,7 @@ sub _parse_data {
 			if ($parsed_data ne ''){
 				$$self{_data_fragment} .= $parsed_data;
 				::print_log("[Insteon_PLM] DEBUG3: Saving parsed data fragment: " 
-					. $parsed_data) if( $main::Debug{insteon} >= 3);
+					. $parsed_data) if( $self->debuglevel(3));
 			}
 		}
                 else
@@ -857,7 +857,7 @@ sub _parse_data {
 			unless (($parsed_data eq $$self{_prior_data_fragment}) or ($parsed_data eq $$self{_data_fragment})) {
 				$$self{_data_fragment} .= $parsed_data;
 				main::print_log("[Insteon_PLM] DEBUG3: Saving parsed data fragment: " 
-					. $parsed_data) if( $main::Debug{insteon} >= 3);
+					. $parsed_data) if( $self->debuglevel(3));
 			}
 		}
 	}
@@ -865,7 +865,7 @@ sub _parse_data {
 	unless( $entered_rcv_loop or $$self{_data_fragment}) {
 		$$self{_data_fragment} = $residue_data;
 		main::print_log("[Insteon_PLM] DEBUG3: Saving residue data fragment: " 
-			. $residue_data) if( $residue_data and $main::Debug{insteon} >= 3);
+			. $residue_data) if( $residue_data and $self->debuglevel(3));
 	}
 
 	if ($process_next_command) {

From f3e5deabe951b4524c6fbdbe174fccafee95fdf3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 17 Oct 2013 22:24:00 -0700
Subject: [PATCH 255/330] Insteon: Fix Typos and Bugs in New Sync_Links

---
 lib/Insteon/BaseInsteon.pm | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 1bfaa1291..1e936176a 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2854,20 +2854,20 @@ sub sync_links
 	$self->_process_sync_queue() unless $insteon_object;
 	
 	# 1. Does a controller link exist for Device-> PLM
-	if (!($self->isa('Insteon::InterfaceController') && 
-	$insteon_object->has_link($self->interface,$self->group,1,$subaddress))) {
+	if ((!$self->isa('Insteon::InterfaceController') && 
+	!$insteon_object->has_link($self->interface,$self->group,1,$subaddress))) {
 		my %link_req = ( member => $insteon_object, cmd => 'add', object => $self->interface,
 			group => $self->group, is_controller => 1,
 			callback => "$self_link_name->_process_sync_queue()",
 			data3 => $subaddress);
-		$link_req{cause} = "Adding controller record from $self_link_name to $interface_name";
+		$link_req{cause} = "Adding controller record to $self_link_name for $interface_name";
 		$link_req{data3} = $self->group;
 		push @{$$self{sync_queue}}, \%link_req;
 	}
 		
 	# 2. Does a responder link exist on the PLM
-	if (!($self->isa('Insteon::InterfaceController') &&
-	$self->interface->has_link($insteon_object,$self->group,0,'00'))) {
+	if ((!$self->isa('Insteon::InterfaceController') &&
+	!$self->interface->has_link($insteon_object,$self->group,0,'00'))) {
 		my %link_req = ( member => $self->interface, cmd => 'add', object => $insteon_object,
 			group => $self->group, is_controller => 0,
 			callback => "$self_link_name->_process_sync_queue()",
@@ -2876,11 +2876,6 @@ sub sync_links
 		push @{$$self{sync_queue}}, \%link_req;
 	}
 
-	if (!$$self{members}) {
-		#No members to sync
-		$self->_process_sync_queue();
-	}
-
 	# Loop members
 	foreach my $member_ref (keys %{$$self{members}}) {
 		my $member = $$self{members}{$member_ref}{object};
@@ -2915,6 +2910,7 @@ sub sync_links
 				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
 				callback => "$self_link_name->_process_sync_queue()",
 				data3 => $member->group);
+			$link_req{cause} = "Adding responder record to $member_name from $self_link_name";
 			push @{$$self{sync_queue}}, \%link_req;
 			$has_link = 0;
 		}
@@ -2931,7 +2927,7 @@ sub sync_links
 				$requires_update = 1;
 				$cause .= "Ramp rate ";
 			}
-			elsif ($cur_on_level != $tgt_on_level){
+			elsif ($cur_on_level-1 > $tgt_on_level && $cur_on_level+1 < $tgt_on_level){
 				$requires_update = 1;
 				$cause .= "On level ";
 			}
@@ -2986,11 +2982,13 @@ sub sync_links
 	foreach (@{$$self{sync_queue}}){
 		my %sync_req = %{$_};
 		my $audit_text = "(AUDIT)" if ($audit_mode);
-		my $log_text = "[Insteon::BaseController] $audit_text $sync_req{cmd}ing the following link on $self_link_name because ";
+		my $log_text = "[Insteon::BaseController] $audit_text ";
 		$log_text .= $sync_req{cause} . "\n";
 		PRINT: for (keys %sync_req) {
 			next PRINT if ($_ eq 'cause');
 			next PRINT if ($_ eq 'callback');
+			next PRINT if ($_ eq 'member');
+			next PRINT if ($_ eq 'object');
 			$log_text .= "$_ = $sync_req{$_}; ";
 		}
 		::print_log($log_text);

From 7b7becdf476712ab976529ad9be95f6403d1980c Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 17 Oct 2013 22:25:55 -0700
Subject: [PATCH 256/330] Insteon: Fix Bug in Call to Is_Deaf in Sync_Links

---
 lib/Insteon.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index ce028a87e..84fabc82b 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -510,7 +510,7 @@ sub sync_all_links
 	# iterate over all registered objects and compare whether the link tables match defined scene linkages in known Insteon_Links
 	for my $obj (&Insteon::find_members('Insteon::BaseController'))
 	{
-        	if ($obj->is_deaf)
+        	if (!$obj->isa('Insteon::InterfaceController') && $obj->is_deaf)
                 {
                 	&main::print_log("[Sync all links] Ignoring links from 'deaf' device: " . $obj->get_object_name);
                 }

From 12fefacaf71040ac96c8897db67d628452084a34 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 17 Oct 2013 22:42:00 -0700
Subject: [PATCH 257/330] Insteon: Add Function to Calculate ALDB Key

It is a simple function, but this calculation is repeated all over the place.  Unifying the calculation ensures that it is always consistent.  Plus, if changes need to be made in the future, they can be more easily implemented.
---
 lib/Insteon/AllLinkDatabase.pm | 183 ++++++++++++---------------------
 lib/Insteon/BaseInsteon.pm     |   8 +-
 2 files changed, 69 insertions(+), 122 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 58d51133f..af93ac7d1 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -80,6 +80,26 @@ sub health
         return $$self{health};
 }
 
+=item C<get_linkkey($deviceid, $group, $is_controller, $data3)>
+
+Used to track the health of MisterHouse's copy of a device's ALDB.
+
+If provided, saves status to memory.
+
+Returns the saved health status.
+
+=cut
+
+sub get_linkkey {
+	my ($self, $deviceid, $group, $is_controller, $data3) = @_;
+	my $linkkey = $deviceid . $group . $is_controller;
+	# '00' and '01' are generally interchangable for $data3 values and are
+	# the most common values.  So to make searching easier we only 
+	# add data3 if it is unique
+	$linkkey .= $data3 if ($data3 ne '00' and $data3 ne '01');
+	return lc $linkkey;
+}
+
 =item C<scandatetime([seconds])>
 
 Used to track the time, in unix time seconds, of the last ALDB scan.
@@ -266,11 +286,8 @@ sub restore_aldb
 				@{$$self{aldb}{duplicates}} = @aldb_duplicates;
 			} elsif (scalar %aldb_record) {
 				next unless $deviceid;
-				my $aldbkey = $deviceid . $groupid . $is_controller;
-				# append the device "sub-address" (e.g., a non-root button on a keypadlinc) if it exists
-				if ($subaddress ne '00' and $subaddress ne '01') {
-					$aldbkey .= $subaddress;
-				}
+				my $aldbkey = $self->get_linkkey($deviceid, $groupid, 
+							$is_controller, $subaddress);
 				%{$$self{aldb}{$aldbkey}} = %aldb_record;
 			}
 		}
@@ -361,12 +378,7 @@ sub delete_link
 		my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
 		my $subaddress = ($link_parms{data3}) ? $link_parms{data3} : '00';
 		# get the address via lookup into the hash
-		my $key = lc $deviceid . $groupid . $is_controller;
-		# append the device "sub-address" (e.g., a non-root button on a keypadlinc) if it exists
-		if ($subaddress ne '00' and $subaddress ne '01')
-		{
-			$key .= $subaddress;
-		}
+		my $key = $self->get_linkkey($deviceid, $groupid, $is_controller, $subaddress);
 		my $address = $$self{aldb}{$key}{address};
 		if ($address)
 		{
@@ -821,13 +833,7 @@ sub add_link
 		$data3_default = '01';
 	}
 	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : $data3_default;
-	# get the address via lookup into the hash
-	my $key = lc $device_id . $group . $is_controller;
-	# append the device "sub-address" (e.g., a non-root button on a keypadlinc) if it exists
-	if (!($data3 eq '00' or $data3 eq '01'))
-        {
-		$key .= $data3;
-	}
+	my $key = $self->get_linkkey($device_id, $group, $is_controller, $data3);
 	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
 		## Check whether ALDB is in sync
 		$self->{callback_parms} = \%link_parms;
@@ -850,7 +856,7 @@ sub add_link
 		&::print_log("[Insteon::AllLinkDatabase] WARN: attempt to add link to " 
 			. $$self{device}->get_object_name 
 			. " that already exists! object=" . $insteon_object->get_object_name 
-			. ", group=$group, is_controller=$is_controller, subaddress=$subaddress");
+			. ", group=$group, is_controller=$is_controller, data3=$data3");
 		if ($link_parms{callback})
                 {
 			package main;
@@ -949,14 +955,7 @@ sub update_link
 	}
 	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : $data3_default;
 	my $deviceid = $insteon_object->device_id;
-	my $subaddress = $data3;
-	# get the address via lookup into the hash
-	my $key = lc $deviceid . $group . $is_controller;
-	# append the device "sub-address" (e.g., a non-root button on a keypadlinc) if it exists
-	if (!($subaddress eq '00' or $subaddress eq '01'))
-        {
-		$key .= $subaddress;
-	}
+	my $key = $self->get_linkkey($deviceid, $group, $is_controller, $data3);
 	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
 		## Check whether ALDB is in sync
 		$self->{callback_parms} = \%link_parms;
@@ -1142,22 +1141,14 @@ or false if it does not.  Generally called as part of C<delete_orphan_links()>.
 
 sub has_link
 {
-	my ($self, $insteon_object, $group, $is_controller, $subaddress) = @_;
-	my $key = "";
-	if ($insteon_object->isa('Insteon::BaseObject') || $insteon_object->isa('Insteon::BaseInterface'))
-        {
-            $key = lc $insteon_object->device_id . $group . $is_controller;
-	}
-        elsif ($insteon_object->isa('Insteon::AllLinkDatabase'))
-        {
-            $key = lc $$insteon_object{device}->device_id . $group . $is_controller;
-	}
-	$subaddress = '00' unless $subaddress;
-	# append the device "sub-address" (e.g., a non-root button on a keypadlinc) if it exists
-	if (!($subaddress eq '00' or $subaddress eq '01'))
-        {
-		$key .= $subaddress;
+	my ($self, $insteon_object, $group, $is_controller, $data3) = @_;
+	my $deviceid;
+	if ($insteon_object->isa('Insteon::AllLinkDatabase')) {
+		$deviceid = $$insteon_object{device}->device_id;
+	} else {
+		$deviceid = lc $insteon_object->device_id;
 	}
+	my $key = $self->get_linkkey($deviceid, $group, $is_controller, $data3);
 	return (defined $$self{aldb}{$key});
 }
 
@@ -1289,15 +1280,10 @@ sub _on_poke
                 elsif ($$self{_mem_action} eq 'aldb_data3')
                 {
 			## update the aldb records w/ the changes that were made
-			my $aldbkey = $$self{pending_aldb}{deviceid}
-                        		. $$self{pending_aldb}{group}
-                                        . $$self{pending_aldb}{is_controller};
-			# append the device "sub-address" (e.g., a non-root button on a keypadlinc) if it exists
-			my $subaddress = $$self{pending_aldb}{data3};
-			if (($subaddress ne '00') and ($subaddress ne '01'))
-                        {
-				$aldbkey .= $subaddress;
-			}
+			my $aldbkey = $self->get_linkkey($$self{pending_aldb}{deviceid},
+							$$self{pending_aldb}{group},
+							$$self{pending_aldb}{is_controller},
+							$$self{pending_aldb}{data3});
 			$$self{aldb}{$aldbkey}{data1} = $$self{pending_aldb}{data1};
 			$$self{aldb}{$aldbkey}{data2} = $$self{pending_aldb}{data2};
 			$$self{aldb}{$aldbkey}{data3} = $$self{pending_aldb}{data3};
@@ -1356,15 +1342,10 @@ sub _on_poke
                 $self->delete_duplicate_link_address($$self{pending_aldb}{address});
 		if (exists $$self{pending_aldb}{deviceid})
                 {
-			my $key = lc $$self{pending_aldb}{deviceid}
-                        		. $$self{pending_aldb}{group}
-                                        . $$self{pending_aldb}{is_controller};
-			# append the device "sub-address" (e.g., a non-root button on a keypadlinc) if it exists
-			my $subaddress = $$self{pending_aldb}{data3};
-			if ($subaddress ne '00' and $subaddress ne '01')
-                        {
-				$key .= $subaddress;
-			}
+			my $key = $self->get_linkkey($$self{pending_aldb}{deviceid},
+							$$self{pending_aldb}{group}, 
+							$$self{pending_aldb}{is_controller},
+							$$self{pending_aldb}{data3});
 			delete $$self{aldb}{$key};
 		}
 		$self->health("good");
@@ -1656,15 +1637,10 @@ sub _on_peek
 					if ($$self{pending_aldb}{inuse})
                                         {
 					# save pending_aldb and then clear it out
-						my $aldbkey = lc $$self{pending_aldb}{deviceid}
-							. $$self{pending_aldb}{group}
-							. $$self{pending_aldb}{is_controller};
-						# append the device "sub-address" (e.g., a non-root button on a keypadlinc) if it exists
-						my $subaddress = $$self{pending_aldb}{data3};
-						if ($subaddress ne '00' and $subaddress ne '01')
-                                                {
-							$aldbkey .= $subaddress;
-						}
+						my $aldbkey = $self->get_linkkey($$self{pending_aldb}{deviceid},
+										$$self{pending_aldb}{group},
+										$$self{pending_aldb}{is_controller},
+										$$self{pending_aldb}{data3});
 						# check for duplicates
 						if (exists $$self{aldb}{$aldbkey} && $$self{aldb}{$aldbkey}{inuse})
                                                 {
@@ -2078,15 +2054,10 @@ sub on_read_write_aldb
 					$$self{pending_aldb}{data3} = lc substr($msg{extra},26,2);
 
 					# save pending_aldb and then clear it out
-					my $aldbkey = lc $$self{pending_aldb}{deviceid}
-						. $$self{pending_aldb}{group}
-						. $$self{pending_aldb}{is_controller};
-					# append the device "sub-address" (e.g., a non-root button on a keypadlinc) if it exists
-					my $subaddress = $$self{pending_aldb}{data3};
-					if ($subaddress ne '00' and $subaddress ne '01')
-					{
-						$aldbkey .= $subaddress;
-					}
+					my $aldbkey = $self->get_linkkey($$self{pending_aldb}{deviceid},
+									$$self{pending_aldb}{group},
+									$$self{pending_aldb}{is_controller},
+									$$self{pending_aldb}{data3});
 					# check for duplicates
 					if (exists $$self{aldb}{$aldbkey} && $$self{aldb}{$aldbkey}{inuse})
 					{
@@ -2114,15 +2085,10 @@ sub on_read_write_aldb
 	{
 		unless ($$self{_mem_activity} eq 'delete') {
 			## update the aldb records w/ the changes that were made
-			my $aldbkey = $$self{pending_aldb}{deviceid}
-					. $$self{pending_aldb}{group}
-					. $$self{pending_aldb}{is_controller};
-			# append the device "sub-address" (e.g., a non-root button on a keypadlinc) if it exists
-			my $subaddress = $$self{pending_aldb}{data3};
-			if (($subaddress ne '00') and ($subaddress ne '01'))
-			{
-				$aldbkey .= $subaddress;
-			}
+			my $aldbkey = $self->get_linkkey($$self{pending_aldb}{deviceid},
+							$$self{pending_aldb}{group},
+							$$self{pending_aldb}{is_controller},
+							$$self{pending_aldb}{data3});
 			$$self{aldb}{$aldbkey}{data1} = $$self{pending_aldb}{data1};
 			$$self{aldb}{$aldbkey}{data2} = $$self{pending_aldb}{data2};
 			$$self{aldb}{$aldbkey}{data3} = $$self{pending_aldb}{data3};
@@ -2152,15 +2118,10 @@ sub on_read_write_aldb
 	                $self->delete_duplicate_link_address($$self{pending_aldb}{address});
 			if (exists $$self{pending_aldb}{deviceid})
 	                {
-				my $key = lc $$self{pending_aldb}{deviceid}
-	                        		. $$self{pending_aldb}{group}
-	                                        . $$self{pending_aldb}{is_controller};
-				# append the device "sub-address" (e.g., a non-root button on a keypadlinc) if it exists
-				my $subaddress = $$self{pending_aldb}{data3};
-				if ($subaddress ne '00' and $subaddress ne '01')
-	                        {
-					$key .= $subaddress;
-				}
+				my $key = $self->get_linkkey($$self{pending_aldb}{deviceid},
+							$$self{pending_aldb}{group}, 
+							$$self{pending_aldb}{is_controller},
+							$$self{pending_aldb}{data3});
 				delete $$self{aldb}{$key};
 			}
 			$self->health("good");
@@ -2444,10 +2405,7 @@ sub restore_linktable
 				$subaddress = $value if ($key eq 'data3');
 				$link_record{$key} = $value if $key and defined($value);
 			}
-			if ($subaddress eq '00' || $subaddress eq '01'){
-				$subaddress = '';
-			}
-			my $linkkey = $deviceid . $groupid . $is_controller . $subaddress;
+			my $linkkey = $self->get_linkkey($deviceid, $groupid, $is_controller, $subaddress);
 			%{$$self{aldb}{lc $linkkey}} = %link_record;
 		}
 	}
@@ -2512,7 +2470,8 @@ sub parse_alllink
 		$link{data1} = substr($data,10,2);
 		$link{data2} = substr($data,12,2);
 		$link{data3} = substr($data,14,2);
-		my $key = $link{deviceid} . $link{group} . $link{is_controller};
+		my $key = $self->get_linkkey($link{deviceid}, $link{group}, 
+					$link{is_controller}, $link{data3});
 		%{$$self{aldb}{lc $key}} = %link;
 	}
 }
@@ -2639,10 +2598,7 @@ sub delete_link
 	my $group = $link_parms{group};
 	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
 	my $subaddress = (defined $link_parms{data3}) ? $link_parms{data3} : '00';
-	if ($subaddress eq '00' || $subaddress eq '01'){
-		$subaddress = '';
-	}
-	my $linkkey = lc $deviceid . $group . $is_controller . $subaddress;
+	my $linkkey = $self->get_linkkey($deviceid, $group, $is_controller, $subaddress);
 	if (defined $$self{aldb}{$linkkey})
         {
 		my $cmd = '80'
@@ -2712,11 +2668,7 @@ sub add_link
 	}
 	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
 	my $subaddress = (defined $link_parms{data3}) ? $link_parms{data3} : '00';
-	if ($subaddress eq '00' || $subaddress eq '01'){
-		$subaddress = '';
-	}
-	# first, confirm that the link does not already exist
-	my $linkkey = lc $device_id . $group . $is_controller . $subaddress;
+	my $linkkey = $self->get_linkkey($device_id, $group, $is_controller, $subaddress);
 	if (defined $$self{aldb}{$linkkey})
         {
 		&::print_log("[Insteon::ALDB_PLM] WARN: attempt to add link to PLM that already exists! "
@@ -2777,14 +2729,9 @@ or false if it does not.  Generally called as part of C<delete_orphan_links()>.
 
 sub has_link
 {
-	my ($self, $insteon_object, $group, $is_controller, $subaddress) = @_;
-	my $key = lc $insteon_object->device_id . $group . $is_controller;
-	$subaddress = '00' unless $subaddress;
-	# append the data3 value (controller = group, responder = 00); 
-	if (!($subaddress eq '00' or $subaddress eq '01'))
-        {
-		$key .= $subaddress;
-	}
+	my ($self, $insteon_object, $group, $is_controller, $data3) = @_;
+	my $key = $self->get_linkkey($insteon_object->device_id, 
+				$group, $is_controller, $data3);
 	return (defined $$self{aldb}{$key});
 }
 
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 1e936176a..f5ad01eee 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2898,10 +2898,10 @@ sub sync_links
 		$tgt_ramp_rate = '0' unless defined $tgt_ramp_rate;
 		$tgt_on_level =~ s/(\d+)%?/$1/;
 		$tgt_ramp_rate =~ s/(\d)s?/$1/;
-		my $resp_aldbkey = lc $insteon_object->device_id . $self->group . '0';
-		if ($member->group ne '01') {
-			$resp_aldbkey .= $member->group;
-		}
+		my $resp_aldbkey = $self->_aldb->get_linkkey($insteon_object->device_id,
+								$self->group,
+								'0',
+								$member->group);
 
 		# 3. Does the responder link exist
 		if (!$member_root->has_link($insteon_object, $self->group, 0, $member->group)){

From c60ef1868c3018d0edb90692141fec35df68002b Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 17 Oct 2013 22:46:00 -0700
Subject: [PATCH 258/330] Insteon: Move _aldb to BaseObject, Define get_root
 for InterfaceController

This way we don't need to treat BaseObjects and InterfaceControlle objects differently.
---
 lib/Insteon/BaseInsteon.pm | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index f5ad01eee..28403edfa 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1100,6 +1100,13 @@ sub get_voice_cmds
     return \%voice_cmds;
 }
 
+sub _aldb
+{
+   my ($self) = @_;
+   my $root_obj = $self->get_root();
+   return $$root_obj{aldb};
+}
+
 =back
 
 =head2 INI PARAMETERS
@@ -1595,13 +1602,6 @@ sub enter_linking_mode
 	$self->_send_cmd($message);
 }
 
-sub _aldb
-{
-   my ($self) = @_;
-   my $root_obj = $self->get_root();
-   return $$root_obj{aldb};
-}
-
 =item C<set_operating_flag(flag)>
 
 Sets the defined flag on the device.
@@ -3476,6 +3476,17 @@ sub is_root
    return 0;
 }
 
+=item C<get_root()>
+
+Returns the root object of a device, in this case the interface.
+
+=cut
+
+sub get_root {
+	my ($self) = @_;
+	return $self->interface;
+}
+
 =item C<get_voice_cmds>
 
 Returns a hash of voice commands where the key is the voice command name and the

From 5c8fd382515ddb33f592bda4152bd4a7272964a7 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 17 Oct 2013 23:16:00 -0700
Subject: [PATCH 259/330] Insteon: Only Change Data3 on Responders, Don't Do
 Processing in _write_link

The distinction in the data3 value between i2CS and everything else only applies to repsonder links.

Remove any processing from the low level _write_link routine.  All processing of the data should occur higher up than this.
---
 lib/Insteon/AllLinkDatabase.pm | 40 +++++++++++++++-------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index af93ac7d1..b07d13d3b 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -826,13 +826,17 @@ sub add_link
 		$device_id = lc $insteon_object->device_id;
 	}
 	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
-	# check whether the link already exists
-	# for I2CS devices the default data3 should be 01 no 00
-	my $data3_default = '00';
+
+	# For I2CS devices the default data3 for responders is 01
+	# For all other devices the default data3 for responders is 00
+	my $data3_resp_default = '00';
 	if ($insteon_object->can('engine_version') && $insteon_object->engine_version eq 'I2CS') {
-		$data3_default = '01';
+		$data3_resp_default = '01';
 	}
-	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : $data3_default;
+	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
+	$data3 = $data3_resp_default if (!$is_controller && ($data3 eq '00' || $data3 eq '01'));
+
+	# check whether the link already exists
 	my $key = $self->get_linkkey($device_id, $group, $is_controller, $data3);
 	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
 		## Check whether ALDB is in sync
@@ -948,12 +952,16 @@ sub update_link
 		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate") if $main::Debug{insteon};
 	my $data1 = &Insteon::DimmableLight::convert_level($on_level);
 	my $data2 = ($$self{device}->isa('Insteon::DimmableLight')) ? &Insteon::DimmableLight::convert_ramp($ramp_rate) : '00';
-	# for I2CS devices the default data3 should be 01 no 00
-	my $data3_default = '00';
+
+	# For I2CS devices the default data3 for responders is 01
+	# For all other devices the default data3 for responders is 00
+	my $data3_resp_default = '00';
 	if ($insteon_object->can('engine_version') && $insteon_object->engine_version eq 'I2CS') {
-		$data3_default = '01';
+		$data3_resp_default = '01';
 	}
-	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : $data3_default;
+	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
+	$data3 = $data3_resp_default if (!$is_controller && ($data3 eq '00' || $data3 eq '01'));
+
 	my $deviceid = $insteon_object->device_id;
 	my $key = $self->get_linkkey($deviceid, $group, $is_controller, $data3);
 	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
@@ -1779,13 +1787,6 @@ sub _write_link
 		$$self{pending_aldb}{is_controller} = $is_controller;
 		$$self{pending_aldb}{data1} = (defined $data1) ? lc $data1 : '00';
 		$$self{pending_aldb}{data2} = (defined $data2) ? lc $data2 : '00';
-		# Note: if device is a KeypadLinc, then $data3 must be assigned the value of the applicable button (01)
-		if (($$self{device}->isa('Insteon::KeyPadLincRelay') or $$self{device}->isa('Insteon::KeyPadLinc')) and ($data3 eq '00'))
-                {
-			&::print_log("[Insteon::ALDB_i1] setting data3 to " . $$self{device}->group . " for this keypadlinc")
-				if $main::Debug{insteon};
-			$data3 = $$self{device}->group;
-		}
 		$$self{pending_aldb}{data3} = (defined $data3) ? lc $data3 : '00';
 		$self->_peek($address);
 	}
@@ -2176,13 +2177,6 @@ sub _write_link
 		$message_extra .= $$self{pending_aldb}{data1}; 
 		$$self{pending_aldb}{data2} = (defined $data2) ? lc $data2 : '00';
 		$message_extra .= $$self{pending_aldb}{data2}; 
-		# Note: if device is a KeypadLinc, then $data3 must be assigned the value of the applicable button (01)
-		if (($$self{device}->isa('Insteon::KeyPadLincRelay') or $$self{device}->isa('Insteon::KeyPadLinc')) and ($data3 eq '00'))
-                {
-			&::print_log("[Insteon::ALDB_i2] setting data3 to " . $$self{device}->group . " for this keypadlinc")
-				if $main::Debug{insteon};
-			$data3 = $$self{device}->group;
-		}
 		$$self{pending_aldb}{data3} = (defined $data3) ? lc $data3 : '00';
 		$message_extra .= $$self{pending_aldb}{data3}; 
 		$message_extra .= '00';  #byte 14

From 7b32a9dced2c97e0c1a087aa9194a1ce322f21a3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 17 Oct 2013 23:17:00 -0700
Subject: [PATCH 260/330] Insteon: Remove Old Style Data3 Code from
 Delete_Orphans

Ready to start testing the outputted results.
---
 lib/Insteon/AllLinkDatabase.pm | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index b07d13d3b..aea443c4f 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -470,7 +470,7 @@ sub delete_orphan_links
 		# Initialize Variables
 		my ($linked_device, $plm_scene, $controller_object, $link_defined,
 			$controller_id, $linked_id, $responder_id, $link_data3,
-			$linked_group, $self_subgroup, $linked_subgroup, $interface_id,
+			$linked_group, $self_subgroup, $interface_id,
 			$link_subgroup);
 		my $group 		= lc $$self{aldb}{$linkkey}{group};
 		my $is_controller 	= $$self{aldb}{$linkkey}{is_controller};
@@ -548,8 +548,6 @@ sub delete_orphan_links
 				$link_defined = 1;
 				#Identify the linked device's group for use later
 				$linked_group = ($is_controller) ? $member->group : $group;
-				#Only needed to support OLD method
-				$linked_subgroup = $member;
 				last MEMBERS;
 			} 
 		}
@@ -595,15 +593,6 @@ sub delete_orphan_links
 		}
 
 		# Does a reciprocal link exist?
-		# Temp OLD compatibility fix for data3, delete to #END to upgrade
-		if (($linked_device eq Insteon::active_interface()) &&
-		 (!$$self{device}->isa('Insteon::KeyPadLincRelay'))){
-			$linked_group = '00';
-		}
-		if ($$self{device}->isa('Insteon::KeyPadLincRelay')){
-			$linked_group = $linked_subgroup->group;
-		}
-		#END
 		if (! $linked_device->has_link($$self{device},$group,($is_controller) ? 0 : 1, lc $linked_group)) {
 			$delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name . " linked_group $linked_group linkkey $linkkey";
 			push @{$$self{delete_queue}}, \%delete_req;

From 15d62f182eb34af726e025011bdb9a7f28372fe8 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Fri, 18 Oct 2013 19:15:42 -0400
Subject: [PATCH 261/330] Move debuglevel sub to Insteon::debuglevel, convert
 other subs to stubs that call this main sub. Insert more stubs, cleanup and
 further testing.

---
 lib/Insteon.pm                 | 42 ++++++++++++++++++++++++++++++----
 lib/Insteon/AllLinkDatabase.pm | 14 +++++++++++-
 lib/Insteon/BaseInsteon.pm     |  9 ++------
 lib/Insteon/BaseInterface.pm   |  7 +-----
 lib/Insteon/Message.pm         | 17 +++++---------
 5 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 369b8e225..684b5299f 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -906,6 +906,28 @@ sub init {
     @_insteon_link = ();
 
 }
+
+=item C<debuglevel([level])>
+
+Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
+
+=cut
+
+sub debuglevel
+{
+	my ($object, $debug_level) = @_;
+	$debug_level = 1 unless $debug_level;
+	my $objname;
+	#try {
+	 $objname = lc $object->get_object_name if defined $object;
+	#} catch {
+	#  &::print_log("$object doesn't have a get_object_name function.") if $main::Debug{insteon} >= 2;
+	#}
+	&::print_log("Insteon::debuglevel: Processing debug for object $objname ... " . $main::Debug{$objname}) if $main::Debug{insteon} >= 5;
+	return 1 if $main::Debug{insteon} >= $debug_level;
+	return 1 if defined $objname && $main::Debug{$objname} >= $debug_level;
+  return 0;
+}
 
 =item C<generate_voice_commands()>
 
@@ -1062,7 +1084,7 @@ Walks through every Insteon device and checks the aldb object version for I1 vs.
 
 sub check_all_aldb_versions
 {
-	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices") if ($main::Debug{insteon} >= 4);
+	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices") if Insteon::debuglevel(undef,4);
 
 	my @ALDB_devices = ();
 	push @ALDB_devices, Insteon::find_members("Insteon::BaseDevice");
@@ -1085,12 +1107,12 @@ sub check_all_aldb_versions
 				if ($ALDB_device->debuglevel(4));
 		}
 	}
-	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices completed") if ($main::Debug{insteon} >= 4);
+	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices completed") if Insteon::debuglevel(undef,4);
 }
 
 sub check_thermo_versions
 {
-	main::print_log("[Insteon] DEBUG4 Initializing thermostat versions") if ($main::Debug{insteon} >= 4);
+	main::print_log("[Insteon] DEBUG4 Initializing thermostat versions") if Insteon::debuglevel(undef,4);
 
 	my @thermo_devices = ();
 	push @thermo_devices, Insteon::find_members("Insteon::Thermostat");
@@ -1187,7 +1209,7 @@ sub _active_interface
    my ($self, $interface) = @_;
    # setup hooks the first time that an interface is made active
    if (!($$self{active_interface}) and $interface) {
-      &main::print_log("[Insteon] Setting up initialization hooks") if $main::Debug{insteon};
+      &main::print_log("[Insteon] Setting up initialization hooks") if $self->debuglevel();
       &main::MainLoop_pre_add_hook(\&Insteon::BaseInterface::check_for_data, 1);
       &main::Reload_post_add_hook(\&Insteon::check_all_aldb_versions, 1);
       &main::Reload_post_add_hook(\&Insteon::BaseInterface::poll_all, 1);
@@ -1199,6 +1221,18 @@ sub _active_interface
    $$self{active_interface} = $interface if $interface;
    return $$self{active_interface};
 }
+
+=item C<debuglevel([level])>
+
+Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
+
+=cut
+
+sub debuglevel
+{
+	my ($self, $debug_level) = @_;
+	return Insteon::debuglevel(undef, $debug_level);
+}
 
 =item C<add()>
 
diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index f1f5721d8..f501937a8 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -1361,6 +1361,18 @@ sub has_link
 	}
 	return (defined $$self{aldb}{$key});
 }
+
+=item C<debuglevel([level])>
+
+Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
+
+=cut
+
+sub debuglevel
+{
+	my ($self, $debug_level) = @_;
+	return Insteon::debuglevel(undef, $debug_level);
+}
 
 =back
 
@@ -2517,7 +2529,7 @@ sub send_read_aldb
 	$message->failure_callback($$self{_failure_callback});
 	$self->_send_cmd($message);
 }
-
+
 =back
 
 =head2 INI PARAMETERS
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index ea31a20e2..5e4118378 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -196,19 +196,14 @@ sub group
 
 =item C<debuglevel([level])>
 
-Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
+Returns 1 if insteon or this device is at least debug level 'level', otherwise returns 0.
 
 =cut
 
 sub debuglevel
 {
 	my ($self, $debug_level) = @_;
-	$debug_level = 1 unless $debug_level;
-	my $objname = lc $self->get_object_name;
-	&::print_log("debuglevel: Processing debug for object $objname ... " . $main::Debug{$objname}) if $main::Debug{insteon} >= 5;
-	return 1 if $main::Debug{insteon} >= $debug_level;
-	return 1 if $main::Debug{$objname} >= $debug_level;
-  return 0;
+	return Insteon::debuglevel($self, $debug_level);
 }
 
 =item C<timeout_factor($float)>
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 15f7e45b2..5c1f3839e 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -129,12 +129,7 @@ Returns 1 if Insteon or this device is at least debug level 'level', otherwise r
 sub debuglevel
 {
 	my ($self, $debug_level) = @_;
-	$debug_level = 1 unless $debug_level;
-	my $objname = lc $self->get_object_name;
-	&::print_log("debuglevel: Processing debug for object $objname ... " . $main::Debug{$objname}) if $main::Debug{insteon} >= 5;
-	return 1 if $main::Debug{insteon} >= $debug_level;
-	return 1 if $main::Debug{$objname} >= $debug_level;
-  return 0;
+	return Insteon::debuglevel($self, $debug_level);
  }
 
 =item C<_is_duplicate(cmd)>
diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index 296791fc8..61ebe4924 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -145,12 +145,7 @@ Returns 1 if Insteon or this device is at least debug level 'level', otherwise r
 sub debuglevel
 {
 	my ($self, $debug_level) = @_;
-	$debug_level = 1 unless $debug_level;
-	my $objname = lc $self->get_object_name;
-	&::print_log("debuglevel: Processing debug for object $objname ... " . $main::Debug{$objname}) if $main::Debug{insteon} >= 5;
-	return 1 if $main::Debug{insteon} >= $debug_level;
-	return 1 if $main::Debug{$objname} >= $debug_level;
-  return 0;
+	return Insteon::debuglevel(undef, $debug_level);
 }
 
 =item C<setby(data)>
@@ -250,7 +245,7 @@ sub send
                 {
                 	&::print_log("[Insteon::BaseMessage] WARN: now resending "
                         	. $self->to_string() . " after " . $self->send_attempts
-                        	. " attempts.") if $main::Debug{insteon};
+                        	. " attempts.") if $self->debuglevel();
                         # revise default hop count to reflect retries
                         if (ref $self->setby && $self->setby->isa('Insteon::BaseObject') 
                         	&& !defined($$self{no_hop_increase}))
@@ -265,7 +260,7 @@ sub send
                         	&& $self->setby->isa('Insteon::BaseObject')){
                         	&main::print_log("[Insteon::BaseMessage] Hop count not increased for "
                         		. $self->setby->get_object_name . " because no_hop_increase flag was set.")
-                        		if $main::Debug{insteon};
+                        		if $self->debuglevel();
                         	$$self{no_hop_increase} = undef;
                         }
                 }
@@ -1101,7 +1096,7 @@ sub generate_commands
 	}
 
 	if ($uc eq undef) {
-	    &main::print_log("[Insteon::Message] Message is for entire HC") if $main::Debug{insteon};
+	    &main::print_log("[Insteon::Message] Message is for entire HC") if Insteon::debuglevel(undef);
 	}
 	else {
 
@@ -1110,7 +1105,7 @@ sub generate_commands
 	    $msg.= substr(unpack("H*",pack("C",$x10_unit_codes{substr($id,2,1)})),1,1);
 	    $msg.= "00";
 	    &main::print_log("[Insteon_PLM] x10 sending code: " . uc($hc . $uc) . " as insteon msg: "
-			     . $msg) if $main::Debug{insteon};
+			     . $msg) if Insteon::debuglevel(undef);
 
             push @data, $msg;
 	}
@@ -1138,7 +1133,7 @@ sub generate_commands
 	    $msg.= "80";
 
      	    &main::print_log("[Insteon_PLM] x10 sending code: " . uc($hc . $x10_arg) . " as insteon msg: "
-			     . $msg) if $main::Debug{insteon};
+			     . $msg) if Insteon::debuglevel(undef);
 
             push @data, $msg;
 

From f4a01b32ae0031e07f8eff53960f01f936f95a2b Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 14:13:37 -0700
Subject: [PATCH 262/330] Insteon: Dont Use Data3 in PLM Linkkey

Data3 on controller links on the PLM should be set to the group.  The old code set this to 0 or the responding device's button.  It doesn't appear that this error had any major effect.  So rather than replace all of these links, simply ignore the data3 value in the linkkey so that old links will be accepted by sync and delete links.

The Data3 value of the responder links on the PLM should always be 00.

Therefore no concern that a different data3 value makes a link on the PLM unique.
---
 lib/Insteon/AllLinkDatabase.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index aea443c4f..0819d4ffc 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -93,6 +93,12 @@ Returns the saved health status.
 sub get_linkkey {
 	my ($self, $deviceid, $group, $is_controller, $data3) = @_;
 	my $linkkey = $deviceid . $group . $is_controller;
+	# Data3 is irrelevant for the PLM itself, b/c for controller records
+	# data3 will always be equal to group.  And for responder records it 
+	# should always be 00, therefor blank data3 so it isn't used
+	if ($$self{device}->isa('Insteon_PLM')){
+		$data3 = '00';
+	}
 	# '00' and '01' are generally interchangable for $data3 values and are
 	# the most common values.  So to make searching easier we only 
 	# add data3 if it is unique

From d74e4d2939dd72b6deba8380647599aab81bf72b Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 14:17:15 -0700
Subject: [PATCH 263/330] Insteon: Fix Comments in Link to Interface to be more
 clear

---
 lib/Insteon/BaseInsteon.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 28403edfa..d1afc62e0 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1407,7 +1407,7 @@ sub link_to_interface
 			$failure_callback = $self->get_object_name."->link_to_interface_i2cs(\"$p_group\",\"$p_data3\")";
 			$self->get_engine_version($success_callback, $failure_callback);	
 		}
-		case (1) { #Add Link from object->PLM
+		case (1) { #Add Controller Link to device for object->PLM link
 			$success_callback = $success_callback_prefix . "\"2\")";
 			my %link_info = ( object => $self->interface, group => $p_group, is_controller => 1,
 				callback => "$success_callback", failure_callback=> "$failure_callback");
@@ -1421,7 +1421,7 @@ sub link_to_interface
 		              ", does not have an ALDB object.  Linking is not permitted.");
 		        }
 		}
-		case (2){ #Add Link from PLM->object
+		case (2){ #Add Responder Link to PLM for object->PLM link
 			$success_callback = $success_callback_prefix . "\"3\")";
 			my $link_info = "deviceid=" . lc $self->device_id . " group=$p_group is_controller=0 " .
 				"callback=$success_callback failure_callback=$failure_callback";	

From ee2f7741c7c08e35a1d31b7aeb697492690cb9b9 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 14:18:04 -0700
Subject: [PATCH 264/330] Insteon: ALDB Cache is in the Member Root

---
 lib/Insteon/BaseInsteon.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index d1afc62e0..2a06cdf5e 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2898,7 +2898,7 @@ sub sync_links
 		$tgt_ramp_rate = '0' unless defined $tgt_ramp_rate;
 		$tgt_on_level =~ s/(\d+)%?/$1/;
 		$tgt_ramp_rate =~ s/(\d)s?/$1/;
-		my $resp_aldbkey = $self->_aldb->get_linkkey($insteon_object->device_id,
+		my $resp_aldbkey = $member_root->_aldb->get_linkkey($insteon_object->device_id,
 								$self->group,
 								'0',
 								$member->group);
@@ -2917,7 +2917,7 @@ sub sync_links
 		
 		# 4. Is the responder link accurate
 		if ($member->isa('Insteon::DimmableLight') && $has_link) {
-			my $member_aldb = $member->_aldb;
+			my $member_aldb = $member_root->_aldb;
 			my $data1 = $$member_aldb{aldb}{$resp_aldbkey}{data1};
 			my $data2 = $$member_aldb{aldb}{$resp_aldbkey}{data2};
 			my $cur_on_level = hex($data1)/2.55;

From 949f7859f6b3ec4755f1b8f16e81732a8e3396f0 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 14:19:00 -0700
Subject: [PATCH 265/330] Insteon: Fix Logic In Sync Links

---
 lib/Insteon/AllLinkDatabase.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 0819d4ffc..f027002b5 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -444,15 +444,17 @@ sub delete_orphan_links
 		if ($$self{device}->is_deaf) {
 			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Will not scan deaf device: $selfname");
 		} 
-		elsif ($self->health ne 'empty'){
-			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Skipping $selfname, it has no links");
+		elsif ($self->health eq 'empty'){
+			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Skipping $selfname, because it has no links");
 		}
 		else {
 			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping $selfname because health: "
 				. $self->health . ". Please rescan the link table of this device and rerun delete "
 				. "orphans if necessary");
 		}
-		$self->_process_delete_queue();
+		if (!$$self{device}->isa('Insteon_PLM')){
+			$self->_process_delete_queue();
+		}
 		return;
 	}
 

From a3388624f51e3ddd17818c5d3661e5761ef5ac5a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 14:29:39 -0700
Subject: [PATCH 266/330] Insteon: Revise Delete_Orphans Rewrite

---
 lib/Insteon/AllLinkDatabase.pm | 121 ++++++++++++++++++---------------
 1 file changed, 65 insertions(+), 56 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index f027002b5..808ac3a57 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -477,9 +477,9 @@ sub delete_orphan_links
 
 		# Initialize Variables
 		my ($linked_device, $plm_scene, $controller_object, $link_defined,
-			$controller_id, $linked_id, $responder_id, $link_data3,
-			$linked_group, $self_subgroup, $interface_id,
-			$link_subgroup);
+			$controller_id, $responder_id, $link_data3,
+			$recip_data3, $group_object, $interface_id,
+			$data3_object);
 		my $group 		= lc $$self{aldb}{$linkkey}{group};
 		my $is_controller 	= $$self{aldb}{$linkkey}{is_controller};
 		my $data3 		= lc $$self{aldb}{$linkkey}{data3};
@@ -492,9 +492,9 @@ sub delete_orphan_links
 			$interface_id	= lc $$self{device}->interface->device_id;
 		}
 		$linked_device = Insteon::get_object($deviceid,'01');
-		$linked_device = $$self{device}->interface if ($deviceid eq $interface_id);
-		$self_subgroup = Insteon::get_object($self_id, $group) if ($is_controller);
-		$link_subgroup = Insteon::get_object($deviceid, $group) if (!$is_controller);
+		$linked_device = Insteon::active_interface() if ($deviceid eq $interface_id);
+		$group_object = ($is_controller) ? Insteon::get_object($self_id, $group) : Insteon::get_object($deviceid, $group);
+		$data3_object = Insteon::get_object($self_id, $data3);
 		my %delete_req = (deviceid => $deviceid,
 			group => $group,
 			is_controller => $is_controller,
@@ -509,35 +509,24 @@ sub delete_orphan_links
 		} 
 
 		# IF link is a PLM Scene, is the PLM Scene defined in MH?
-		if (($linked_device->isa("Insteon::BaseInterface") and !$is_controller)||
-		($$self{device}->isa("Insteon::BaseInterface") and $is_controller)) {
+		if (($linked_device->isa("Insteon_PLM") and !$is_controller)||
+		($$self{device}->isa("Insteon_PLM") and $is_controller)) {
 			$plm_scene = &Insteon::get_object('000000', $group);
-			if ($group eq '01' || $group eq '00') {
-				my $not_plm_name;
-				if ($linked_device->isa("Insteon::BaseInterface")){
-					$not_plm_name = $selfname;
-				} else {
-					$not_plm_name = $linked_device->get_object_name;
-				}
-				::print_log("[Insteon::AllLinkDatabase] DEBUG2 Ignoring link between PLM and $not_plm_name "
-					."for group 01 or 00") if $main::Debug{insteon} >= 2;
-				next LINKKEY;
-			}
-			elsif (!ref $plm_scene) {
+			if (!ref $plm_scene && $group ne '01' && $group ne '00') {
 				$delete_req{cause} = "no plm scene for this group could be found";
 				push @{$$self{delete_queue}}, \%delete_req;
 				next LINKKEY;
 			}
 		}
 
-		# Is this link defined in MH? 5-Step Process
-		# First define variables based on type of link
-		$linked_id = lc $linked_device->device_id;
-		$controller_id = ($is_controller) ? $self_id : $linked_id;
-		$responder_id = ($is_controller) ? $linked_id : $self_id;
+		# Is this link defined in MH? 3-Step Process
+		# Define variables based on type of link
+		$controller_id = ($is_controller) ? $self_id : lc $linked_device->device_id;
+		$responder_id = ($is_controller) ? lc $linked_device->device_id : $self_id;
 		$controller_object = Insteon::get_object($controller_id,$group);
 		$controller_object = $plm_scene if (ref $plm_scene);
-		# Second, iterate over the controller object members to find the link definition
+
+		# First, iterate over the controller object members to find the link definition
 		MEMBERS: foreach my $member_ref (keys %{$$controller_object{members}}) {
 			my $member = $$controller_object{members}{$member_ref}{object};
 			if ($member->isa('Light_Item')) {
@@ -546,47 +535,66 @@ sub delete_orphan_links
 			}
 			# For resp, D3 = resp group; For cont, D3 = cont group
 			$link_data3 = ($is_controller) ? $group : $member->group;
-			# 00 and 01 likely only neede for old design OLD delete to END
-			if ($member->group ne '01') {
-				$link_data3 = $member->group;
-			}
-			#END
-			if (lc($member->device_id) eq $responder_id && 
-			($data3 eq '00' or $data3 eq '01' or ($data3 eq $link_data3))) {
-				$link_defined = 1;
-				#Identify the linked device's group for use later
-				$linked_group = ($is_controller) ? $member->group : $group;
-				last MEMBERS;
+			if (lc($member->device_id) eq $responder_id) {
+				if ($data3 eq $link_data3){
+					$link_defined = 1;
+					$recip_data3 = ($is_controller) ? $member->group : $group;
+					last MEMBERS;
+				} 
+				elsif (($link_data3 eq '00' || $link_data3 eq '01') && 
+					($data3 eq '00' || $data3 eq '01' )){
+					# Allow for 00 or 01 interchangability
+					$link_defined = 1;
+					$recip_data3 = ($is_controller) ? $member->group : $group;
+					last MEMBERS;
+				}
 			} 
 		}
 
-		# Third, is this a controller link from the device to the PLM?
-		if ($is_controller && $deviceid eq $interface_id && ref $self_subgroup){
-			$link_defined = 1;
-		}
-
-		# Fourth, is this a responder link on the PLM from a device?
-		if (!$is_controller && $self_id eq $interface_id && ref $link_subgroup){
-			$link_defined = 1;
-			$linked_group = '00';
-			$linked_group = $group if ($group ne '01');
+		# Second, is this a PLM->Device, Device->PLM link, these are not members
+		if ($$self{device}->isa("Insteon_PLM") && ($data3 eq '00' || $data3 eq '01')){
+			if ($is_controller && ($group eq '00' || $group eq '01')){
+				#Valid Controller for PLM->Device link
+				::print_log("[Insteon::AllLinkDatabase] Delete orphan links: "
+					."Skipping reciprocal link check for group 00 or 01 link from "
+					."$selfname to " . $linked_device->get_object_name); 
+				next LINKKEY;
+			}
+			elsif (!$is_controller && ref $group_object){
+				#Valid Responder for Device->PLM link
+				$link_defined = 1;
+				$recip_data3 = $group;
+			}
+		} 
+		elsif($deviceid eq $interface_id && (ref $data3_object || ($data3 eq '00' || $data3 eq '01'))){
+			if ($is_controller && ref $group_object){
+				#Valid Controller for Device->PLM link
+				$link_defined = 1;
+				$recip_data3 = '00';
+			}
+			elsif (!$is_controller && ($group eq '00' || $group eq '01')) {
+				#Valid Responder for PLM->Device link
+				$link_defined = 1;
+				$recip_data3 = '00';
+			}
+			
 		}
 
-		# Fifth, delete link if not defined
+		# Third, delete link if not defined
 		if (!$link_defined){
 			$delete_req{cause} = "link is not defined in MisterHouse $linkkey";
 			push @{$$self{delete_queue}}, \%delete_req;
 			next LINKKEY;
 		}
 
-		# Ignore links to deaf devices
-		if (! $linked_device->isa('Insteon_PLM') && $linked_device->is_deaf) {
+		# Do not delete links to deaf devices
+		if (!$linked_device->isa('Insteon_PLM') && $linked_device->is_deaf) {
 			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: "
 				."ignoring link from $selfname to 'deaf' device: " . $linked_device->get_object_name);
 			next LINKKEY;
 		}
 		
-		# Ignore links to unhealthy devices 
+		# Do not delete links to unhealthy devices 
 		if ($linked_device->_aldb->health ne 'good' && $linked_device->_aldb->health ne 'empty') {
 			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping check for reciprocal links from "
 				. $linked_device->get_object_name . " because aldb health of that device is "
@@ -594,15 +602,16 @@ sub delete_orphan_links
 			next LINKKEY;
 		}
 		
-		# Ignore Controller Links to the PLM
-		if ($linked_device->isa("Insteon::BaseInterface") and $is_controller) {
-			# ignore since this is just a link back to the PLM
+		# Do not delete responder links from the PLM (prevents locking i2CS devices)
+		if ($linked_device->isa("Insteon_PLM") and !$is_controller && ($group eq '00' || $group eq '01')) {
+			::print_log("[Insteon::AllLinkDatabase] Skipping check for reciprocal link on PLM for responder "
+				."link on $selfname for group 00 or 01.");
 			next LINKKEY;
 		}
 
 		# Does a reciprocal link exist?
-		if (! $linked_device->has_link($$self{device},$group,($is_controller) ? 0 : 1, lc $linked_group)) {
-			$delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name . " linked_group $linked_group linkkey $linkkey";
+		if (! $linked_device->has_link($$self{device},$group,($is_controller) ? 0 : 1, lc $recip_data3)) {
+			$delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name . " recip_data3 $recip_data3 linkkey $linkkey";
 			push @{$$self{delete_queue}}, \%delete_req;
 		} 
 

From 3ffbd1a4ad07591d5d262fdf9849ad0e07b2b046 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 14:30:31 -0700
Subject: [PATCH 267/330] Insteon: Revise Default Data3 Distinction for
 i2CS/not-i2CS

---
 lib/Insteon/AllLinkDatabase.pm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 808ac3a57..cef851bb9 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -833,14 +833,14 @@ sub add_link
 	}
 	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
 
-	# For I2CS devices the default data3 for responders is 01
-	# For all other devices the default data3 for responders is 00
-	my $data3_resp_default = '00';
+	# For I2CS devices the default data3 for links is 01
+	# For all other devices the default data3 for links is 00
+	my $data3_default = '00';
 	if ($insteon_object->can('engine_version') && $insteon_object->engine_version eq 'I2CS') {
-		$data3_resp_default = '01';
+		$data3_default = '01';
 	}
 	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
-	$data3 = $data3_resp_default if (!$is_controller && ($data3 eq '00' || $data3 eq '01'));
+	$data3 = $data3_default if ($data3 eq '00' || $data3 eq '01');
 
 	# check whether the link already exists
 	my $key = $self->get_linkkey($device_id, $group, $is_controller, $data3);
@@ -959,14 +959,14 @@ sub update_link
 	my $data1 = &Insteon::DimmableLight::convert_level($on_level);
 	my $data2 = ($$self{device}->isa('Insteon::DimmableLight')) ? &Insteon::DimmableLight::convert_ramp($ramp_rate) : '00';
 
-	# For I2CS devices the default data3 for responders is 01
-	# For all other devices the default data3 for responders is 00
-	my $data3_resp_default = '00';
+	# For I2CS devices the default data3 for links is 01
+	# For all other devices the default data3 for links is 00
+	my $data3_default = '00';
 	if ($insteon_object->can('engine_version') && $insteon_object->engine_version eq 'I2CS') {
-		$data3_resp_default = '01';
+		$data3_default = '01';
 	}
 	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
-	$data3 = $data3_resp_default if (!$is_controller && ($data3 eq '00' || $data3 eq '01'));
+	$data3 = $data3_default if ($data3 eq '00' || $data3 eq '01');
 
 	my $deviceid = $insteon_object->device_id;
 	my $key = $self->get_linkkey($deviceid, $group, $is_controller, $data3);

From 96689bbb66b22ea822a1b7bab9d5cb9e3e3a5785 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 14:32:01 -0700
Subject: [PATCH 268/330] Insteon: Add Comments re Oddity in PLM Control Codes

Control Codes for Manage All Link Database entries do not appear to match reality.

Did not alter the code to address this, as it doesn't appear that d1-3 matter on the PLM and thus there is no reason to update a link.
---
 lib/Insteon/AllLinkDatabase.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index cef851bb9..641db4914 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -2684,6 +2684,15 @@ sub add_link
 	}
         else
         {
+		# The modem developers guide appears to be wrong regarding control
+		# codes.  40 and 41 will respond with a NACK if a record for that
+		# group/device/is_controller combination already exist.  It appears 
+		# that code 20 can be used to edit existing but not create new records.
+		# However, since data1-3 are consistent for all PLM links we never
+		# really need to update a PLM link.  NB prior MH code did not set
+		# data3 on control records to the group, however this does not 
+		# appear to have any adverse effects, and the current MH code will
+		# not flag these entries as being incorrect or requiring an update
 		my $control_code = ($is_controller) ? '40' : '41';
 		# flags should be 'a2' for responder and 'e2' for controller
 		my $flags = ($is_controller) ? 'E2' : 'A2';

From 7e123b58e4ecc24e35da922eb9018851a4f9548c Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 15:19:21 -0700
Subject: [PATCH 269/330] Insteon: Sync Half Links for Deaf or Unhealthy
 Devices

Will add the responder/controller link to the other device even if the other device is deaf or unhealthy.
---
 lib/Insteon.pm             | 20 ++++----------------
 lib/Insteon/BaseInsteon.pm | 31 +++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 84fabc82b..b976387e4 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -510,22 +510,10 @@ sub sync_all_links
 	# iterate over all registered objects and compare whether the link tables match defined scene linkages in known Insteon_Links
 	for my $obj (&Insteon::find_members('Insteon::BaseController'))
 	{
-        	if (!$obj->isa('Insteon::InterfaceController') && $obj->is_deaf)
-                {
-                	&main::print_log("[Sync all links] Ignoring links from 'deaf' device: " . $obj->get_object_name);
-                }
-                elsif(!($obj->isa('Insteon::InterfaceController')) && ($obj->_aldb->health eq 'unknown'))
-                {
-                	&main::print_log("[Sync all links] Skipping links from 'unreachable' device: "
-                        	. $obj->get_object_name . ". Consider rescanning the link table of this device");
-                }
-                else
-                {
-			my %sync_req = ('sync_object' => $obj, 'audit_mode' => ($audit_mode) ? 1 : 0);
-                	&main::print_log("[Sync all links] Adding " . $obj->get_object_name
-                        	. " to sync queue");
-	       		push @_sync_devices, \%sync_req
-                };
+		my %sync_req = ('sync_object' => $obj, 'audit_mode' => ($audit_mode) ? 1 : 0);
+		&main::print_log("[Sync all links] Adding " . $obj->get_object_name
+			. " to sync queue");
+		push @_sync_devices, \%sync_req
 	}
 
         $_sync_cnt = scalar @_sync_devices;
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 2a06cdf5e..247a22477 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2845,17 +2845,32 @@ sub sync_links
 	my $interface_object = Insteon::active_interface();
 	my $interface_name = $interface_object->get_object_name;
 	if (!($self->isa('Insteon::InterfaceController'))) {
-		$insteon_object = &Insteon::get_object($self->device_id,'01');
-		&main::print_log("[Insteon::BaseController] WARN!! A device w/ insteon address: " . $self->device_id . ":01 could not be found. "
+		$insteon_object = $self->get_root;
+		::print_log("[Insteon::BaseController] WARN!! A device w/ insteon address: " . $self->device_id . ":01 could not be found. "
 			. "Please double check your items.mht file.") if (!(defined($insteon_object)));
 	}
 
 	# Abort if $insteon_object doesn't exist
 	$self->_process_sync_queue() unless $insteon_object;
 	
+	# Warn if device is deaf or ALDB out of sync
+	if ((!$self->isa('Insteon::InterfaceController') && $insteon_object->is_deaf)) {
+		::print_log("[Insteon::BaseController] WARN! $self_link_name is a deaf device, responder links will be added to devices "
+			."controlled by this device, but no links will be added to $self_link_name.");
+	}
+	elsif (!$self->isa('Insteon::InterfaceController') &&
+	($insteon_object->_aldb->health ne 'good' && $insteon_object->_aldb->health ne 'empty')){
+		::print_log("[Insteon::BaseController] WARN! The ALDB of $self_link_name is ".$insteon_object->_aldb->health
+			.", links will be added to devices "
+			."linked to this device, but no links will be added to $self_link_name.  Please rescan this device and attempt "
+			."sync links again.");
+	}
+	
 	# 1. Does a controller link exist for Device-> PLM
 	if ((!$self->isa('Insteon::InterfaceController') && 
-	!$insteon_object->has_link($self->interface,$self->group,1,$subaddress))) {
+	!$insteon_object->has_link($self->interface,$self->group,1,$subaddress) && 
+	!$insteon_object->is_deaf &&
+	($insteon_object->_aldb->health eq 'good' || $insteon_object->_aldb->health eq 'empty'))) {
 		my %link_req = ( member => $insteon_object, cmd => 'add', object => $self->interface,
 			group => $self->group, is_controller => 1,
 			callback => "$self_link_name->_process_sync_queue()",
@@ -2904,7 +2919,8 @@ sub sync_links
 								$member->group);
 
 		# 3. Does the responder link exist
-		if (!$member_root->has_link($insteon_object, $self->group, 0, $member->group)){
+		if (!$member_root->has_link($insteon_object, $self->group, 0, $member->group) &&
+		($member_root->_aldb->health eq 'good' || $member_root->_aldb->health eq 'empty')){
 			my %link_req = ( member => $member, cmd => 'add', object => $insteon_object,
 				group => $self->group, is_controller => 0,
 				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
@@ -2951,7 +2967,8 @@ sub sync_links
 				$cause .= "Ramp rate ";
 			}
 		}
-		if ($requires_update) {
+		if ($requires_update &&
+		($member_root->_aldb->health eq 'good' || $member_root->_aldb->health eq 'empty')) {
 			my %link_req = ( member => $member, cmd => 'update', object => $insteon_object,
 				group => $self->group, is_controller => 0,
 				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
@@ -2963,7 +2980,9 @@ sub sync_links
 		}
 
 		# 5. Does the controller link on this device exist
-		if (!($insteon_object->has_link($member, $self->group, 1, $subaddress))) {
+		if (!($insteon_object->has_link($member, $self->group, 1, $subaddress)) &&
+		!$insteon_object->is_deaf &&
+		($insteon_object->_aldb->health eq 'healthy' || $insteon_object->_aldb->health eq 'empty')) {
 			my %link_req = ( member => $insteon_object, cmd => 'add', object => $member,
 				group => $self->group, is_controller => 1,
 				callback => "$self_link_name->_process_sync_queue()",

From 0b4f76d44892e2bffcc31d5d73a76cbb2617c247 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 15:47:43 -0700
Subject: [PATCH 270/330] Insteon: Simplify Process Delete Queue in PLM

---
 lib/Insteon/AllLinkDatabase.pm | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 641db4914..2f24e92b7 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -2549,19 +2549,12 @@ sub _process_delete_queue {
 		}
                 else
                 {
-			if ($delete_req{linkdevice} eq $self)
-                        {
-				&::print_log("[Insteon::ALDB_PLM] now deleting orphaned link w/ details: "
-					. (($delete_req{is_controller}) ? "controller($delete_req{data3})" : "responder")
-					. ", " . (($delete_req{object}) ? "object=" . $delete_req{object}->get_object_name
-					: "deviceid=$delete_req{deviceid}") . ", group=$delete_req{group}")
-					if $main::Debug{insteon};
-				$self->delete_link(%delete_req);
-			}
-                        elsif ($delete_req{linkdevice})
-                        {
-				$delete_req{linkdevice}->delete_link(%delete_req);
-			}
+			&::print_log("[Insteon::ALDB_PLM] now deleting orphaned link w/ details: "
+				. (($delete_req{is_controller}) ? "controller($delete_req{data3})" : "responder")
+				. ", " . (($delete_req{object}) ? "object=" . $delete_req{object}->get_object_name
+				: "deviceid=$delete_req{deviceid}") . ", group=$delete_req{group}")
+				if $main::Debug{insteon};
+			$self->delete_link(%delete_req);
 		}
 	}
         else

From ea8b40f15714a69ed133cfced8da370d8fcf996d Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 16:15:53 -0700
Subject: [PATCH 271/330] Insteon: Make PLM Log Links Output Easier to Read

---
 lib/Insteon/AllLinkDatabase.pm | 48 ++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 2f24e92b7..acc815f09 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -2424,29 +2424,39 @@ sub log_alllink_table
 	my ($self) = @_;
         &::print_log("[Insteon::ALDB_PLM] Link table health: " . $self->health);
 	foreach my $linkkey (sort(keys(%{$$self{aldb}}))) {
-		my $data3 = $$self{aldb}{$linkkey}{data3};
 		my $is_controller = $$self{aldb}{$linkkey}{is_controller};
-		my $group = ($is_controller) ? $data3 : $$self{aldb}{$linkkey}{group};
+		my $group = $$self{aldb}{$linkkey}{group};
 		$group = '01' if $group eq '00';
-                my $deviceid = $$self{aldb}{$linkkey}{deviceid};
-		my $device = &Insteon::get_object($deviceid,$group);
-		my $object_name = '';
-                if ($device)
-                {
-                	$object_name = $device->get_object_name;
-                }
-                else
-                {
-                        $object_name = uc substr($deviceid,0,2) . '.' .
-                        	       uc substr($deviceid,2,2) . '.' .
-                                       uc substr($deviceid,4,2);
-                }
+		my $deviceid = $$self{aldb}{$linkkey}{deviceid};
+		my $linked_subgroup = '01';
+		my $controller_device;
+		my $controller_name;
+		if (!$is_controller){
+			$linked_subgroup = $group;
+		}
+		elsif ($group ne '00' && $group ne '01') {
+			$controller_device = Insteon::get_object('000000',$group);
+			$controller_name = $controller_device->get_object_name . " ($group)";
+		}
+		else {
+			$controller_name = $group;
+		}
+		my $linked_object = Insteon::get_object($deviceid,$linked_subgroup);
+		my $linked_name = '';
+		if ($linked_object) {
+			$linked_name = $linked_object->get_object_name;
+		}
+		else {
+			$linked_name = uc substr($deviceid,0,2) . '.' .
+				       uc substr($deviceid,2,2) . '.' .
+				       uc substr($deviceid,4,2);
+		}
 		&::print_log("[Insteon::ALDB_PLM] " .
-			(($is_controller) ? "cntlr($$self{aldb}{$linkkey}{group}) record to "
-			. $object_name
-			: "responder record to " . $object_name . "($$self{aldb}{$linkkey}{group})")
+			(($is_controller) ? "cntlr($controller_name) record to "
+			. $linked_name
+			: "responder record to " . $linked_name . "($$self{aldb}{$linkkey}{group})")
 			. " (d1=$$self{aldb}{$linkkey}{data1}, d2=$$self{aldb}{$linkkey}{data2}, "
-			. "d3=$data3)");
+			. "d3=$$self{aldb}{$linkkey}{data3})");
 	}
 }
 

From 7902e5708e843411cdad7b51a10d18e28a10b7a3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 17:42:43 -0700
Subject: [PATCH 272/330] Insteon: Place Skip Messages into Delete_Req

This way the print in the proper order with everything else.
---
 lib/Insteon/AllLinkDatabase.pm | 89 ++++++++++++++++++----------------
 1 file changed, 47 insertions(+), 42 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index acc815f09..6c14e711b 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -440,9 +440,9 @@ sub delete_orphan_links
 	my $selfname = $$self{device}->get_object_name;
 
 	# first, make sure that the health of ALDB is ok
-	if ($self->health ne 'good') {
-		if ($$self{device}->is_deaf) {
-			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Will not scan deaf device: $selfname");
+	if ($self->health ne 'good' || (!$$self{device}->isa('Insteon_PLM') && $$self{device}->is_deaf)) {
+		if (!$$self{device}->isa('Insteon_PLM') && $$self{device}->is_deaf) {
+			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Will not delete links on deaf device: $selfname");
 		} 
 		elsif ($self->health eq 'empty'){
 			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Skipping $selfname, because it has no links");
@@ -463,13 +463,14 @@ sub delete_orphan_links
 		# Skip empty addresses
 		next LINKKEY if ($linkkey eq 'empty');
 		
+		# Define delete request
+		my %delete_req = (callback => "$selfname->_aldb->_process_delete_queue()",);
+
 		# Delete duplicate entries
 		if ($linkkey eq 'duplicates') {
 			push my @duplicate_addresses, @{$$self{aldb}{duplicates}};
 			foreach (@duplicate_addresses) {
-				my %delete_req = (address => $_,
-					callback => "$selfname->_aldb->_process_delete_queue()",
-					cause => "it is a duplicate record");
+				%delete_req = (address => $_, cause => "it is a duplicate record");
 				push @{$$self{delete_queue}}, \%delete_req;
 			}
 			next LINKKEY;
@@ -477,28 +478,22 @@ sub delete_orphan_links
 
 		# Initialize Variables
 		my ($linked_device, $plm_scene, $controller_object, $link_defined,
-			$controller_id, $responder_id, $link_data3,
-			$recip_data3, $group_object, $interface_id,
-			$data3_object);
+			$controller_id, $responder_id, $link_data3, $recip_data3, 
+			$group_object, $data3_object);
 		my $group 		= lc $$self{aldb}{$linkkey}{group};
 		my $is_controller 	= $$self{aldb}{$linkkey}{is_controller};
 		my $data3 		= lc $$self{aldb}{$linkkey}{data3};
 		my $deviceid 		= lc $$self{aldb}{$linkkey}{deviceid};
 		my $self_id		= lc $$self{device}->device_id;
-		if ($$self{device}->isa('Insteon_PLM')){
-			$interface_id	= $self_id;
-		} 
-		else {
-			$interface_id	= lc $$self{device}->interface->device_id;
-		}
+		my $interface_id	= $self_id;
+		$interface_id = lc $$self{device}->interface->device_id if (!$$self{device}->isa('Insteon_PLM'));
 		$linked_device = Insteon::get_object($deviceid,'01');
 		$linked_device = Insteon::active_interface() if ($deviceid eq $interface_id);
 		$group_object = ($is_controller) ? Insteon::get_object($self_id, $group) : Insteon::get_object($deviceid, $group);
 		$data3_object = Insteon::get_object($self_id, $data3);
-		my %delete_req = (deviceid => $deviceid,
+		%delete_req = (deviceid => $deviceid,
 			group => $group,
 			is_controller => $is_controller,
-			callback => "$selfname->_aldb->_process_delete_queue()",
 			data3 => $data3);
 
 		# Is the linked device defined in MH?
@@ -506,14 +501,14 @@ sub delete_orphan_links
 			$delete_req{cause} = "no device with deviceid: $deviceid could be found";
 			push @{$$self{delete_queue}}, \%delete_req;
 			next LINKKEY;
-		} 
+		}
 
-		# IF link is a PLM Scene, is the PLM Scene defined in MH?
+		# If link is a PLM Scene, is the PLM Scene defined in MH?
 		if (($linked_device->isa("Insteon_PLM") and !$is_controller)||
 		($$self{device}->isa("Insteon_PLM") and $is_controller)) {
-			$plm_scene = &Insteon::get_object('000000', $group);
+			$plm_scene = Insteon::get_object('000000', $group);
 			if (!ref $plm_scene && $group ne '01' && $group ne '00') {
-				$delete_req{cause} = "no plm scene for this group could be found";
+				$delete_req{cause} = "no plm scene for group $group could be found";
 				push @{$$self{delete_queue}}, \%delete_req;
 				next LINKKEY;
 			}
@@ -552,12 +547,11 @@ sub delete_orphan_links
 		}
 
 		# Second, is this a PLM->Device, Device->PLM link, these are not members
-		if ($$self{device}->isa("Insteon_PLM") && ($data3 eq '00' || $data3 eq '01')){
+		if ($$self{device}->isa("Insteon_PLM")){
 			if ($is_controller && ($group eq '00' || $group eq '01')){
 				#Valid Controller for PLM->Device link
-				::print_log("[Insteon::AllLinkDatabase] Delete orphan links: "
-					."Skipping reciprocal link check for group 00 or 01 link from "
-					."$selfname to " . $linked_device->get_object_name); 
+				$delete_req{skip} = "$selfname -- Skipping reciprocal link check for controller group 00 or 01 link to "
+				. $linked_device->get_object_name; 
 				next LINKKEY;
 			}
 			elsif (!$is_controller && ref $group_object){
@@ -582,49 +576,63 @@ sub delete_orphan_links
 
 		# Third, delete link if not defined
 		if (!$link_defined){
-			$delete_req{cause} = "link is not defined in MisterHouse $linkkey";
+			$delete_req{cause} = "link is not defined in MisterHouse";
 			push @{$$self{delete_queue}}, \%delete_req;
 			next LINKKEY;
 		}
 
 		# Do not delete links to deaf devices
 		if (!$linked_device->isa('Insteon_PLM') && $linked_device->is_deaf) {
-			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: "
-				."ignoring link from $selfname to 'deaf' device: " . $linked_device->get_object_name);
+			$delete_req{skip} = "$selfname -- Skipping check for reciprocal links on deaf device " . $linked_device->get_object_name;
 			next LINKKEY;
 		}
 		
 		# Do not delete links to unhealthy devices 
 		if ($linked_device->_aldb->health ne 'good' && $linked_device->_aldb->health ne 'empty') {
-			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping check for reciprocal links from "
+			$delete_req{skip} = "$selfname -- Skipping check for reciprocal links on "
 				. $linked_device->get_object_name . " because aldb health of that device is "
-				. $linked_device->_aldb->health . ". Please rescan this device!!");
+				. $linked_device->_aldb->health . ". Please rescan this device.";
 			next LINKKEY;
 		}
 		
 		# Do not delete responder links from the PLM (prevents locking i2CS devices)
 		if ($linked_device->isa("Insteon_PLM") and !$is_controller && ($group eq '00' || $group eq '01')) {
-			::print_log("[Insteon::AllLinkDatabase] Skipping check for reciprocal link on PLM for responder "
-				."link on $selfname for group 00 or 01.");
+			$delete_req{skip} = "$selfname -- Skipping check for reciprocal controller link on PLM for group 00 or 01.";
 			next LINKKEY;
 		}
 
 		# Does a reciprocal link exist?
 		if (! $linked_device->has_link($$self{device},$group,($is_controller) ? 0 : 1, lc $recip_data3)) {
-			$delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name . " recip_data3 $recip_data3 linkkey $linkkey";
+			$delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name;
 			push @{$$self{delete_queue}}, \%delete_req;
 		} 
 
 	} # /LINKKEY Loop
+	my $index = 0;
 	foreach (@{$$self{delete_queue}}){
 		my %delete_req = %{$_};
 		my $audit_text = "(AUDIT)" if ($audit_mode);
-		my $log_text = "[Insteon::AllLinkDatabase] $audit_text Deleting the following link on $selfname because ";
-		$log_text .= $delete_req{cause} . "\n";
-		PRINT: for (keys %delete_req) {
-			next PRINT if ($_ eq 'cause');
-			next PRINT if ($_ eq 'callback');
-			$log_text .= "$_ = $delete_req{$_}; ";
+		my $log_text;
+		if ($delete_req{skip}){
+			$log_text = "[Insteon::AllLinkDatabase] $audit_text " . $delete_req{skip};
+			splice @{$$self{delete_queue}}, $index, 1;
+		} else {
+			$log_text = "[Insteon::AllLinkDatabase] $audit_text Deleting the following link on $selfname because ";
+			$log_text .= $delete_req{cause} . "\n";
+			PRINT: for (keys %delete_req) {
+				next PRINT if ($_ eq 'cause');
+				next PRINT if ($_ eq 'callback');
+				$log_text .= "$_ = $delete_req{$_}; ";
+			}
+			if ($delete_req{deviceid}){
+				my $reciprocal_object = Insteon::get_object($delete_req{deviceid}, '01');
+				if (!$delete_req{is_controller}){
+					$reciprocal_object = Insteon::get_object($delete_req{deviceid}, $delete_req{group});
+				}
+				my $reciprocal_name = $reciprocal_object->get_object_name;
+				$log_text .= "linked device name= " . $reciprocal_name;
+			}
+			$index ++;
 		}
 		::print_log($log_text);
 	}
@@ -2525,11 +2533,8 @@ sub delete_orphan_links
 
         &::print_log("[Insteon::ALDB_PLM] #### NOW BEGINNING DELETE ORPHAN LINKS ####");
 
-	@{$$self{delete_queue}} = (); # reset the work queue
 	$self->SUPER::delete_orphan_links($audit_mode);
 
-	$$self{delete_queue_processed} = 0; # reset the counter
-
 	# iterate over all registered objects and compare whether the link tables match defined scene linkages in known Insteon_Links
 	for my $obj (&Insteon::find_members('Insteon::BaseDevice'))
 	{

From a58f5ae0683f2c4bac0ca214a47ae7a09066ab12 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 17:44:09 -0700
Subject: [PATCH 273/330] Insteon: Fix Return from i2CS to Link to Interface

Was in the wrong location, which skipped adding the controller record on the device for device->PLM
---
 lib/Insteon/BaseInsteon.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 7a575d43d..edf517301 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1482,7 +1482,7 @@ sub link_to_interface_i2cs
 		case (2) { #Scan device to get an accurate link table
 			#return to normal link_to_interface routine if successful
 			$success_callback_prefix = $self->get_object_name."->link_to_interface('$p_group','$p_data3',";
-			$success_callback = $success_callback_prefix . "'2')";
+			$success_callback = $success_callback_prefix . "'1')";
 			$self->scan_link_table($success_callback, $failure_callback);
 		}
 	}

From 9c81b59e1b4b9dc26b7b897bb3e162de83568ce0 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 18:17:46 -0700
Subject: [PATCH 274/330] Insteon: Prevent Success Callback from Running on Get
 Engine NACK

Both the success callback and the failure callback were being called on an i2CS device when using the command link to interface.
---
 lib/Insteon/BaseInsteon.pm | 2 ++
 lib/Insteon/Message.pm     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index f465feef7..ee1de5a9a 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1886,6 +1886,8 @@ sub _get_engine_version_failure
 			."linked; Please use 'link to interface' voice command");
 		$self->engine_version('I2CS');
 	}
+	#Clear success callback, otherwise it will run when message is cleared
+	$self->interface->active_message->success_callback('0');
 }
 
 =item C<ping([count])>
diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index fea11d116..fbdb13a34 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -113,7 +113,7 @@ Data will be evaluated after the receipt of an ACK from the device for this comm
 sub success_callback
 {
 	my ($self, $callback) = @_;
-        if ($callback)
+        if (defined $callback)
         {
         	$$self{success_callback} = $callback;
         }

From 038387d3e72c199e6b247df3145d4fbf080c072d Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 19 Oct 2013 19:35:58 -0700
Subject: [PATCH 275/330] Insteon: Fix Merge Conflict Bug

---
 lib/Insteon/BaseInsteon.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 188c85f0f..5946f27d8 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -3441,6 +3441,7 @@ Returns the root object of a device, in this case the interface.
 sub get_root {
 	my ($self) = @_;
 	return $self->interface;
+}
 
 sub is_responder {
 	return 1;

From 10f0dc5bf8fbc7e851fd7c85e0eae96c9fae986f Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Sun, 20 Oct 2013 01:31:41 -0400
Subject: [PATCH 276/330] Simplify pa type iteration, switch to arrow notation
 for referenced hash values.

---
 code/common/pa_control.pl |  14 ++--
 lib/PAobj.pm              | 162 +++++++++++---------------------------
 2 files changed, 51 insertions(+), 125 deletions(-)

diff --git a/code/common/pa_control.pl b/code/common/pa_control.pl
index 3418fb753..bb36db5ab 100644
--- a/code/common/pa_control.pl
+++ b/code/common/pa_control.pl
@@ -100,11 +100,11 @@ sub pa_parms_stub {
     } else {
         #MH is already speaking, and other PA zones are already active. Delay speech.
         if ($main::Debug{voice}) {
-            $$parms{clash_retry}=0 unless $$parms{clash_retry};
-            &print_log("PA SPEECH CLASH($$parms{clash_retry}): Delaying speech call for " . $$parms{text} . "\n") unless $$parms{clash_retry} lt 1;
-            $$parms{clash_retry}++; #To track how many loops are made
+            $parms->{clash_retry}=0 unless $parms->{clash_retry};
+            &print_log("PA SPEECH CLASH($parms->{clash_retry}): Delaying speech call for " . $parms->{text} . "\n") unless $parms->{clash_retry} lt 1;
+            $parms->{clash_retry}++; #To track how many loops are made
         }
-        $$parms{nolog}=1;       #To stop MH from logging the speech again
+        $parms->{nolog}=1;       #To stop MH from logging the speech again
 
         my $parmstxt;
         my ($pkey,$pval);
@@ -112,13 +112,13 @@ sub pa_parms_stub {
             $parmstxt.=', ' if $parmstxt;
             $parmstxt .= "$pkey => q($pval)";
         }
-        &print_log("PA SPEECH CLASH Parameters: $parmstxt") if $main::Debug{voice} && $$parms{clash_retry} eq 0;
+        &print_log("PA SPEECH CLASH Parameters: $parmstxt") if $main::Debug{voice} && $parms->{clash_retry} eq 0;
         &run_after_delay($pa_clash_delay, "speak($parmstxt)");
 
-        $$parms{no_speak}=1;    #To stop MH from speaking this time around
+        $parms->{no_speak}=1;    #To stop MH from speaking this time around
         return;
     }
-    if ($$parms{clash_retry}) {
+    if ($parms->{clash_retry}) {
         &print_log("PA SPEECH CLASH: Resolved, continuing speech.");
     }
 }
diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index 8091f851c..4a7f1949a 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -49,7 +49,7 @@ sub new
 
     bless $self,$class;
 
-    $$self{pa_delay} = 0.5;
+    $self->{pa_delay} = 0.5;
 
     return $self;
 }
@@ -66,66 +66,26 @@ sub init {
     $self->active(0);
 
     my @speakers = $self->get_speakers('allspeakers');
-    my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl,@speakers_audrey,@speakers_aviosys);
+    my %speakertype;
 
     for my $room (@speakers) {
         my $ref = &::get_object_by_name("pa_$room");
         my $type = $ref->get_type();
         &::print_log("PAobj: init: room=$room, zonetype=$type") if $main::Debug{pa};
         $pa_zone_types{$type}++ unless $pa_zone_types{$type};
-        
-        if($type eq 'wdio') {
-            push(@speakers_wdio,$room);
-        }
-        if($type eq 'x10') {
-            push(@speakers_x10,$room);
-        }
-        if($type eq 'xap') {
-            push(@speakers_xap,$room);
-        }
-        if($type eq 'xpl') {
-            push(@speakers_xpl,$room);
-        }
-        if($type eq 'object') {
-            push(@speakers_obj,$room);
-        }
-        if($type eq 'audrey') {
-            push(@speakers_audrey,$room);
-        }
-        if($type eq 'aviosys') {
-            push(@speakers_aviosys,$room);
-        }
+        push(@{$speakertype{$type}}, $room);
     }
     
-    &::print_log("PAobj: speakers_wdio: $#speakers_wdio") if $main::Debug{pa};# || $#speakers_wdio gt -1;
-    &::print_log("PAobj: speakers_x10: $#speakers_x10") if $main::Debug{pa};# || $#speakers_x10 gt -1;
-    &::print_log("PAobj: speakers_xap: $#speakers_xap") if $main::Debug{pa};# || $#speakers_xap gt -1;
-    &::print_log("PAobj: speakers_xpl: $#speakers_xpl") if $main::Debug{pa};# || $#speakers_xpl gt -1;
-    &::print_log("PAobj: speakers_audrey: $#speakers_audrey") if $main::Debug{pa};# || $#speakers_audrey gt -1;
-    &::print_log("PAobj: speakers_aviosys: $#speakers_aviosys") if $main::Debug{pa};# || $#speakers_aviosys gt -1;
-    &::print_log("PAobj: speakers_obj: $#speakers_obj") if $main::Debug{pa};# || $#speakers_obj gt -1;
-
-
-    $pa_zones{all}{wdio}=join(',',@speakers_wdio);
-    $pa_zones{all}{x10}=join(',',@speakers_x10);
-    $pa_zones{all}{xap}=join(',',@speakers_xap);
-    $pa_zones{all}{xpl}=join(',',@speakers_xpl);
-    $pa_zones{all}{audrey}=join(',',@speakers_audrey);
-    $pa_zones{all}{aviosys}=join(',',@speakers_aviosys);
-    $pa_zones{all}{obj}=join(',',@speakers_obj);
-
-    if ($#speakers_wdio > -1) {
-        $self->init_weeder(@speakers_wdio);
-    }
-    if ($pa_zone_types{'x10'}) {
-        &::print_log("PAobj: x10 PA type initialized...") if $main::Debug{pa};
-    }
-    if ($pa_zone_types{'xap'}) {
-        &::print_log("PAobj: xAP PA type initialized...") if $main::Debug{pa};
-    }
-    if ($pa_zone_types{'xpl'}) {
-        &::print_log("PAobj: xPL PA type initialized...") if $main::Debug{pa};
-    }
+    foreach my $type (keys(%speakertype)) {
+        my @thespeakers = \@{$speakertype{$type}};
+        &::print_log("PAobj: speakers_$type: $#thespeakers") if $main::Debug{pa};
+        $pa_zones{all}{$type}=join(',',@thespeakers);
+        if ($#thespeakers > -1) {
+            &::print_log("PAobj: $type PA type initialized...") if $main::Debug{pa};
+            $self->init_weeder(@thespeakers) if $type eq 'wdio';
+        }
+    } 
+
     return 1;
 }
 
@@ -162,10 +122,10 @@ sub active
     &::print_log("PAobj: setactive: active: $active / set: $setactive\n") if $main::Debug{pa} >=4;
     return $active unless defined $setactive;
     if($active && $setactive) {
-        &::print_log("PAobj: Cannot make active, already active\n") if $main::Debug{pa} >=3;
+        &::print_log("PAobj: Cannot make active, already active\n") if $main::Debug{pa};
         return 0;
     }
-    &::print_log("PAobj: setting active to: ".$setactive."\n") if $main::Debug{pa} >=3;
+    &::print_log("PAobj: setting active to: ".$setactive."\n") if $main::Debug{pa} >=2;
     $active=$setactive;
     return 1;
 }
@@ -184,59 +144,24 @@ sub prep_parms
     
     $parms->{pa_zones} = join(',', @speakers);
     
-    my (@speakers_wdio,@speakers_x10,@speakers_obj,@speakers_xap,@speakers_xpl,@speakers_audrey,@speakers_aviosys);
+    my %speakertype;
 
     for my $room (@speakers) {
         my $ref = &::get_object_by_name("pa_$room");
-        my $type = lc $ref->get_type();
-        if($type eq 'wdio' || $type eq 'wdio_old') {
-            &::print_log("PAobj: speakers_wdio: Adding $room") if $main::Debug{pa} >=3;
-            push(@speakers_wdio,$room);
-        }
-        if($type eq 'x10') {
-            &::print_log("PAobj: speakers_x10: Adding $room") if $main::Debug{pa} >=3;
-            push(@speakers_x10,$room);
-        }
-        if($type eq 'xap') {
-            &::print_log("PAobj: speakers_xap: Adding $room") if $main::Debug{pa} >=3;
-            push(@speakers_xap,$room);
-        }
-        if($type eq 'xpl') {
-            &::print_log("PAobj: speakers_xpl: Adding $room") if $main::Debug{pa} >=3;
-            push(@speakers_xpl,$room);
-        }
-        if($type eq 'audrey') {
-            &::print_log("PAobj: speakers_audrey: Adding $room") if $main::Debug{pa} >=3;
-            push(@speakers_audrey,$room);
-        }
-        if($type eq 'aviosys') {
-            &::print_log("PAobj: speakers_aviosys: Adding $room") if $main::Debug{pa} >=3;
-            push(@speakers_aviosys,$room);
-        }
-        if($type eq 'object') {
-            &::print_log("PAobj: speakers_object: Adding $room") if $main::Debug{pa} >=3;
-            push(@speakers_obj,$room);
-        }
+        my $type = $ref->get_type();
+         &::print_log("PAobj: speakers_$type: Adding $room") if $main::Debug{pa} >=3;
+        $pa_zone_types{$type}++ unless $pa_zone_types{$type};
+        push(@{$speakertype{$type}}, $room);
     }
     
-    &::print_log("PAobj: speakers_wdio: $#speakers_wdio") if $main::Debug{pa}  >=2 || $#speakers_wdio gt -1;
-    &::print_log("PAobj: speakers_x10: $#speakers_x10") if $main::Debug{pa}  >=2 || $#speakers_x10 gt -1;
-    &::print_log("PAobj: speakers_xap: $#speakers_xap") if $main::Debug{pa}  >=2 || $#speakers_xap gt -1;
-    &::print_log("PAobj: speakers_xpl: $#speakers_xpl") if $main::Debug{pa}  >=2 || $#speakers_xpl gt -1;
-    &::print_log("PAobj: speakers_audrey: $#speakers_audrey") if $main::Debug{pa}  >=2 || $#speakers_audrey gt -1;
-    &::print_log("PAobj: speakers_aviosys: $#speakers_aviosys") if $main::Debug{pa}  >=2 || $#speakers_aviosys gt -1;
-    &::print_log("PAobj: speakers_obj: $#speakers_obj") if $main::Debug{pa}  >=2 || $#speakers_obj gt -1;
-
-    
-    $pa_zones{active}{wdio}=join(',',@speakers_wdio);
-    $pa_zones{active}{x10}=join(',',@speakers_x10);
-    $pa_zones{active}{xap}=join(',',@speakers_xap);
-    $pa_zones{active}{xpl}=join(',',@speakers_xpl);
-    $pa_zones{active}{audrey}=join(',',@speakers_audrey);
-    $pa_zones{active}{aviosys}=join(',',@speakers_aviosys);
-    $pa_zones{active}{obj}=join(',',@speakers_obj);
-    
-    $parms->{web_file}="web_file" if $#speakers_audrey gt -1;
+    foreach my $type (keys(%speakertype)) {
+        my @thespeakers = @{$speakertype{$type}};
+        &::print_log("PAobj: speakers_$type: $#thespeakers: " . join(',',@thespeakers)) if $main::Debug{pa};
+        $pa_zones{active}{$type}=join(',',@thespeakers);
+        if ($#thespeakers > -1) {
+            $parms->{web_file}="web_file" if $type eq 'audrey';
+        }
+    }
     
     if(
         1
@@ -248,7 +173,7 @@ sub prep_parms
         && $pa_zones{active}{obj} eq ''
         
     ) {
-        $$parms{to_file}='/dev/null';
+        $parms->{to_file}='/dev/null';
     }
     
     return 1;
@@ -297,7 +222,7 @@ sub audio_hook
     $results = $self->set_obj($state,@speakers_obj) 			if $#speakers_obj > -1;
     
     &::print_log("PAobj: set results: $results") if $main::Debug{pa};
-    select undef, undef, undef, $$self{pa_delay} if $results;
+    select undef, undef, undef, $self->{pa_delay} if $results;
     
     $results=0;
     if(
@@ -469,7 +394,8 @@ sub get_weeder_string
 
     for $bit ('A' .. $pa_weeder_max_port{$card}) {
         $id = $card . 'L' . $bit;
-        $id = "D$id" if $$self{pa_type} eq 'wdio_old'; #TODO: Find way to implement this with new code
+        #TODO: Find way to implement this with new code
+        #$id = "D$id" if $self->{pa_type} eq 'wdio_old';
         my $ref = &Device_Item::item_by_id($id);
         if ($ref) {
             $state = $ref->{state};
@@ -495,7 +421,7 @@ sub get_weeder_string
         $weeder_code = $decimal_to_hex{$byte_code} . $weeder_code;
     }
 
-    if ($$self{pa_type} eq 'wdio_old') { #TODO: Find way to implement this with new code
+    if ($self->{pa_type} eq 'wdio_old') { #TODO: Find way to implement this with new code
         $card = "D$card";
         $weeder_code = 'h' . $weeder_code;
     }
@@ -613,7 +539,7 @@ sub get_pa_zones
 sub set_delay
 {
     my ($self,$delay) = @_;
-    $$self{pa_delay} = $delay;
+    $self->{pa_delay} = $delay;
 }
 
 sub print_speaker_states
@@ -648,11 +574,11 @@ sub new
 
     bless $self,$class;
 
-    $$self{name}		= $paz_name;
-    $$self{address}	= $paz_address;
-    $$self{groups}	= $paz_groups;
-    $$self{serial}	= $paz_serial;
-    $$self{other}		= $paz_other;
+    $self->{name}		= $paz_name;
+    $self->{address}	= $paz_address;
+    $self->{groups}	= $paz_groups;
+    $self->{serial}	= $paz_serial;
+    $self->{other}		= $paz_other;
 
     return $self;
 }
@@ -665,31 +591,31 @@ sub init
 sub get_address
 {
     my ($self) = @_;
-    return $$self{address};
+    return $self->{address};
 }
 
 sub get_name
 {
     my ($self) = @_;
-    return $$self{name};
+    return $self->{name};
 }
 
 sub get_groups
 {
     my ($self) = @_;
-    return $$self{groups};
+    return $self->{groups};
 }
 
 sub get_serial
 {
     my ($self) = @_;
-    return $$self{serial};
+    return $self->{serial};
 }
 
 sub get_type
 {
     my ($self) = @_;
-    return $$self{other};
+    return $self->{other};
 }
 
 1;

From 6cb48b78d9fb8648986338c6fecf6e3762ceaef9 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Sun, 20 Oct 2013 01:49:18 -0400
Subject: [PATCH 277/330] Fix array reference for wdio.

---
 lib/PAobj.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index 4a7f1949a..abee38043 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -77,7 +77,7 @@ sub init {
     }
     
     foreach my $type (keys(%speakertype)) {
-        my @thespeakers = \@{$speakertype{$type}};
+        my @thespeakers = @{$speakertype{$type}};
         &::print_log("PAobj: speakers_$type: $#thespeakers") if $main::Debug{pa};
         $pa_zones{all}{$type}=join(',',@thespeakers);
         if ($#thespeakers > -1) {

From 10e62b596bc02447eec0bdf9c043781dc06dd8cc Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Sun, 20 Oct 2013 02:00:39 -0400
Subject: [PATCH 278/330] Cause print_log statements to display the actual
 number of array elements, rather than the index of the last element. (index 0
 = element 1)

---
 lib/PAobj.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index abee38043..a106a067b 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -78,7 +78,7 @@ sub init {
     
     foreach my $type (keys(%speakertype)) {
         my @thespeakers = @{$speakertype{$type}};
-        &::print_log("PAobj: speakers_$type: $#thespeakers") if $main::Debug{pa};
+        &::print_log("PAobj: speakers_$type: ".($#thespeakers+1)) if $main::Debug{pa};
         $pa_zones{all}{$type}=join(',',@thespeakers);
         if ($#thespeakers > -1) {
             &::print_log("PAobj: $type PA type initialized...") if $main::Debug{pa};
@@ -156,7 +156,7 @@ sub prep_parms
     
     foreach my $type (keys(%speakertype)) {
         my @thespeakers = @{$speakertype{$type}};
-        &::print_log("PAobj: speakers_$type: $#thespeakers: " . join(',',@thespeakers)) if $main::Debug{pa};
+        &::print_log("PAobj: speakers_$type: ".($#thespeakers+1).": " . join(',',@thespeakers)) if $main::Debug{pa};
         $pa_zones{active}{$type}=join(',',@thespeakers);
         if ($#thespeakers > -1) {
             $parms->{web_file}="web_file" if $type eq 'audrey';
@@ -271,7 +271,7 @@ sub set_audrey
 {
     my ($self,$speakFile,@speakers) = @_;
     &::print_log("PAobj: set_audrey: file: " . $speakFile) if $main::Debug{pa} >=4;
-    &::print_log("PAobj: set_audrey: count: " . $#speakers) if $main::Debug{pa} >=4;
+    &::print_log("PAobj: set_audrey: count: " . ($#speakers+1)) if $main::Debug{pa} >=4;
     
     for my $room (@speakers) {
         #my $ref = &::get_object_by_name('pa_'.$room);
@@ -496,7 +496,7 @@ sub check_group
     my $ref = &::get_object_by_name("pa_$group");
     if (!$ref) {&::print_log("PAobj: check group: Error! Group does not exist: $group"); return;}
     my @list = $ref->list;
-    &::print_log("PAobj: check group=$group, list=$#list") if $main::Debug{pa} >=2;
+    &::print_log("PAobj: check group=$group, list=".($#list+1)) if $main::Debug{pa} >=2;
     if ($#list == -1) {
         &::print_log("PAobj: check populating group: $group!") if $main::Debug{pa};
         for my $room ($self->get_speakers('allspeakers')) {
@@ -522,7 +522,7 @@ sub get_speakers_speakable
             my $gss_mode = $ref->{mode};
             if ($gss_mode ne 'sleeping' && ($gss_mode eq 'normal' || $mode eq 'unmuted')) {
                 push(@pazones,$room);
-                &::print_log("PAobj: speakable: Pushing $room into pazones array:$#pazones") if $main::Debug{pa} >=2;
+                &::print_log("PAobj: speakable: Pushed $room into pazones array. New count:".($#pazones+1)) if $main::Debug{pa} >=2;
             }
         }
     }

From 242f9890e3b202b5a9874e72b71f5903524587a4 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 20 Oct 2013 09:57:53 -0700
Subject: [PATCH 279/330] Insteon: Don't Try and Name Unknown Objects in Delete
 Orphans

---
 lib/Insteon/AllLinkDatabase.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 6c14e711b..0b11aa306 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -629,8 +629,9 @@ sub delete_orphan_links
 				if (!$delete_req{is_controller}){
 					$reciprocal_object = Insteon::get_object($delete_req{deviceid}, $delete_req{group});
 				}
-				my $reciprocal_name = $reciprocal_object->get_object_name;
-				$log_text .= "linked device name= " . $reciprocal_name;
+				if (ref $reciprocal_object) {
+					$log_text .= "linked device name= " . $reciprocal_object->get_object_name;
+				}
 			}
 			$index ++;
 		}

From 2e69fea9886464256f97fd16707dda2bafd8a5d5 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 20 Oct 2013 10:27:27 -0700
Subject: [PATCH 280/330] Insteon: Move Device Parameter Flags in BaseObject
 add to BaseInterface

This includes, is_deaf, is_responder, is_controller parameters.  No need to continue calling both isa('Insteon::BaseDevice') and these functions.
---
 lib/Insteon/BaseInsteon.pm   | 134 +++++++++++++++++++----------------
 lib/Insteon/BaseInterface.pm |  34 +++++++++
 2 files changed, 108 insertions(+), 60 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 68ba714e8..876491412 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -127,6 +127,7 @@ sub new
 	$$self{is_responder} = 1;
         $$self{default_hop_count} = 0;
 	$$self{timeout_factor} = 1.0;
+	$$self{is_deaf} = 0;
 
 	&Insteon::add($self);
 	return $self;
@@ -1124,6 +1125,69 @@ sub get_voice_cmds
     return \%voice_cmds;
 }
 
+sub _aldb
+{
+   my ($self) = @_;
+   my $root_obj = $self->get_root();
+   return $$root_obj{aldb};
+}
+
+=item C<is_deaf()>
+
+Returns true if the device must be awake in order to respond to messages.  Most
+devices are not deaf, currently devices that are deaf are battery operated
+devices such as the Motion Sensor, RemoteLinc and TriggerLinc.
+
+At the BaseObject level all devices are defined as not deaf.  Objects which
+inherit BaseObject should redefine is_deaf as necessary.
+
+=cut
+
+sub is_deaf
+{
+	my ($self) = @_;
+	return $$self{is_deaf};
+}
+
+=item C<is_controller()>
+
+Returns true if the device is a controller.
+
+=cut
+
+sub is_controller
+{
+	my ($self) = @_;
+	return $$self{is_controller};
+}
+
+=item C<is_responder([1|0])>
+
+Stores and returns whether a device is a responder.
+
+=cut
+
+sub is_responder
+{
+	my ($self,$is_responder) = @_;
+	$$self{is_responder} = $is_responder if defined $is_responder;
+	if ($self->is_root) {
+		return $$self{is_responder};
+	}
+        else
+        {
+		my $root_obj = $self->get_root();
+		if (ref $root_obj)
+                {
+			return $$root_obj{is_responder};
+		}
+                else
+                {
+			return 0;
+		}
+	}
+}
+
 =back
 
 =head2 INI PARAMETERS
@@ -1277,7 +1341,6 @@ sub new
 	$$self{max_queue_time} = 10 unless $$self{max_queue_time}; # 10 seconds is max time allowed in command stack
 	@{$$self{command_stack}} = ();
 	$$self{_onlevel} = undef;
-	$$self{is_responder} = 1;
     $$self{retry_count_log} = 0;
     $$self{fail_count_log} = 0;
     $$self{outgoing_count_log} = 0;
@@ -1287,7 +1350,7 @@ sub new
     $$self{hops_left_count} = 0;
     $$self{max_hops_count} = 0;
     $$self{outgoing_hop_count} = 0;
-	$$self{is_deaf} = 0;
+
 
 	return $self;
 }
@@ -1322,62 +1385,6 @@ sub rate
 	return $$self{rate};
 }
 
-=item C<is_deaf()>
-
-Returns true if the device must be awake in order to respond to messages.  Most
-devices are not deaf, currently devices that are deaf are battery operated
-devices such as the Motion Sensor, RemoteLinc and TriggerLinc.
-
-At the BaseObject level all devices are defined as not deaf.  Objects which
-inherit BaseObject should redefine is_deaf as necessary.
-
-=cut
-
-sub is_deaf
-{
-	my ($self) = @_;
-	return $$self{is_deaf};
-}
-
-=item C<is_controller()>
-
-Returns true if the device is a controller.
-
-=cut
-
-sub is_controller
-{
-	my ($self) = @_;
-	return $$self{is_controller};
-}
-
-=item C<is_responder([1|0])>
-
-Stores and returns whether a device is a responder.
-
-=cut
-
-sub is_responder
-{
-	my ($self,$is_responder) = @_;
-	$$self{is_responder} = $is_responder if defined $is_responder;
-	if ($self->is_root) {
-		return $$self{is_responder};
-	}
-        else
-        {
-		my $root_obj = $self->get_root();
-		if (ref $root_obj)
-                {
-			return $$root_obj{is_responder};
-		}
-                else
-                {
-			return 0;
-		}
-	}
-}
-
 =item C<link_to_interface([group,data3])>
 
 If a controller link from the device to the interface does not exist, this will
@@ -3471,8 +3478,15 @@ sub is_root
    return 0;
 }
 
-sub is_responder {
-	return 1;
+=item C<get_root()>
+
+Returns the root object of a device, in this case the interface.
+
+=cut
+
+sub get_root {
+	my ($self) = @_;
+	return $self->interface;
 }
 
 # For IFaceControllers, need to call set_linked_devices
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 5d0faf805..0b87c4806 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -926,6 +926,40 @@ sub get_voice_cmds
     return \%voice_cmds;
 }
 
+=item C<is_deaf()>
+
+Returns false.
+
+=cut
+
+sub is_deaf
+{
+	return 0;
+}
+
+=item C<is_controller()>
+
+Returns true.
+
+=cut
+
+sub is_controller
+{
+	return 1;
+}
+
+=item C<is_responder()>
+
+Returns true.
+
+=cut
+
+sub is_responder
+{
+	return 1;
+}
+
+
 =back
 
 =head2 INI PARAMETERS

From 9cebf7d227e00103ae99a6054f97c4aa4c17cfc2 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 20 Oct 2013 11:20:30 -0700
Subject: [PATCH 281/330] Insteon: Remove Extra ISA Calls from Sync Links

---
 lib/Insteon/BaseInsteon.pm | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index e34451c3f..2801650e5 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2857,33 +2857,32 @@ sub sync_links
 	my $insteon_object = $self->interface;
 	my $interface_object = Insteon::active_interface();
 	my $interface_name = $interface_object->get_object_name;
-	if (!($self->isa('Insteon::InterfaceController'))) {
-		$insteon_object = $self->get_root;
-		::print_log("[Insteon::BaseController] WARN!! A device w/ insteon address: " . $self->device_id . ":01 could not be found. "
-			. "Please double check your items.mht file.") if (!(defined($insteon_object)));
-	}
+	$insteon_object = $self->get_root;
+	::print_log("[Insteon::BaseController] WARN!! A device w/ insteon address: " . $self->device_id . ":01 could not be found. "
+		. "Please double check your items.mht file.") if (!(defined($insteon_object)));
 
 	# Abort if $insteon_object doesn't exist
 	$self->_process_sync_queue() unless $insteon_object;
 	
 	# Warn if device is deaf or ALDB out of sync
-	if ((!$self->isa('Insteon::InterfaceController') && $insteon_object->is_deaf)) {
+	my $insteon_object_is_syncable = 1;
+	if ($insteon_object->is_deaf) {
 		::print_log("[Insteon::BaseController] WARN! $self_link_name is a deaf device, responder links will be added to devices "
 			."controlled by this device, but no links will be added to $self_link_name.");
+		$insteon_object_is_syncable = 0;
 	}
-	elsif (!$self->isa('Insteon::InterfaceController') &&
-	($insteon_object->_aldb->health ne 'good' && $insteon_object->_aldb->health ne 'empty')){
+	elsif ($insteon_object->_aldb->health ne 'good' && $insteon_object->_aldb->health ne 'empty'){
 		::print_log("[Insteon::BaseController] WARN! The ALDB of $self_link_name is ".$insteon_object->_aldb->health
 			.", links will be added to devices "
 			."linked to this device, but no links will be added to $self_link_name.  Please rescan this device and attempt "
 			."sync links again.");
+		$insteon_object_is_syncable = 0;
 	}
 	
 	# 1. Does a controller link exist for Device-> PLM
-	if ((!$self->isa('Insteon::InterfaceController') && 
+	if (!$insteon_object->isa('Insteon_PLM') && 
 	!$insteon_object->has_link($self->interface,$self->group,1,$subaddress) && 
-	!$insteon_object->is_deaf &&
-	($insteon_object->_aldb->health eq 'good' || $insteon_object->_aldb->health eq 'empty'))) {
+	$insteon_object_is_syncable) {
 		my %link_req = ( member => $insteon_object, cmd => 'add', object => $self->interface,
 			group => $self->group, is_controller => 1,
 			callback => "$self_link_name->_process_sync_queue()",
@@ -2894,7 +2893,7 @@ sub sync_links
 	}
 		
 	# 2. Does a responder link exist on the PLM
-	if ((!$self->isa('Insteon::InterfaceController') &&
+	if ((!$insteon_object->isa('Insteon_PLM') &&
 	!$self->interface->has_link($insteon_object,$self->group,0,'00'))) {
 		my %link_req = ( member => $self->interface, cmd => 'add', object => $insteon_object,
 			group => $self->group, is_controller => 0,
@@ -2994,8 +2993,7 @@ sub sync_links
 
 		# 5. Does the controller link on this device exist
 		if (!($insteon_object->has_link($member, $self->group, 1, $subaddress)) &&
-		!$insteon_object->is_deaf &&
-		($insteon_object->_aldb->health eq 'healthy' || $insteon_object->_aldb->health eq 'empty')) {
+		$insteon_object_is_syncable) {
 			my %link_req = ( member => $insteon_object, cmd => 'add', object => $member,
 				group => $self->group, is_controller => 1,
 				callback => "$self_link_name->_process_sync_queue()",

From 3de22c1161ef3c76fb5960d8771036f778a7323c Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 20 Oct 2013 12:00:20 -0700
Subject: [PATCH 282/330] Insteon: Do Not Get Root Obj for IFaceController in
 Is_Responder

IFace Controller are responders, but root object PLM is not.
---
 lib/Insteon/BaseInsteon.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 876491412..c44c8bcdd 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1171,7 +1171,7 @@ sub is_responder
 {
 	my ($self,$is_responder) = @_;
 	$$self{is_responder} = $is_responder if defined $is_responder;
-	if ($self->is_root) {
+	if ($self->is_root || $self->isa('Insteon::InterfaceController')) {
 		return $$self{is_responder};
 	}
         else

From 6330e56bdd6a2197e2a93c6f5d990a8aba16d596 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 20 Oct 2013 12:27:05 -0700
Subject: [PATCH 283/330] Insteon: KeyPadLinc Subgroups Derive Link State is
 Not Dimmable

The subgroups are not dimmable
---
 lib/Insteon/BaseInsteon.pm |  7 ++++---
 lib/Insteon/Lighting.pm    | 12 ++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 68ba714e8..dba1a97f7 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -443,6 +443,7 @@ sub set_receive
 	my ($self, $p_state, $p_setby, $p_response) = @_;
 	my $curr_milli = sprintf('%.0f', &main::get_tickcount);
 	my $window = 1000;
+	$p_state = $self->derive_link_state($p_state);
 	if (($p_state eq $self->state || $p_state eq $self->state_final)
 		&& ($curr_milli - $$self{set_milliseconds} < $window)){
 		::print_log("[Insteon::BaseObject] Ignoring duplicate set " . $p_state .
@@ -3135,8 +3136,8 @@ sub set_linked_devices
 					# remember the current state to support resume
 					$$self{members}{$member_ref}{resume_state} = $light->state;
 					$member->manual($light, $ramp_rate);
-					if ($light->can('derive_link_state') && lc $link_state ne 'on'){
-						$local_state = $light->derive_link_state($link_state);
+					if (lc $link_state ne 'on'){
+						$local_state = $light->$link_state;
 					}
 					$light->set_receive($local_state,$self);
 				}
@@ -3153,7 +3154,7 @@ sub set_linked_devices
 				# if they are Insteon_Device objects, then simply set_receive their state to
 				#   the member on level
 				if (lc $link_state ne 'on'){
- 					$local_state = $member->derive_link_state($link_state);
+ 					$local_state = $link_state;
 				}
 				$member->set_receive($local_state,$self);
 			}
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index a4e23830a..4b786516f 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -986,6 +986,18 @@ sub get_voice_cmds
     return \%voice_cmds;
 }
 
+# The subgroup items are not dimmable, so call BaseInsteon for them
+
+sub derive_link_state
+{
+	my ($self, $p_state) = @_;
+	if ($self->group eq '01'){
+		return $self->SUPER::derive_link_state($p_state);
+	} else {
+		return $self->Insteon::BaseObject::derive_link_state($p_state);
+	}
+}
+
 =back
 
 =head2 AUTHOR

From 1e6d29195c1e63028796dd9dba610490f6862f11 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 20 Oct 2013 12:42:19 -0700
Subject: [PATCH 284/330] Insteon: Insert Delete_Req Hash Into Itself so as not
 to Delete Callback

---
 lib/Insteon/AllLinkDatabase.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 0b11aa306..97b01c0f0 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -470,7 +470,7 @@ sub delete_orphan_links
 		if ($linkkey eq 'duplicates') {
 			push my @duplicate_addresses, @{$$self{aldb}{duplicates}};
 			foreach (@duplicate_addresses) {
-				%delete_req = (address => $_, cause => "it is a duplicate record");
+				%delete_req = (%delete_req, address => $_, cause => "it is a duplicate record");
 				push @{$$self{delete_queue}}, \%delete_req;
 			}
 			next LINKKEY;
@@ -491,10 +491,8 @@ sub delete_orphan_links
 		$linked_device = Insteon::active_interface() if ($deviceid eq $interface_id);
 		$group_object = ($is_controller) ? Insteon::get_object($self_id, $group) : Insteon::get_object($deviceid, $group);
 		$data3_object = Insteon::get_object($self_id, $data3);
-		%delete_req = (deviceid => $deviceid,
-			group => $group,
-			is_controller => $is_controller,
-			data3 => $data3);
+		%delete_req = (%delete_req, deviceid => $deviceid, group => $group,
+			is_controller => $is_controller, data3 => $data3);
 
 		# Is the linked device defined in MH?
 		if (! ref $linked_device) {

From ce6d858c8fe9871a8b34e7c7c293b754a99ef073 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 20 Oct 2013 13:12:56 -0700
Subject: [PATCH 285/330] Insteon: Add Inline Debug Msg When Skipping a Link
 Due to ALDB Health in Sync Links

---
 lib/Insteon/BaseInsteon.pm | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index d779d0023..f5e196f9e 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2868,8 +2868,8 @@ sub sync_links
 	# Warn if device is deaf or ALDB out of sync
 	my $insteon_object_is_syncable = 1;
 	if ($insteon_object->is_deaf) {
-		::print_log("[Insteon::BaseController] WARN! $self_link_name is a deaf device, responder links will be added to devices "
-			."controlled by this device, but no links will be added to $self_link_name.");
+		::print_log("[Insteon::BaseController] $self_link_name is deaf, only responder links will be added to devices "
+			."controlled by this device.");
 		$insteon_object_is_syncable = 0;
 	}
 	elsif ($insteon_object->_aldb->health ne 'good' && $insteon_object->_aldb->health ne 'empty'){
@@ -2942,6 +2942,17 @@ sub sync_links
 			$link_req{cause} = "Adding responder record to $member_name from $self_link_name";
 			push @{$$self{sync_queue}}, \%link_req;
 			$has_link = 0;
+		} 
+		elsif ($member_root->_aldb->health ne 'good' && $member_root->_aldb->health ne 'empty'){
+			my %link_req = ( member => $member, cmd => 'add', object => $insteon_object,
+				group => $self->group, is_controller => 0,
+				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
+				callback => "$self_link_name->_process_sync_queue()",
+				data3 => $member->group);
+			$link_req{skip} = "Unable to add the following responder record to $member_name "
+				."from $self_link_name because the aldb of $member_name is "
+				. $member_root->_aldb->health;
+			push @{$$self{sync_queue}}, \%link_req;
 		}
 		
 		# 4. Is the responder link accurate
@@ -3005,6 +3016,7 @@ sub sync_links
 	}
 	
 	my $num_sync_queue = @{$$self{sync_queue}};
+	my $index = 0;
 	if (!($num_sync_queue))
 	{
 		&::print_log("[Insteon::BaseController] Nothing to do when syncing links for " . $self->get_object_name)
@@ -3014,12 +3026,19 @@ sub sync_links
 		my %sync_req = %{$_};
 		my $audit_text = "(AUDIT)" if ($audit_mode);
 		my $log_text = "[Insteon::BaseController] $audit_text ";
-		$log_text .= $sync_req{cause} . "\n";
+		if ($sync_req{skip}){
+			$log_text .= $sync_req{skip} ."\n";
+			splice @{$$self{sync_queue}}, $index, 1;
+		} else {
+			$index++;
+			$log_text .= $sync_req{cause} . "\n";
+		}
 		PRINT: for (keys %sync_req) {
 			next PRINT if ($_ eq 'cause');
 			next PRINT if ($_ eq 'callback');
 			next PRINT if ($_ eq 'member');
 			next PRINT if ($_ eq 'object');
+			next PRINT if ($_ eq 'skip');
 			$log_text .= "$_ = $sync_req{$_}; ";
 		}
 		::print_log($log_text);

From 3861dce8f9799e14cb1be157f58a31f92e95727d Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 20 Oct 2013 13:18:35 -0700
Subject: [PATCH 286/330] Insteon: Capture Number of Delete PLM Links

---
 lib/Insteon/AllLinkDatabase.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 97b01c0f0..54e1eacb4 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -2569,6 +2569,7 @@ sub _process_delete_queue {
 				: "deviceid=$delete_req{deviceid}") . ", group=$delete_req{group}")
 				if $main::Debug{insteon};
 			$self->delete_link(%delete_req);
+			$$self{delete_queue_processed}++;
 		}
 	}
         else

From e89b5474852c9883cd15f5af0903b66c682d11b8 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 20 Oct 2013 14:02:33 -0700
Subject: [PATCH 287/330] Insteon: Fix Log Link Entry for New Data3 Setup

---
 lib/Insteon/AllLinkDatabase.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 54e1eacb4..6f0dc2d79 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -1134,7 +1134,7 @@ sub log_alllink_table
 		    		}
 
 		    		$log_msg .= $is_controller ? "contlr($aldb_entry->{group}) "
-				    . "record to $object_name ($rspndr_group), "
+				    . "record to $object_name, "
 				    . "(d1:$aldb_entry->{data1}, "
 				    . "d2:$aldb_entry->{data2}, "
 				    . "d3:$aldb_entry->{data3})"

From 3b597eda8d93029036ca60c25de0fd4e93a120fe Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Sun, 20 Oct 2013 18:43:40 -0400
Subject: [PATCH 288/330] Change from every minute, to hook into
 weather_commons update routine.

---
 code/common/weather_summary.pl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/common/weather_summary.pl b/code/common/weather_summary.pl
index b72178f66..9e3f12f0f 100644
--- a/code/common/weather_summary.pl
+++ b/code/common/weather_summary.pl
@@ -13,8 +13,14 @@
 ## Mark Radke
 ##
 
+if($Startup || $Reload){
+    &Weather_Common::weather_add_hook(\&weather_summary_update);
+}
+
+$v_weather_summary_update = new Voice_Cmd("Update weather summary");
+if(said $v_weather_summary_update) {&weather_summary_update;}
 
-if ($New_Minute) {
+sub weather_summary_update {
 ##
 ## '&#176' puts in a degree symbol
 ##

From 26976c267afbf7155788a5e8af1414796dfc6b30 Mon Sep 17 00:00:00 2001
From: Pmatis <steve@switzerny.org>
Date: Mon, 21 Oct 2013 21:55:31 -0400
Subject: [PATCH 289/330] Added Alsa support through amixer to enable left and
 right audio and multiple speaker out channels to be used as separate PA
 rooms.

---
 code/common/pa_control.pl | 12 ++++++++-
 lib/PAobj.pm              | 51 ++++++++++++++++++++++++++++++++++-----
 lib/read_table_A.pl       |  4 ++-
 3 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/code/common/pa_control.pl b/code/common/pa_control.pl
index bb36db5ab..5ce3d7b51 100644
--- a/code/common/pa_control.pl
+++ b/code/common/pa_control.pl
@@ -175,6 +175,11 @@ sub pa_web_hook {
 PA,	192.168.0.1,family,		all|mainfloor,				, xap
 PA,	192.168.0.2,dining,		all|mainfloor,				, xpl
 PA,	192.168.0.3,table,		all|mainfloor,				, audrey
+#
+PA,	Headphone:0:L,	mix1l,		all,					, amixer
+PA,	Headphone:0:R,	mix1r,		all,					, amixer
+PA,	Headphone:1,	mix2,		all,					, amixer
+PA,	Headphone:1:R,	mix2r,		all,					, amixer
 
 
 Type:        "PA", constant. This must be there.
@@ -185,6 +190,11 @@ sub pa_web_hook {
                if the command to turn on the pin you want is: BHC, then the Address is: BC
              For X10, the X10 address of the (likely) relay device.
              For xAP, xPL and audrey, use the IP address or hostname of the target device.
+             For amixer (Linux Only), use the alsa mixer name. My laptop has "Headphone" and
+               "Headphone 1". This is really "Headphone,0" and "Headphone,1". They are also both
+               stereo. Use : as a separator, and then add L or R to control the left or right
+               channel. Omitting this causes BOTH channels to be turned on. There's several examples
+               above.
              For "object", use the name of the object (without the $). You may use anything that
                responds ON and OFF set commands. Tested with and Insteon device.
 
@@ -203,7 +213,7 @@ sub pa_web_hook {
              The default is "weeder". Note that this can be changed with an INI parm.
 
 Other:       Optional. Sets the type of PA control. Defaults to 'wdio'. Available options are:
-             wdio,wdio_old,X10,xpl,xap,audrey,object
+             wdio,wdio_old,X10,xpl,xap,audrey,amixer,object
 
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 =begin Audrey Config
diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index a106a067b..ae3f8b346 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -170,6 +170,7 @@ sub prep_parms
         && $pa_zones{active}{xap} eq ''
         && $pa_zones{active}{xpl} eq ''
         && $pa_zones{active}{aviosys} eq ''
+        && $pa_zones{active}{amixer} eq ''
         && $pa_zones{active}{obj} eq ''
         
     ) {
@@ -189,6 +190,7 @@ sub audio_hook
     my @speakers_x10=split(',',$pa_zones{active}{x10});
     my @speakers_xap=split(',',$pa_zones{active}{xap});
     my @speakers_xpl=split(',',$pa_zones{active}{xpl});
+    my @speakers_amixer=split(',',$pa_zones{active}{amixer});
     my @speakers_obj=split(',',$pa_zones{active}{obj});
 
     #TODO: Properly handle $results across multiple types
@@ -200,7 +202,7 @@ sub audio_hook
 
     for my $room (split(',',$pa_zones{active}{aviosys})) {
         my $ref = &::get_object_by_name('pa_'.$room);
-	my $serial=$ref->get_serial();
+        my $serial=$ref->get_serial();
         &::print_log("PAobj: aviosys serial: " . $room . " / " . $serial) if $main::Debug{pa} >=3;
         push(@{$speakers_aviosys{$serial}},$room);
     }
@@ -210,7 +212,7 @@ sub audio_hook
     }
     for my $room (split(',',$pa_zones{active}{wdio})) {
         my $ref = &::get_object_by_name('pa_'.$room);
-	my $serial=$ref->get_serial();
+        my $serial=$ref->get_serial();
         &::print_log("PAobj: wdio serial: " . $room . " / " . $serial) if $main::Debug{pa} >=3;
         push(@{$speakers_wdio{$serial}},$room);
     }
@@ -219,6 +221,7 @@ sub audio_hook
         $results = $self->set_weeder($state,$serial,@{$speakers_wdio{$serial}});
     }
 
+    $results = $self->set_amixer($state,@speakers_amixer) 			if $#speakers_amixer > -1;
     $results = $self->set_obj($state,@speakers_obj) 			if $#speakers_obj > -1;
     
     &::print_log("PAobj: set results: $results") if $main::Debug{pa};
@@ -453,6 +456,34 @@ sub set_aviosys
     return 1;
 }
 
+sub set_amixer
+{
+    my ($self,$state,@speakers) = @_;
+    my %amixerref;
+    my $mixpercent;
+    $mixpercent = '0%' if lc $state eq 'off';
+    $mixpercent = '100%' if lc $state eq 'on';
+    for my $room (@speakers) {
+        my $ref = &::get_object_by_name('pa_'.$room);
+        &::print_log("PAobj: set_amixer: " . $room . " / " . $state . " / " . $ref->{mixer} . " / " . $ref->{mixerchan}) if $main::Debug{pa} >=3;
+        
+        if(defined($ref->{mixerchan})) {
+            $amixerref{$ref->{mixer}}{'l'}='0%' unless $amixerref{$ref->{mixer}}{'l'};
+            $amixerref{$ref->{mixer}}{'r'}='0%' unless $amixerref{$ref->{mixer}}{'r'};
+            $amixerref{$ref->{mixer}}{$ref->{mixerchan}}=$mixpercent if $mixpercent;
+        } else {
+            $amixerref{$ref->{mixer}}{'l'}=$mixpercent if $mixpercent;
+            $amixerref{$ref->{mixer}}{'r'}=$mixpercent if $mixpercent;
+        }
+    }
+    foreach my $mixer (keys(%amixerref)) {
+        my $mixcmd = "amixer -q set $mixer ".$amixerref{$mixer}{'l'}.','.$amixerref{$mixer}{'r'};
+        &main::print_log("PAobj: set_amixer: CMD: $mixcmd") if $main::Debug{pa} >=2;
+        my $r = system $mixcmd;
+        &main::print_log("PAobj: set_amixer: ERROR running command: $mixcmd") if $r != 0;
+    }
+}
+
 sub get_speakers
 {
     my ($self,$rooms) = @_;
@@ -566,10 +597,10 @@ sub last_char
     return((sort @chars)[-1]);
 }
 
-#Type Address	Name			Groups               		Serial   Other
+#Type Address	Name			Groups               		Serial   Type
 sub new
 {
-    my ($class,$paz_address,$paz_name,$paz_groups,$paz_serial,$paz_other) = @_;
+    my ($class,$paz_address,$paz_name,$paz_groups,$paz_serial,$paz_type) = @_;
     my $self={};
 
     bless $self,$class;
@@ -578,7 +609,15 @@ sub new
     $self->{address}	= $paz_address;
     $self->{groups}	= $paz_groups;
     $self->{serial}	= $paz_serial;
-    $self->{other}		= $paz_other;
+    $self->{type}		= $paz_type;
+    
+    if(lc $paz_type eq 'amixer') {
+        #Headphone:0:L
+        my ($mixer,$mixernum,$channel) = split(':',$self->{address});
+        &main::print_log("$mixer / $mixernum / $channel");
+        $self->{mixer} = "$mixer,$mixernum";
+        $self->{mixerchan} = lc $channel if $channel;
+    }
 
     return $self;
 }
@@ -615,7 +654,7 @@ sub get_serial
 sub get_type
 {
     my ($self) = @_;
-    return $self->{other};
+    return $self->{type};
 }
 
 1;
diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index f162ed2a8..26a28e39e 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -528,7 +528,7 @@ sub read_table_A {
         my ($pa_type, $serial);
         ($address, $name, $grouplist, $serial, $pa_type, @other) = @item_info;
         $pa_type = 'wdio' unless $pa_type;
-
+        
         if( ! $packages{PAobj}++ ) {   # first time for this object type?
             $code .= "my (%pa_weeder_max_port,%pa_zone_types,%pa_zone_type_by_zone);\n";
         }
@@ -585,6 +585,8 @@ sub read_table_A {
             my $aviosysref = {'on' => {'1' => '!','2' => '#','3' => '%','4' => '&','5' => '(','6' => '_','7' => '{','8' => '}' },'off' => {'1' => '@','2' => '$','3' => '^','4' => '*','5' => ')','6' => '-','7' => '[','8' => ']'}};
             $code .= sprintf "\$%-35s = new Serial_Item('%s','on','%s');\n",$name.'_obj',$aviosysref->{'on'}{$address},$serial;
             $code .= sprintf "\$%-35s -> add ('%s','off');\n",$name.'_obj',$aviosysref->{'off'}{$address};
+        } elsif (lc $pa_type eq 'amixer') {
+            #Nothing needed here, except to avoid the "else" statement.
         } else {
             print "\nUnrecognized .mht entry for PA: $record\n";
             return;

From b0d962222d816bc01e344ac2fbe286f7ffb1b1bd Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 22 Oct 2013 17:27:00 -0700
Subject: [PATCH 290/330] Insteon: Remove Unnecessary ISA Calls in
 Delete_Orphans

---
 lib/Insteon/AllLinkDatabase.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 6f0dc2d79..4fcba2914 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -440,8 +440,8 @@ sub delete_orphan_links
 	my $selfname = $$self{device}->get_object_name;
 
 	# first, make sure that the health of ALDB is ok
-	if ($self->health ne 'good' || (!$$self{device}->isa('Insteon_PLM') && $$self{device}->is_deaf)) {
-		if (!$$self{device}->isa('Insteon_PLM') && $$self{device}->is_deaf) {
+	if ($self->health ne 'good' || $$self{device}->is_deaf) {
+		if ($$self{device}->is_deaf) {
 			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Will not delete links on deaf device: $selfname");
 		} 
 		elsif ($self->health eq 'empty'){
@@ -580,7 +580,7 @@ sub delete_orphan_links
 		}
 
 		# Do not delete links to deaf devices
-		if (!$linked_device->isa('Insteon_PLM') && $linked_device->is_deaf) {
+		if ($linked_device->is_deaf) {
 			$delete_req{skip} = "$selfname -- Skipping check for reciprocal links on deaf device " . $linked_device->get_object_name;
 			next LINKKEY;
 		}

From a57834e74f72a8da0dff5a0d9eac5aabdee39ae4 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 22 Oct 2013 17:28:00 -0700
Subject: [PATCH 291/330] Insteon: Catch, Report and Recover from Errors in
 Sync All Links

This enables the same feature that has been available in the scan_all_links function.  If an error occurs while attempting to sync_all_links, MH now recovers from the error, and continues to process the remainin objects in Sync_All.  At the conclusion of the Sync_All routine a message is displayed identifying the failed objects.

Partial Fix #73
---
 lib/Insteon/AllLinkDatabase.pm |  4 ++--
 lib/Insteon/BaseInsteon.pm     | 18 +++++++++++-------
 lib/Insteon/BaseInterface.pm   |  4 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 4fcba2914..140a59d87 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -851,6 +851,8 @@ sub add_link
 
 	# check whether the link already exists
 	my $key = $self->get_linkkey($device_id, $group, $is_controller, $data3);
+	$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
+	$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
 	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
 		## Check whether ALDB is in sync
 		$self->{callback_parms} = \%link_parms;
@@ -896,8 +898,6 @@ sub add_link
 		$ramp_rate = '0.1' unless $ramp_rate; # 0.1s is the default
 		# get the first available memory location
 		my $address = $self->get_first_empty_address();
-		$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
-		$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
                 if ($address)
                 {
 			&::print_log("[Insteon::AllLinkDatabase] DEBUG2: adding link record to " . $$self{device}->get_object_name
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index f5e196f9e..eb6cbfb3c 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2887,7 +2887,8 @@ sub sync_links
 		my %link_req = ( member => $insteon_object, cmd => 'add', object => $self->interface,
 			group => $self->group, is_controller => 1,
 			callback => "$self_link_name->_process_sync_queue()",
-			data3 => $subaddress);
+			failure_callback => $failure_callback,
+			data3 => $self->group);
 		$link_req{cause} = "Adding controller record to $self_link_name for $interface_name";
 		$link_req{data3} = $self->group;
 		push @{$$self{sync_queue}}, \%link_req;
@@ -2899,6 +2900,7 @@ sub sync_links
 		my %link_req = ( member => $self->interface, cmd => 'add', object => $insteon_object,
 			group => $self->group, is_controller => 0,
 			callback => "$self_link_name->_process_sync_queue()",
+			failure_callback => $failure_callback,
 			data3 => '00');
 		$link_req{cause} = "Adding responder record to $interface_name from $self_link_name";
 		push @{$$self{sync_queue}}, \%link_req;
@@ -2938,6 +2940,7 @@ sub sync_links
 				group => $self->group, is_controller => 0,
 				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
 				callback => "$self_link_name->_process_sync_queue()",
+				failure_callback => $failure_callback,
 				data3 => $member->group);
 			$link_req{cause} = "Adding responder record to $member_name from $self_link_name";
 			push @{$$self{sync_queue}}, \%link_req;
@@ -2948,6 +2951,7 @@ sub sync_links
 				group => $self->group, is_controller => 0,
 				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
 				callback => "$self_link_name->_process_sync_queue()",
+				failure_callback => $failure_callback,
 				data3 => $member->group);
 			$link_req{skip} = "Unable to add the following responder record to $member_name "
 				."from $self_link_name because the aldb of $member_name is "
@@ -2997,6 +3001,7 @@ sub sync_links
 				group => $self->group, is_controller => 0,
 				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
 				callback => "$self_link_name->_process_sync_queue()",
+				failure_callback => $failure_callback,
 				data3 => $member->group);
 			$link_req{cause} = "Updating responder record on $member_name "
 				. "to fix $cause";
@@ -3009,7 +3014,8 @@ sub sync_links
 			my %link_req = ( member => $insteon_object, cmd => 'add', object => $member,
 				group => $self->group, is_controller => 1,
 				callback => "$self_link_name->_process_sync_queue()",
-				data3 => $subaddress);
+				failure_callback => $failure_callback,
+				data3 => $self->group);
 			$link_req{cause} = "Adding controller record to $self_link_name for $member_name";
 			push @{$$self{sync_queue}}, \%link_req;
 		}
@@ -3034,11 +3040,9 @@ sub sync_links
 			$log_text .= $sync_req{cause} . "\n";
 		}
 		PRINT: for (keys %sync_req) {
-			next PRINT if ($_ eq 'cause');
-			next PRINT if ($_ eq 'callback');
-			next PRINT if ($_ eq 'member');
-			next PRINT if ($_ eq 'object');
-			next PRINT if ($_ eq 'skip');
+			next PRINT if (($_ eq 'cause') || ($_ eq 'callback') ||
+				($_ eq 'member') || ($_ eq 'object') || 
+				($_ eq 'skip') || ($_ eq 'failure_callback'));
 			$log_text .= "$_ = $sync_req{$_}; ";
 		}
 		::print_log($log_text);
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 0b87c4806..a010c0fed 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -369,8 +369,6 @@ sub process_queue
 					&main::print_log("[Insteon::BaseInterface] WARN! Unable to clear acknowledge for "
 						. ((defined($failed_message->setby)) ? $failed_message->setby->get_object_name : "undefined"));
 				}
-				# clear active message
-				$self->clear_active_message();
                                 # may instead want a "failure" callback separate from success callback
 				if ($failed_message->failure_callback)
                                 {
@@ -383,6 +381,8 @@ sub process_queue
 					&::print_log("[Insteon::BaseInterface] problem w/ retry callback: $@") if $@;
 					package Insteon::BaseInterface;
 				}
+				# clear active message
+				$self->clear_active_message();
                 		$self->process_queue();
                         }
 		}

From 5ade47aed386da2391cb005f37e2819eee8059a3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 22 Oct 2013 17:28:00 -0700
Subject: [PATCH 292/330] Insteon: Remove Unnecessary SubAddress Variable from
 Sync Links Routine

---
 lib/Insteon/BaseInsteon.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index eb6cbfb3c..b44e1742a 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2853,7 +2853,6 @@ sub sync_links
 	# Intialize Variables
 	@{$$self{sync_queue}} = (); # reset the work queue
 	$$self{sync_queue_callback} = ($callback) ? $callback : undef;
-	my $subaddress = $self->group;
 	my $self_link_name = $self->get_object_name;
 	my $insteon_object = $self->interface;
 	my $interface_object = Insteon::active_interface();
@@ -2882,7 +2881,7 @@ sub sync_links
 	
 	# 1. Does a controller link exist for Device-> PLM
 	if (!$insteon_object->isa('Insteon_PLM') && 
-	!$insteon_object->has_link($self->interface,$self->group,1,$subaddress) && 
+	!$insteon_object->has_link($self->interface,$self->group,1,$self->group) && 
 	$insteon_object_is_syncable) {
 		my %link_req = ( member => $insteon_object, cmd => 'add', object => $self->interface,
 			group => $self->group, is_controller => 1,
@@ -2890,7 +2889,6 @@ sub sync_links
 			failure_callback => $failure_callback,
 			data3 => $self->group);
 		$link_req{cause} = "Adding controller record to $self_link_name for $interface_name";
-		$link_req{data3} = $self->group;
 		push @{$$self{sync_queue}}, \%link_req;
 	}
 		
@@ -3009,7 +3007,7 @@ sub sync_links
 		}
 
 		# 5. Does the controller link on this device exist
-		if (!($insteon_object->has_link($member, $self->group, 1, $subaddress)) &&
+		if (!($insteon_object->has_link($member, $self->group, 1, $self->group)) &&
 		$insteon_object_is_syncable) {
 			my %link_req = ( member => $insteon_object, cmd => 'add', object => $member,
 				group => $self->group, is_controller => 1,

From b3bd3ad36c45075d934810ed9dd43895a90ed1b7 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 22 Oct 2013 17:29:00 -0700
Subject: [PATCH 293/330] Insteon: Extend Failure Callback to Update_Links

---
 lib/Insteon/AllLinkDatabase.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 140a59d87..d6089582e 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -975,6 +975,9 @@ sub update_link
 	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
 	$data3 = $data3_default if ($data3 eq '00' || $data3 eq '01');
 
+	$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
+	$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
+
 	my $deviceid = $insteon_object->device_id;
 	my $key = $self->get_linkkey($deviceid, $group, $is_controller, $data3);
 	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
@@ -997,8 +1000,6 @@ sub update_link
 	elsif (defined $$self{aldb}{$key} && $link_parms{aldb_check} eq "ok"){	
 		my $address = $$self{aldb}{$key}{address};
 		$$self{_mem_activity} = 'update';
-		$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
-		$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
 		$self->_write_link($address, $deviceid, $group, $is_controller, $data1, $data2, $data3);
 	} else {
 		&::print_log("[Insteon::AllLinkDatabase] ERROR: updating link record failed because "

From e361a69461febb567d5a7b232415cdac12d3dc1e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 22 Oct 2013 20:18:43 -0700
Subject: [PATCH 294/330] Insteon:  Track, Recover, and Report from Failed
 Delete Orphans

Adds a similar functionality to what has been in scan all links.  If a failure occurs on a device while running delte orphans, MH now recovers and continues to process the rest of the delete queue.  At the conclusion of the queue, the failed object is reported.

Fixes #82 #73
---
 lib/Insteon/AllLinkDatabase.pm | 52 +++++++++++++++++++++++-----------
 lib/Insteon/BaseInsteon.pm     |  4 +--
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index d6089582e..42fab13a2 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -434,7 +434,7 @@ scanned and processed.
 
 sub delete_orphan_links
 {
-	my ($self, $audit_mode) = @_;
+	my ($self, $audit_mode, $failure_callback) = @_;
 	@{$$self{delete_queue}} = (); # reset the work queue
 	$$self{delete_queue_processed} = 0;
 	my $selfname = $$self{device}->get_object_name;
@@ -464,7 +464,8 @@ sub delete_orphan_links
 		next LINKKEY if ($linkkey eq 'empty');
 		
 		# Define delete request
-		my %delete_req = (callback => "$selfname->_aldb->_process_delete_queue()",);
+		my %delete_req = (callback => "$selfname->_aldb->_process_delete_queue()",
+				  failure_callback => $failure_callback);
 
 		# Delete duplicate entries
 		if ($linkkey eq 'duplicates') {
@@ -618,8 +619,8 @@ sub delete_orphan_links
 			$log_text = "[Insteon::AllLinkDatabase] $audit_text Deleting the following link on $selfname because ";
 			$log_text .= $delete_req{cause} . "\n";
 			PRINT: for (keys %delete_req) {
-				next PRINT if ($_ eq 'cause');
-				next PRINT if ($_ eq 'callback');
+				next PRINT if (($_ eq 'cause') || ($_ eq 'callback') ||
+						($_ eq 'failure_callback'));
 				$log_text .= "$_ = $delete_req{$_}; ";
 			}
 			if ($delete_req{deviceid}){
@@ -2557,27 +2558,48 @@ sub _process_delete_queue {
         {
 		my $delete_req_ptr = shift(@{$$self{delete_queue}});
 		my %delete_req = %$delete_req_ptr;
+		my $failure_callback = $$self{device}->get_object_name . 
+					"->_aldb->_process_delete_queue_failure";
 		# distinguish between deleting PLM links and processing delete orphans for a root item
 		if ($delete_req{'root_object'})
                 {
-			$delete_req{'root_object'}->delete_orphan_links($delete_req{'audit_mode'});
+			$$self{current_delete_device} = $delete_req{'root_object'}->get_object_name;
+			$delete_req{'root_object'}->delete_orphan_links(($delete_req{'audit_mode'}) ? 1 : 0, $failure_callback);
 		}
                 else
                 {
+			$$self{current_delete_device} = $$self{device}->get_object_name;
 			&::print_log("[Insteon::ALDB_PLM] now deleting orphaned link w/ details: "
 				. (($delete_req{is_controller}) ? "controller($delete_req{data3})" : "responder")
 				. ", " . (($delete_req{object}) ? "object=" . $delete_req{object}->get_object_name
 				: "deviceid=$delete_req{deviceid}") . ", group=$delete_req{group}")
 				if $main::Debug{insteon};
+				$delete_req{failure_callback} = $failure_callback;
 			$self->delete_link(%delete_req);
 			$$self{delete_queue_processed}++;
 		}
 	}
-        else
-        {
-		&::print_log("[Insteon::ALDB_PLM] A total of $$self{delete_queue_processed} orphaned link records were deleted.");
-        	&::print_log("[Insteon::ALDB_PLM] #### END DELETE ORPHAN LINKS ####");
+	else {
+		::print_log("[Insteon::ALDB_PLM] Delete All Links has Completed.");
+		my $_delete_failure_cnt = scalar $$self{_delete_device_failures};
+		if ($_delete_failure_cnt) {
+			&main::print_log("[Insteon::ALDB_PLM] However, some failures were noted with the following devices:");
+			for my $failed_obj (@{$$self{_delete_device_failures}}) {
+				::print_log("[Insteon::ALDB_PLM] Failure on: "
+				. $failed_obj);
+			}
+		}
+		::print_log("[Insteon::ALDB_PLM] A total of $$self{delete_queue_processed} orphaned link records were deleted.");
+		::print_log("[Insteon::ALDB_PLM] #### END DELETE ORPHAN LINKS ####");
 	}
+}
+
+sub _process_delete_queue_failure {
+	my ($self) = @_;
+	push @{$$self{_delete_device_failures}}, $$self{current_delete_device};
+	::print_log("[Insteon::ALDB_PLM] WARN: failure occurred when deleting orphan links from: "
+			. $$self{current_delete_device} . ".  Moving on...");
+	$self->_process_delete_queue;
 
 }
 
@@ -2620,10 +2642,8 @@ sub delete_link
 		delete $$self{aldb}{$linkkey};
 		$num_deleted = 1;
                 my $message = new Insteon::InsteonMessage('all_link_manage_rec', $$self{device});
-                if ($link_parms{callback})
-                {
-			$$self{_success_callback} = $link_parms{callback};
-                }
+		$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
+		$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
                 $message->interface_data($cmd);
 		$$self{device}->queue_message($message);
 	}
@@ -2729,10 +2749,8 @@ sub add_link
 		$self->health('good') if($self->health() eq 'empty');
                 my $message =  new Insteon::InsteonMessage('all_link_manage_rec', $$self{device});
                 $message->interface_data($cmd);
-                if ($link_parms{callback})
-                {
-			$$self{_success_callback} = $link_parms{callback};
-                }
+		$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
+		$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
                 $message->interface_data($cmd);
 		$$self{device}->queue_message($message);
 	}
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index b44e1742a..a64e8744c 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2177,8 +2177,8 @@ does nothing.
 
 sub delete_orphan_links
 {
-	my ($self, $audit_mode) = @_;
-        return $self->_aldb->delete_orphan_links($audit_mode) if $self->_aldb;
+	my ($self, $audit_mode, $failure_callback) = @_;
+        return $self->_aldb->delete_orphan_links($audit_mode, $failure_callback) if $self->_aldb;
 }
 
 sub _process_delete_queue {

From b5ba05100a09fb0215baf07baeaaf8bc5b957afd Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 23 Oct 2013 17:29:00 -0700
Subject: [PATCH 295/330] Insteon: Re-enable off_fast and on_fast in dimmable
 lights

Accidentally dropped this feature when the new set routine was merged.
---
 lib/Insteon/Lighting.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index 4b786516f..930421c2b 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -187,9 +187,8 @@ sub derive_link_state
 	}
 	
 	my $link_state = 'on';
-	if ($p_state eq 'off' or $p_state eq 'off_fast')
-	{
-		$link_state = 'off';
+	if (grep(/$p_state/i, @{['on_fast', 'off', 'off_fast']})) {
+		$link_state = $p_state;
 	}
 	elsif ($p_state =~ /\d+%?/)
 	{

From a70563b522707ece28cdbce87fd23e600f546e7d Mon Sep 17 00:00:00 2001
From: CityDweller <spaulding@icanbrew.com>
Date: Fri, 25 Oct 2013 10:15:35 -0400
Subject: [PATCH 296/330] array error/deprecations from perl

---
 lib/Musica.pm | 84 +++++++++++++++++++++++++--------------------------
 lib/UPBPIM.pm |  2 +-
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/lib/Musica.pm b/lib/Musica.pm
index ada131467..e4965cc86 100644
--- a/lib/Musica.pm
+++ b/lib/Musica.pm
@@ -7,7 +7,7 @@ Important Note:
    Because the new FM-Tuner keypads (and possibly other newer keypads?) take
    *forever (minutes) to respond to the StatVer command, their version is
    stored in the persistant Misterhouse %Save hash.  This means that if you
-   change the physical keypad, you'll need to stop Misterhouse, edit 
+   change the physical keypad, you'll need to stop Misterhouse, edit
    data_dir/mh_temp.saved_states.persistent, and search for 'Musica' and
    remove or modify the entry for the zone you chaged.  Then start Misterhouse
    back up.  If you simply remove a keypad, just take the entry for that zone
@@ -136,7 +136,7 @@ Controlling either all zones or one zone:
       $zone1_obj->set_source('MP3');
       $Musica->set_source($source1_obj);
 
-   set_volume(level): Sets the volume of one or all zones, where the level 
+   set_volume(level): Sets the volume of one or all zones, where the level
    specified must range from 0 to 35.  Can also be specified as a percentage
    where '0%' is off and '100%' is full volume.
 
@@ -200,8 +200,8 @@ Controlling either all zones or one zone:
 Controlling the Musica system object:
 
    The following functions allow you to make changes to the Musica system
-   as a whole from Misterhouse.  
-   
+   as a whole from Misterhouse.
+
    all_off(): Turn off all zones.
 
 Retrieving data from the Musica system object:
@@ -223,9 +223,9 @@ Controlling the Musica zone objects using functions:
 
    The following functions allow you to make changes to a specific Musica
    zone from Misterhouse.
-   
+
    set_source(source): Sets the zone to the specified source, where 'source'
-   is a number between 1 and 4 or E for the local expansion source.  Turns 
+   is a number between 1 and 4 or E for the local expansion source.  Turns
    the zone ON if it is not already on.
 
    turn_off(): Turns off the zone.
@@ -294,15 +294,15 @@ Monitoring the Musica zone objects:
    source_changed: The zone is already on and a user changed the source.
    changed_label_source_X: This zone keypad was used to change the label
       of source X (where X is a number from 1 to 4).
-   volume_changed: Volume of the zone was changed. 
-   bass_changed: Bass level of the zone was changed. 
+   volume_changed: Volume of the zone was changed.
+   bass_changed: Bass level of the zone was changed.
    treble_changed: Treble level of the zone was changed.
    balance_changed: Balance level of the zone was changed.
    loudness_on: Loudness was enabled in the zone
    loudness_off: Loudness was disabled in the zone
    mute_on: This zone was muted.
    mute_off: This zone was unmuted.
-   color_amber: The backlight color in this zone was changed to amber 
+   color_amber: The backlight color in this zone was changed to amber
       (or blue on applicable keypads).
    color_green: The backlight color in this zone was changed to green
       (or white on applicable keypads).
@@ -321,8 +321,8 @@ Monitoring the Musica zone objects:
    button_pressed_*: A button was pressed (button names can be found after
       this comment section or by calling get_button_labels() on a zone
       object).
-   button_held_*: A button was pressed and held (button names can be found 
-      after this comment section or by calling get_button_labels() on a 
+   button_held_*: A button was pressed and held (button names can be found
+      after this comment section or by calling get_button_labels() on a
       zone object).
 
 Controlling the Musica source object:
@@ -332,18 +332,18 @@ Controlling the Musica source object:
 
    set_label(label): Sets the global label for this particular source.  The
       label can either be given as a number between 1 and 30 or as a string.
-      Only certain strings are allowed, and these strings can be determined 
+      Only certain strings are allowed, and these strings can be determined
       by calling get_source_labels() on a source object.
 
 Retrieving data from a Musica source object:
 
-   get_musica_obj(): Returns the main musica object. 
-   get_source_num(): Returns the numerical source number associated with 
+   get_musica_obj(): Returns the main musica object.
+   get_source_num(): Returns the numerical source number associated with
       this source object.
-   get_label(): Returns the label for the source as a string. 
+   get_label(): Returns the label for the source as a string.
    get_source_labels(): Returns a list of valid source labels.
    get_zones(): Returns array of zones currently listening to this source.
-   get_usage_count(): Returns the number of zones currently listening to 
+   get_usage_count(): Returns the number of zones currently listening to
       this source.
 
 Monitoring the Musica source objects:
@@ -354,14 +354,14 @@ Monitoring the Musica source objects:
    error: An error has occurred, call get_last_error() for details.
    label_changed: somebody changed the label for this source from a keypad
       (call get_set_by() to find the object name of the keypad used to make
-      the change). 
+      the change).
    first_listener: the source now has a listener and it did not before.
    no_listeners: the only listener stopped listening and now nobody is using
       this particular source.
    listener_zone_X: zone X just selected this source.
    button_pressed_*: A button was pressed (button names can be found after
       this comment section or by calling get_button_labels()).
-   button_held_*: A button was pressed and held (button names can be found 
+   button_held_*: A button was pressed and held (button names can be found
       after this comment section or by calling get_button_labels()).
 
 Usage Examples:
@@ -377,10 +377,10 @@ Usage Examples:
          }
       }
 
-   Then I create an array of all of the Musica::Source objects (which 
+   Then I create an array of all of the Musica::Source objects (which
    are already defined in my .mht file):
 
-      my @musica_sources = ( $music_source1, $music_source2, $music_source3, 
+      my @musica_sources = ( $music_source1, $music_source2, $music_source3,
                              $music_source4 );
 
    The 'first_listener' and 'no_listeners' states are handy to start/stop
@@ -424,7 +424,7 @@ MUSICA SYSTEM BUGS:
    - Never sends back a copy of the ChangeAmp command nor does it send
    an EventData message back.
    - Does not respond to various commands like ChangeVol, ChangeBass, etc.
-   Instead, sends an EventData message showing the changes (bug or protocol 
+   Instead, sends an EventData message showing the changes (bug or protocol
    change?)
 
    [ADC Version M30419/Keypad Version R30419]
@@ -451,7 +451,7 @@ TODO:
    - Implement IR_Dn/IR_Up?
    - ExeMenu* is not implemented as the ADC does not respond which makes it
      not like every other command plus I don't know why you would use it as it
-     just allows you to navigate the menu system on a keypad but you can 
+     just allows you to navigate the menu system on a keypad but you can
      change everything directly through other messages anyways.  But, for the
      record:
         ExeMenu/Zone/Command where Command is:
@@ -506,8 +506,8 @@ package Musica;
 
 @Musica::ISA = ('Serial_Item');
 
-use vars qw( %source_name_to_number @source_number_to_name 
-             %source_name_to_number_30419 @source_number_to_name_30419 
+use vars qw( %source_name_to_number @source_number_to_name
+             %source_name_to_number_30419 @source_number_to_name_30419
              %button_name_to_number @button_number_to_name
              %button_name_to_number_40822 @button_number_to_name_40822
            );
@@ -574,7 +574,7 @@ use vars qw( %source_name_to_number @source_number_to_name
    'R&B'      => 23,
    'RAP'      => 24,
    'RADIO'    => 25,
-   'HD RADIO' => 25, 
+   'HD RADIO' => 25,
    'ROCK'     => 26,
    'SAT'      => 27,
    'SAT2'     => 28,
@@ -636,7 +636,7 @@ use vars qw( %source_name_to_number @source_number_to_name
    'SAT'      ,
    'SAT2'     ,
    'SOUL'     ,
-   'WESTERN'  
+   'WESTERN'
 );
 
 @source_number_to_name_30419 = (
@@ -681,22 +681,22 @@ use vars qw( %source_name_to_number @source_number_to_name
    'DSS'      ,
    'M SERVER' ,
    'DISH'     ,
-   ''         
+   ''
 );
 
 %button_name_to_number = (
-   'pause'     => 1,  
-   'stop'      => 2,  
-   'play'      => 3,  
-   'rewind'    => 4, 
-   'up'        => 5,  
-   'forward'   => 6, 
-   'left'      => 7,  
-   'down'      => 8,  
-   'right'     => 9,  
-   'previous'  => 10, 
+   'pause'     => 1,
+   'stop'      => 2,
+   'play'      => 3,
+   'rewind'    => 4,
+   'up'        => 5,
+   'forward'   => 6,
+   'left'      => 7,
+   'down'      => 8,
+   'right'     => 9,
+   'previous'  => 10,
    'power'     => 11,
-   'next'      => 12, 
+   'next'      => 12,
 );
 
 %button_name_to_number_40822 = (
@@ -1168,14 +1168,14 @@ sub _parse_data {
          }
       }
    } elsif ($cmd eq 'EventData') {
-      my ($zone, $volume, $bass, $treble, $balance, $loudness, $mute, $blcolor, 
+      my ($zone, $volume, $bass, $treble, $balance, $loudness, $mute, $blcolor,
           $brightness, $audioport, $amp, $locked, $overheat) = split /\//, $value;
       if ($$self{'zones'}[$zone]) {
          if ($self->_check_first_cmd($zone, "ChangeVol/$zone/$volume")) {
             $self->_store_zone_data($zone, 'volume', $volume, 'volume_changed');
          } elsif ($$self{'zones'}[$zone]->{'volume'} != $volume) {
             if (defined($$self{'zones'}[$zone]->{'volume'}) and (($$self{'zones'}[$zone]->{'on_time'} + IGNORE_AFTER_ON) < $::Time)) {
-               $$self{'zones'}[$zone]->set_receive('volume_changed', 'keypad') 
+               $$self{'zones'}[$zone]->set_receive('volume_changed', 'keypad')
             }
             $$self{'zones'}[$zone]->{'volume'} = $volume;
          }
@@ -1302,7 +1302,7 @@ sub _parse_data {
 sub _process_keypad_version {
    my ($self, $zone_num) = @_;
    if ($$self{'zones'}[$zone_num]->{'keypad_version'} < 40822) {
-      # Use older source names if any keypad is older... 
+      # Use older source names if any keypad is older...
       %source_name_to_number = %source_name_to_number_30419;
       @source_number_to_name = @source_number_to_name_30419;
    }
@@ -1343,7 +1343,7 @@ sub _send_next_cmd {
             if ($$self{'zones'}[$zone]->{'just_turned_on'}) {
                my $moved = '';
                # See if we can find a command for another zone meanwhile
-               for (my $i = 0; $i <= $#{@{$$self{'queue'}}}; $i++) {
+               for (my $i = 0; $i <= {@{$$self{'queue'}}}; $i++) {
                   if ($$self{'queue'}->[$i] =~ /^[^\/]+\/(\d+)/) {
                      if ($$self{'zones'}[$1] and not $$self{'zones'}[$zone]->{'just_turned_on'}) {
                         $moved = $$self{'queue'}->[$i];
diff --git a/lib/UPBPIM.pm b/lib/UPBPIM.pm
index 4730a1a1d..f6d1ade59 100644
--- a/lib/UPBPIM.pm
+++ b/lib/UPBPIM.pm
@@ -181,7 +181,7 @@ sub get_register
 	my $response;
 	for (my $index=$start;$index<$start+$end;$index++)
 	{
-		$response.=sprintf("%02X",@{$$self{'registers'}}->[$index]);
+		$response.=sprintf("%02X",$$self{'registers'}->[$index]);
 	}
 	return $response;
 }

From 7842ee0365ac39f4d85990ef18ff50b9b9b56635 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 25 Oct 2013 13:24:56 -0700
Subject: [PATCH 297/330] Scene_Builder: Dereference Hashes for Backwards
 Compatibility in Perl

http://stackoverflow.com/questions/10979486/perl-incompatibility-issue-with-each-in-a-hash-of-hashes-5-14-5-8-8

as discovered by @CityDweller
---
 lib/read_table_A.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index f3240d200..38cb9aed1 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -1085,10 +1085,10 @@ sub read_table_finish_A {
 
         #Loop through the controller hash
         if (exists $scene_build_controllers{$scene}){
-	        foreach my $scene_controller (keys $scene_build_controllers{$scene}) {
+	        foreach my $scene_controller (keys %{$scene_build_controllers{$scene}}) {
 	            if ($objects{$scene_controller}) {
 	            	#Make a link to each responder in the responder hash
-	                while (my ($scene_responder, $responder_data) = each($scene_build_responders{$scene})) {
+	                while (my ($scene_responder, $responder_data) = each(%{$scene_build_responders{$scene}})) {
 	                    my ($on_level, $ramp_rate) = split(',', $responder_data);
 	
 	                    if (($objects{$scene_responder}) and ($scene_responder ne $scene_controller)) {

From 7981001f6aad2df016702187a86958bc9cfd77b6 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 25 Oct 2013 17:29:00 -0700
Subject: [PATCH 298/330] Insteon: Add Sync_All_Links Routine for Multigroup
 items; Add MultigroupDevice Package

Added a package called MutigroupDevice in BaseInsteon.pm.  The purpose of this package is to contain routines specific to all multigroup devices.

Added Sync_All_links routines to MultigroupDevice.  The routine will sync all links between any group on the device.  Useful for KeyPadLincs and RemoteLincs and such.

Fixes #85
---
 lib/Insteon/BaseInsteon.pm | 147 +++++++++++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index b1b7259dc..82dacfa90 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2745,6 +2745,153 @@ You should have received a copy of the GNU General Public License along with thi
 
 =cut
 
+####################################
+###                  ###############
+### MultigroupDevice ###############
+###                  ###############
+####################################
+
+=head1 B<Insteon::MultigroupDevice>
+
+=head2 DESCRIPTION
+
+Contains functions which are unique to insteon devices which have more than
+one group.  This includes, KeyPadLincs, RemoteLincs, FanLincs, Thermostats 
+(i2 versions).
+
+=head2 INHERITS
+
+Nothing.
+
+This package is meant to provide supplemental support and should only be added
+as a secondary inheritance to an object.
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::MultigroupDevice;
+
+=item C<sync_all_links(audit_mode)>
+
+Syncs all links on the object, including all subgroups such as additional
+buttons.
+
+Paramter B<audit_mode> - Causes sync to walk through but not actually 
+send any commands to the devices.  Useful with the insteon:3 debug setting for 
+troubleshooting. 
+
+=cut
+
+sub sync_all_links
+{
+	my ($self, $audit_mode) = @_;
+	$self = $self->get_root();
+	@{$$self{_sync_devices}} = ();
+	@{$$self{_sync_device_failures}} = ();
+	my $device_id = $self->device_id();
+	my ($subgroup_object, $group, $dec_group);
+	
+	::print_log("[Insteon::MultigroupDevice] Sync All Links on device "
+		.$self->get_object_name . " starting ...");
+	# Find all subgroup items check groups from 02 - FF;
+	for ($dec_group = 02; $dec_group <= 255; $dec_group++) {
+		$group = sprintf("%02X", $dec_group);
+		$subgroup_object = Insteon::get_object($device_id, $group);
+		if (ref $subgroup_object){
+			my %sync_req = ('sync_object' => $subgroup_object, 
+					'audit_mode' => ($audit_mode) ? 1 : 0);
+			::print_log("[Insteon::MultigroupDevice] "
+				."Adding " . $subgroup_object->get_object_name 
+				." to sync queue.");
+			push @{$$self{_sync_devices}}, \%sync_req
+		}
+	}
+	$$self{_sync_cnt} = scalar @{$$self{_sync_devices}};
+	$self->_get_next_linksync();
+}
+
+=item C<_get_next_linksync()>
+
+Calls the sync_links() function for each device identified by sync_all_link.  
+This function will be called recursively since the callback passed to sync_links() 
+is this function again.  Will also ask sync_links() to call 
+_get_next_linksync_failure() if sync_links() fails. 
+
+=cut
+
+sub _get_next_linksync
+{
+	my ($self) = @_;
+	$self = $self->get_root();
+	my $sync_req_ptr = shift(@{$$self{_sync_devices}});
+	my %sync_req = ($sync_req_ptr) ? %$sync_req_ptr : undef;
+	my $current_sync_device;
+	if (%sync_req) {
+		$current_sync_device = $sync_req{'sync_object'};
+	}
+	else {
+		$current_sync_device = undef;
+	}
+
+	if ($current_sync_device) {
+		::print_log("[Insteon::MultigroupDevice] Now syncing: "
+			. $current_sync_device->get_object_name . " ("
+			. ($$self{_sync_cnt} - scalar @{$$self{_sync_devices}})
+			. " of ".$$self{_sync_cnt}.")");
+		$current_sync_device->sync_links($sync_req{'audit_mode'}, 
+			$self->get_object_name . '->_get_next_linksync()',
+			$self->get_object_name . '->_get_next_linksync_failure('.$current_sync_device->get_object_name.')');
+	}
+	else {
+		::print_log("[Insteon::MultigroupDevice] All links have completed syncing "
+				. "on device " . $self->get_object_name);
+		my $_sync_failure_cnt = scalar @{$$self{_sync_device_failures}};
+		if ($_sync_failure_cnt) {
+			::print_log("[Insteon::MultigroupDevice] However, some failures were noted:");
+			for my $failed_obj (@{$$self{_sync_device_failures}}) {
+				::print_log("[Insteon::MultigroupDevice] WARN: failure occurred when syncing "
+				. $failed_obj->get_object_name);
+			}
+		}
+	}
+}
+
+=item C<_get_next_linksync()>
+
+Called by the failure callback in a device's sync_links() function.  Will add
+the failed device to the module global variable @_sync_device_failures. 
+
+=cut
+
+sub _get_next_linksync_failure
+{
+	my ($self, $current_sync_device) = @_;
+	$self = $self->get_root();
+	push @{$$self{_sync_device_failures}}, $current_sync_device;
+	::print_log("[Insteon::MultigroupDevice] WARN: failure occurred when syncing "
+		. $current_sync_device->get_object_name . ".  Moving on...");
+	$self->_get_next_linksync();
+}
+
+=back
+
+=head2 AUTHOR
+
+Kevin Robert Keegan
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
 ####################################
 ###                #################
 ### BaseController #################

From ed4ecba51c7277effbc16530ace6ff273224f26a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 25 Oct 2013 17:39:00 -0700
Subject: [PATCH 299/330] Insteon: Add Sync All Links Voice Command to
 Multigroup Devices

---
 lib/Insteon/Controller.pm | 33 ++++++++++++++++++++++++++++-
 lib/Insteon/Lighting.pm   | 44 ++++++++++++++++++++++++++++++++++-----
 lib/Insteon/Thermostat.pm | 13 +++++++++---
 3 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index 4c1c67e30..93568a86f 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -42,6 +42,7 @@ must first be put into "awake mode."
 
 L<Insteon::BaseDevice|Insteon::BaseInsteon/Insteon::BaseDevice>, 
 L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>, 
+L<Insteon::Insteon::MultigroupDevice|Insteon::BaseInsteon/Insteon::Insteon::MultigroupDevice>
 
 =head2 METHODS
 
@@ -54,7 +55,7 @@ package Insteon::RemoteLinc;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::RemoteLinc::ISA = ('Insteon::BaseDevice','Insteon::DeviceController');
+@Insteon::RemoteLinc::ISA = ('Insteon::BaseDevice','Insteon::DeviceController', 'Insteon::MultigroupDevice');
 
 my %message_types = (
 	%Insteon::BaseDevice::message_types,
@@ -243,6 +244,36 @@ sub _process_message {
 	return $clear_message;
 }
 
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds}
+    );
+    if ($self->is_root){
+        %voice_cmds = (
+            %voice_cmds,
+            'sync all device links' => "$object_name->sync_all_links()",
+            'AUDIT sync all device links' => "$object_name->sync_all_links(1)"
+        );
+    }
+    return \%voice_cmds;
+}
+
 =back
 
 =head2 AUTHOR
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index 4b786516f..bfa473296 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -733,7 +733,8 @@ Provides support for the Insteon KeypadLinc Relay.
 =head2 INHERITS
 
 L<Insteon::BaseLight|Insteon::Lighting/Insteon::BaseLight>, 
-L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>,
+L<Insteon::Insteon::MultigroupDevice|Insteon::BaseInsteon/Insteon::Insteon::MultigroupDevice>
 
 =head2 METHODS
 
@@ -746,7 +747,7 @@ package Insteon::KeyPadLincRelay;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::KeyPadLincRelay::ISA = ('Insteon::BaseLight','Insteon::DeviceController');
+@Insteon::KeyPadLincRelay::ISA = ('Insteon::BaseLight','Insteon::DeviceController', 'Insteon::MultigroupDevice');
 
 our %operating_flags = (
    'program_lock_on' => '00',
@@ -876,7 +877,9 @@ sub get_voice_cmds
             'set 8 button - backlight normal' => "$object_name->update_flags(\"02\")",
             'set 6 button - backlight dim' => "$object_name->update_flags(\"08\")",
             'set 6 button - backlight off' => "$object_name->update_flags(\"04\")",
-            'set 6 button - backlight normal' => "$object_name->update_flags(\"00\")"
+            'set 6 button - backlight normal' => "$object_name->update_flags(\"00\")",
+            'sync all device links' => "$object_name->sync_all_links()",
+            'AUDIT sync all device links' => "$object_name->sync_all_links(1)"
         );
     }
     return \%voice_cmds;
@@ -1036,7 +1039,8 @@ Provides support for the Insteon FanLinc.
 =head2 INHERITS
 
 L<Insteon::DimmableLight|Insteon::Lighting/Insteon::DimmableLight>, 
-L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>,
+L<Insteon::Insteon::MultigroupDevice|Insteon::BaseInsteon/Insteon::Insteon::MultigroupDevice>
 
 =head2 METHODS
 
@@ -1049,7 +1053,7 @@ package Insteon::FanLinc;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::FanLinc::ISA = ('Insteon::DimmableLight','Insteon::DeviceController');
+@Insteon::FanLinc::ISA = ('Insteon::DimmableLight','Insteon::DeviceController', 'Insteon::MultigroupDevice');
 
 =item C<new()>
 
@@ -1178,6 +1182,36 @@ sub is_acknowledged
 	}
 }
 
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds}
+    );
+    if ($self->is_root){
+        %voice_cmds = (
+            %voice_cmds,
+            'sync all device links' => "$object_name->sync_all_links()",
+            'AUDIT sync all device links' => "$object_name->sync_all_links(1)"
+        );
+    }
+    return \%voice_cmds;
+}
+
 =back
 
 =head2 AUTHOR 
diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index f7a6eef45..b66a7e14a 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -569,7 +569,7 @@ sub simple_message {
 package Insteon::Thermo_i2CS;
 use strict;
 
-@Insteon::Thermo_i2CS::ISA = ('Insteon::Thermostat');
+@Insteon::Thermo_i2CS::ISA = ('Insteon::Thermostat', 'Insteon::MultigroupDevice');
 
 our %message_types = (
 	%Insteon::Thermostat::message_types,
@@ -1186,9 +1186,16 @@ sub get_voice_cmds
     my ($self) = @_;
     my $object_name = $self->get_object_name;
     my %voice_cmds = (
-        %{$self->SUPER::get_voice_cmds},
-        'sync time' => "$object_name->sync_time()"
+        %{$self->SUPER::get_voice_cmds}
     );
+    if ($self->is_root){
+        %voice_cmds = (
+            %{$self->SUPER::get_voice_cmds},
+            'sync time' => "$object_name->sync_time()",
+            'sync all device links' => "$object_name->sync_all_links()",
+            'AUDIT sync all device links' => "$object_name->sync_all_links(1)"
+        );
+    }
     return \%voice_cmds;
 }
 

From 65b63b0c1a80128d925da34478f61472f0842d6a Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 25 Oct 2013 17:39:00 -0700
Subject: [PATCH 300/330] Insteon: Multigroup Sync All Links to Scan Root
 Object

Not sure why I omitted this before.
---
 lib/Insteon/BaseInsteon.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 82dacfa90..daa008757 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2797,7 +2797,7 @@ sub sync_all_links
 	::print_log("[Insteon::MultigroupDevice] Sync All Links on device "
 		.$self->get_object_name . " starting ...");
 	# Find all subgroup items check groups from 02 - FF;
-	for ($dec_group = 02; $dec_group <= 255; $dec_group++) {
+	for ($dec_group = 01; $dec_group <= 255; $dec_group++) {
 		$group = sprintf("%02X", $dec_group);
 		$subgroup_object = Insteon::get_object($device_id, $group);
 		if (ref $subgroup_object){

From 097d46320e3a3c93334b3379f59302516d9527b4 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sun, 27 Oct 2013 12:39:00 -0700
Subject: [PATCH 301/330] Insteon: Set Failure Callback for ALDB Query

This way if device is unreachable, we still continue on with the scan
---
 lib/Insteon.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index b976387e4..a0341b3f2 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -458,6 +458,7 @@ sub _get_next_linkscan
 			## check if aldb_delta has changed;
 			$current_scan_device->_aldb->{_aldb_unchanged_callback} = '&Insteon::_get_next_linkscan('.$skip_unchanged.')';
 			$current_scan_device->_aldb->{_aldb_changed_callback} = '&Insteon::_get_next_linkscan('.$skip_unchanged.', '.$current_scan_device->get_object_name.')';
+			$current_scan_device->_aldb->{_failure_callback} = '&Insteon::_get_next_linkscan_failure('.$skip_unchanged.')';
 			$current_scan_device->_aldb->query_aldb_delta("check");
 			$checking = 1;
 		}

From ec5311c14433ebac25bcf56c2b886d8dceee43c2 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 4 Nov 2013 17:39:00 -0800
Subject: [PATCH 302/330] Display Git Build Number and Date for Unstable Branch

If running unstable, Mh will now try and determine a build number and modification date by calling git commands.
---
 bin/mh | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/bin/mh b/bin/mh
index e85103685..404bf1028 100755
--- a/bin/mh
+++ b/bin/mh
@@ -70,6 +70,14 @@ BEGIN {
     $Version = $autover || 'unknown';
     $Version .= " (compiler: $Info{Perl_compiled})" if $Info{Perl_compiled};
 
+    #Create a build number if this is unstable version
+    if (lc $Version eq 'unstable'){
+	my $build = lc `git describe --long`;
+	$build =~ /(\S+)-(\d+)-g([0-9a-f]+)/;
+	$Version = "$1 Build $2 ($3)" if ($1 && $2 && $3);
+    }
+
+
 #   $Pgm_Path = '.';
 
     $usage = <<"eof";
@@ -213,9 +221,23 @@ BEGIN {
 
     sub print_version {
 
-        $Version_date = localtime((stat $0)[9]);
+        $Version_date = localtime((stat $0)[9]); #this script as default
         $Version_date = localtime((stat "$Pgm_Path/bin/$0.exe")[9]) if $PerlApp::BUILD;
         $Version_date = localtime((stat $ENV{sourceExe})[9]) if $ENV{sourceExe}; # Older 3.x perl2exe
+        $Version_date = localtime((stat '../VERSION')[9]) if (-e '../VERSION'); #if VERSION file exists use that
+	
+        #Get version date for unstable branch
+        my $autover;
+        if (-e '../VERSION') {
+		open (VERSION, '../VERSION');
+		$autover = <VERSION>;
+		chomp $autover;
+		close (VERSION);
+        }
+        if (lc $autover eq 'unstable'){
+		my $build_date = `git show -s --format="%ci"`;
+		$Version_date = $build_date if ($build_date=~/^\d\d\d\d-\d\d-\d\d/);
+        }
 
         $Pgm_PathU = '.';       # Since we now chdir, this is obsolete, but still used in some user code :(
         $Pgm_Root  = './..';
@@ -249,7 +271,7 @@ BEGIN {
 
         print "\nCommand: $Pgm_Name @ARGV\n";
         print "Pgm  path   : $Pgm_Path\n";
-        print "Pgm  version: $Version  Last updated: $Version_date\n";
+        print "Pgm  version: $Version  \nLast updated: $Version_date\n";
         $Info{Perl_version} = $];
                                 # Use eval to avoid problems with earlier version (e.g. build 502)
         $Info{Perl_version} .= " Build " . eval "&Win32::BuildNumber()" if $OS_win;

From 9c8f29298af218a5b67a936683d8c92d4ae5e80e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Tue, 5 Nov 2013 17:39:00 -0800
Subject: [PATCH 303/330] Remove Switch/Case Statement, Incompatible with Perl
 5.8

For some reason it appears that Swtich.pm version 2.10 which was distributed in perl 5.8.x has some egregious bugs.

In order to enable backwards compatibility, these have been converted to if/elsif/else statements
---
 lib/Insteon/BaseInsteon.pm | 223 ++++++++++++++++++-------------------
 1 file changed, 108 insertions(+), 115 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index b1b7259dc..c25350b06 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -25,7 +25,6 @@ L<Generic_Item|Generic_Item>
 
 package Insteon::BaseObject;
 
-use Switch;
 use strict;
 use Insteon::AllLinkDatabase;
 
@@ -1412,62 +1411,60 @@ sub link_to_interface
 	my $failure_callback = '::print_log("[Insteon::BaseInsteon] Error: The Link_To_Interface '.
 		'routine failed for device: '.$self->get_object_name.'")';
 	$step = 0 if ($step eq '');
-	switch ($step){
-		case (0) { #If NAK on get_engine, then this is an I2CS device
-			$success_callback = $success_callback_prefix . "\"1\")";
-			$failure_callback = $self->get_object_name."->link_to_interface_i2cs(\"$p_group\",\"$p_data3\")";
-			$self->get_engine_version($success_callback, $failure_callback);	
-		}
-		case (1) { #Add Link from object->PLM
-			$success_callback = $success_callback_prefix . "\"2\")";
-			my %link_info = ( object => $self->interface, group => $p_group, is_controller => 1,
-				callback => "$success_callback", failure_callback=> "$failure_callback");
-			$link_info{data3} = $p_data3 if $p_data3;
-		        if ($self->_aldb) {
-			   $self->_aldb->add_link(%link_info);
-		        }
-		        else
-		        {
-		           &main::print_log("[Insteon::BaseInsteon] Error: This item, " . $self->get_object_name .
-		              ", does not have an ALDB object.  Linking is not permitted.");
-		        }
-		}
-		case (2){ #Add Link from PLM->object
-			$success_callback = $success_callback_prefix . "\"3\")";
-			my $link_info = "deviceid=" . lc $self->device_id . " group=$p_group is_controller=0 " .
-				"callback=$success_callback failure_callback=$failure_callback";	
-		        $self->interface->add_link($link_info);
-		}
-		case (3){ #Add surrogate link on device if surrogate exists
-			if (ref $$self{surrogate}){
-				$success_callback = $success_callback_prefix . "\"4\")";
-				my $surrogate_group = $$self{surrogate}->group;
-				my %link_info = ( object => $self->interface, 
-					group => $surrogate_group, is_controller => 0,
-					callback => "$success_callback", 
-					failure_callback=> "$failure_callback",
-					data3 => $p_group);
-				$self->_aldb->add_link(%link_info);
-			} else {
-				::print_log('[Insteon::BaseInsteon] Link_To_Interface successfully completed'.
-					' for device ' .$self->get_object_name);	
-			}
-		}
-		case (4){ #Add surrogate link on PLM if surrogate exists
-			$success_callback = $success_callback_prefix . "\"5\")";
+	if ($step == 0) { #If NAK on get_engine, then this is an I2CS device
+		$success_callback = $success_callback_prefix . "\"1\")";
+		$failure_callback = $self->get_object_name."->link_to_interface_i2cs(\"$p_group\",\"$p_data3\")";
+		$self->get_engine_version($success_callback, $failure_callback);	
+	}
+	elsif ($step == 1) { #Add Link from object->PLM
+		$success_callback = $success_callback_prefix . "\"2\")";
+		my %link_info = ( object => $self->interface, group => $p_group, is_controller => 1,
+			callback => "$success_callback", failure_callback=> "$failure_callback");
+		$link_info{data3} = $p_data3 if $p_data3;
+	        if ($self->_aldb) {
+		   $self->_aldb->add_link(%link_info);
+	        }
+	        else
+	        {
+	           &main::print_log("[Insteon::BaseInsteon] Error: This item, " . $self->get_object_name .
+	              ", does not have an ALDB object.  Linking is not permitted.");
+	        }
+	}
+	elsif ($step == 2){ #Add Link from PLM->object
+		$success_callback = $success_callback_prefix . "\"3\")";
+		my $link_info = "deviceid=" . lc $self->device_id . " group=$p_group is_controller=0 " .
+			"callback=$success_callback failure_callback=$failure_callback";	
+	        $self->interface->add_link($link_info);
+	}
+	elsif ($step == 3){ #Add surrogate link on device if surrogate exists
+		if (ref $$self{surrogate}){
+			$success_callback = $success_callback_prefix . "\"4\")";
 			my $surrogate_group = $$self{surrogate}->group;
-			my %link_info = ( deviceid=> lc $self->device_id, 
-				group => $surrogate_group, is_controller => 1,
+			my %link_info = ( object => $self->interface, 
+				group => $surrogate_group, is_controller => 0,
 				callback => "$success_callback", 
 				failure_callback=> "$failure_callback",
-				data3 => $surrogate_group);
-			$self->interface->add_link(%link_info);
-		}
-		case (5){
+				data3 => $p_group);
+			$self->_aldb->add_link(%link_info);
+		} else {
 			::print_log('[Insteon::BaseInsteon] Link_To_Interface successfully completed'.
-				' for device ' .$self->get_object_name);			
+				' for device ' .$self->get_object_name);	
 		}
 	}
+	elsif ($step == 4){ #Add surrogate link on PLM if surrogate exists
+		$success_callback = $success_callback_prefix . "\"5\")";
+		my $surrogate_group = $$self{surrogate}->group;
+		my %link_info = ( deviceid=> lc $self->device_id, 
+			group => $surrogate_group, is_controller => 1,
+			callback => "$success_callback", 
+			failure_callback=> "$failure_callback",
+			data3 => $surrogate_group);
+		$self->interface->add_link(%link_info);
+	}
+	elsif ($step == 5){
+		::print_log('[Insteon::BaseInsteon] Link_To_Interface successfully completed'.
+			' for device ' .$self->get_object_name);			
+	}
 }
 
 =item C<link_to_interface_i2cs([group,data3])>
@@ -1488,21 +1485,19 @@ sub link_to_interface_i2cs
 	my $failure_callback = "::print_log('[Insteon::BaseInsteon] Error Link_To_Interface_I2CS ".
 		"routine failed for device: ".$self->get_object_name."')";
 	$step = 0 if ($step eq '');
-	switch ($step){
-		case (0) { #Put PLM into initiate linking mode
-			$success_callback = $success_callback_prefix . "'1')";
-			$self->interface()->initiate_linking_as_controller('00', $success_callback, $failure_callback);	
-		}
-		case (1) { #Ask device to respond to link request
-			$success_callback = $success_callback_prefix . "'2')";
-			$self->enter_linking_mode($p_group, $success_callback, $failure_callback);	
-		}
-		case (2) { #Scan device to get an accurate link table
-			#return to normal link_to_interface routine if successful
-			$success_callback_prefix = $self->get_object_name."->link_to_interface('$p_group','$p_data3',";
-			$success_callback = $success_callback_prefix . "'1')";
-			$self->scan_link_table($success_callback, $failure_callback);
-		}
+	if ($step == 0) { #Put PLM into initiate linking mode
+		$success_callback = $success_callback_prefix . "'1')";
+		$self->interface()->initiate_linking_as_controller('00', $success_callback, $failure_callback);	
+	}
+	elsif ($step == 1) { #Ask device to respond to link request
+		$success_callback = $success_callback_prefix . "'2')";
+		$self->enter_linking_mode($p_group, $success_callback, $failure_callback);	
+	}
+	elsif ($step == 2) { #Scan device to get an accurate link table
+		#return to normal link_to_interface routine if successful
+		$success_callback_prefix = $self->get_object_name."->link_to_interface('$p_group','$p_data3',";
+		$success_callback = $success_callback_prefix . "'1')";
+		$self->scan_link_table($success_callback, $failure_callback);
 	}
 }
 
@@ -1529,62 +1524,60 @@ sub unlink_to_interface
 	my $failure_callback = "::print_log('[Insteon::BaseInsteon] ERROR: Unlink_To_Interface ".
 		"failed for device: ".$self->get_object_name."')";
 	$step = 0 if ($step eq '');
-	switch ($step){
-		case (0) { #Delete link on the device
-		        if ($self->_aldb) {
-		        	$success_callback = $success_callback_prefix . "'1')";
-				$self->_aldb->delete_link(object => $self->interface, 
-					group => $p_group, 
-					data3=> $p_group, is_controller => 1,
-					callback => $success_callback,
-					failure_callback=> $failure_callback);
-		        }
-		        else
-		        {
-		           &main::print_log("[BaseInsteon] This item " . $self->get_object_name .
-		              " does not have an ALDB object.  Unlinking is not permitted.");
-		        }
-		}
-		case (1) { #Delete link on the PLM
-			$success_callback = $success_callback_prefix . "'2')";
-			$self->interface->delete_link(
-				deviceid => lc $self->device_id, 
-				group=> $p_group, is_controller=>0,
-				callback=>$success_callback,
-				failure_callback=>$failure_callback);
-		}
-		case (2){ #Delete surrogate link on device if surrogate exists
-			if (ref $$self{surrogate}){
-				$success_callback = $success_callback_prefix . "'3')";
-				my $surrogate_group = $$self{surrogate}->group;
-				my %link_info = ( object => $self->interface, 
-					group => $surrogate_group, is_controller => 0,
-					callback => "$success_callback", 
-					failure_callback=> "$failure_callback",
-					data3 => $p_group);
-				$self->_aldb->delete_link(%link_info);
-			} else {
-				::print_log("[Insteon::BaseInsteon] Unlink_To_Interface".
-					" successfully completed for device "
-					. $self->get_object_name);	
-			}
-		}
-		case (3){ #Delete surrogate link on PLM if surrogate exists
-			$success_callback = $success_callback_prefix . "'4')";
+	if ($step == 0) { #Delete link on the device
+	        if ($self->_aldb) {
+	        	$success_callback = $success_callback_prefix . "'1')";
+			$self->_aldb->delete_link(object => $self->interface, 
+				group => $p_group, 
+				data3=> $p_group, is_controller => 1,
+				callback => $success_callback,
+				failure_callback=> $failure_callback);
+	        }
+	        else
+	        {
+	           &main::print_log("[BaseInsteon] This item " . $self->get_object_name .
+	              " does not have an ALDB object.  Unlinking is not permitted.");
+	        }
+	}
+	elsif ($step == 1) { #Delete link on the PLM
+		$success_callback = $success_callback_prefix . "'2')";
+		$self->interface->delete_link(
+			deviceid => lc $self->device_id, 
+			group=> $p_group, is_controller=>0,
+			callback=>$success_callback,
+			failure_callback=>$failure_callback);
+	}
+	elsif ($step == 2){ #Delete surrogate link on device if surrogate exists
+		if (ref $$self{surrogate}){
+			$success_callback = $success_callback_prefix . "'3')";
 			my $surrogate_group = $$self{surrogate}->group;
-			my %link_info = ( deviceid=> lc $self->device_id, 
-				group => $surrogate_group, is_controller => 1,
+			my %link_info = ( object => $self->interface, 
+				group => $surrogate_group, is_controller => 0,
 				callback => "$success_callback", 
 				failure_callback=> "$failure_callback",
-				data3 => $surrogate_group);
-			$self->interface->delete_link(%link_info);
-		}
-		case (4) {
+				data3 => $p_group);
+			$self->_aldb->delete_link(%link_info);
+		} else {
 			::print_log("[Insteon::BaseInsteon] Unlink_To_Interface".
 				" successfully completed for device "
-				. $self->get_object_name);
+				. $self->get_object_name);	
 		}
 	}
+	elsif ($step == 3){ #Delete surrogate link on PLM if surrogate exists
+		$success_callback = $success_callback_prefix . "'4')";
+		my $surrogate_group = $$self{surrogate}->group;
+		my %link_info = ( deviceid=> lc $self->device_id, 
+			group => $surrogate_group, is_controller => 1,
+			callback => "$success_callback", 
+			failure_callback=> "$failure_callback",
+			data3 => $surrogate_group);
+		$self->interface->delete_link(%link_info);
+	}
+	elsif ($step == 4) {
+		::print_log("[Insteon::BaseInsteon] Unlink_To_Interface".
+			" successfully completed for device "
+			. $self->get_object_name);
+	}
 }
 
 =item C<enter_linking_mode(group, success_callback, failure_callback)>

From 2771d11dbf3cdfa7c23d7cc03b033291c6bfb54f Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Wed, 6 Nov 2013 13:21:36 -0800
Subject: [PATCH 304/330] Allow a Build Number of 0

Check if build number is defined, not if true, as in extremely rare case build number may be 0.
---
 bin/mh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/mh b/bin/mh
index 404bf1028..3eb52899e 100755
--- a/bin/mh
+++ b/bin/mh
@@ -74,7 +74,7 @@ BEGIN {
     if (lc $Version eq 'unstable'){
 	my $build = lc `git describe --long`;
 	$build =~ /(\S+)-(\d+)-g([0-9a-f]+)/;
-	$Version = "$1 Build $2 ($3)" if ($1 && $2 && $3);
+	$Version = "$1 Build $2 ($3)" if ($1 && defined($2) && $3);
     }
 
 

From 762b9adb412678ba2a73442a43c9a6354714d7b9 Mon Sep 17 00:00:00 2001
From: JaredF <Jared.Fernandez@GMail.com>
Date: Wed, 6 Nov 2013 16:08:02 -0800
Subject: [PATCH 305/330] Adds INSTEON_TRIGGERLINC Device to 'Edit Items' Page
 in Web Interface

---
 web/bin/items.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/bin/items.pl b/web/bin/items.pl
index 8fbf3c409..cc224b435 100644
--- a/web/bin/items.pl
+++ b/web/bin/items.pl
@@ -67,7 +67,7 @@ sub web_items_list {
                         'EIB Value (EIB5)', 'EIB Drive (EIB7)',
                         'GENERIC', 'GROUP', 'IBUTTON', 'INSTEON_PLM','INSTEON_LAMPLINC','INSTEON_APPLIANCELINC',
                         'INSTEON_SWITCHLINC','INSTEON_SWITCHLINCRELAY','INSTEON_KEYPADLINC','INSTEON_KEYPADLINCRELAY',
-                        'INSTEON_REMOTELINC','INSTEON_MOTIONSENSOR','INSTEON_ICONTROLLER',
+                        'INSTEON_REMOTELINC','INSTEON_MOTIONSENSOR','INSTEON_TRIGGERLINC','INSTEON_ICONTROLLER',
                         'MP3PLAYER', 'One-Wire xAP Connector (OWX)', 'RF', 'SERIAL',
                         'SG485LCD', 'SG485RCSTHRM', 'STARGATEDIN', 'STARGATEVAR',
                         'STARGATEFLAG', 'STARGATERELAY', 'STARGATETHERM', 'STARGATEPHONE',
@@ -148,6 +148,7 @@ sub web_items_list {
 		    INSTEON_KEYPADLINCRELAY  	=> [qw(Address Name Groups)],
 		    INSTEON_REMOTELINC  	=> [qw(Address Name Groups)],
 		    INSTEON_MOTIONSENSOR  	=> [qw(Address Name Groups)],
+		    INSTEON_TRIGGERLINC		=> [qw(Address Name Groups)],
 		    INSTEON_ICONTROLLER  	=> [qw(Address Name Groups)],
                     SCENE_MEMBER => [qw(MemberName LinkName OnLevel RampRate)],
                     default => [qw(Address Name Groups Other)]

From 1345a22873edd32e5d6009392130e3be4576488b Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 7 Nov 2013 17:25:00 -0800
Subject: [PATCH 306/330] Insteon: Remove extraneous commented code from
 Insteon.pm

If we don't remove the code now, we will likely never do it.
---
 lib/Insteon.pm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index a2000bd70..2da44a1ed 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -917,11 +917,7 @@ sub debuglevel
 	my ($object, $debug_level) = @_;
 	$debug_level = 1 unless $debug_level;
 	my $objname;
-	#try {
 	 $objname = lc $object->get_object_name if defined $object;
-	#} catch {
-	#  &::print_log("$object doesn't have a get_object_name function.") if $main::Debug{insteon} >= 2;
-	#}
 	&::print_log("Insteon::debuglevel: Processing debug for object $objname ... " . $main::Debug{$objname}) if $main::Debug{insteon} >= 5;
 	return 1 if $main::Debug{insteon} >= $debug_level;
 	return 1 if defined $objname && $main::Debug{$objname} >= $debug_level;
@@ -1132,7 +1128,6 @@ sub check_thermo_versions
 			bless $thermo_device, 'Insteon::Thermo_i1';
 		}
 	}
-	#main::print_log("[Insteon] DEBUG4 Checking thermostat version of all devices completed") if ($self->debuglevel(4));	
 }
 
 =back

From 52e97ab547b960c86fbdbdbb4eb87644e50bcb14 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 7 Nov 2013 17:35:00 -0800
Subject: [PATCH 307/330] Insteon: Convert DebugLevel Entries to Parent Device

ALDB objects have no real name, and as such, a user would not be able to add them to a debug line in the ini.  Moreover, if a user puts a device in the debug line, they likely expect to get all relevant messages, including ALDB messages for this device.

Removed debuglevel routine as it is unnecessary.
---
 lib/Insteon/AllLinkDatabase.pm | 121 +++++++++++++++------------------
 1 file changed, 54 insertions(+), 67 deletions(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 9ab9d79f8..3e3396096 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -145,7 +145,7 @@ sub query_aldb_delta
 			$self->{_aldb_changed_callback} = undef;
 			eval ($callback);
 			&::print_log("[Insteon::AllLinkDatabase] " . $self->{device}->get_object_name . ": error during scan callback $@")
-				if $@ and $self->debuglevel();
+				if $@ and $self->{device}->debuglevel();
 			package Insteon::AllLinkDatabase;
 		}
         } elsif ($action eq "check" && ((&main::get_tickcount - $self->scandatetime()) <= 2000)){
@@ -160,7 +160,7 @@ sub query_aldb_delta
 			$self->{_aldb_unchanged_callback} = undef;
 			eval ($callback);
 			&::print_log("[Insteon::AllLinkDatabase] " . $self->{device}->get_object_name . ": error during scan callback $@")
-				if $@ and $self->debuglevel();
+				if $@ and $self->{device}->debuglevel();
 			package Insteon::AllLinkDatabase;
 		}
         } else {
@@ -209,7 +209,6 @@ sub restore_string
 			}
 			$aldb .= $record;
 		}
-#		&::print_log("[AllLinkDataBase] aldb restore string: $aldb") if $self->debuglevel();
 		if (defined $self->scandatetime)
                 {
 			$restore_string .= $$self{device}->get_object_name . "->_aldb->scandatetime(q~" . $self->scandatetime . "~) if "
@@ -337,7 +336,7 @@ sub delete_link
 			package main;
 			eval($link_parms{callback});
 			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
-				if $@ and $self->debuglevel();
+				if $@ and $self->{device}->debuglevel();
 			package Insteon::AllLinkDatabase;
 		}
 	} elsif ($link_parms{address} && $link_parms{aldb_check} eq "ok")
@@ -395,7 +394,7 @@ sub delete_link
 				package main;
 				eval($link_parms{callback});
 				&::print_log("[Insteon::AllLinkDatabase] error encountered during delete_link callback: " . $@)
-					if $@ and $self->debuglevel();
+					if $@ and $self->{device}->debuglevel();
 				package Insteon::AllLinkDataBase;
 			}
 		}
@@ -561,7 +560,7 @@ sub delete_orphan_links
 						if ($group eq '01' || $group eq '00') {
 							#ignore manual responder link to PLM group 01 or 00 required for I2CS devices
 							main::print_log("[Insteon::AllLinkDatabase] DEBUG2 Ignoring orphan responder link from "
-								. $selfname . " to PLM for group 01 or 00") if $self->debuglevel(2);
+								. $selfname . " to PLM for group 01 or 00") if $self->{device}->debuglevel(2);
 						}
 						elsif ($audit_mode)
                                                 {
@@ -857,7 +856,7 @@ sub _process_delete_queue {
         else
         {
         	&::print_log("[Insteon::AllLinkDatabase] Nothing else to do for " . $$self{device}->get_object_name . " after deleting "
-                	. $$self{delete_queue_processed} . " links") if $self->debuglevel();
+                	. $$self{delete_queue_processed} . " links") if $self->{device}->debuglevel();
 		$$self{device}->interface->_aldb->_process_delete_queue($$self{delete_queue_processed});
 	}
 }
@@ -978,10 +977,10 @@ sub get_first_empty_address
 		}
 		$first_address = ($high_address > 0) ? sprintf('%04x', $high_address - 8) : 0;
 		main::print_log("[Insteon::AllLinkDatabase] DEBUG4: No empty link entries; using next lowest link address ["
-			.$first_address."]") if $self->debuglevel(4);
+			.$first_address."]") if $self->{device}->debuglevel(4);
 	} else {
 		main::print_log("[Insteon::AllLinkDatabase] DEBUG4: Found empty address ["
-			.$first_address."] in empty array") if $self->debuglevel(4);
+			.$first_address."] in empty array") if $self->{device}->debuglevel(4);
 	}
 
         return $first_address;
@@ -1047,7 +1046,7 @@ sub add_link
 			package main;
 			eval($link_parms{callback});
 			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
-				if $@ and $self->debuglevel();
+				if $@ and $self->{device}->debuglevel();
 			package Insteon::AllLinkDatabase;
 		}
 	}
@@ -1063,7 +1062,7 @@ sub add_link
 			eval($link_parms{callback});
 			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " 
 				. $$self{device}->get_object_name . ":" . $@)
-				if $@ and $self->debuglevel();
+				if $@ and $self->{device}->debuglevel();
 			package Insteon::AllLinkDatabase;
 		}
 	}
@@ -1086,7 +1085,7 @@ sub add_link
 			&::print_log("[Insteon::AllLinkDatabase] DEBUG2: adding link record " . $$self{device}->get_object_name
 				. " light level controlled by " . $insteon_object->get_object_name
 		       		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate")
-                                if $self->debuglevel(2);
+                                if $self->{device}->debuglevel(2);
 			my ($data1, $data2);
 			if($link_parms{is_controller}) {
 				$data1 = '03';  #application retries == 3
@@ -1106,14 +1105,14 @@ sub add_link
                         	. $$self{device}->get_object_name
 				. " does not have a record of the first empty ALDB record."
                                 . " Please rescan this device's link table")
-                                if $self->debuglevel();
+                                if $self->{device}->debuglevel();
 
                          if ($$self{_success_callback})
                          {
 				package main;
 				eval ($$self{_success_callback});
 				&::print_log("[Insteon::AllLinkDatabase] WARN1: Error encountered during ack callback: " . $@)
-			 		if $@ and $self->debuglevel(1);
+			 		if $@ and $self->{device}->debuglevel(1);
 			 	package Insteon::AllLinkDatabase;
                          }
                 }
@@ -1145,7 +1144,7 @@ sub update_link
 	my $ramp_rate = $link_parms{ramp_rate};
 	$ramp_rate =~ s/(\d)s?/$1/;
 	&::print_log("[Insteon::AllLinkDatabase] updating " . $$self{device}->get_object_name . " light level controlled by " . $insteon_object->get_object_name
-		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate") if $self->debuglevel();
+		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate") if $self->{device}->debuglevel();
 	my $data1 = &Insteon::DimmableLight::convert_level($on_level);
 	my $data2 = ($$self{device}->isa('Insteon::DimmableLight')) ? &Insteon::DimmableLight::convert_ramp($ramp_rate) : '00';
 	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
@@ -1171,7 +1170,7 @@ sub update_link
 			package main;
 			eval($link_parms{callback});
 			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
-				if $@ and $self->debuglevel();
+				if $@ and $self->{device}->debuglevel();
 			package Insteon::AllLinkDatabase;
 		}
 	}
@@ -1185,14 +1184,14 @@ sub update_link
 		&::print_log("[Insteon::AllLinkDatabase] ERROR: updating link record failed because "
 			. $$self{device}->get_object_name
 			. " does not have an existing ALDB entry key=$key")
-			if $self->debuglevel();
+			if $self->{device}->debuglevel();
 
 		if ($$self{_success_callback})
 		{
 			package main;
 			eval ($$self{_success_callback});
 			&::print_log("[Insteon::AllLinkDatabase] WARN1: Error encountered during ack callback: " . $@)
-				if $@ and $self->debuglevel(1);
+				if $@ and $self->{device}->debuglevel(1);
 			package Insteon::AllLinkDatabase;
 		}
 	}
@@ -1362,18 +1361,6 @@ sub has_link
 	return (defined $$self{aldb}{$key});
 }
 
-=item C<debuglevel([level])>
-
-Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
-
-=cut
-
-sub debuglevel
-{
-	my ($self, $debug_level) = @_;
-	return Insteon::debuglevel(undef, $debug_level);
-}
-
 =back
 
 =head2 INI PARAMETERS
@@ -1592,7 +1579,7 @@ sub _on_peek
         my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'peek');
 	if ($msg{is_extended}) {
 		&::print_log("[Insteon::ALDB_i1]: extended peek for " . $$self{device}->{object_name}
-		. " is " . $msg{extra}) if $self->debuglevel();
+		. " is " . $msg{extra}) if $self->{device}->debuglevel();
 	}
         else
         {
@@ -1644,7 +1631,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
 				my $flag = hex($msg{extra});
 				$$self{pending_aldb}{inuse} = ($flag & 0x80) ? 1 : 0;
 				$$self{pending_aldb}{is_controller} = ($flag & 0x40) ? 1 : 0;
@@ -1674,7 +1661,7 @@ sub _on_peek
                                         }
 
 					&::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name . " completed link memory scan")
-						if $self->debuglevel();
+						if $self->{device}->debuglevel();
 					$self->health("good");
 					# Put the new ALDB Delta into memory
 					$self->query_aldb_delta('set');
@@ -1724,7 +1711,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
 				$$self{pending_aldb}{group} = lc $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_devhi';
@@ -1744,7 +1731,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
 				$$self{pending_aldb}{deviceid} = lc $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_devmid';
@@ -1765,7 +1752,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
 				$$self{pending_aldb}{deviceid} .= lc $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_devlo';
@@ -1786,7 +1773,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
 				$$self{pending_aldb}{deviceid} .= lc $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_data1';
@@ -1809,7 +1796,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
 				$$self{_mem_action} = 'aldb_data2';
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{pending_aldb}{data1} = $msg{extra};
@@ -1832,7 +1819,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
 				$$self{pending_aldb}{data2} = $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_data3';
@@ -1855,7 +1842,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
 				$$self{pending_aldb}{data3} = $msg{extra};
 
                         	if ($$self{_stress_test_act}){
@@ -1937,7 +1924,7 @@ sub _on_peek
 		else {
 		::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name 
 			. ": unhandled _mem_action=".$$self{_mem_action})
-			if $self->debuglevel();
+			if $self->{device}->debuglevel();
 		}
 	}
 }
@@ -2020,7 +2007,7 @@ sub _write_link
 		if (($$self{device}->isa('Insteon::KeyPadLincRelay') or $$self{device}->isa('Insteon::KeyPadLinc')) and ($data3 eq '00'))
                 {
 			&::print_log("[Insteon::ALDB_i1] setting data3 to " . $$self{device}->group . " for this keypadlinc")
-				if $self->debuglevel();
+				if $self->{device}->debuglevel();
 			$data3 = $$self{device}->group;
 		}
 		$$self{pending_aldb}{data3} = (defined $data3) ? lc $data3 : '00';
@@ -2036,7 +2023,7 @@ sub _write_link
 			package main;
 			eval ($$self{_success_callback});
 			&::print_log("[Insteon::ALDB_i1] WARN1: Error encountered during ack callback: " . $@)
-		 		if $@ and $self->debuglevel(1);
+		 		if $@ and $self->{device}->debuglevel(1);
 		 	package Insteon::ALDB_i1;
                 }
 	}
@@ -2144,7 +2131,7 @@ sub on_read_write_aldb
 	&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 		. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
 		. lc $msg{extra} . " for _mem_activity=".$$self{_mem_activity}
-		 ." _mem_action=". $$self{_mem_action}) if  $self->debuglevel(3);
+		 ." _mem_action=". $$self{_mem_action}) if  $self->{device}->debuglevel(3);
 
 	if ($$self{_mem_action} eq 'aldb_i2read')
 	{
@@ -2156,12 +2143,12 @@ sub on_read_write_aldb
 			$$self{_mem_action} = 'aldb_i2readack';
 			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received ack")
-				if  $self->debuglevel(3);
+				if  $self->{device}->debuglevel(3);
 		} else {
 			#otherwise just ignore the message because it is out of sequence
 			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] ack not received. "
-				. "ignoring message") if  $self->debuglevel(3);
+				. "ignoring message") if  $self->{device}->debuglevel(3);
 		}
 		
 	}
@@ -2170,14 +2157,14 @@ sub on_read_write_aldb
 		if($msg{is_ack}) {
 			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received duplicate ack. Ignoring.")
-				if  $self->debuglevel(3);
+				if  $self->{device}->debuglevel(3);
 				$clear_message = 0;
 		} elsif(length($msg{extra})<30)
 		{
 			&::print_log("[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed: "
 				. $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
+				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
 			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
 			#can't clear message, if valid message doesn't arrive
 			#resend logic will kick in
@@ -2188,7 +2175,7 @@ sub on_read_write_aldb
 				. " address received did not match address requested: "
 				. $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->debuglevel(3);
+				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
 			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
 			#can't clear message, if valid message doesn't arrive
 			#resend logic will kick in
@@ -2206,7 +2193,7 @@ sub on_read_write_aldb
 			if (lc $$self{_mem_msb} eq '00' and lc $$self{_mem_lsb} eq '00')
 			{
 				main::print_log("[Insteon::ALDB_i2] DEBUG4: Start of scan; initializing aldb structure") 
-					if  $self->debuglevel(4);
+					if  $self->{device}->debuglevel(4);
 				# reinit the aldb hash as there will be a new one
 				$$self{aldb} = undef;
 				# reinit the empty address list
@@ -2248,10 +2235,10 @@ sub on_read_write_aldb
 					. $$self{device}->get_object_name
 					. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
 					. lc $msg{extra} . " for " .  $$self{_mem_action}) 
-					if(($$self{pending_aldb}{inuse}) and $self->debuglevel(3));
+					if(($$self{pending_aldb}{inuse}) and $self->{device}->debuglevel(3));
 				main::print_log("[Insteon::ALDB_i2] DEBUG4: scan done; adding last address ["
 					. $$self{_mem_msb} . $$self{_mem_lsb} ."] to empty array") 
-					if  $self->debuglevel(4);
+					if  $self->{device}->debuglevel(4);
 				$self->add_empty_address($$self{_mem_msb} . $$self{_mem_lsb});
 				# scan done; clear out state flags
 				$$self{_mem_action} = undef;
@@ -2268,7 +2255,7 @@ sub on_read_write_aldb
 
 				&::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name 
 					. " completed link memory scan: status: " . $self->health())
-					if $self->debuglevel();
+					if $self->{device}->debuglevel();
 				$self->health("good");
 				# Put the new ALDB Delta into memory
 				$self->query_aldb_delta('set');
@@ -2279,7 +2266,7 @@ sub on_read_write_aldb
 				{
 					main::print_log("[Insteon::ALDB_i2] DEBUG4: inuse flag == false; adding address ["
 						. $$self{_mem_msb} . $$self{_mem_lsb} ."] to empty array") 
-						if  $self->debuglevel(4);
+						if  $self->{device}->debuglevel(4);
 					$self->add_empty_address($$self{pending_aldb}{address});
 				}
 				else
@@ -2305,14 +2292,14 @@ sub on_read_write_aldb
 					{
 						main::print_log("[Insteon::ALDB_i2] DEBUG4: duplicate link found; adding address ["
 							. $$self{_mem_msb} . $$self{_mem_lsb} ."] to duplicates array") 
-							if  $self->debuglevel(4);
+							if  $self->{device}->debuglevel(4);
 						$self->add_duplicate_link_address($$self{pending_aldb}{address});
 					}
 					else
 					{
 						main::print_log("[Insteon::ALDB_i2] DEBUG4: active link found; adding address ["
 							. $$self{_mem_msb} . $$self{_mem_lsb} ."] to aldb") 
-							if  $self->debuglevel(4);
+							if  $self->{device}->debuglevel(4);
 						%{$$self{aldb}{$aldbkey}} = %{$$self{pending_aldb}};
 					}
 				}
@@ -2352,7 +2339,7 @@ sub on_read_write_aldb
 			$$self{pending_aldb} = undef;
 			main::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name 
 				. " link write completed for [".$$self{aldb}{$aldbkey}{address}."]")
-				if $self->debuglevel(3);
+				if $self->{device}->debuglevel(3);
 			$self->health("good");
 			# Put the new ALDB Delta into memory
 			$self->query_aldb_delta('set');
@@ -2385,7 +2372,7 @@ sub on_read_write_aldb
 	{
 		main::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name 
 			. ": unhandled _mem_action=".$$self{_mem_action})
-			if $self->debuglevel();
+			if $self->{device}->debuglevel();
 		$clear_message = 0;
 	}
 	return $clear_message;
@@ -2432,7 +2419,7 @@ sub _write_link
 		if (($$self{device}->isa('Insteon::KeyPadLincRelay') or $$self{device}->isa('Insteon::KeyPadLinc')) and ($data3 eq '00'))
                 {
 			&::print_log("[Insteon::ALDB_i2] setting data3 to " . $$self{device}->group . " for this keypadlinc")
-				if $self->debuglevel();
+				if $self->{device}->debuglevel();
 			$data3 = $$self{device}->group;
 		}
 		$$self{pending_aldb}{data3} = (defined $data3) ? lc $data3 : '00';
@@ -2453,7 +2440,7 @@ sub _write_link
 			package main;
 			eval ($$self{_success_callback});
 			&::print_log("[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: " . $@)
-		 		if $@ and $self->debuglevel(1);
+		 		if $@ and $self->{device}->debuglevel(1);
 		 	package Insteon::ALDB_i2;
                 }
 	}
@@ -2503,7 +2490,7 @@ sub _write_delete
 			package main;
 			eval ($$self{_success_callback});
 			&::print_log("[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: " . $@)
-		 		if $@ and $self->debuglevel(1);
+		 		if $@ and $self->{device}->debuglevel(1);
 		 	package Insteon::ALDB_i2;
                 }
 	}
@@ -2783,7 +2770,7 @@ sub delete_orphan_links
                         &::print_log("[Insteon::ALDB_PLM] (AUDIT) Delete Orphan Link to non-existant deviceid: " .
                                 $deviceid . "; group:$group; "
                                 . (($is_controller) ? "controller; data:$data3" : "responder"))
-                                if $self->debuglevel();
+                                if $self->{device}->debuglevel();
                         }
                         else
                         {
@@ -2808,13 +2795,13 @@ sub delete_orphan_links
 					if ($group eq '01' || $group eq '00') {
 						#ignore manual controller link from PLM group 01 or 00 to device required for I2CS devices
 						main::print_log("[Insteon::ALDB_PLM] DEBUG2 Ignoring orphan PLM controller(01 or 00) link to "
-							. $device->get_object_name() ) if $self->debuglevel(2);
+							. $device->get_object_name() ) if $self->{device}->debuglevel(2);
 					}
 					elsif ($audit_mode)
                                         {
 	                                        &::print_log("[Insteon::ALDB_PLM] (AUDIT) Delete Orphan PLM controller link ($group) to: "
                                                         . $device->get_object_name() . "($data3)")
-                                                        if $self->debuglevel();
+                                                        if $self->{device}->debuglevel();
                                         }
                                         else
                                         {
@@ -2938,7 +2925,7 @@ sub _process_delete_queue {
 					. (($delete_req{is_controller}) ? "controller($delete_req{data3})" : "responder")
 					. ", " . (($delete_req{object}) ? "object=" . $delete_req{object}->get_object_name
 					: "deviceid=$delete_req{deviceid}") . ", group=$delete_req{group}")
-					if $self->debuglevel();
+					if $self->{device}->debuglevel();
 				$self->delete_link(%delete_req);
 			}
                         elsif ($delete_req{linkdevice})
@@ -3008,7 +2995,7 @@ sub delete_link
 			package main;
 			eval ($link_parms{callback});
 			&::print_log("[Insteon_PLM] error in add link callback: " . $@)
-				if $@ and $self->debuglevel();
+				if $@ and $self->{device}->debuglevel();
 			package Insteon_PLM;
 		}
 	}
@@ -3059,7 +3046,7 @@ sub add_link
 			package main;
 			eval ($link_parms{callback});
 			&::print_log("[Insteon::ALDB_PLM] error in add link callback: " . $@)
-				if $@ and $self->debuglevel();
+				if $@ and $self->{device}->debuglevel();
 			package Insteon_PLM;
 		}
 	}

From b1241bed7520b1e7ab2bc06ee9ad0ddc9de34f4d Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 8 Nov 2013 17:20:00 -0800
Subject: [PATCH 308/330] Insteon: Removed Debuglevel routine from Insteon.pm

Neither the Insteon Manager nor the non-object oriented Insteon.pm have user friendly names that can be put into the debug parameter.  As a result adding a debuglevel routine which really just resulted in returning the global insteon debug level only complicated things.
---
 lib/Insteon.pm | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 2da44a1ed..2345dc989 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -906,24 +906,6 @@ sub init {
 
 }
 
-=item C<debuglevel([level])>
-
-Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
-
-=cut
-
-sub debuglevel
-{
-	my ($object, $debug_level) = @_;
-	$debug_level = 1 unless $debug_level;
-	my $objname;
-	 $objname = lc $object->get_object_name if defined $object;
-	&::print_log("Insteon::debuglevel: Processing debug for object $objname ... " . $main::Debug{$objname}) if $main::Debug{insteon} >= 5;
-	return 1 if $main::Debug{insteon} >= $debug_level;
-	return 1 if defined $objname && $main::Debug{$objname} >= $debug_level;
-  return 0;
-}
-
 =item C<generate_voice_commands()>
 
 Generates and sets the voice commands for all Insteon devices.
@@ -1079,7 +1061,7 @@ Walks through every Insteon device and checks the aldb object version for I1 vs.
 
 sub check_all_aldb_versions
 {
-	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices") if Insteon::debuglevel(undef,4);
+	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices") if ($main::Debug{insteon} >= 4);
 
 	my @ALDB_devices = ();
 	push @ALDB_devices, Insteon::find_members("Insteon::BaseDevice");
@@ -1102,12 +1084,12 @@ sub check_all_aldb_versions
 				if ($ALDB_device->debuglevel(4));
 		}
 	}
-	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices completed") if Insteon::debuglevel(undef,4);
+	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices completed") if ($main::Debug{insteon} >= 4);
 }
 
 sub check_thermo_versions
 {
-	main::print_log("[Insteon] DEBUG4 Initializing thermostat versions") if Insteon::debuglevel(undef,4);
+	main::print_log("[Insteon] DEBUG4 Initializing thermostat versions") if ($main::Debug{insteon} >= 4);
 
 	my @thermo_devices = ();
 	push @thermo_devices, Insteon::find_members("Insteon::Thermostat");
@@ -1203,7 +1185,7 @@ sub _active_interface
    my ($self, $interface) = @_;
    # setup hooks the first time that an interface is made active
    if (!($$self{active_interface}) and $interface) {
-      &main::print_log("[Insteon] Setting up initialization hooks") if $self->debuglevel();
+      &main::print_log("[Insteon] Setting up initialization hooks") if $main::Debug{insteon};
       &main::MainLoop_pre_add_hook(\&Insteon::BaseInterface::check_for_data, 1);
       &main::Reload_post_add_hook(\&Insteon::check_all_aldb_versions, 1);
       &main::Reload_post_add_hook(\&Insteon::BaseInterface::poll_all, 1);
@@ -1216,18 +1198,6 @@ sub _active_interface
    return $$self{active_interface};
 }
 
-=item C<debuglevel([level])>
-
-Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
-
-=cut
-
-sub debuglevel
-{
-	my ($self, $debug_level) = @_;
-	return Insteon::debuglevel(undef, $debug_level);
-}
-
 =item C<add()>
 
 Adds a list of objects to be tracked.

From 48e7f075f5a5cafc3243fd0ef0772669497f62c3 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 8 Nov 2013 17:28:00 -0800
Subject: [PATCH 309/330] Insteon: Move Debuglevel into BaseObject, Re-Assign
 Debuglevel in BaseInterface

Trying to attach the debug message to the most logical object.  Whenever possible, trying to avoid having the PLM be the "catch-all" object.
---
 lib/Insteon/BaseInsteon.pm   | 10 ++++++++--
 lib/Insteon/BaseInterface.pm | 24 ++++++++++++++----------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index faeb92099..1adc93bd4 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -214,8 +214,14 @@ Returns 1 if insteon or this device is at least debug level 'level', otherwise r
 
 sub debuglevel
 {
-	my ($self, $debug_level) = @_;
-	return Insteon::debuglevel($self, $debug_level);
+	my ($object, $debug_level) = @_;
+	$debug_level = 1 unless $debug_level;
+	my $objname;
+	$objname = lc $object->get_object_name if defined $object;
+	::print_log("[Insteon] debuglevel: Processing debug for object $objname ... " . $main::Debug{$objname}) if $main::Debug{insteon} >= 5;
+	return 1 if $main::Debug{insteon} >= $debug_level;
+	return 1 if defined $objname && $main::Debug{$objname} >= $debug_level;
+	return 0;
 }
 
 =item C<timeout_factor($float)>
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 85ab3b813..1707fa2f9 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -129,7 +129,7 @@ Returns 1 if Insteon or this device is at least debug level 'level', otherwise r
 sub debuglevel
 {
 	my ($self, $debug_level) = @_;
-	return Insteon::debuglevel($self, $debug_level);
+	return Insteon::BaseObject::debuglevel($self, $debug_level);
  }
 
 =item C<_is_duplicate(cmd)>
@@ -576,7 +576,7 @@ sub on_standard_insteon_received
 		   					if($object->_process_message($self, %msg)) {
 								if ($self->active_message->success_callback){
 									main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
-										. $self->active_message->success_callback) if $self->debuglevel(4);
+										. $self->active_message->success_callback) if $object->debuglevel(4);
 									package main;
 										eval $self->active_message->success_callback;
 										::print_log("[Insteon::BaseInterface] problem w/ success callback: $@") if $@;
@@ -606,11 +606,11 @@ sub on_standard_insteon_received
 							if (($msg{extra} == $self->active_message->setby->group)){
                                                                 &main::print_log("[Insteon::BaseInterface] DEBUG3: Cleanup message received for scene "
                                                                 	. $object->get_object_name . " from " . $setby_object->get_object_name)
-                                                                	if $self->debuglevel(3);
+                                                                	if $object->debuglevel(3);
 							} elsif ($self->active_message->command_type eq 'all_link_direct_cleanup' &&
 								lc($self->active_message->setby->device_id) eq $msg{source}) 
 							{
-								&::print_log("[Insteon::BaseInterface] DEBUG2: ALL-Linking Direct Completed with ". $self->active_message->setby->get_object_name) if $self->debuglevel(2);
+								&::print_log("[Insteon::BaseInterface] DEBUG2: ALL-Linking Direct Completed with ". $self->active_message->setby->get_object_name) if $object->debuglevel(2);
 								$self->clear_active_message();
 							}
 							else {
@@ -619,7 +619,7 @@ sub on_standard_insteon_received
 								. $object->get_object_name . ", but group in recent message " 
 								. $msg{extra}. " did not match group in "
 								. "prior sent message group " . $self->active_message->setby->group) 
-									if $self->debuglevel(3);
+									if $object->debuglevel(3);
                                 			}
                                 			# If ACK or NACK received then PLM is still working on the ALL Link Command
                                 			# Increase the command timeout to wait for next one
@@ -655,9 +655,13 @@ sub on_standard_insteon_received
                                                 #   in the Insteon_PLM handler for cleanup messages.
                                                 #   however, if the virtual handler was not invoked due to receipt of the broadcast message
                                                 #   then, the above cleanup handler would be run
+						my $plm_group_obj = Insteon::get_object('000000', $msg{extra});
+						my $group_name = $msg{extra};
+						$group_name = $plm_group_obj->get_object_name if (ref $plm_group_obj);
+						$plm_group_obj = $self if (!ref $plm_group_obj);
                                                 &main::print_log("[Insteon::BaseInterface] DEBUG3: received cleanup message responding to "
-                                                	. "PLM controller group: $msg{extra}. Ignoring as this has already been processed")
-                                                        if $self->debuglevel(3);
+                                                	. "PLM controller group: $group_name. Ignoring as this has already been processed")
+                                                        if $plm_group_obj->debuglevel(3);
                                         }
                                         else
                                         {
@@ -728,11 +732,11 @@ sub on_extended_insteon_received
                         		if( (!($msg{is_ack} or $msg{is_nack}) and $self->debuglevel()) 
                         		or $self->debuglevel(3));
                    	}
-		   	&::print_log("[Insteon::BaseInterface] Processing message for " . $object->get_object_name) if $self->debuglevel(3);
+		   	&::print_log("[Insteon::BaseInterface] Processing message for " . $object->get_object_name) if $object->debuglevel(3);
 			if($object->_process_message($self, %msg)) {
 				if (ref $self->active_message && $self->active_message->success_callback){
 					main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
-						. $self->active_message->success_callback) if $self->debuglevel(4);
+						. $self->active_message->success_callback) if $object->debuglevel(4);
 					package main;
 						eval $self->active_message->success_callback;
 						::print_log("[Insteon::BaseInterface] problem w/ success callback: $@") if $@;
@@ -891,7 +895,7 @@ sub _is_duplicate_received {
             $object->default_hop_count($msg{maxhops}-$msg{hopsleft}) if $object->can('default_hop_count');
 		};
 		::print_log("[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
-			. $message_data . ", from $source.") if $self->debuglevel();
+			. $message_data . ", from ". $object->get_object_name) if $object->debuglevel();
 	} else {
 		#Message was not in hash, so add it
 		$$self{received_commands}{$key} = $curr_milli + $delay;

From cc2eb5eb8cedf2dde65b6021b1fe9fdc29068a4d Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 8 Nov 2013 17:30:00 -0800
Subject: [PATCH 310/330] Insteon: Edit Debuglevel Calls in Message.pm

Remove debuglevel routine, messages have no human readable names.  All calls should be to the relevant object.

Calls to X10 items are tricky, x10 items are defined outside of BaseObject and so do not inherit the necessary debuglevel routine (unless it is expanded to Generic_Item at some future date)
---
 lib/Insteon/Message.pm | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index eb95975fd..cf65bb0a7 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -136,18 +136,6 @@ sub send_attempts
         return $$self{send_attempts};
 }
 
-=item C<debuglevel([level])>
-
-Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
-
-=cut
-
-sub debuglevel
-{
-	my ($self, $debug_level) = @_;
-	return Insteon::debuglevel(undef, $debug_level);
-}
-
 =item C<setby(data)>
 
 Stores and retrieves what the source of this message was.
@@ -245,7 +233,7 @@ sub send
                 {
                 	&::print_log("[Insteon::BaseMessage] WARN: now resending "
                         	. $self->to_string() . " after " . $self->send_attempts
-                        	. " attempts.") if $self->debuglevel();
+                        	. " attempts.") if $self->setby->debuglevel();
                         # revise default hop count to reflect retries
                         if (ref $self->setby && $self->setby->isa('Insteon::BaseObject') 
                         	&& !defined($$self{no_hop_increase}))
@@ -260,7 +248,7 @@ sub send
                         	&& $self->setby->isa('Insteon::BaseObject')){
                         	&main::print_log("[Insteon::BaseMessage] Hop count not increased for "
                         		. $self->setby->get_object_name . " because no_hop_increase flag was set.")
-                        		if $self->debuglevel();
+                        		if $self->setby->debuglevel();
                         	$$self{no_hop_increase} = undef;
                         }
                 }
@@ -1098,7 +1086,7 @@ sub generate_commands
 	}
 
 	if ($uc eq undef) {
-	    &main::print_log("[Insteon::Message] Message is for entire HC") if Insteon::debuglevel(undef);
+	    &main::print_log("[Insteon::Message] Message is for entire HC") if Insteon::BaseObject::debuglevel($p_setby,);
 	}
 	else {
 
@@ -1107,7 +1095,7 @@ sub generate_commands
 	    $msg.= substr(unpack("H*",pack("C",$x10_unit_codes{substr($id,2,1)})),1,1);
 	    $msg.= "00";
 	    &main::print_log("[Insteon_PLM] x10 sending code: " . uc($hc . $uc) . " as insteon msg: "
-			     . $msg) if Insteon::debuglevel(undef);
+			     . $msg) if Insteon::BaseObject::debuglevel($p_setby,);
 
             push @data, $msg;
 	}
@@ -1135,7 +1123,7 @@ sub generate_commands
 	    $msg.= "80";
 
      	    &main::print_log("[Insteon_PLM] x10 sending code: " . uc($hc . $x10_arg) . " as insteon msg: "
-			     . $msg) if Insteon::debuglevel(undef);
+			     . $msg) if Insteon::BaseObject::debuglevel($p_setby,);
 
             push @data, $msg;
 

From f746ba23c29bb62dd16745120992d1bbb777e8ac Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 8 Nov 2013 17:41:00 -0800
Subject: [PATCH 311/330] Insteon: Rearrange Debuglevel Association in
 Insteon_PLM

Attempt to remove as many messages from the PLM as possible.  Avoid using it like a "catch-all".

This is particularly difficult for incoming messages.
---
 lib/Insteon_PLM.pm | 54 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index 019451663..3bc1060c5 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -390,7 +390,7 @@ sub _send_cmd {
         my $incurred_delay_time = $message->seconds_delayed;
         &main::print_log("[Insteon_PLM] DEBUG2: Sending " . $message->to_string . " incurred delay of "
         	. sprintf('%.2f',$incurred_delay_time) . " seconds; starting hop-count: "
-                . ((ref $message->setby && $message->setby->isa('Insteon::BaseObject')) ? $message->setby->default_hop_count : "?")) if $self->debuglevel(2);
+                . ((ref $message->setby && $message->setby->isa('Insteon::BaseObject')) ? $message->setby->default_hop_count : "?")) if $message->setby->debuglevel(2);
 
 	if ($message->isa('Insteon::X10Message')) { # is x10; so, be slow
         	$command = $prefix{x10_send} . $command;
@@ -412,8 +412,8 @@ sub _send_cmd {
 	} 
 	else
 	{
-		&::print_log( "[Insteon_PLM] DEBUG3: Sending  PLM raw data: ".lc($command)) if $self->debuglevel(3);
-		&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($command)) if $self->debuglevel(4);
+		&::print_log( "[Insteon_PLM] DEBUG3: Sending  PLM raw data: ".lc($command)) if $message->setby->debuglevel(3);
+		&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($command)) if $message->setby->debuglevel(4);
 		my $data = pack("H*",$command);
 		$main::Serial_Ports{$instance}{object}->write($data) if $main::Serial_Ports{$instance};
 	
@@ -492,7 +492,7 @@ sub _parse_data {
                         $entered_ack_loop = 1;
 			if ($parsed_data =~ /^($ackcmd)|($nackcmd)|($prefix{plm_info}\w{12}06)|($prefix{plm_info}\w{12}15)|($prefix{all_link_first_rec}15)|($prefix{all_link_next_rec}15)|($badcmd)$/)
                         {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->active_message->setby->debuglevel(4);
 				my $ret_code = substr($parsed_data,length($parsed_data)-2,2);
 				my $record_type = substr($parsed_data,0,4);
                                 my $message_data = substr($parsed_data,4,length($parsed_data)-4);
@@ -515,7 +515,7 @@ sub _parse_data {
 							package main;
 							eval ($self->active_message->success_callback);
 							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
-								if $@ and $self->debuglevel(1);
+								if $@ and $self->active_message->setby->debuglevel(1);
 							package Insteon_PLM;
                                         	}
                                                 # clear the active message because we're done
@@ -524,7 +524,7 @@ sub _parse_data {
                                         else
                                         {
                                         	&::print_log("[Insteon_PLM] DEBUG3: Received PLM acknowledge: "
-                                                	. $pending_message->to_string) if $self->debuglevel(3);
+                                                	. $pending_message->to_string) if $self->active_message->setby->debuglevel(3);
                                         }
 
                                         # X10 messages don't ACK back on the powerline, so clear them if the PLM acknowledges
@@ -552,7 +552,7 @@ sub _parse_data {
 							package main;
 							eval ($callback);
 							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
-								if $@ and $self->debuglevel(1);
+								if $@ and $self->active_message->setby->debuglevel(1);
 							package Insteon_PLM;	
                                                 }
 					}
@@ -665,7 +665,6 @@ sub _parse_data {
                         	# is $parsed_data an accidental anomoly? (there are other cases; but, this is a good start)
                                 if ($parsed_data =~ /^($prefix{insteon_send}\w{12}06)|($prefix{insteon_send}\w{12}15)$/)
                                 {
-					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
                                 	# first, parse the content to confirm that it could be a legitimate ACK
                                         my $unknown_deviceid = substr($parsed_data,4,6);
                                         my $unknown_msg_flags = substr($parsed_data,10,2);
@@ -674,6 +673,7 @@ sub _parse_data {
                                         my $unknown_obj = &Insteon::get_object($unknown_deviceid, '01');
                                         if ($unknown_obj)
                                         {
+                                        	&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $unknown_obj->debuglevel(4);
                                         	&::print_log("[Insteon_PLM] WARN: encountered '$parsed_data' "
                                                 	. "from " . $unknown_obj->get_object_name()
                                                         . " with command: $unknown_command, but expected '$ackcmd'.");
@@ -681,6 +681,7 @@ sub _parse_data {
                                         }
                                         else
                                         {
+                                        	&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
                                         	&::print_log("[Insteon_PLM] ERROR: encountered '$parsed_data' "
                                                 	. "that does not match any known device ID (expected '$ackcmd')."
                                                         . " Discarding received data.");
@@ -710,7 +711,7 @@ sub _parse_data {
 	{
 		#ignore blanks.. the split does odd things
 		next if $parsed_data eq '';
-		&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+
 		if ($previous_parsed_data eq $parsed_data){
 			# guard against repeats
 			::print_log("[Insteon_PLM] DEBUG3: Dropped duplicate message: $parsed_data") if $self->debuglevel(3); 
@@ -727,14 +728,29 @@ sub _parse_data {
 
 		if ($parsed_prefix eq $prefix{insteon_received} and ($message_length == 22))
                 { #Insteon Standard Received
+			my $find_obj = Insteon::get_object(substr($parsed_data,4,6));
+			if (ref $find_obj) {
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $find_obj->debuglevel(4);
+			} 
+			else {
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+			}
                         $self->on_standard_insteon_received($message_data);
 		}
                 elsif ($parsed_prefix eq $prefix{insteon_ext_received} and ($message_length == 50))
                 { #Insteon Extended Received
+			my $find_obj = Insteon::get_object(substr($parsed_data,4,6));
+			if (ref $find_obj) {
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $find_obj->debuglevel(4);
+			} 
+			else {
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+			}
                 	$self->on_extended_insteon_received($message_data);
 		}
                 elsif($parsed_prefix eq $prefix{x10_received} and ($message_length == 8))
                 { #X10 Received
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
                        	my $x10_message = new Insteon::X10Message($parsed_data);
                         my $x10_data = $x10_message->get_formatted_data();
 			&::print_log("[Insteon_PLM] DEBUG3: received x10 data: $x10_data") if $self->debuglevel(3);
@@ -742,6 +758,7 @@ sub _parse_data {
 		}
                 elsif ($parsed_prefix eq $prefix{all_link_complete} and ($message_length == 20))
                 { #ALL-Linking Completed
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
 			my $link_address = substr($message_data,4,6);
 			&::print_log("[Insteon_PLM] DEBUG2: ALL-Linking Completed with $link_address ($message_data)") if $self->debuglevel(2);
 			if ($self->active_message->success_callback){
@@ -763,21 +780,23 @@ sub _parse_data {
                         	# bytes 0-1 - group; 2-7 device address
                         	my $failure_group = substr($message_data,0,2);
                         	my $failure_device = substr($message_data,2,6);
-
-				&::print_log("[Insteon_PLM] DEBUG2: Received all-link cleanup failure from device: "
-                        		. "$failure_device and group: $failure_group") if $self->debuglevel(2);
-                        
                         	my $failed_object = &Insteon::get_object($failure_device,'01');
                         	if (ref $failed_object){
+					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $failed_object->debuglevel(4);
+					&::print_log("[Insteon_PLM] DEBUG2: Received all-link cleanup failure from " . $failed_object->get_object_name
+                        		. " for all link group: $failure_group. Trying a direct cleanup.") if $failed_object->debuglevel(2);
 	                        	my $message = new Insteon::InsteonMessage('all_link_direct_cleanup', $failed_object, 
 	                        		$self->active_message->command, $failure_group);
 	                        	push(@{$$failed_object{command_stack}}, $message);
 	                        	$failed_object->_process_command_stack();
                         	} else {
-                        		&::print_log("[Insteon_PLM] WARN: Device ID: $failure_device does not exist. You may "
+					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+					&::print_log("[Insteon_PLM] Received all-link cleanup failure from an unkown device id: "
+                        		. "$failure_device and for all link group: $failure_group. You may "
                         			. "want to run delete orphans to remove this link from your PLM");
                         	}
 			} else {
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
 				&::print_log("[Insteon_PLM] DEBUG2: Received all-link cleanup failure."
                         		. " But there is no pending message.") if $self->debuglevel(2);
 			}
@@ -785,6 +804,7 @@ sub _parse_data {
 		}
                 elsif ($parsed_prefix eq $prefix{all_link_record} and ($message_length == 20))
                 { #ALL-Link Record Response
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
 			&::print_log("[Insteon_PLM] DEBUG2: ALL-Link Record Response:$message_data") if $self->debuglevel(2);
 			$self->_aldb->parse_alllink($message_data);
         		# before doing the next, make sure that the pending command
@@ -795,16 +815,18 @@ sub _parse_data {
 		}
 		elsif ($parsed_prefix eq $prefix{plm_user_reset} and ($message_length == 4))
 		{
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
 			main::print_log("[Insteon_PLM] Detected PLM user reset to factory defaults");
 		}
                 elsif ($parsed_prefix eq $prefix{all_link_clean_status} and ($message_length == 6))
                 { #ALL-Link Cleanup Status Report
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
 			my $cleanup_ack = substr($message_data,0,2);
 			if ($cleanup_ack eq '15')
                         {
 				&::print_log("[Insteon_PLM] WARN1: All-link cleanup failure for scene: "
                                 	. $self->active_message->setby->get_object_name . ". Retrying in 1 second.")
-					if $self->debuglevel(1);
+					if $self->active_message->setby->debuglevel(1);
                                 $self->retry_active_message();
                                 # except that we should cause a bit of a delay to let things settle out
 				$self->_set_timeout('xmit', 1000);
@@ -814,7 +836,7 @@ sub _parse_data {
                         {
                         	my $message_to_string = ($self->active_message) ? $self->active_message->to_string() : "";
 				&::print_log("[Insteon_PLM] Received all-link cleanup success: $message_to_string")
-                                	if $self->debuglevel();
+                                	if $self->active_message->setby->debuglevel();
 				if (ref $self->active_message && ref $self->active_message->setby){
 					my $object = $self->active_message->setby;
 					$object->is_acknowledged(1);

From 23c0049f2a9424c6afaca85a19943cb684a9ccb4 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 8 Nov 2013 17:41:00 -0800
Subject: [PATCH 312/330] Insteon: Fix Errors in Insteon_PLM, Get_Object
 Requires Group

---
 lib/Insteon_PLM.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index 3bc1060c5..7089896ec 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -728,7 +728,7 @@ sub _parse_data {
 
 		if ($parsed_prefix eq $prefix{insteon_received} and ($message_length == 22))
                 { #Insteon Standard Received
-			my $find_obj = Insteon::get_object(substr($parsed_data,4,6));
+			my $find_obj = Insteon::get_object(substr($parsed_data,4,6), '01');
 			if (ref $find_obj) {
 				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $find_obj->debuglevel(4);
 			} 
@@ -739,7 +739,7 @@ sub _parse_data {
 		}
                 elsif ($parsed_prefix eq $prefix{insteon_ext_received} and ($message_length == 50))
                 { #Insteon Extended Received
-			my $find_obj = Insteon::get_object(substr($parsed_data,4,6));
+			my $find_obj = Insteon::get_object(substr($parsed_data,4,6), '01');
 			if (ref $find_obj) {
 				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $find_obj->debuglevel(4);
 			} 

From 02d768059d2c51abd53373a879684863629a73eb Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 8 Nov 2013 17:55:00 -0800
Subject: [PATCH 313/330] Insteon: Move Debuglevel Routine to Generic_Item, Fix
 Bugs in Insteon_PLM

Moving to Generic_Item so that it will work properly with X10 items, also allows for expansion into other object types.
---
 lib/Generic_Item.pm            |  18 ++++++
 lib/Insteon.pm                 |  10 +--
 lib/Insteon/AllLinkDatabase.pm | 108 ++++++++++++++++-----------------
 lib/Insteon/BaseInsteon.pm     |  94 ++++++++++++----------------
 lib/Insteon/BaseInterface.pm   |  40 ++++++------
 lib/Insteon/Controller.pm      |   6 +-
 lib/Insteon/IOLinc.pm          |  18 +++---
 lib/Insteon/Irrigation.pm      |   8 +--
 lib/Insteon/Lighting.pm        |   4 +-
 lib/Insteon/Message.pm         |  10 +--
 lib/Insteon/Security.pm        |  12 ++--
 lib/Insteon/Thermostat.pm      |  48 +++++++--------
 lib/Insteon_PLM.pm             |  94 +++++++++++++++-------------
 13 files changed, 239 insertions(+), 231 deletions(-)

diff --git a/lib/Generic_Item.pm b/lib/Generic_Item.pm
index acf58f291..0399bf523 100644
--- a/lib/Generic_Item.pm
+++ b/lib/Generic_Item.pm
@@ -1340,6 +1340,24 @@ sub user_data {
     return \%{$$self{user_data}};
 }
 
+=item C<debuglevel([level], [debug_group])>
+
+Returns 1 if debug_group or this device is at least debug level 'level', otherwise returns 0.
+
+=cut
+
+sub debuglevel
+{
+	my ($object, $debug_level, $debug_group) = @_;
+	$debug_level = 1 unless $debug_level;
+	my $objname;
+	$objname = lc $object->get_object_name if defined $object;
+	::print_log("[Generic_Item] debuglevel: Processing debug for object $objname ... " . $main::Debug{$objname}) if $main::Debug{$debug_group} >= 5;
+	return 1 if $main::Debug{$debug_group} >= $debug_level;
+	return 1 if defined $objname && $main::Debug{$objname} >= $debug_level;
+	return 0;
+}
+
 =back
 
 =head2 PACKAGE FUNCTIONS
diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 2345dc989..9665ef1f6 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -406,7 +406,7 @@ sub scan_all_linktables
 		       		push @_scan_devices, $candidate_object;
                 		&main::print_log("[Scan all linktables] INFO1: "
                         		. $candidate_object->get_object_name
-                        		. " will be scanned.") if $candidate_object->debuglevel(1);
+                        		. " will be scanned.") if $candidate_object->debuglevel(1, 'insteon');
         		}
                 	else
                 	{
@@ -1075,13 +1075,13 @@ sub check_all_aldb_versions
 		{
 			main::print_log("[Insteon] DEBUG4 Checking aldb version for "
 				. $ALDB_device->get_object_name()
-				. " ($count of $ALDB_cnt)") if ($ALDB_device->debuglevel(4));
+				. " ($count of $ALDB_cnt)") if ($ALDB_device->debuglevel(4, 'insteon'));
 			$ALDB_device->check_aldb_version();
 		} else
 		{
 			main::print_log("[Insteon] DEBUG4 " . $ALDB_device->get_object_name
 				. " does not have its own aldb ($count of $ALDB_cnt)")
-				if ($ALDB_device->debuglevel(4));
+				if ($ALDB_device->debuglevel(4, 'insteon'));
 		}
 	}
 	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices completed") if ($main::Debug{insteon} >= 4);
@@ -1099,14 +1099,14 @@ sub check_thermo_versions
 			$thermo_device->get_root()->engine_version eq "I2CS"){
 			main::print_log("[Insteon] DEBUG4 Setting thermostat "
 				. $thermo_device->get_object_name() . " to i2CS") 
-			if ($thermo_device->debuglevel(4));
+			if ($thermo_device->debuglevel(4, 'insteon'));
 			bless $thermo_device, 'Insteon::Thermo_i2CS';
 			$thermo_device->init();
 		}
 		else {
 			main::print_log("[Insteon] DEBUG4 Setting thermostat "
 				. $thermo_device->get_object_name() . " to i1") 
-			if ($thermo_device->debuglevel(4));
+			if ($thermo_device->debuglevel(4, 'insteon'));
 			bless $thermo_device, 'Insteon::Thermo_i1';
 		}
 	}
diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 3e3396096..594186190 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -145,7 +145,7 @@ sub query_aldb_delta
 			$self->{_aldb_changed_callback} = undef;
 			eval ($callback);
 			&::print_log("[Insteon::AllLinkDatabase] " . $self->{device}->get_object_name . ": error during scan callback $@")
-				if $@ and $self->{device}->debuglevel();
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
 			package Insteon::AllLinkDatabase;
 		}
         } elsif ($action eq "check" && ((&main::get_tickcount - $self->scandatetime()) <= 2000)){
@@ -160,7 +160,7 @@ sub query_aldb_delta
 			$self->{_aldb_unchanged_callback} = undef;
 			eval ($callback);
 			&::print_log("[Insteon::AllLinkDatabase] " . $self->{device}->get_object_name . ": error during scan callback $@")
-				if $@ and $self->{device}->debuglevel();
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
 			package Insteon::AllLinkDatabase;
 		}
         } else {
@@ -336,7 +336,7 @@ sub delete_link
 			package main;
 			eval($link_parms{callback});
 			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
-				if $@ and $self->{device}->debuglevel();
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
 			package Insteon::AllLinkDatabase;
 		}
 	} elsif ($link_parms{address} && $link_parms{aldb_check} eq "ok")
@@ -394,7 +394,7 @@ sub delete_link
 				package main;
 				eval($link_parms{callback});
 				&::print_log("[Insteon::AllLinkDatabase] error encountered during delete_link callback: " . $@)
-					if $@ and $self->{device}->debuglevel();
+					if $@ and $self->{device}->debuglevel(1, 'insteon');
 				package Insteon::AllLinkDataBase;
 			}
 		}
@@ -560,7 +560,7 @@ sub delete_orphan_links
 						if ($group eq '01' || $group eq '00') {
 							#ignore manual responder link to PLM group 01 or 00 required for I2CS devices
 							main::print_log("[Insteon::AllLinkDatabase] DEBUG2 Ignoring orphan responder link from "
-								. $selfname . " to PLM for group 01 or 00") if $self->{device}->debuglevel(2);
+								. $selfname . " to PLM for group 01 or 00") if $self->{device}->debuglevel(2, 'insteon');
 						}
 						elsif ($audit_mode)
                                                 {
@@ -856,7 +856,7 @@ sub _process_delete_queue {
         else
         {
         	&::print_log("[Insteon::AllLinkDatabase] Nothing else to do for " . $$self{device}->get_object_name . " after deleting "
-                	. $$self{delete_queue_processed} . " links") if $self->{device}->debuglevel();
+                	. $$self{delete_queue_processed} . " links") if $self->{device}->debuglevel(1, 'insteon');
 		$$self{device}->interface->_aldb->_process_delete_queue($$self{delete_queue_processed});
 	}
 }
@@ -977,10 +977,10 @@ sub get_first_empty_address
 		}
 		$first_address = ($high_address > 0) ? sprintf('%04x', $high_address - 8) : 0;
 		main::print_log("[Insteon::AllLinkDatabase] DEBUG4: No empty link entries; using next lowest link address ["
-			.$first_address."]") if $self->{device}->debuglevel(4);
+			.$first_address."]") if $self->{device}->debuglevel(4, 'insteon');
 	} else {
 		main::print_log("[Insteon::AllLinkDatabase] DEBUG4: Found empty address ["
-			.$first_address."] in empty array") if $self->{device}->debuglevel(4);
+			.$first_address."] in empty array") if $self->{device}->debuglevel(4, 'insteon');
 	}
 
         return $first_address;
@@ -1046,7 +1046,7 @@ sub add_link
 			package main;
 			eval($link_parms{callback});
 			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
-				if $@ and $self->{device}->debuglevel();
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
 			package Insteon::AllLinkDatabase;
 		}
 	}
@@ -1062,7 +1062,7 @@ sub add_link
 			eval($link_parms{callback});
 			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " 
 				. $$self{device}->get_object_name . ":" . $@)
-				if $@ and $self->{device}->debuglevel();
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
 			package Insteon::AllLinkDatabase;
 		}
 	}
@@ -1085,7 +1085,7 @@ sub add_link
 			&::print_log("[Insteon::AllLinkDatabase] DEBUG2: adding link record " . $$self{device}->get_object_name
 				. " light level controlled by " . $insteon_object->get_object_name
 		       		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate")
-                                if $self->{device}->debuglevel(2);
+                                if $self->{device}->debuglevel(2, 'insteon');
 			my ($data1, $data2);
 			if($link_parms{is_controller}) {
 				$data1 = '03';  #application retries == 3
@@ -1105,14 +1105,14 @@ sub add_link
                         	. $$self{device}->get_object_name
 				. " does not have a record of the first empty ALDB record."
                                 . " Please rescan this device's link table")
-                                if $self->{device}->debuglevel();
+                                if $self->{device}->debuglevel(1, 'insteon');
 
                          if ($$self{_success_callback})
                          {
 				package main;
 				eval ($$self{_success_callback});
 				&::print_log("[Insteon::AllLinkDatabase] WARN1: Error encountered during ack callback: " . $@)
-			 		if $@ and $self->{device}->debuglevel(1);
+			 		if $@ and $self->{device}->debuglevel(1, 'insteon');
 			 	package Insteon::AllLinkDatabase;
                          }
                 }
@@ -1144,7 +1144,7 @@ sub update_link
 	my $ramp_rate = $link_parms{ramp_rate};
 	$ramp_rate =~ s/(\d)s?/$1/;
 	&::print_log("[Insteon::AllLinkDatabase] updating " . $$self{device}->get_object_name . " light level controlled by " . $insteon_object->get_object_name
-		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate") if $self->{device}->debuglevel();
+		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate") if $self->{device}->debuglevel(1, 'insteon');
 	my $data1 = &Insteon::DimmableLight::convert_level($on_level);
 	my $data2 = ($$self{device}->isa('Insteon::DimmableLight')) ? &Insteon::DimmableLight::convert_ramp($ramp_rate) : '00';
 	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
@@ -1170,7 +1170,7 @@ sub update_link
 			package main;
 			eval($link_parms{callback});
 			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
-				if $@ and $self->{device}->debuglevel();
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
 			package Insteon::AllLinkDatabase;
 		}
 	}
@@ -1184,14 +1184,14 @@ sub update_link
 		&::print_log("[Insteon::AllLinkDatabase] ERROR: updating link record failed because "
 			. $$self{device}->get_object_name
 			. " does not have an existing ALDB entry key=$key")
-			if $self->{device}->debuglevel();
+			if $self->{device}->debuglevel(1, 'insteon');
 
 		if ($$self{_success_callback})
 		{
 			package main;
 			eval ($$self{_success_callback});
 			&::print_log("[Insteon::AllLinkDatabase] WARN1: Error encountered during ack callback: " . $@)
-				if $@ and $self->{device}->debuglevel(1);
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
 			package Insteon::AllLinkDatabase;
 		}
 	}
@@ -1579,7 +1579,7 @@ sub _on_peek
         my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'peek');
 	if ($msg{is_extended}) {
 		&::print_log("[Insteon::ALDB_i1]: extended peek for " . $$self{device}->{object_name}
-		. " is " . $msg{extra}) if $self->{device}->debuglevel();
+		. " is " . $msg{extra}) if $self->{device}->debuglevel(1, 'insteon');
 	}
         else
         {
@@ -1631,7 +1631,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
 				my $flag = hex($msg{extra});
 				$$self{pending_aldb}{inuse} = ($flag & 0x80) ? 1 : 0;
 				$$self{pending_aldb}{is_controller} = ($flag & 0x40) ? 1 : 0;
@@ -1661,7 +1661,7 @@ sub _on_peek
                                         }
 
 					&::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name . " completed link memory scan")
-						if $self->{device}->debuglevel();
+						if $self->{device}->debuglevel(1, 'insteon');
 					$self->health("good");
 					# Put the new ALDB Delta into memory
 					$self->query_aldb_delta('set');
@@ -1711,7 +1711,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
 				$$self{pending_aldb}{group} = lc $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_devhi';
@@ -1731,7 +1731,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
 				$$self{pending_aldb}{deviceid} = lc $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_devmid';
@@ -1752,7 +1752,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
 				$$self{pending_aldb}{deviceid} .= lc $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_devlo';
@@ -1773,7 +1773,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
 				$$self{pending_aldb}{deviceid} .= lc $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_data1';
@@ -1796,7 +1796,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
 				$$self{_mem_action} = 'aldb_data2';
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{pending_aldb}{data1} = $msg{extra};
@@ -1819,7 +1819,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
 				$$self{pending_aldb}{data2} = $msg{extra};
 				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
 				$$self{_mem_action} = 'aldb_data3';
@@ -1842,7 +1842,7 @@ sub _on_peek
                         {
                         	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
                                 	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
 				$$self{pending_aldb}{data3} = $msg{extra};
 
                         	if ($$self{_stress_test_act}){
@@ -1924,7 +1924,7 @@ sub _on_peek
 		else {
 		::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name 
 			. ": unhandled _mem_action=".$$self{_mem_action})
-			if $self->{device}->debuglevel();
+			if $self->{device}->debuglevel(1, 'insteon');
 		}
 	}
 }
@@ -2007,7 +2007,7 @@ sub _write_link
 		if (($$self{device}->isa('Insteon::KeyPadLincRelay') or $$self{device}->isa('Insteon::KeyPadLinc')) and ($data3 eq '00'))
                 {
 			&::print_log("[Insteon::ALDB_i1] setting data3 to " . $$self{device}->group . " for this keypadlinc")
-				if $self->{device}->debuglevel();
+				if $self->{device}->debuglevel(1, 'insteon');
 			$data3 = $$self{device}->group;
 		}
 		$$self{pending_aldb}{data3} = (defined $data3) ? lc $data3 : '00';
@@ -2023,7 +2023,7 @@ sub _write_link
 			package main;
 			eval ($$self{_success_callback});
 			&::print_log("[Insteon::ALDB_i1] WARN1: Error encountered during ack callback: " . $@)
-		 		if $@ and $self->{device}->debuglevel(1);
+		 		if $@ and $self->{device}->debuglevel(1, 'insteon');
 		 	package Insteon::ALDB_i1;
                 }
 	}
@@ -2131,7 +2131,7 @@ sub on_read_write_aldb
 	&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 		. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
 		. lc $msg{extra} . " for _mem_activity=".$$self{_mem_activity}
-		 ." _mem_action=". $$self{_mem_action}) if  $self->{device}->debuglevel(3);
+		 ." _mem_action=". $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
 
 	if ($$self{_mem_action} eq 'aldb_i2read')
 	{
@@ -2143,12 +2143,12 @@ sub on_read_write_aldb
 			$$self{_mem_action} = 'aldb_i2readack';
 			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received ack")
-				if  $self->{device}->debuglevel(3);
+				if  $self->{device}->debuglevel(3, 'insteon');
 		} else {
 			#otherwise just ignore the message because it is out of sequence
 			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] ack not received. "
-				. "ignoring message") if  $self->{device}->debuglevel(3);
+				. "ignoring message") if  $self->{device}->debuglevel(3, 'insteon');
 		}
 		
 	}
@@ -2157,14 +2157,14 @@ sub on_read_write_aldb
 		if($msg{is_ack}) {
 			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received duplicate ack. Ignoring.")
-				if  $self->{device}->debuglevel(3);
+				if  $self->{device}->debuglevel(3, 'insteon');
 				$clear_message = 0;
 		} elsif(length($msg{extra})<30)
 		{
 			&::print_log("[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed: "
 				. $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
+				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
 			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
 			#can't clear message, if valid message doesn't arrive
 			#resend logic will kick in
@@ -2175,7 +2175,7 @@ sub on_read_write_aldb
 				. " address received did not match address requested: "
 				. $$self{device}->get_object_name
 				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3);
+				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
 			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
 			#can't clear message, if valid message doesn't arrive
 			#resend logic will kick in
@@ -2193,7 +2193,7 @@ sub on_read_write_aldb
 			if (lc $$self{_mem_msb} eq '00' and lc $$self{_mem_lsb} eq '00')
 			{
 				main::print_log("[Insteon::ALDB_i2] DEBUG4: Start of scan; initializing aldb structure") 
-					if  $self->{device}->debuglevel(4);
+					if  $self->{device}->debuglevel(4, 'insteon');
 				# reinit the aldb hash as there will be a new one
 				$$self{aldb} = undef;
 				# reinit the empty address list
@@ -2235,10 +2235,10 @@ sub on_read_write_aldb
 					. $$self{device}->get_object_name
 					. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
 					. lc $msg{extra} . " for " .  $$self{_mem_action}) 
-					if(($$self{pending_aldb}{inuse}) and $self->{device}->debuglevel(3));
+					if(($$self{pending_aldb}{inuse}) and $self->{device}->debuglevel(3, 'insteon'));
 				main::print_log("[Insteon::ALDB_i2] DEBUG4: scan done; adding last address ["
 					. $$self{_mem_msb} . $$self{_mem_lsb} ."] to empty array") 
-					if  $self->{device}->debuglevel(4);
+					if  $self->{device}->debuglevel(4, 'insteon');
 				$self->add_empty_address($$self{_mem_msb} . $$self{_mem_lsb});
 				# scan done; clear out state flags
 				$$self{_mem_action} = undef;
@@ -2255,7 +2255,7 @@ sub on_read_write_aldb
 
 				&::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name 
 					. " completed link memory scan: status: " . $self->health())
-					if $self->{device}->debuglevel();
+					if $self->{device}->debuglevel(1, 'insteon');
 				$self->health("good");
 				# Put the new ALDB Delta into memory
 				$self->query_aldb_delta('set');
@@ -2266,7 +2266,7 @@ sub on_read_write_aldb
 				{
 					main::print_log("[Insteon::ALDB_i2] DEBUG4: inuse flag == false; adding address ["
 						. $$self{_mem_msb} . $$self{_mem_lsb} ."] to empty array") 
-						if  $self->{device}->debuglevel(4);
+						if  $self->{device}->debuglevel(4, 'insteon');
 					$self->add_empty_address($$self{pending_aldb}{address});
 				}
 				else
@@ -2292,14 +2292,14 @@ sub on_read_write_aldb
 					{
 						main::print_log("[Insteon::ALDB_i2] DEBUG4: duplicate link found; adding address ["
 							. $$self{_mem_msb} . $$self{_mem_lsb} ."] to duplicates array") 
-							if  $self->{device}->debuglevel(4);
+							if  $self->{device}->debuglevel(4, 'insteon');
 						$self->add_duplicate_link_address($$self{pending_aldb}{address});
 					}
 					else
 					{
 						main::print_log("[Insteon::ALDB_i2] DEBUG4: active link found; adding address ["
 							. $$self{_mem_msb} . $$self{_mem_lsb} ."] to aldb") 
-							if  $self->{device}->debuglevel(4);
+							if  $self->{device}->debuglevel(4, 'insteon');
 						%{$$self{aldb}{$aldbkey}} = %{$$self{pending_aldb}};
 					}
 				}
@@ -2339,7 +2339,7 @@ sub on_read_write_aldb
 			$$self{pending_aldb} = undef;
 			main::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name 
 				. " link write completed for [".$$self{aldb}{$aldbkey}{address}."]")
-				if $self->{device}->debuglevel(3);
+				if $self->{device}->debuglevel(3, 'insteon');
 			$self->health("good");
 			# Put the new ALDB Delta into memory
 			$self->query_aldb_delta('set');
@@ -2372,7 +2372,7 @@ sub on_read_write_aldb
 	{
 		main::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name 
 			. ": unhandled _mem_action=".$$self{_mem_action})
-			if $self->{device}->debuglevel();
+			if $self->{device}->debuglevel(1, 'insteon');
 		$clear_message = 0;
 	}
 	return $clear_message;
@@ -2419,7 +2419,7 @@ sub _write_link
 		if (($$self{device}->isa('Insteon::KeyPadLincRelay') or $$self{device}->isa('Insteon::KeyPadLinc')) and ($data3 eq '00'))
                 {
 			&::print_log("[Insteon::ALDB_i2] setting data3 to " . $$self{device}->group . " for this keypadlinc")
-				if $self->{device}->debuglevel();
+				if $self->{device}->debuglevel(1, 'insteon');
 			$data3 = $$self{device}->group;
 		}
 		$$self{pending_aldb}{data3} = (defined $data3) ? lc $data3 : '00';
@@ -2440,7 +2440,7 @@ sub _write_link
 			package main;
 			eval ($$self{_success_callback});
 			&::print_log("[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: " . $@)
-		 		if $@ and $self->{device}->debuglevel(1);
+		 		if $@ and $self->{device}->debuglevel(1, 'insteon');
 		 	package Insteon::ALDB_i2;
                 }
 	}
@@ -2490,7 +2490,7 @@ sub _write_delete
 			package main;
 			eval ($$self{_success_callback});
 			&::print_log("[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: " . $@)
-		 		if $@ and $self->{device}->debuglevel(1);
+		 		if $@ and $self->{device}->debuglevel(1, 'insteon');
 		 	package Insteon::ALDB_i2;
                 }
 	}
@@ -2770,7 +2770,7 @@ sub delete_orphan_links
                         &::print_log("[Insteon::ALDB_PLM] (AUDIT) Delete Orphan Link to non-existant deviceid: " .
                                 $deviceid . "; group:$group; "
                                 . (($is_controller) ? "controller; data:$data3" : "responder"))
-                                if $self->{device}->debuglevel();
+                                if $self->{device}->debuglevel(1, 'insteon');
                         }
                         else
                         {
@@ -2795,13 +2795,13 @@ sub delete_orphan_links
 					if ($group eq '01' || $group eq '00') {
 						#ignore manual controller link from PLM group 01 or 00 to device required for I2CS devices
 						main::print_log("[Insteon::ALDB_PLM] DEBUG2 Ignoring orphan PLM controller(01 or 00) link to "
-							. $device->get_object_name() ) if $self->{device}->debuglevel(2);
+							. $device->get_object_name() ) if $self->{device}->debuglevel(2, 'insteon');
 					}
 					elsif ($audit_mode)
                                         {
 	                                        &::print_log("[Insteon::ALDB_PLM] (AUDIT) Delete Orphan PLM controller link ($group) to: "
                                                         . $device->get_object_name() . "($data3)")
-                                                        if $self->{device}->debuglevel();
+                                                        if $self->{device}->debuglevel(1, 'insteon');
                                         }
                                         else
                                         {
@@ -2925,7 +2925,7 @@ sub _process_delete_queue {
 					. (($delete_req{is_controller}) ? "controller($delete_req{data3})" : "responder")
 					. ", " . (($delete_req{object}) ? "object=" . $delete_req{object}->get_object_name
 					: "deviceid=$delete_req{deviceid}") . ", group=$delete_req{group}")
-					if $self->{device}->debuglevel();
+					if $self->{device}->debuglevel(1, 'insteon');
 				$self->delete_link(%delete_req);
 			}
                         elsif ($delete_req{linkdevice})
@@ -2995,7 +2995,7 @@ sub delete_link
 			package main;
 			eval ($link_parms{callback});
 			&::print_log("[Insteon_PLM] error in add link callback: " . $@)
-				if $@ and $self->{device}->debuglevel();
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
 			package Insteon_PLM;
 		}
 	}
@@ -3046,7 +3046,7 @@ sub add_link
 			package main;
 			eval ($link_parms{callback});
 			&::print_log("[Insteon::ALDB_PLM] error in add link callback: " . $@)
-				if $@ and $self->{device}->debuglevel();
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
 			package Insteon_PLM;
 		}
 	}
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 1adc93bd4..b569c1df1 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -206,24 +206,6 @@ sub group
 	return $$self{m_group};
 }
 
-=item C<debuglevel([level])>
-
-Returns 1 if insteon or this device is at least debug level 'level', otherwise returns 0.
-
-=cut
-
-sub debuglevel
-{
-	my ($object, $debug_level) = @_;
-	$debug_level = 1 unless $debug_level;
-	my $objname;
-	$objname = lc $object->get_object_name if defined $object;
-	::print_log("[Insteon] debuglevel: Processing debug for object $objname ... " . $main::Debug{$objname}) if $main::Debug{insteon} >= 5;
-	return 1 if $main::Debug{insteon} >= $debug_level;
-	return 1 if defined $objname && $main::Debug{$objname} >= $debug_level;
-	return 0;
-}
-
 =item C<timeout_factor($float)>
 
 Changes the amount of time MH will wait to receive a response from a device before
@@ -291,7 +273,7 @@ sub default_hop_count
 	my ($self, $hop_count) = @_;
 	if (defined($hop_count)){
 		::print_log("[Insteon::BaseObject] DEBUG3: Adding hop count of " . $hop_count . " to hop_array of "
-			. $self->get_object_name) if $self->debuglevel(3);
+			. $self->get_object_name) if $self->debuglevel(3, 'insteon');
 		if (!defined(@{$$self{hop_array}})) {
 			unshift(@{$$self{hop_array}}, $$self{default_hop_count});
 			$$self{hop_sum} = $$self{default_hop_count};
@@ -305,7 +287,7 @@ sub default_hop_count
 		::print_log("[Insteon::BaseObject] DEBUG4: ".$self->get_object_name
 			."->default_hop_count()=".$$self{default_hop_count}
 			." :: hop_array[]=". join("",@{$$self{hop_array}})) 
-			if $self->debuglevel(4);
+			if $self->debuglevel(4, 'insteon');
 	}
 
 	#Allow for per-device settings
@@ -386,14 +368,14 @@ sub set
 		{ #If set by device, update MH state,
 			my $derived_state = $self->derive_link_state($p_state);
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
-				. "::set_receive($derived_state, $setby_name)") if $self->debuglevel();
+				. "::set_receive($derived_state, $setby_name)") if $self->debuglevel(1, 'insteon');
 			$self->set_receive($derived_state,$p_setby,$p_response);
 			$self->set_linked_devices($p_state);
 		} 
 		elsif (ref $p_setby and $p_setby eq $self->interface) 
 		{ #If set by interface, this was a manual status_request response
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
-				. "::set_receive($p_state, $setby_name)") if $self->debuglevel();
+				. "::set_receive($p_state, $setby_name)") if $self->debuglevel(1, 'insteon');
 			$self->set_receive($p_state,$p_setby,$p_response);
 		}
 		else { # Not called by device, send set command
@@ -401,7 +383,7 @@ sub set
 				my $message = $self->derive_message($p_state);
 				$self->_send_cmd($message);
 				&::print_log("[Insteon::BaseObject] " . $self->get_object_name() . "::set($p_state, $setby_name)")
-					if $self->debuglevel();
+					if $self->debuglevel(1, 'insteon');
 				$self->is_acknowledged(0);
 				$$self{pending_state} = $p_state;
 				$$self{pending_setby} = $p_setby;
@@ -467,7 +449,7 @@ sub set_receive
 		&& ($curr_milli - $$self{set_milliseconds} < $window)){
 		::print_log("[Insteon::BaseObject] Ignoring duplicate set " . $p_state .
 			" state command for " . $self->get_object_name . " received in " .
-			"less than $window milliseconds") if $self->debuglevel(); 
+			"less than $window milliseconds") if $self->debuglevel(1, 'insteon'); 
 	} else {
 		$$self{set_milliseconds} = $curr_milli;
 		$self->level($p_state) if $self->can('level'); # update the level value
@@ -591,7 +573,7 @@ sub derive_message
 
 	# confirm that the resulting $msg is legitimate
 	if (!(defined($self->message_type_code($command)))) {
-		&::print_log("[Insteon::BaseInsteon] invalid state=$command") if $self->debuglevel();
+		&::print_log("[Insteon::BaseInsteon] invalid state=$command") if $self->debuglevel(1, 'insteon');
 		return undef;
 	}
 
@@ -675,7 +657,7 @@ sub _is_info_request
 		my $ack_on_level = sprintf("%d", int((hex($msg{extra}) * 100 / 255)+.5));
 		&::print_log("[Insteon::BaseObject] received status for " .
 			$self->{object_name} . " with on-level: $ack_on_level%, "
-			. "hops left: $msg{hopsleft}") if $self->debuglevel();
+			. "hops left: $msg{hopsleft}") if $self->debuglevel(1, 'insteon');
 		$self->level($ack_on_level) if $self->can('level'); # update the level value
 		if ($ack_on_level == 0) {
 			$self->set('off', $ack_setby);
@@ -733,7 +715,7 @@ sub _is_info_request
 			package main;
 			eval ($callback);
 			&::print_log("[Insteon::BaseObject] " . $self->get_object_name . ": error during scan callback $@")
-				if $@ and $self->debuglevel();
+				if $@ and $self->debuglevel(1, 'insteon');
 			package Insteon::BaseObject;                		
 		}
 	}
@@ -744,7 +726,7 @@ sub _is_info_request
 		$self->engine_version($version);
 		&::print_log("[Insteon::BaseObject] received engine version for " 
 			. $self->{object_name} . " of $version. "
-			. "hops left: $msg{hopsleft}") if $self->debuglevel();
+			. "hops left: $msg{hopsleft}") if $self->debuglevel(1, 'insteon');
 	}
 	return $is_info_request;
 }
@@ -761,7 +743,7 @@ sub _process_message
 	# by Insteon_Link.
 
 	main::print_log("[Insteon::BaseObject] WARN: Message has invalid checksum")
-		if ($self->debuglevel() && !($msg{crc_valid}) 
+		if ($self->debuglevel(1, 'insteon') && !($msg{crc_valid}) 
 		&& $msg{is_extended} && $self->engine_version() eq 'I2CS');
 
 	my $clear_message = 0;
@@ -827,7 +809,7 @@ sub _process_message
 				if (!$corrupt_cmd){
 					$self->_process_command_stack(%msg);
 					&::print_log("[Insteon::BaseObject] received ping acknowledgement from " . $self->{object_name})
-						if $self->debuglevel();
+						if $self->debuglevel(1, 'insteon');
 					$self->ping();
 					$clear_message = 1;
 				}
@@ -836,7 +818,7 @@ sub _process_message
 				$corrupt_cmd = 1 if ($msg{cmd_code} ne $self->message_type_hex($pending_cmd));
 				if (!$corrupt_cmd){
 					&::print_log("[Insteon::BaseObject] received linking mode ACK from " . $self->{object_name})
-						if $self->debuglevel();
+						if $self->debuglevel(1, 'insteon');
 					$self->interface->_set_timeout('xmit', 2000);
 					$clear_message = 0;
 				}
@@ -853,7 +835,7 @@ sub _process_message
 				# signal receipt of message to the command stack in case commands are queued
 				$self->_process_command_stack(%msg);
 				&::print_log("[Insteon::BaseObject] received command/state (awaiting) acknowledge from " . $self->{object_name}
-					. ": $pending_cmd and data: $msg{extra}") if $self->debuglevel();
+					. ": $pending_cmd and data: $msg{extra}") if $self->debuglevel(1, 'insteon');
 			}
 		}
                 else
@@ -865,7 +847,7 @@ sub _process_message
 			$self->_process_command_stack(%msg);
 			&::print_log("[Insteon::BaseObject] received command/state acknowledge from " . $self->{object_name}
 				. ": " . (($msg{command}) ? $msg{command} : "(unknown)")
-				. " and data: $msg{extra}") if $self->debuglevel();
+				. " and data: $msg{extra}") if $self->debuglevel(1, 'insteon');
 		}
 		if ($corrupt_cmd) {
 			main::print_log("[Insteon::BaseObject] WARN: received a message from "
@@ -885,7 +867,7 @@ sub _process_message
 			. $self->get_nack_msg_for( $msg{extra} ) .") for " . $self->{object_name}
 			. ".  It may be unplugged, have a burned out bulb, or this may be a new I2CS "
 			. "type device that must first be manually linked to the PLM using the set button.") 
-			if $self->debuglevel();
+			if $self->debuglevel(1, 'insteon');
 		}
 		else 
 		{
@@ -899,7 +881,7 @@ sub _process_message
 		if($p_setby->active_message->failure_callback)
 		{
 			main::print_log("[Insteon::BaseObject] WARN: Now calling message failure callback: "
-				. $p_setby->active_message->failure_callback) if $self->debuglevel();
+				. $p_setby->active_message->failure_callback) if $self->debuglevel(1, 'insteon');
 			$self->failure_reason('NAK');
 			package main;
 			eval $p_setby->active_message->failure_callback;
@@ -943,7 +925,7 @@ sub _process_message
 			if ($msg{command} eq 'link_cleanup_report'){
 				if ($msg{extra} == 0){
 					::print_log("[Insteon::BaseObject] DEBUG Received AllLink Cleanup Success for "
-						. $self->{object_name}) if $self->debuglevel(1);
+						. $self->{object_name}) if $self->debuglevel(1, 'insteon');
 				} else {
 					::print_log("[Insteon::BaseObject] WARN " . $msg{extra} . " Device(s) failed to "
 						. "acknowledge the command from " . $self->{object_name});
@@ -959,7 +941,7 @@ sub _process_message
 				my $timeout = (scalar(@links)+1) * 300;
 				::print_log("[Insteon::BaseObject] DEBUG3 Delaying any outgoing messages ". 
 					"by $timeout milliseconds to avoid collision with subsequent cleanup ".
-					"messages from " . $self->get_object_name) if ($self->debuglevel(3));
+					"messages from " . $self->get_object_name) if ($self->debuglevel(3, 'insteon'));
 				$self->interface->_set_timeout('xmit', $timeout);
 			}
                 }
@@ -968,14 +950,14 @@ sub _process_message
                 	if (($self->state eq $p_state or $self->state_final eq $p_state)
                 		and $$self{_pending_cleanup}){
 				::print_log("[Insteon::BaseObject] Ignoring Received Direct AllLink Cleanup Message for " 
-					. $self->{object_name} . " since AllLink Broadcast Message was Received.") if $self->debuglevel();
+					. $self->{object_name} . " since AllLink Broadcast Message was Received.") if $self->debuglevel(1, 'insteon');
                 	} else {
 				$self->set($p_state, $self);
 			}
 			$$self{_pending_cleanup} = 0;
 		} else {
 			main::print_log("[Insteon::BaseObject] Ignoring unsupported command from " 
-				. $self->{object_name}) if $self->debuglevel();
+				. $self->{object_name}) if $self->debuglevel(1, 'insteon');
 			$self->corrupt_count_log(1) if $self->can('corrupt_count_log');
                 }
 	}
@@ -1038,11 +1020,11 @@ sub _process_command_stack
 			package main;
 			eval ($callback);
 			&::print_log("[Insteon::BaseObject] error in queue timer callback: " . $@)
-				if $@ and $self->debuglevel();
+				if $@ and $self->debuglevel(1, 'insteon');
 			package Insteon::BaseObject;
 		}
 	} else {
-#		&::print_log("[Insteon_Device] " . $self->get_object_name . " command queued but not yet sent; awaiting ack from prior command") if $self->debuglevel();
+#		&::print_log("[Insteon_Device] " . $self->get_object_name . " command queued but not yet sent; awaiting ack from prior command") if $self->debuglevel(1, 'insteon');
 	}
 }
 
@@ -1986,7 +1968,7 @@ sub _get_engine_version_failure
 	my $failure_reason = $self->failure_reason();
 	
 	main::print_log("[Insteon::BaseDevice::_get_engine_version_failure] DEBUG4: "
-		."failure reason: $failure_reason") if $self->debuglevel(4);
+		."failure reason: $failure_reason") if $self->debuglevel(4, 'insteon');
 	
 	if($failure_reason eq 'NAK')
 	{
@@ -2052,7 +2034,7 @@ sub ping
 			package main;
 			eval ($complete_callback);
 			&::print_log("[Insteon::BaseDevice] error in ping callback: " . $@)
-				if $@ and $self->debuglevel();
+				if $@ and $self->debuglevel(1, 'insteon');
 			package Insteon::BaseDevice;
 			delete $$self{ping_callback};
 		}
@@ -2358,7 +2340,7 @@ sub stress_test
 			package main;
 			eval ($complete_callback);
 			&::print_log("[Insteon::BaseDevice] error in stress_test callback: " . $@)
-				if $@ and $self->debuglevel();
+				if $@ and $self->debuglevel(1, 'insteon');
 			package Insteon::BaseDevice;
 			delete $$self{stress_test_callback};
 		}
@@ -2673,7 +2655,7 @@ sub check_aldb_version
 	if ($new_version) {
 		main::print_log("[Insteon::BaseDevice] DEBUG4: aldb_version is "
 			.$self->_aldb->aldb_version()." but device is ".$engine_version.
-			".  Remapping aldb version to $new_version") if $self->debuglevel(4);
+			".  Remapping aldb version to $new_version") if $self->debuglevel(4, 'insteon');
 		my $restore_string = '';
 		if ($self->_aldb) {
 			$restore_string = $self->_aldb->restore_string();
@@ -2690,7 +2672,7 @@ sub check_aldb_version
 		package main;
 		eval ($restore_string);
 		&::print_log("[Insteon::BaseDevice] error in eval creating ALDB object: " . $@)
-			if $@ and $self->debuglevel();
+			if $@ and $self->debuglevel(1, 'insteon');
 		package Insteon::BaseDevice;
 	}
 }
@@ -2942,7 +2924,7 @@ sub sync_links
 						$requires_update = 1;
                                                 &::print_log("[Insteon::BaseController] DEBUG: flagging " . $self->get_object_name
                                                 	. " for update because existing ramp rate ($raw_ramp_rate) != target ($raw_tgt_ramp_rate)")
-							if $self->debuglevel();
+							if $self->debuglevel(1, 'insteon');
 
 					}
                                         elsif (($link_on_level > $tgt_on_level + 1) or ($link_on_level < $tgt_on_level -1))
@@ -2950,7 +2932,7 @@ sub sync_links
 						$requires_update = 1;
                                                 &::print_log("[Insteon::BaseController] DEBUG: flagging " . $self->get_object_name
                                                 	. " for update because existing on level ($link_on_level) != target ($tgt_on_level)")
-							if $self->debuglevel();
+							if $self->debuglevel(1, 'insteon');
 					}
 				}
 				if ($requires_update)
@@ -2977,7 +2959,7 @@ sub sync_links
 							. $member->get_object_name . " for "
 							. $insteon_object->get_object_name . " with group:" . $self->group
 							. "; on_level:$tgt_on_level; ramp_rate:$tgt_ramp_rate")
-							if $self->debuglevel(4);
+							if $self->debuglevel(4, 'insteon');
 				       		push @{$$self{sync_queue}}, \%link_req;
                                         }
 				}
@@ -3006,7 +2988,7 @@ sub sync_links
 						. $member->get_object_name . " for "
 						. $insteon_object->get_object_name . " with group:" . $self->group
 						. "; on_level:$tgt_on_level; ramp_rate:$tgt_ramp_rate")
-						if $self->debuglevel(4);
+						if $self->debuglevel(4, 'insteon');
 					push @{$$self{sync_queue}}, \%link_req;
                                 }
 			}
@@ -3030,7 +3012,7 @@ sub sync_links
 					}
 					main::print_log("[Insteon::BaseController] DEBUG4: queuing add for controller record to "
 						. $insteon_object->get_object_name . " for " . $member->get_object_name 
-						. " with group:" . $self->group) if $self->debuglevel(4);
+						. " with group:" . $self->group) if $self->debuglevel(4, 'insteon');
 					push @{$$self{sync_queue}}, \%link_req;
                                 }
 			}
@@ -3058,7 +3040,7 @@ sub sync_links
 				main::print_log("[Insteon::BaseController] DEBUG4: queuing add for controller record to "
 					. $insteon_object->get_object_name . " for "
 					. $self->interface->get_object_name . " with group:" . $self->group)
-					if $self->debuglevel(4);
+					if $self->debuglevel(4, 'insteon');
 				push @{$$self{sync_queue}}, \%link_req;
                         }
 		}
@@ -3079,7 +3061,7 @@ sub sync_links
 				main::print_log("[Insteon::BaseController] DEBUG4: queuing add for responder record to "
 					. $self->interface->get_object_name . " for "
 					. $insteon_object->get_object_name . " with group:" . $self->group)
-					if $self->debuglevel(4);
+					if $self->debuglevel(4, 'insteon');
 				push @{$$self{sync_queue}}, \%link_req;
                         }
 		}
@@ -3088,7 +3070,7 @@ sub sync_links
 	if (!($num_sync_queue))
         {
 		&::print_log("[Insteon::BaseController] Nothing to do when syncing links for " . $self->get_object_name)
-			if $self->debuglevel();
+			if $self->debuglevel(1, 'insteon');
 	}
 	$self->_process_sync_queue();
 
@@ -3115,7 +3097,7 @@ sub _process_sync_queue {
 		package main;
 		eval ($$self{sync_queue_callback});
 		&::print_log("[Insteon::BaseController] error in sync links callback: " . $@)
-			if $@ and $self->debuglevel();
+			if $@ and $self->debuglevel(1, 'insteon');
 		$$self{sync_queue_callback} = undef;
 		package Insteon::BaseController;
 	} else {
@@ -3249,7 +3231,7 @@ sub update_members
 				my %current_record = $device->get_link_record($self->device_id . $self->group);
 				if (%current_record) {
 					&::print_log("[Insteon::BaseController] remote record: $current_record{data1}")
-						if $self->debuglevel();
+						if $self->debuglevel(1, 'insteon');
 				}
 			}
 		}
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 1707fa2f9..d1b70eccb 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -128,8 +128,8 @@ Returns 1 if Insteon or this device is at least debug level 'level', otherwise r
 
 sub debuglevel
 {
-	my ($self, $debug_level) = @_;
-	return Insteon::BaseObject::debuglevel($self, $debug_level);
+	my ($self, $debug_level, $debug_group) = @_;
+	return Generic_Item::debuglevel($self, $debug_level, $debug_group);
  }
 
 =item C<_is_duplicate(cmd)>
@@ -308,7 +308,7 @@ sub queue_message
         	my $setby = $message->setby;
 		if ($self->_is_duplicate($message->interface_data) && !($message->isa('Insteon::X10Message')))
                 {
-			&main::print_log("[Insteon::BaseInterface] Attempt to queue command already in queue; skipping ...") if $self->debuglevel();
+			&main::print_log("[Insteon::BaseInterface] Attempt to queue command already in queue; skipping ...") if $self->debuglevel(1, 'insteon');
 		}
                 else
                 {
@@ -366,7 +366,7 @@ sub process_queue
                                	&::print_log("[Insteon::BaseInterface] WARN: number of retries ("
                                        	. $self->active_message->send_attempts
                 			. ") for " . $self->active_message->to_string()
-                                        . " exceeds limit.  Now moving on...") if $self->debuglevel();
+                                        . " exceeds limit.  Now moving on...") if $self->debuglevel(1, 'insteon');
                                 # !!!!!!!!! TO-DO - handle failure timeout ???
                                 my $failed_message = $self->active_message;
                                 # make sure to let the sending object know!!!
@@ -387,7 +387,7 @@ sub process_queue
 				if ($failed_message->failure_callback)
                                 {
                                        	&::print_log("[Insteon::BaseInterface] WARN: Message Timeout:  Now calling callback: " .
-                                               	$failed_message->failure_callback) if $self->debuglevel();
+                                               	$failed_message->failure_callback) if $self->debuglevel(1, 'insteon');
 					$failed_message->setby->failure_reason('timeout') 
 						if (defined($failed_message->setby) and $failed_message->setby->can('failure_reason'));
 		       			package main;
@@ -500,7 +500,7 @@ sub on_interface_info_received
 	my ($self) = @_;
 	&::print_log("[Insteon_PLM] PLM id: " . $self->device_id .
 		" firmware: " . $self->firmware)
-		if $self->debuglevel();
+		if $self->debuglevel(1, 'insteon');
         $self->clear_active_message();
 }
 
@@ -533,7 +533,7 @@ sub on_standard_insteon_received
 		#time has been required. Extra 50 millis helps prevent dupes
 		$wait_time = ($wait_time * 100) + 50;
 		$wait_message .= "delaying next transmit by $wait_time milliseconds to avoid collisions.";
-		::print_log($wait_message) if ($self->debuglevel(3) && $wait_time > 50);
+		::print_log($wait_message) if ($self->debuglevel(3, 'insteon') && $wait_time > 50);
 		$self->_set_timeout('xmit', $wait_time);			
 
 		# get the matching object
@@ -548,13 +548,13 @@ sub on_standard_insteon_received
                 		$msg{command} = $object->message_type($msg{cmd_code});
 		      		&::print_log("[Insteon::BaseInterface] Received message from: ". $object->get_object_name
 		      			."; command: $msg{command}; type: $msg{type}; group: $msg{group}")
-                        		if (!($msg{is_ack} or $msg{is_nack})) and $self->debuglevel();
+                        		if (!($msg{is_ack} or $msg{is_nack})) and $self->debuglevel(1, 'insteon');
                    	}
                    	if ($msg{is_ack} or $msg{is_nack})
                    	{
 		      		main::print_log("[Insteon::BaseInterface] DEBUG3: PLM command:insteon_received; "
 		      			. "Device command:$msg{command}; type:$msg{type}; group: $msg{group}")
-                        		if $self->debuglevel(3);
+                        		if $self->debuglevel(3, 'insteon');
                         	# need to confirm that this message corresponds to the current active one before clearing it
                                 # TO-DO!!! This is a brute force and poor compare technique; needs to be replaced by full compare
                                 if ($self->active_message && ref $self->active_message->setby)
@@ -576,7 +576,7 @@ sub on_standard_insteon_received
 		   					if($object->_process_message($self, %msg)) {
 								if ($self->active_message->success_callback){
 									main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
-										. $self->active_message->success_callback) if $object->debuglevel(4);
+										. $self->active_message->success_callback) if $object->debuglevel(4, 'insteon');
 									package main;
 										eval $self->active_message->success_callback;
 										::print_log("[Insteon::BaseInterface] problem w/ success callback: $@") if $@;
@@ -606,11 +606,11 @@ sub on_standard_insteon_received
 							if (($msg{extra} == $self->active_message->setby->group)){
                                                                 &main::print_log("[Insteon::BaseInterface] DEBUG3: Cleanup message received for scene "
                                                                 	. $object->get_object_name . " from " . $setby_object->get_object_name)
-                                                                	if $object->debuglevel(3);
+                                                                	if $object->debuglevel(3, 'insteon');
 							} elsif ($self->active_message->command_type eq 'all_link_direct_cleanup' &&
 								lc($self->active_message->setby->device_id) eq $msg{source}) 
 							{
-								&::print_log("[Insteon::BaseInterface] DEBUG2: ALL-Linking Direct Completed with ". $self->active_message->setby->get_object_name) if $object->debuglevel(2);
+								&::print_log("[Insteon::BaseInterface] DEBUG2: ALL-Linking Direct Completed with ". $self->active_message->setby->get_object_name) if $object->debuglevel(2, 'insteon');
 								$self->clear_active_message();
 							}
 							else {
@@ -619,7 +619,7 @@ sub on_standard_insteon_received
 								. $object->get_object_name . ", but group in recent message " 
 								. $msg{extra}. " did not match group in "
 								. "prior sent message group " . $self->active_message->setby->group) 
-									if $object->debuglevel(3);
+									if $object->debuglevel(3, 'insteon');
                                 			}
                                 			# If ACK or NACK received then PLM is still working on the ALL Link Command
                                 			# Increase the command timeout to wait for next one
@@ -661,7 +661,7 @@ sub on_standard_insteon_received
 						$plm_group_obj = $self if (!ref $plm_group_obj);
                                                 &main::print_log("[Insteon::BaseInterface] DEBUG3: received cleanup message responding to "
                                                 	. "PLM controller group: $group_name. Ignoring as this has already been processed")
-                                                        if $plm_group_obj->debuglevel(3);
+                                                        if $plm_group_obj->debuglevel(3, 'insteon');
                                         }
                                         else
                                         {
@@ -714,7 +714,7 @@ sub on_extended_insteon_received
 		#time has been required. Extra 50 millis helps prevent dupes
 		$wait_time = ($wait_time * 200) + 50;
 		$wait_message .= "delaying next transmit by $wait_time milliseconds to avoid collisions.";
-		::print_log($wait_message) if ($self->debuglevel(3) && $wait_time > 50);
+		::print_log($wait_message) if ($self->debuglevel(3, 'insteon') && $wait_time > 50);
 		$self->_set_timeout('xmit', $wait_time);
 
 		# get the matching object
@@ -729,14 +729,14 @@ sub on_extended_insteon_received
                 		$msg{command} = $object->message_type($msg{cmd_code});
 		      		main::print_log("[Insteon::BaseInterface] DEBUG: PLM command:insteon_ext_received; "
 		      			. "Device command:$msg{command}; type:$msg{type}; group: $msg{group}")
-                        		if( (!($msg{is_ack} or $msg{is_nack}) and $self->debuglevel()) 
-                        		or $self->debuglevel(3));
+                        		if( (!($msg{is_ack} or $msg{is_nack}) and $self->debuglevel(1, 'insteon')) 
+                        		or $self->debuglevel(3, 'insteon'));
                    	}
-		   	&::print_log("[Insteon::BaseInterface] Processing message for " . $object->get_object_name) if $object->debuglevel(3);
+		   	&::print_log("[Insteon::BaseInterface] Processing message for " . $object->get_object_name) if $object->debuglevel(3, 'insteon');
 			if($object->_process_message($self, %msg)) {
 				if (ref $self->active_message && $self->active_message->success_callback){
 					main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
-						. $self->active_message->success_callback) if $object->debuglevel(4);
+						. $self->active_message->success_callback) if $object->debuglevel(4, 'insteon');
 					package main;
 						eval $self->active_message->success_callback;
 						::print_log("[Insteon::BaseInterface] problem w/ success callback: $@") if $@;
@@ -895,7 +895,7 @@ sub _is_duplicate_received {
             $object->default_hop_count($msg{maxhops}-$msg{hopsleft}) if $object->can('default_hop_count');
 		};
 		::print_log("[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
-			. $message_data . ", from ". $object->get_object_name) if $object->debuglevel();
+			. $message_data . ", from ". $object->get_object_name) if $object->debuglevel(1, 'insteon');
 	} else {
 		#Message was not in hash, so add it
 		$$self{received_commands}{$key} = $curr_milli + $delay;
diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index 6a9958855..89f58e777 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -209,9 +209,9 @@ sub _process_message {
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
-		main::print_log("[Insteon::RemoteLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel();
+		main::print_log("[Insteon::RemoteLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel(1, 'insteon');
 		if ($$self{_ext_set_get_action} eq 'set'){
-			main::print_log("[Insteon::RemoteLinc] Clearing active message") if $self->debuglevel();
+			main::print_log("[Insteon::RemoteLinc] Clearing active message") if $self->debuglevel(1, 'insteon');
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
 			$self->_process_command_stack(%msg);	
@@ -234,7 +234,7 @@ sub _process_message {
 			$self->_process_command_stack(%msg);
 		} else {
 			main::print_log("[Insteon::RemoteLinc] WARN: Corrupt Extended "
-				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel();
+				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel(1, 'insteon');
 		}
 	}
 	else {
diff --git a/lib/Insteon/IOLinc.pm b/lib/Insteon/IOLinc.pm
index 92b94876b..0349011c1 100755
--- a/lib/Insteon/IOLinc.pm
+++ b/lib/Insteon/IOLinc.pm
@@ -158,11 +158,11 @@ sub set
 		if ($p_state eq $$self{child_state} &&
 			($curr_milli - $$self{child_set_milliseconds} < $window)) {
 			::print_log("[Insteon::IOLinc] Received duplicate ". $self->get_object_name
-				. " sensor " . $p_state . " message, ignoring.") if $self->debuglevel();
+				. " sensor " . $p_state . " message, ignoring.") if $self->debuglevel(1, 'insteon');
 		}
 		else {
 			::print_log("[Insteon::IOLinc] Received ". $self->get_object_name
-				. " sensor " . $p_state . " message.") if $self->debuglevel();
+				. " sensor " . $p_state . " message.") if $self->debuglevel(1, 'insteon');
 			$$self{child_state} = $p_state;
 			$$self{child_set_milliseconds} = $curr_milli;
 			if (ref $$self{child_sensor}){
@@ -213,7 +213,7 @@ sub _is_info_request
 		my $child_state = &Insteon::BaseObject::derive_link_state(hex($msg{extra}));
 		&::print_log("[Insteon::IOLinc] received status for " .
 			$self->get_object_name . "sensor of: $child_state "
-			. "hops left: $msg{hopsleft}") if $self->debuglevel();
+			. "hops left: $msg{hopsleft}") if $self->debuglevel(1, 'insteon');
 		$ack_setby = $$self{child_sensor} if ref $$self{child_sensor};
 		if (ref $$self{child_sensor}){
 			$$self{child_sensor}->set_receive($child_state, $ack_setby);
@@ -265,9 +265,9 @@ sub _process_message {
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
-		main::print_log("[Insteon::IOLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel();
+		main::print_log("[Insteon::IOLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel(1, 'insteon');
 		if ($$self{_ext_set_get_action} eq 'set'){
-			main::print_log("[Insteon::IOLinc] Clearing active message") if $self->debuglevel();
+			main::print_log("[Insteon::IOLinc] Clearing active message") if $self->debuglevel(1, 'insteon');
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
 			$self->_process_command_stack(%msg);	
@@ -284,12 +284,12 @@ sub _process_message {
 			$self->_process_command_stack(%msg);
 		} else {
 			main::print_log("[Insteon::IOLinc] WARN: Corrupt Extended "
-				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel();
+				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel(1, 'insteon');
 		}
 	}
 	elsif ($msg{command} eq "set_operating_flags" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		main::print_log("[Insteon::IOLinc] Acknowledged flag set for " . $self->get_object_name) if $self->debuglevel();
+		main::print_log("[Insteon::IOLinc] Acknowledged flag set for " . $self->get_object_name) if $self->debuglevel(1, 'insteon');
 		$clear_message = 1;
 		$self->_process_command_stack(%msg);
 	}
@@ -314,12 +314,12 @@ sub set_momentary_time
 	my $root = $self->get_root();
 	if ($momentary_time == 0){
 		::print_log("[Insteon::IOLinc] Setting " . $self->get_object_name . 
-			" to Latching Relay Mode." ) if $self->debuglevel();
+			" to Latching Relay Mode." ) if $self->debuglevel(1, 'insteon');
 	} 
 	elsif ($momentary_time <= 255) {
 		$momentary_time = 2 if $momentary_time == 1; #Can't set to 1
 		::print_log("[Insteon::IOLinc] Setting Momentary Time to $momentary_time " .
-			"tenths of a second for " . $self->get_object_name) if $self->debuglevel();
+			"tenths of a second for " . $self->get_object_name) if $self->debuglevel(1, 'insteon');
 	}
 	else {
 		::print_log("[Insteon::IOLinc] WARN Invalid Momentary Time of $momentary_time " .
diff --git a/lib/Insteon/Irrigation.pm b/lib/Insteon/Irrigation.pm
index f56b0a957..686586780 100755
--- a/lib/Insteon/Irrigation.pm
+++ b/lib/Insteon/Irrigation.pm
@@ -128,7 +128,7 @@ sub set_valve {
    }
    unless ($cmd and $subcmd) {
       &::print_log("Insteon::Irrigation] ERROR: You must specify a valve number and a valid state (ON or OFF)")
-          if $self->debuglevel();
+          if $self->debuglevel(1, 'insteon');
       return;
    }
    my $message = new Insteon::InsteonMessage('insteon_send', $self, $cmd, $subcmd);
@@ -154,7 +154,7 @@ sub set_program {
    }
    unless ($cmd and $subcmd) {
       &::print_log("Insteon::Irrigation] ERROR: You must specify a program number and a valid state (ON or OFF)")
-          if $self->debuglevel();
+          if $self->debuglevel(1, 'insteon');
       return;
    }
    my $message = new Insteon::InsteonMessage('insteon_send', $self, $cmd, $subcmd);
@@ -257,7 +257,7 @@ sub _is_info_request {
         or $cmd eq 'sprinkler_program_off') {
       $is_info_request = 1;
       my $val = hex($msg{extra});
-      &::print_log("[Insteon::Irrigation] Processing data for $cmd with value: $val") if $self->debuglevel();
+      &::print_log("[Insteon::Irrigation] Processing data for $cmd with value: $val") if $self->debuglevel(1, 'insteon');
       $$self{'active_valve_id'} = ($val & 7) + 1;
       $$self{'active_program_number'} = (($val >> 3) & 3) + 1;
       $$self{'program_is_running'} = ($val >> 5) & 1;
@@ -265,7 +265,7 @@ sub _is_info_request {
       $$self{'valve_is_running'} = ($val >> 7) & 1;
       &::print_log("[Insteon::Irrigation] active_valve_id: $$self{'active_valve_id'},"
         . " valve_is_running: $$self{'valve_is_running'}, active_program: $$self{'active_program_number'},"
-        . " program_is_running: $$self{'program_is_running'}, pump_enabled: $$self{'pump_enabled'}") if $self->debuglevel();
+        . " program_is_running: $$self{'program_is_running'}, pump_enabled: $$self{'pump_enabled'}") if $self->debuglevel(1, 'insteon');
    }
    else {
       #Check if this was a generic info_request
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index cd12c6b91..070f7a383 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -1140,7 +1140,7 @@ sub _is_info_request
 		my $child_state = $child_obj->derive_link_state(hex($msg{extra}));
 		&::print_log("[Insteon::FanLinc] received status for " .
 			$child_obj->{object_name} . " of: $child_state "
-			. "hops left: $msg{hopsleft}") if $self->debuglevel();
+			. "hops left: $msg{hopsleft}") if $self->debuglevel(1, 'insteon');
 		$ack_setby = $$child_obj{m_status_request_pending} if ref $$child_obj{m_status_request_pending};
 		$child_obj->SUPER::set($child_state, $ack_setby);
 		delete($$parent{child_status_request_pending});
@@ -1171,7 +1171,7 @@ sub is_acknowledged
 		$$child_obj{pending_setby} = undef;
 		$$child_obj{pending_response} = undef;
 		$$parent{child_pending_state} = undef;
-		&::print_log("[Insteon::FanLinc] received command/state acknowledge from " . $child_obj->{object_name}) if $self->debuglevel();
+		&::print_log("[Insteon::FanLinc] received command/state acknowledge from " . $child_obj->{object_name}) if $self->debuglevel(1, 'insteon');
 		return $$self{is_acknowledged};
 	} else {
 		return $self->SUPER::is_acknowledged($p_ack);
diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index cf65bb0a7..843547980 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -233,7 +233,7 @@ sub send
                 {
                 	&::print_log("[Insteon::BaseMessage] WARN: now resending "
                         	. $self->to_string() . " after " . $self->send_attempts
-                        	. " attempts.") if $self->setby->debuglevel();
+                        	. " attempts.") if $self->setby->debuglevel(1, 'insteon');
                         # revise default hop count to reflect retries
                         if (ref $self->setby && $self->setby->isa('Insteon::BaseObject') 
                         	&& !defined($$self{no_hop_increase}))
@@ -248,7 +248,7 @@ sub send
                         	&& $self->setby->isa('Insteon::BaseObject')){
                         	&main::print_log("[Insteon::BaseMessage] Hop count not increased for "
                         		. $self->setby->get_object_name . " because no_hop_increase flag was set.")
-                        		if $self->setby->debuglevel();
+                        		if $self->setby->debuglevel(1, 'insteon');
                         	$$self{no_hop_increase} = undef;
                         }
                 }
@@ -1086,7 +1086,7 @@ sub generate_commands
 	}
 
 	if ($uc eq undef) {
-	    &main::print_log("[Insteon::Message] Message is for entire HC") if Insteon::BaseObject::debuglevel($p_setby,);
+	    &main::print_log("[Insteon::Message] Message is for entire HC") if (ref $p_setby && $p_setby->debuglevel(1,'insteon'));
 	}
 	else {
 
@@ -1095,7 +1095,7 @@ sub generate_commands
 	    $msg.= substr(unpack("H*",pack("C",$x10_unit_codes{substr($id,2,1)})),1,1);
 	    $msg.= "00";
 	    &main::print_log("[Insteon_PLM] x10 sending code: " . uc($hc . $uc) . " as insteon msg: "
-			     . $msg) if Insteon::BaseObject::debuglevel($p_setby,);
+			     . $msg) if (ref $p_setby && $p_setby->debuglevel(1,'insteon'));
 
             push @data, $msg;
 	}
@@ -1123,7 +1123,7 @@ sub generate_commands
 	    $msg.= "80";
 
      	    &main::print_log("[Insteon_PLM] x10 sending code: " . uc($hc . $x10_arg) . " as insteon msg: "
-			     . $msg) if Insteon::BaseObject::debuglevel($p_setby,);
+			     . $msg) if (ref $p_setby && $p_setby->debuglevel(1,'insteon'));
 
             push @data, $msg;
 
diff --git a/lib/Insteon/Security.pm b/lib/Insteon/Security.pm
index cfdcdfa43..cdd325efd 100644
--- a/lib/Insteon/Security.pm
+++ b/lib/Insteon/Security.pm
@@ -392,7 +392,7 @@ sub _process_message {
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
-		main::print_log("[Insteon::MotionSensor] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel();
+		main::print_log("[Insteon::MotionSensor] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel(1, 'insteon');
 		if ($$self{_ext_set_get_action} eq 'set'){
 			if (defined($$root{_set_bit_action})){
 				::print_log("[Insteon::MotionSensor] Set of ".
@@ -400,7 +400,7 @@ sub _process_message {
 					$root->get_object_name);
 				$$root{_set_bit_action} = undef;
 			} else {
-				main::print_log("[Insteon::MotionSensor] Clearing active message") if $self->debuglevel();
+				main::print_log("[Insteon::MotionSensor] Clearing active message") if $self->debuglevel(1, 'insteon');
 			}
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
@@ -455,7 +455,7 @@ sub _process_message {
 			$self->_process_command_stack(%msg);
 		} else {
 			main::print_log("[Insteon::MotionSensor] WARN: Unknown Extended "
-				."Set/Get Data Message Received for ". $self->get_object_name) if $self->debuglevel();
+				."Set/Get Data Message Received for ". $self->get_object_name) if $self->debuglevel(1, 'insteon');
 		}
 	}
 	else {
@@ -817,9 +817,9 @@ sub _process_message {
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
-		main::print_log("[Insteon::TriggerLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel();
+		main::print_log("[Insteon::TriggerLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel(1, 'insteon');
 		if ($$self{_ext_set_get_action} eq 'set'){
-			main::print_log("[Insteon::TriggerLinc] Clearing active message") if $self->debuglevel();
+			main::print_log("[Insteon::TriggerLinc] Clearing active message") if $self->debuglevel(1, 'insteon');
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
 			$self->_process_command_stack(%msg);	
@@ -837,7 +837,7 @@ sub _process_message {
 			$self->_process_command_stack(%msg);
 		} else {
 			main::print_log("[Insteon::TriggerLinc] WARN: Corrupt Extended "
-				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel();
+				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel(1, 'insteon');
 		}
 	}
 	else {
diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index a8f88fb82..e9eea1a35 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -215,7 +215,7 @@ Sets fan to 'on' or 'auto'
 sub fan{
 	my ($self, $state) = @_;
 	$state = lc($state);
-	main::print_log("[Insteon::Thermostat] Fan $state") if $self->debuglevel();
+	main::print_log("[Insteon::Thermostat] Fan $state") if $self->debuglevel(1, 'insteon');
 	my $fan;
 	if (($state eq 'on') or ($state eq 'fan_on')) {
 		$fan = '07';
@@ -236,7 +236,7 @@ Sets a new cool setpoint.
 =cut
 sub cool_setpoint{
 	my ($self, $temp) = @_;
-      main::print_log("[Insteon::Thermostat] Cool setpoint -> $temp") if $self->debuglevel();
+      main::print_log("[Insteon::Thermostat] Cool setpoint -> $temp") if $self->debuglevel(1, 'insteon');
       if($temp !~ /^\d+$/){
          main::print_log("[Insteon::Thermostat] ERROR: cool_setpoint $temp not numeric");
          return;
@@ -250,7 +250,7 @@ Sets a new heat setpoint.
 =cut
 sub heat_setpoint{
 	my ($self, $temp) = @_;
-	main::print_log("[Insteon::Thermostat] Heat setpoint -> $temp") if $self->debuglevel();
+	main::print_log("[Insteon::Thermostat] Heat setpoint -> $temp") if $self->debuglevel(1, 'insteon');
 	if($temp !~ /^\d+$/){
 		main::print_log("[Insteon::Thermostat] ERROR: heat_setpoint $temp not numeric");
 		return;
@@ -374,7 +374,7 @@ sub _is_info_request {
    my $is_info_request = ($cmd eq 'thermostat_get_zone_info') ? 1 : 0;
    if ($is_info_request) {
       my $val = $msg{extra};
-      main::print_log("[Insteon::Thermostat] Processing is_info_request for $cmd with value: $val") if $self->debuglevel(); 
+      main::print_log("[Insteon::Thermostat] Processing is_info_request for $cmd with value: $val") if $self->debuglevel(1, 'insteon'); 
       if ($$self{_zone_action} eq "temp") {
          $val = (hex $val) / 2; # returned value is twice the real value
          if (exists $$self{'temp'} and ($$self{'temp'} != $val)) {
@@ -420,21 +420,21 @@ sub _process_message
 	elsif ($msg{command} eq "thermostat_setpoint_cool" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermostat] Received ACK of cool setpoint ".
-			"for ". $self->get_object_name) if $self->debuglevel();	
+			"for ". $self->get_object_name) if $self->debuglevel(1, 'insteon');	
 		$self->_cool_sp((hex($msg{extra})/2));
 		$clear_message = 1;
 	}
 	elsif ($msg{command} eq "thermostat_setpoint_heat" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermostat] Received ACK of heat setpoint ".
-			"for ". $self->get_object_name) if $self->debuglevel();	
+			"for ". $self->get_object_name) if $self->debuglevel(1, 'insteon');	
 		$self->_heat_sp((hex($msg{extra})/2));
 		$clear_message = 1;
 	}
 	elsif ($$self{_zone_action} eq 'setpoint' && $$self{m_pending_setpoint}) {
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		# we got our cool setpoint in auto mode
-		main::print_log("[Insteon::Thermostat] Processing data for $msg{command} with value: $msg{extra}") if $self->debuglevel();
+		main::print_log("[Insteon::Thermostat] Processing data for $msg{command} with value: $msg{extra}") if $self->debuglevel(1, 'insteon');
 		my $val = (hex $msg{extra})/2;
 		$self->_cool_sp($val);
 		$$self{m_setpoint_pending} = 0;
@@ -498,7 +498,7 @@ Sets system mode to argument: 'off', 'heat', 'cool', 'auto', 'program_heat',
 sub mode{
 	my ($self, $state) = @_;
 	$state = lc($state);
-	main::print_log("[Insteon::Thermostat] Mode $state") if $self->debuglevel();
+	main::print_log("[Insteon::Thermostat] Mode $state") if $self->debuglevel(1, 'insteon');
 	my $mode;
 	if ($state eq 'off') {
 		$mode = "09";
@@ -527,7 +527,7 @@ sub _is_info_request {
 	my $is_info_request;
 	if ($cmd eq 'thermostat_control' && $$self{_control_action} eq "mode") {
 		my $val = $msg{extra};
-		main::print_log("[Insteon::Thermo_i1] Processing is_info_request for $cmd with value: $val") if $self->debuglevel(); 
+		main::print_log("[Insteon::Thermo_i1] Processing is_info_request for $cmd with value: $val") if $self->debuglevel(1, 'insteon'); 
 		if ($val eq '00') {
 			$self->_mode('off');
 		} elsif ($val eq '01') {
@@ -719,16 +719,16 @@ sub _process_message {
 	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		#If this was a get request don't clear until data packet received
-		main::print_log("[Insteon::Thermo_i2CS] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel();
+		main::print_log("[Insteon::Thermo_i2CS] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel(1, 'insteon');
 		if ($$self{_ext_set_get_action} eq 'set'){
-			main::print_log("[Insteon::Thermo_i2CS] Clearing active message") if $self->debuglevel();
+			main::print_log("[Insteon::Thermo_i2CS] Clearing active message") if $self->debuglevel(1, 'insteon');
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
 			$self->_process_command_stack(%msg);	
 		}
 		elsif ($$self{_ext_set_get_action} eq 'set_high_humid'){
 			main::print_log("[Insteon::Thermostat] Received ACK of high humid setpoint ".
-				"for ". $self->get_object_name) if $self->debuglevel();	
+				"for ". $self->get_object_name) if $self->debuglevel(1, 'insteon');	
 			$self->_high_humid_sp($$self{_high_humid_pending});
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
@@ -737,7 +737,7 @@ sub _process_message {
 		}
 		elsif ($$self{_ext_set_get_action} eq 'set_low_humid'){
 			main::print_log("[Insteon::Thermostat] Received ACK of low humid setpoint ".
-				"for ". $self->get_object_name) if $self->debuglevel();	
+				"for ". $self->get_object_name) if $self->debuglevel(1, 'insteon');	
 			$self->_low_humid_sp($$self{_low_humid_pending});
 			$clear_message = 1;
 			$$self{_ext_set_get_action} = undef;
@@ -749,7 +749,7 @@ sub _process_message {
 		if (substr($msg{extra},0,4) eq "0201") {
 			$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 			main::print_log("[Insteon::Thermo_i2CS] Extended Set/Get Data ".
-				"Received for ". $self->get_object_name) if $self->debuglevel();
+				"Received for ". $self->get_object_name) if $self->debuglevel(1, 'insteon');
 			#0 = 2				#14 = Cool SP 
 			#2 = 1				#16 = humidity
 			#3 = day			#18 = temp in Celsius High byte
@@ -821,37 +821,37 @@ sub _process_message {
 		}
 		else {
 			main::print_log("[Insteon::Thermo_i2CS] WARN: Unknown Extended "
-				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel();
+				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel(1, 'insteon');
 		}
 	}
 	elsif ($msg{command} eq "status_temp" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2CS] Received Temp Change Message ".
-			"from ". $self->get_object_name) if $self->debuglevel();	
+			"from ". $self->get_object_name) if $self->debuglevel(1, 'insteon');	
 		$self->hex_short_temp($msg{extra});
 	}
 	elsif ($msg{command} eq "status_mode" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2CS] Received Mode Change Message ".
-			"from ". $self->get_object_name) if $self->debuglevel();	
+			"from ". $self->get_object_name) if $self->debuglevel(1, 'insteon');	
 		$self->status_mode($msg{extra});
 	}
 	elsif ($msg{command} eq "status_cool" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2CS] Received Cool Setpoint Change Message ".
-			"from ". $self->get_object_name) if $self->debuglevel();	
+			"from ". $self->get_object_name) if $self->debuglevel(1, 'insteon');	
 		$self->hex_cool($msg{extra});
 	}
 	elsif ($msg{command} eq "status_humid" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2CS] Received Humidity Change Message ".
-			"from ". $self->get_object_name) if $self->debuglevel();	
+			"from ". $self->get_object_name) if $self->debuglevel(1, 'insteon');	
 		$self->hex_humid($msg{extra});
 	}
 	elsif ($msg{command} eq "status_heat" && !$msg{is_ack}){
 		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
 		main::print_log("[Insteon::Thermo_i2CS] Received Heat Setpoint Change Message ".
-			"from ". $self->get_object_name) if $self->debuglevel();	
+			"from ". $self->get_object_name) if $self->debuglevel(1, 'insteon');	
 		$self->hex_heat($msg{extra});
 	}
 	else {
@@ -865,7 +865,7 @@ sub _is_info_request {
 	my $is_info_request;
 	if ($cmd eq 'thermostat_control' && $$self{_control_action} eq "mode") {
 		my $val = $msg{extra};
-		main::print_log("[Insteon::Thermo_i2CS] Processing is_info_request for $cmd with value: $val") if $self->debuglevel(); 
+		main::print_log("[Insteon::Thermo_i2CS] Processing is_info_request for $cmd with value: $val") if $self->debuglevel(1, 'insteon'); 
 		if ($val eq '09') {
 			$self->_mode('Off');
 		} elsif ($val eq '04') {
@@ -1062,7 +1062,7 @@ Sets system mode to argument: 'off', 'heat', 'cool', 'auto', 'program_heat',
 sub mode{
 	my ($self, $state) = @_;
 	$state = lc($state);
-	main::print_log("[Insteon::Thermostat] Mode $state") if $self->debuglevel();
+	main::print_log("[Insteon::Thermostat] Mode $state") if $self->debuglevel(1, 'insteon');
 	my $mode;
 	if ($state eq 'off') {
 		$mode = "09";
@@ -1110,7 +1110,7 @@ Sets the high humidity setpoint.
 =cut
 sub high_humid_setpoint {
 	my ($self, $value) = @_;
-	main::print_log("[Insteon::Thermo_i2CS] Setting high humid setpoint -> $value") if $self->debuglevel();
+	main::print_log("[Insteon::Thermo_i2CS] Setting high humid setpoint -> $value") if $self->debuglevel(1, 'insteon');
 	if($value !~ /^\d+$/){
 		main::print_log("[Insteon::Thermo_i2CS] ERROR: Setpoint $value not numeric");
 		return;
@@ -1134,7 +1134,7 @@ Sets the low humidity setpoint.
 =cut
 sub low_humid_setpoint {
 	my ($self, $value) = @_;
-	main::print_log("[Insteon::Thermo_i2CS] Setting low humid setpoint -> $value") if $self->debuglevel();
+	main::print_log("[Insteon::Thermo_i2CS] Setting low humid setpoint -> $value") if $self->debuglevel(1, 'insteon');
 	if($value !~ /^\d+$/){
 		main::print_log("[Insteon::Thermo_i2CS] ERROR: Setpoint $value not numeric");
 		return;
diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index 7089896ec..2b91d37f2 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -218,7 +218,7 @@ sub check_for_data {
             		}
                 	else
                 	{
-               			&::print_log("[Insteon_PLM] DEBUG2: PLM command timer expired but no transmission in place.  Moving on...") if $self->debuglevel(2);
+               			&::print_log("[Insteon_PLM] DEBUG2: PLM command timer expired but no transmission in place.  Moving on...") if $self->debuglevel(2, 'insteon');
 	       			$self->clear_active_message();
                			$self->process_queue();
             		}
@@ -388,16 +388,18 @@ sub _send_cmd {
         # determine the delay from the point that the message was created to
         # the point that it is queued
         my $incurred_delay_time = $message->seconds_delayed;
-        &main::print_log("[Insteon_PLM] DEBUG2: Sending " . $message->to_string . " incurred delay of "
-        	. sprintf('%.2f',$incurred_delay_time) . " seconds; starting hop-count: "
-                . ((ref $message->setby && $message->setby->isa('Insteon::BaseObject')) ? $message->setby->default_hop_count : "?")) if $message->setby->debuglevel(2);
 
 	if ($message->isa('Insteon::X10Message')) { # is x10; so, be slow
+		&main::print_log("[Insteon_PLM] DEBUG2: Sending " . $message->to_string . " incurred delay of "
+		. sprintf('%.2f',$incurred_delay_time) . " seconds") if $self->debuglevel(2, 'insteon');
         	$command = $prefix{x10_send} . $command;
 		$delay = $$self{xmit_x10_delay};
                 # clear command timeout so that we don't wait for an insteon ack before sending the next command
 	} else {
                 my $command_type = $message->command_type;
+		&main::print_log("[Insteon_PLM] DEBUG2: Sending " . $message->to_string . " incurred delay of "
+		. sprintf('%.2f',$incurred_delay_time) . " seconds; starting hop-count: "
+		. ((ref $message->setby && $message->setby->isa('Insteon::BaseObject')) ? $message->setby->default_hop_count : "?")) if $message->setby->debuglevel(2, 'insteon');
                 $command = $prefix{$command_type} . $command;
                 if ($command_type eq 'all_link_send' or $command_type eq 'insteon_send' or $command_type eq 'insteon_ext_send' or $command_type eq 'all_link_direct_cleanup')
                 {
@@ -412,8 +414,10 @@ sub _send_cmd {
 	} 
 	else
 	{
-		&::print_log( "[Insteon_PLM] DEBUG3: Sending  PLM raw data: ".lc($command)) if $message->setby->debuglevel(3);
-		&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($command)) if $message->setby->debuglevel(4);
+		my $debug_obj = $self;
+		$debug_obj = $message->setby if ($message->can('setby') && ref $message->setby);
+		&::print_log( "[Insteon_PLM] DEBUG3: Sending  PLM raw data: ".lc($command)) if $debug_obj->debuglevel(3, 'insteon');
+		&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($command)) if $debug_obj->debuglevel(4, 'insteon');
 		my $data = pack("H*",$command);
 		$main::Serial_Ports{$instance}{object}->write($data) if $main::Serial_Ports{$instance};
 	
@@ -442,7 +446,7 @@ sub _parse_data {
 	# it is possible that a fragment exists from a previous attempt; so, if it exists, prepend it
 	if ($$self{_data_fragment})
         {
-		&::print_log("[Insteon_PLM] DEBUG3: Prepending prior data fragment: $$self{_data_fragment}") if $self->debuglevel(3);
+		&::print_log("[Insteon_PLM] DEBUG3: Prepending prior data fragment: $$self{_data_fragment}") if $self->debuglevel(3, 'insteon');
                 # maintain a copy of the parsed data fragment
 		$$self{_prior_data_fragment} = $$self{_data_fragment};
                 # append if not a repeat
@@ -456,7 +460,7 @@ sub _parse_data {
                 $$self{_prior_data_fragment} = '';
         }
 
-	&::print_log( "[Insteon_PLM] DEBUG3: Received PLM raw data: $data") if $self->debuglevel(3);
+	&::print_log( "[Insteon_PLM] DEBUG3: Received PLM raw data: $data") if $self->debuglevel(3, 'insteon');
 
 	# begin by pulling out any PLM ack/nacks
 	my $prev_cmd = '';
@@ -492,7 +496,9 @@ sub _parse_data {
                         $entered_ack_loop = 1;
 			if ($parsed_data =~ /^($ackcmd)|($nackcmd)|($prefix{plm_info}\w{12}06)|($prefix{plm_info}\w{12}15)|($prefix{all_link_first_rec}15)|($prefix{all_link_next_rec}15)|($badcmd)$/)
                         {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->active_message->setby->debuglevel(4);
+				my $debug_obj = $self;
+				$debug_obj = $self->active_message->setby if ($self->active_message->can('setby') && ref $self->active_message->setby);
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $debug_obj->debuglevel(4, 'insteon');
 				my $ret_code = substr($parsed_data,length($parsed_data)-2,2);
 				my $record_type = substr($parsed_data,0,4);
                                 my $message_data = substr($parsed_data,4,length($parsed_data)-4);
@@ -515,7 +521,7 @@ sub _parse_data {
 							package main;
 							eval ($self->active_message->success_callback);
 							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
-								if $@ and $self->active_message->setby->debuglevel(1);
+								if $@ and $self->active_message->setby->debuglevel(1, 'insteon');
 							package Insteon_PLM;
                                         	}
                                                 # clear the active message because we're done
@@ -523,8 +529,10 @@ sub _parse_data {
                                         }
                                         else
                                         {
+						my $debug_obj = $self;
+						$debug_obj = $self->active_message->setby if ($self->active_message->can('setby') && ref $self->active_message->setby);
                                         	&::print_log("[Insteon_PLM] DEBUG3: Received PLM acknowledge: "
-                                                	. $pending_message->to_string) if $self->active_message->setby->debuglevel(3);
+                                                	. $pending_message->to_string) if $debug_obj->debuglevel(3, 'insteon');
                                         }
 
                                         # X10 messages don't ACK back on the powerline, so clear them if the PLM acknowledges
@@ -552,7 +560,7 @@ sub _parse_data {
 							package main;
 							eval ($callback);
 							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
-								if $@ and $self->active_message->setby->debuglevel(1);
+								if $@ and $self->active_message->setby->debuglevel(1, 'insteon');
 							package Insteon_PLM;	
                                                 }
 					}
@@ -579,7 +587,7 @@ sub _parse_data {
                                                 $self->_aldb->scandatetime(&main::get_tickcount);
 						&::print_log("[Insteon_PLM] " . $self->get_object_name 
 							. " completed link memory scan: status: " . $self->_aldb->health())
-							if $self->debuglevel();
+							if $self->debuglevel(1, 'insteon');
 						if ($$self{_mem_callback})
 						{
 							my $callback = $$self{_mem_callback};
@@ -587,7 +595,7 @@ sub _parse_data {
 							package main;
 							eval ($callback);
 							&::print_log("[Insteon_PLM] WARN1: Error encountered during nack callback: " . $@)
-								if $@ and $self->debuglevel(1);
+								if $@ and $self->debuglevel(1, 'insteon');
 							package Insteon_PLM;
 						}
                                         }
@@ -637,7 +645,7 @@ sub _parse_data {
 							package main;
 							eval ($callback);
 							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
-								if $@ and $self->debuglevel(1);
+								if $@ and $self->debuglevel(1, 'insteon');
 							package Insteon_PLM;
 						}
                                                 # clear the active message because we're done
@@ -673,7 +681,7 @@ sub _parse_data {
                                         my $unknown_obj = &Insteon::get_object($unknown_deviceid, '01');
                                         if ($unknown_obj)
                                         {
-                                        	&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $unknown_obj->debuglevel(4);
+                                        	&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $unknown_obj->debuglevel(4, 'insteon');
                                         	&::print_log("[Insteon_PLM] WARN: encountered '$parsed_data' "
                                                 	. "from " . $unknown_obj->get_object_name()
                                                         . " with command: $unknown_command, but expected '$ackcmd'.");
@@ -681,7 +689,7 @@ sub _parse_data {
                                         }
                                         else
                                         {
-                                        	&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+                                        	&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
                                         	&::print_log("[Insteon_PLM] ERROR: encountered '$parsed_data' "
                                                 	. "that does not match any known device ID (expected '$ackcmd')."
                                                         . " Discarding received data.");
@@ -714,7 +722,7 @@ sub _parse_data {
 
 		if ($previous_parsed_data eq $parsed_data){
 			# guard against repeats
-			::print_log("[Insteon_PLM] DEBUG3: Dropped duplicate message: $parsed_data") if $self->debuglevel(3); 
+			::print_log("[Insteon_PLM] DEBUG3: Dropped duplicate message: $parsed_data") if $self->debuglevel(3, 'insteon'); 
 			next;
 		}
                 $previous_parsed_data = $parsed_data; # and, now reinitialize
@@ -730,10 +738,10 @@ sub _parse_data {
                 { #Insteon Standard Received
 			my $find_obj = Insteon::get_object(substr($parsed_data,4,6), '01');
 			if (ref $find_obj) {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $find_obj->debuglevel(4);
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $find_obj->debuglevel(4, 'insteon');
 			} 
 			else {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
 			}
                         $self->on_standard_insteon_received($message_data);
 		}
@@ -741,29 +749,29 @@ sub _parse_data {
                 { #Insteon Extended Received
 			my $find_obj = Insteon::get_object(substr($parsed_data,4,6), '01');
 			if (ref $find_obj) {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $find_obj->debuglevel(4);
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $find_obj->debuglevel(4, 'insteon');
 			} 
 			else {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
 			}
                 	$self->on_extended_insteon_received($message_data);
 		}
                 elsif($parsed_prefix eq $prefix{x10_received} and ($message_length == 8))
                 { #X10 Received
-			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
                        	my $x10_message = new Insteon::X10Message($parsed_data);
                         my $x10_data = $x10_message->get_formatted_data();
-			&::print_log("[Insteon_PLM] DEBUG3: received x10 data: $x10_data") if $self->debuglevel(3);
+			&::print_log("[Insteon_PLM] DEBUG3: received x10 data: $x10_data") if $self->debuglevel(3, 'insteon');
 			&::process_serial_data($x10_data,undef,$self);
 		}
                 elsif ($parsed_prefix eq $prefix{all_link_complete} and ($message_length == 20))
                 { #ALL-Linking Completed
-			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
 			my $link_address = substr($message_data,4,6);
-			&::print_log("[Insteon_PLM] DEBUG2: ALL-Linking Completed with $link_address ($message_data)") if $self->debuglevel(2);
+			&::print_log("[Insteon_PLM] DEBUG2: ALL-Linking Completed with $link_address ($message_data)") if $self->debuglevel(2, 'insteon');
 			if ($self->active_message->success_callback){
 				main::print_log("[Insteon::Insteon_PLM] DEBUG4: Now calling message success callback: "
-					. $self->active_message->success_callback) if $self->debuglevel(4);
+					. $self->active_message->success_callback) if $self->debuglevel(4, 'insteon');
 				package main;
 					eval $self->active_message->success_callback;
 					::print_log("[Insteon::Insteon_PLM] problem w/ success callback: $@") if $@;
@@ -782,30 +790,30 @@ sub _parse_data {
                         	my $failure_device = substr($message_data,2,6);
                         	my $failed_object = &Insteon::get_object($failure_device,'01');
                         	if (ref $failed_object){
-					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $failed_object->debuglevel(4);
+					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $failed_object->debuglevel(4, 'insteon');
 					&::print_log("[Insteon_PLM] DEBUG2: Received all-link cleanup failure from " . $failed_object->get_object_name
-                        		. " for all link group: $failure_group. Trying a direct cleanup.") if $failed_object->debuglevel(2);
+                        		. " for all link group: $failure_group. Trying a direct cleanup.") if $failed_object->debuglevel(2, 'insteon');
 	                        	my $message = new Insteon::InsteonMessage('all_link_direct_cleanup', $failed_object, 
 	                        		$self->active_message->command, $failure_group);
 	                        	push(@{$$failed_object{command_stack}}, $message);
 	                        	$failed_object->_process_command_stack();
                         	} else {
-					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
 					&::print_log("[Insteon_PLM] Received all-link cleanup failure from an unkown device id: "
                         		. "$failure_device and for all link group: $failure_group. You may "
                         			. "want to run delete orphans to remove this link from your PLM");
                         	}
 			} else {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
 				&::print_log("[Insteon_PLM] DEBUG2: Received all-link cleanup failure."
-                        		. " But there is no pending message.") if $self->debuglevel(2);
+                        		. " But there is no pending message.") if $self->debuglevel(2, 'insteon');
 			}
                         
 		}
                 elsif ($parsed_prefix eq $prefix{all_link_record} and ($message_length == 20))
                 { #ALL-Link Record Response
-			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
-			&::print_log("[Insteon_PLM] DEBUG2: ALL-Link Record Response:$message_data") if $self->debuglevel(2);
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
+			&::print_log("[Insteon_PLM] DEBUG2: ALL-Link Record Response:$message_data") if $self->debuglevel(2, 'insteon');
 			$self->_aldb->parse_alllink($message_data);
         		# before doing the next, make sure that the pending command
                         #   (if it sitll exists) is pulled from the queue
@@ -815,18 +823,18 @@ sub _parse_data {
 		}
 		elsif ($parsed_prefix eq $prefix{plm_user_reset} and ($message_length == 4))
 		{
-			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
 			main::print_log("[Insteon_PLM] Detected PLM user reset to factory defaults");
 		}
                 elsif ($parsed_prefix eq $prefix{all_link_clean_status} and ($message_length == 6))
                 { #ALL-Link Cleanup Status Report
-			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4);
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
 			my $cleanup_ack = substr($message_data,0,2);
 			if ($cleanup_ack eq '15')
                         {
 				&::print_log("[Insteon_PLM] WARN1: All-link cleanup failure for scene: "
                                 	. $self->active_message->setby->get_object_name . ". Retrying in 1 second.")
-					if $self->active_message->setby->debuglevel(1);
+					if $self->active_message->setby->debuglevel(1, 'insteon');
                                 $self->retry_active_message();
                                 # except that we should cause a bit of a delay to let things settle out
 				$self->_set_timeout('xmit', 1000);
@@ -836,7 +844,7 @@ sub _parse_data {
                         {
                         	my $message_to_string = ($self->active_message) ? $self->active_message->to_string() : "";
 				&::print_log("[Insteon_PLM] Received all-link cleanup success: $message_to_string")
-                                	if $self->active_message->setby->debuglevel();
+                                	if $self->active_message->setby->debuglevel(1, 'insteon');
 				if (ref $self->active_message && ref $self->active_message->setby){
 					my $object = $self->active_message->setby;
 					$object->is_acknowledged(1);
@@ -853,14 +861,14 @@ sub _parse_data {
 				if ($self->active_message){
 					my $nack_delay = ($::config_parms{Insteon_PLM_disable_throttling}) ? 0.3 : 1.0;
 					&::print_log("[Insteon_PLM] DEBUG3: Interface extremely busy. Resending command"
-						. " after delaying for $nack_delay second") if $self->debuglevel(3);
+						. " after delaying for $nack_delay second") if $self->debuglevel(3, 'insteon');
 					$self->_set_timeout('xmit',$nack_delay * 1000);
 					$self->active_message->no_hop_increase(1);
                                 	$self->retry_active_message();
 					$process_next_command = 0;
 				} else {
 					&::print_log("[Insteon_PLM] DEBUG3: Interface extremely busy."
-						. " No message to resend.") if $self->debuglevel(3);
+						. " No message to resend.") if $self->debuglevel(3, 'insteon');
 				}
 				$nack_count++;
 			}
@@ -869,7 +877,7 @@ sub _parse_data {
 			if ($parsed_data ne ''){
 				$$self{_data_fragment} .= $parsed_data;
 				::print_log("[Insteon_PLM] DEBUG3: Saving parsed data fragment: " 
-					. $parsed_data) if( $self->debuglevel(3));
+					. $parsed_data) if( $self->debuglevel(3, 'insteon'));
 			}
 		}
                 else
@@ -879,7 +887,7 @@ sub _parse_data {
 			unless (($parsed_data eq $$self{_prior_data_fragment}) or ($parsed_data eq $$self{_data_fragment})) {
 				$$self{_data_fragment} .= $parsed_data;
 				main::print_log("[Insteon_PLM] DEBUG3: Saving parsed data fragment: " 
-					. $parsed_data) if( $self->debuglevel(3));
+					. $parsed_data) if( $self->debuglevel(3, 'insteon'));
 			}
 		}
 	}
@@ -887,7 +895,7 @@ sub _parse_data {
 	unless( $entered_rcv_loop or $$self{_data_fragment}) {
 		$$self{_data_fragment} = $residue_data;
 		main::print_log("[Insteon_PLM] DEBUG3: Saving residue data fragment: " 
-			. $residue_data) if( $residue_data and $self->debuglevel(3));
+			. $residue_data) if( $residue_data and $self->debuglevel(3, 'insteon'));
 	}
 
 	if ($process_next_command) {

From 937006b9df5718a189b4b859cf8e028313d4b33c Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 11 Nov 2013 17:20:00 -0800
Subject: [PATCH 314/330] Insteon: Fix Bug Preventing Delete Orphans Due to
 Is_Deaf Error

Closes #310
---
 lib/Insteon/AllLinkDatabase.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 003db8636..dd24473b4 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -421,7 +421,7 @@ sub delete_orphan_links
         # first, make sure that the health of ALDB is ok
         if ($self->health ne 'good')
         {
-        	if ($self->is_deaf)
+        	if ($$self{device}->is_deaf)
                 {
         		&::print_log("[Insteon::AllLinkDatabase] Delete orphan links: ignoring link from deaf device: $selfname");
 

From 4e06fb4de9bc2b5bf1910ef76ed1d4413d53a363 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 11 Nov 2013 17:25:00 -0800
Subject: [PATCH 315/330] Insteon: Fix Bug Which Converted Object Names to
 Lowercase

It looks like the routine lc is greedy and will convert multiple concatenated strings.

Closed #309
---
 lib/Insteon/BaseInsteon.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index c25350b06..7328b1d66 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1432,7 +1432,7 @@ sub link_to_interface
 	}
 	elsif ($step == 2){ #Add Link from PLM->object
 		$success_callback = $success_callback_prefix . "\"3\")";
-		my $link_info = "deviceid=" . lc $self->device_id . " group=$p_group is_controller=0 " .
+		my $link_info = "deviceid=" . lc ($self->device_id) . " group=$p_group is_controller=0 " .
 			"callback=$success_callback failure_callback=$failure_callback";	
 	        $self->interface->add_link($link_info);
 	}
@@ -1454,7 +1454,7 @@ sub link_to_interface
 	elsif ($step == 4){ #Add surrogate link on PLM if surrogate exists
 		$success_callback = $success_callback_prefix . "\"5\")";
 		my $surrogate_group = $$self{surrogate}->group;
-		my %link_info = ( deviceid=> lc $self->device_id, 
+		my %link_info = ( deviceid=> lc($self->device_id), 
 			group => $surrogate_group, is_controller => 1,
 			callback => "$success_callback", 
 			failure_callback=> "$failure_callback",
@@ -1542,7 +1542,7 @@ sub unlink_to_interface
 	elsif ($step == 1) { #Delete link on the PLM
 		$success_callback = $success_callback_prefix . "'2')";
 		$self->interface->delete_link(
-			deviceid => lc $self->device_id, 
+			deviceid => lc($self->device_id), 
 			group=> $p_group, is_controller=>0,
 			callback=>$success_callback,
 			failure_callback=>$failure_callback);
@@ -1566,7 +1566,7 @@ sub unlink_to_interface
 	elsif ($step == 3){ #Delete surrogate link on PLM if surrogate exists
 		$success_callback = $success_callback_prefix . "'4')";
 		my $surrogate_group = $$self{surrogate}->group;
-		my %link_info = ( deviceid=> lc $self->device_id, 
+		my %link_info = ( deviceid=> lc($self->device_id), 
 			group => $surrogate_group, is_controller => 1,
 			callback => "$success_callback", 
 			failure_callback=> "$failure_callback",

From a159c571281730fef7162e7e671d8bd2840f7189 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 11 Nov 2013 17:32:00 -0800
Subject: [PATCH 316/330] Insteon: Check if Hop_Array is Defined Before
 Printing

Closes #311
---
 lib/Insteon/BaseInsteon.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index c25350b06..7f15cc94e 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1877,7 +1877,9 @@ sub log_aldb_status
 {
 	my ($self) = @_;
 	main::print_log( "     Device ID: ".$self->device_id());
-	main::print_log( "     Hop Count: ".$self->default_hop_count()." :: [". join("",@{$$self{hop_array}})."]");
+	my $hop_array;
+	$hop_array = join("",@{$$self{hop_array}}) if (defined($$self{hop_array}));
+	main::print_log( "     Hop Count: ".$self->default_hop_count()." :: [$hop_array]");
 	main::print_log( "Engine Version: ".$self->engine_version());
 	my $aldb = $self->get_root()->_aldb;
 	if ($aldb)

From fd47e540eefcb2c9346114e9abca249f7ee9edd8 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 14 Nov 2013 17:25:00 -0800
Subject: [PATCH 317/330] Insteon: Clear Active Message Before Calling Retry
 Failure Callback

If active message is not cleared, subsequent messages which are cued by the Retry Failure Callback will continue to call the Callback over and over.
---
 lib/Insteon/BaseInterface.pm | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 9e97f5135..0de64a645 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -381,20 +381,26 @@ sub process_queue
 					&main::print_log("[Insteon::BaseInterface] WARN! Unable to clear acknowledge for "
 						. ((defined($failed_message->setby)) ? $failed_message->setby->get_object_name : "undefined"));
 				}
-                                # may instead want a "failure" callback separate from success callback
-				if ($failed_message->failure_callback)
+
+				# Get failed message details before clearing
+				my $callback = $failed_message->failure_callback;
+				my $setby = $failed_message->setby;
+				# clear active message
+				$self->clear_active_message();
+
+				if ($callback)
                                 {
                                        	&::print_log("[Insteon::BaseInterface] WARN: Message Timeout:  Now calling callback: " .
-                                               	$failed_message->failure_callback) if $self->debuglevel(1, 'insteon');
-					$failed_message->setby->failure_reason('timeout') 
-						if (defined($failed_message->setby) and $failed_message->setby->can('failure_reason'));
+                                               	$callback) if $self->debuglevel(1, 'insteon');
+					$setby->failure_reason('timeout') 
+						if (defined($setby) and $setby->can('failure_reason'));
 		       			package main;
-					eval $failed_message->failure_callback;
+					eval $callback;
 					&::print_log("[Insteon::BaseInterface] problem w/ retry callback: $@") if $@;
 					package Insteon::BaseInterface;
 				}
-				# clear active message
-				$self->clear_active_message();
+				
+				#Any other outgoing messages pending in the queue?
                 		$self->process_queue();
                         }
 		}

From 694aa8ffde58f234d861f75c3a9c8ebb038db72e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 14 Nov 2013 17:32:00 -0800
Subject: [PATCH 318/330] Insteon: Report Skipped Devices in List of Failed
 Objects

When syncing an object if a device is skipped because the device is out of sync, the object will be reported in the failed objects list at the end of the sync process to help identify potentially out-of-sync devices.
---
 lib/Insteon.pm             |  8 ++++----
 lib/Insteon/BaseInsteon.pm | 11 +++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 6451cf387..fafb42396 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -561,11 +561,11 @@ sub _get_next_linksync
                 my $_sync_failure_cnt = scalar @_sync_device_failures;
                 if ($_sync_failure_cnt)
                 {
-          	  	&main::print_log("[Sync all links] However, some failures were noted:");
+          	  	&main::print_log("[Sync all links] WARN! Failures occured, "
+          	  		."some links for the following objects remain out-of-sync:");
                   	for my $failed_obj (@_sync_device_failures)
                   	{
-        			&main::print_log("[Sync all links] WARN: failure occurred when syncing "
-                		. $failed_obj->get_object_name);
+        			&main::print_log("[Sync all links] " . $failed_obj->get_object_name);
                   	}
                 }
 
@@ -583,7 +583,7 @@ the failed device to the module global variable @_sync_device_failures.
 sub _get_next_linksync_failure
 {
         push @_sync_device_failures, $current_sync_device;
-        &main::print_log("[Sync all links] WARN: failure occurred when scanning "
+        &main::print_log("[Sync all links] WARN: failure occurred when syncing links for "
                 	. $current_sync_device->get_object_name . ".  Moving on...");
         &_get_next_linksync();
 
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index d5ce42cec..7d1e85e3c 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2995,6 +2995,8 @@ sub sync_links
 	# Intialize Variables
 	@{$$self{sync_queue}} = (); # reset the work queue
 	$$self{sync_queue_callback} = ($callback) ? $callback : undef;
+	$$self{sync_queue_failure_callback} = ($failure_callback) ? $failure_callback : undef;
+	$$self{sync_queue_failure} = undef;
 	my $self_link_name = $self->get_object_name;
 	my $insteon_object = $self->interface;
 	my $interface_object = Insteon::active_interface();
@@ -3019,6 +3021,7 @@ sub sync_links
 			."linked to this device, but no links will be added to $self_link_name.  Please rescan this device and attempt "
 			."sync links again.");
 		$insteon_object_is_syncable = 0;
+		$$self{sync_queue_failure} = 1;
 	}
 	
 	# 1. Does a controller link exist for Device-> PLM
@@ -3097,6 +3100,7 @@ sub sync_links
 				."from $self_link_name because the aldb of $member_name is "
 				. $member_root->_aldb->health;
 			push @{$$self{sync_queue}}, \%link_req;
+			$$self{sync_queue_failure} = 1;
 		}
 		
 		# 4. Is the responder link accurate
@@ -3209,11 +3213,14 @@ sub _process_sync_queue {
 			$link_member->add_link(%link_req);
 		}
 	} elsif ($$self{sync_queue_callback}) {
+		my $callback = $$self{sync_queue_callback};
+		if ($$self{sync_queue_failure}){
+			$callback = $$self{sync_queue_failure_callback};
+		}
 		package main;
-		eval ($$self{sync_queue_callback});
+		eval ($callback);
 		&::print_log("[Insteon::BaseController] error in sync links callback: " . $@)
 			if $@ and $self->debuglevel(1, 'insteon');
-		$$self{sync_queue_callback} = undef;
 		package Insteon::BaseController;
 	} else {
 		main::print_log($self->get_object_name." completed sync links");

From d27ec930242134f9dac9db1f592d71d6fc10f6ef Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 14 Nov 2013 17:34:00 -0800
Subject: [PATCH 319/330] Insteon: Resume Sync Queue After Failure of a Device

Previously, if a single failure occured in a sync_queue, the whole queue was abandoned.  This attempts to resume where the queue left off.
---
 lib/Insteon.pm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index fafb42396..5df9206ca 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -562,7 +562,7 @@ sub _get_next_linksync
                 if ($_sync_failure_cnt)
                 {
           	  	&main::print_log("[Sync all links] WARN! Failures occured, "
-          	  		."some links for the following objects remain out-of-sync:");
+          	  		."some links involving the following objects remain out-of-sync:");
                   	for my $failed_obj (@_sync_device_failures)
                   	{
         			&main::print_log("[Sync all links] " . $failed_obj->get_object_name);
@@ -582,10 +582,17 @@ the failed device to the module global variable @_sync_device_failures.
 
 sub _get_next_linksync_failure
 {
-        push @_sync_device_failures, $current_sync_device;
+        push @_sync_device_failures, $current_sync_device 
+		unless (grep{$current_sync_device == $_} @_sync_device_failures);
         &main::print_log("[Sync all links] WARN: failure occurred when syncing links for "
-                	. $current_sync_device->get_object_name . ".  Moving on...");
+                	. $current_sync_device->get_object_name . ". Resuming sync queue if it exists.");
+	my $num_sync_queue = @{$$current_sync_device{sync_queue}};
+	if ($num_sync_queue){
+		$current_sync_device->_process_sync_queue();
+	}
+	else { #No other pending links in the queue
         &_get_next_linksync();
+	}
 
 }
 

From d1a3ec8dd24d5362b638c6f4c98edbb28ad71924 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 14 Nov 2013 17:38:00 -0800
Subject: [PATCH 320/330] Insteon: Report Out-of-Sync Devices in Failed Delete
 Orphans Log

If a device is skipped because it was out of sync, it will now appear in the final summary listing the devices for which delete orphans failed.
---
 lib/Insteon/AllLinkDatabase.pm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index 878f4057f..e6f37738e 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -440,6 +440,7 @@ sub delete_orphan_links
 
 	# first, make sure that the health of ALDB is ok
 	if ($self->health ne 'good' || $$self{device}->is_deaf) {
+		my $sent_to_failure = 0;
 		if ($$self{device}->is_deaf) {
 			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Will not delete links on deaf device: $selfname");
 		} 
@@ -450,8 +451,17 @@ sub delete_orphan_links
 			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping $selfname because health: "
 				. $self->health . ". Please rescan the link table of this device and rerun delete "
 				. "orphans if necessary");
+			#log the failure
+			$sent_to_failure = 1;
+			if ($failure_callback) {
+				package main;
+				eval ($failure_callback);
+				&::print_log("[Insteon::AllLinkDatabase] error in delete orphans failure callback: " . $@)
+					if $@ and $self->{device}->debuglevel(1, 'insteon');
+				package Insteon::AllLinkDatabase;
+		}
 		}
-		if (!$$self{device}->isa('Insteon_PLM')){
+		if (!$$self{device}->isa('Insteon_PLM') && !$sent_to_failure){
 			$self->_process_delete_queue();
 		}
 		return;

From ec6cda4a4defa06b4fb4497f774f4f53aed7c22e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 14 Nov 2013 17:40:00 -0800
Subject: [PATCH 321/330] Insteon: Make Failed Device Reports Easier to Read

Condense list of failed devices into a single line in the print log.
---
 lib/Insteon.pm                 | 42 +++++++++++++++-------------------
 lib/Insteon/AllLinkDatabase.pm | 11 +++++----
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 5df9206ca..e9984e30d 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -477,16 +477,14 @@ sub _get_next_linkscan
     	{
           	&main::print_log("[Scan all link tables] All tables have completed scanning");
                 my $_scan_failure_cnt = scalar @_scan_device_failures;
-                if ($_scan_failure_cnt)
-                {
-          	  &main::print_log("[Scan all link tables] However, some failures were noted:");
-                  for my $failed_obj (@_scan_device_failures)
-                  {
-        		&main::print_log("[Scan all link tables] WARN: failure occurred when scanning "
-                	. $failed_obj->get_object_name);
-                  }
-                }
-
+                if ($_scan_failure_cnt){
+			my $obj_list;
+			for my $failed_obj (@_scan_device_failures){
+				$obj_list .= $failed_obj->get_object_name .", ";
+			}
+			::print_log("[Scan all link tables] However, some failures "
+				."were noted with the following devices: $obj_list");
+		}
     	}
 }
 
@@ -559,16 +557,14 @@ sub _get_next_linksync
         {
           	&main::print_log("[Sync all links] All links have completed syncing");
                 my $_sync_failure_cnt = scalar @_sync_device_failures;
-                if ($_sync_failure_cnt)
-                {
-          	  	&main::print_log("[Sync all links] WARN! Failures occured, "
-          	  		."some links involving the following objects remain out-of-sync:");
-                  	for my $failed_obj (@_sync_device_failures)
-                  	{
-        			&main::print_log("[Sync all links] " . $failed_obj->get_object_name);
-                  	}
-                }
-
+                if ($_sync_failure_cnt){
+			my $obj_list;
+			for my $failed_obj (@_sync_device_failures){
+				$obj_list .= $failed_obj->get_object_name .", ";
+			}
+			::print_log("[Sync all links] WARN! Failures occured, "
+				."some links involving the following objects remain out-of-sync: $obj_list");
+		}
     	}
 
 }
@@ -591,7 +587,7 @@ sub _get_next_linksync_failure
 		$current_sync_device->_process_sync_queue();
 	}
 	else { #No other pending links in the queue
-        &_get_next_linksync();
+		&_get_next_linksync();
 	}
 
 }
@@ -901,7 +897,7 @@ sub init {
     @_insteon_link = ();
 
 }
-
+
 =item C<generate_voice_commands()>
 
 Generates and sets the voice commands for all Insteon devices.
@@ -1193,7 +1189,7 @@ sub _active_interface
    $$self{active_interface} = $interface if $interface;
    return $$self{active_interface};
 }
-
+
 =item C<add()>
 
 Adds a list of objects to be tracked.
diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index e6f37738e..eec478977 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -459,7 +459,7 @@ sub delete_orphan_links
 				&::print_log("[Insteon::AllLinkDatabase] error in delete orphans failure callback: " . $@)
 					if $@ and $self->{device}->debuglevel(1, 'insteon');
 				package Insteon::AllLinkDatabase;
-		}
+			}
 		}
 		if (!$$self{device}->isa('Insteon_PLM') && !$sent_to_failure){
 			$self->_process_delete_queue();
@@ -2592,11 +2592,12 @@ sub _process_delete_queue {
 		::print_log("[Insteon::ALDB_PLM] Delete All Links has Completed.");
 		my $_delete_failure_cnt = scalar $$self{_delete_device_failures};
 		if ($_delete_failure_cnt) {
-			&main::print_log("[Insteon::ALDB_PLM] However, some failures were noted with the following devices:");
-			for my $failed_obj (@{$$self{_delete_device_failures}}) {
-				::print_log("[Insteon::ALDB_PLM] Failure on: "
-				. $failed_obj);
+			my $obj_list;
+			for my $failed_obj (@{$$self{_delete_device_failures}}){
+				$obj_list .= $failed_obj .", ";
 			}
+			::print_log("[Insteon::ALDB_PLM] However, some failures were ".
+				"noted with the following devices: $obj_list");
 		}
 		::print_log("[Insteon::ALDB_PLM] A total of $$self{delete_queue_processed} orphaned link records were deleted.");
 		::print_log("[Insteon::ALDB_PLM] #### END DELETE ORPHAN LINKS ####");

From 20b514b7291f52053fe7d8896707cc04266c5624 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 15 Nov 2013 17:19:00 -0800
Subject: [PATCH 322/330] Insteon: Don't Call Debuglevel if Object Doesn't
 Exist

---
 lib/Insteon/BaseInterface.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 0de64a645..93d00e589 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -899,9 +899,13 @@ sub _is_duplicate_received {
             #This message still provides a data point on how many hops it is 
             #taking for messages to arrive.
             $object->default_hop_count($msg{maxhops}-$msg{hopsleft}) if $object->can('default_hop_count');
-		};
 		::print_log("[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
 			. $message_data . ", from ". $object->get_object_name) if $object->debuglevel(1, 'insteon');
+		}
+		else {
+			::print_log("[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
+			. " from an unknown device.  Id: $msg{source} Grp: $msg{group}") if $main::Debug{'insteon'};
+		}
 	} else {
 		#Message was not in hash, so add it
 		$$self{received_commands}{$key} = $curr_milli + $delay;

From baa8de6d9cbad302a5d24ec7eeaee0458a45d346 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Fri, 15 Nov 2013 17:27:00 -0800
Subject: [PATCH 323/330] Insteon: Permit Syncing of Deaf Devices if Called for
 Individual Device

---
 lib/Insteon.pm             | 3 ++-
 lib/Insteon/BaseInsteon.pm | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index e9984e30d..58afb690f 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -550,8 +550,9 @@ sub _get_next_linksync
                 	. $current_sync_device->get_object_name . " ("
                         . ($_sync_cnt - scalar @_sync_devices)
                         . " of $_sync_cnt)");
+		my $skip_deaf = 1;
                 # pass first the success callback followed by the failure callback
-          	$current_sync_device->sync_links($sync_req{'audit_mode'}, '&Insteon::_get_next_linksync()','&Insteon::_get_next_linksync_failure()');
+          	$current_sync_device->sync_links($sync_req{'audit_mode'}, '&Insteon::_get_next_linksync()','&Insteon::_get_next_linksync_failure()', $skip_deaf);
     	}
         else
         {
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index 7d1e85e3c..efe8ab1a7 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -2990,7 +2990,7 @@ it then loops through all of the links defined for a device and checks:
 
 sub sync_links
 {
-	my ($self, $audit_mode, $callback, $failure_callback) = @_;
+	my ($self, $audit_mode, $callback, $failure_callback, $skip_deaf) = @_;
 	
 	# Intialize Variables
 	@{$$self{sync_queue}} = (); # reset the work queue
@@ -3010,9 +3010,10 @@ sub sync_links
 	
 	# Warn if device is deaf or ALDB out of sync
 	my $insteon_object_is_syncable = 1;
-	if ($insteon_object->is_deaf) {
+	if ($insteon_object->is_deaf && $skip_deaf) {
 		::print_log("[Insteon::BaseController] $self_link_name is deaf, only responder links will be added to devices "
-			."controlled by this device.");
+			."controlled by this device.  To sync links on this device, put it in awake mode and run the 'Sync Links' "
+			."command on this specific device.");
 		$insteon_object_is_syncable = 0;
 	}
 	elsif ($insteon_object->_aldb->health ne 'good' && $insteon_object->_aldb->health ne 'empty'){

From 7ec54651c3228af82c341fb5667b641137d72e35 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Sat, 16 Nov 2013 17:34:27 -0800
Subject: [PATCH 324/330] Normalize Line Endings in Repository to LF

---
 .gitattributes                                |     1 +
 bin/dir_to_file.bat                           |     6 +-
 bin/get_earthquakes.bat                       |     2 +-
 bin/holical.bat                               |     4 +-
 bin/ical2vsdb.bat                             |     4 +-
 bin/xAP-speech.pl                             |   492 +-
 code/common/cm11_control.pl                   |    74 +-
 code/common/cm11_monitor.pl                   |   196 +-
 code/common/dvd_player.pl                     |   154 +-
 code/common/email_marketplace_sales.pl        |   442 +-
 code/common/froggyrita.pl                     |   142 +-
 code/common/holiday_ical.pl                   |    88 +-
 code/common/mp3_dj.pl                         |   574 +-
 .../SOAP_examples/vb.net/AssemblyInfo.vb      |    64 +-
 code/examples/SOAP_examples/vb.net/Form1.resx |   420 +-
 code/examples/SOAP_examples/vb.net/Form1.vb   |   464 +-
 .../Web References/MySoapRef/Reference.map    |    10 +-
 .../Web References/MySoapRef/Reference.vb     |   226 +-
 .../Web References/MySoapRef/mhsoap.wsdl      |   198 +-
 .../vb.net/WebServiceTest.vbproj              |   288 +-
 .../vb.net/WebServiceTest.vbproj.user         |    96 +-
 code/examples/iButton_weather_station.pl      |   462 +-
 code/examples/network_items_web.pl            |    26 +-
 code/examples/test_weather_item.pl            |    26 +-
 code/public/Brian/flagreminders.pl            |   152 +-
 code/public/Brian/grlevel3.lst                |    12 +-
 code/public/Brian/grlevel3.pl                 |   248 +-
 code/public/Brian/klier.mht                   |   248 +-
 .../old stuff i don't use anymore/calllog.pl  |   516 +-
 .../old stuff i don't use anymore/callog.pl   |   464 +-
 .../old stuff i don't use anymore/radar.pl    |   160 +-
 .../tk_frames.pl                              |   158 +-
 .../tk_widgets.pl                             |    76 +-
 .../old stuff i don't use anymore/tracking.pl |  2788 ++---
 code/public/Brian/phonestuff.pl               |    68 +-
 code/public/Brian/radar-wx.pl                 |   386 +-
 code/public/Brian/stormwarning.pl             |    86 +-
 code/public/Brian/xpl.pl                      |   112 +-
 code/public/Esensor_EM01.pl                   |   144 +-
 code/public/Ricardo/bin/get_tv_com            |   494 +-
 code/public/Ricardo/bin/get_tv_com.bat        |     2 +-
 code/public/Ricardo/bin/get_weather_ca        |   716 +-
 code/public/Ricardo/code/tv_com.pl            |   248 +-
 code/public/hvac_upb_thermostat.pl            |   106 +-
 data/event_sounds.txt                         |    64 +-
 data/infrared/devicelib/Apple MAC.dvc         |    32 +-
 data/infrared/devicelib/Motorola qip6200.dvc  |   142 +-
 .../devicelib/Samsung HLT Series TV.dvc       |   268 +-
 docs/faq.pod                                  |  3578 +++---
 docs/usenet_post.txt                          |   206 +-
 lib/Insteon.pm                                |  2740 ++--
 lib/Insteon/AllLinkDatabase.pm                |  5610 ++++-----
 lib/Insteon/BaseInsteon.pm                    |  7338 +++++------
 lib/Insteon/BaseInterface.pm                  |  2040 +--
 lib/Insteon/Controller.pm                     |   750 +-
 lib/Insteon/Irrigation.pm                     |   622 +-
 lib/Insteon/Lighting.pm                       |  2460 ++--
 lib/Insteon/Message.pm                        |  2302 ++--
 lib/Insteon/MessageDecoder.pm                 |  1906 +--
 lib/Insteon/MessageDecoder_test.pl            |   176 +-
 lib/Insteon/PLMTerminal.pl                    |   686 +-
 lib/Insteon_PLM.pm                            |  1980 +--
 lib/Weather_davisvantageproii.pm              |  1158 +-
 lib/X10_RF_rfxsensor.pm                       |   320 +-
 lib/ajax.pm                                   |   432 +-
 lib/site/ControlX10/CM11.pm.old               |  1678 +--
 lib/site/MSN.pm                               |  1670 +--
 lib/site/Tie/Hash.pm.original                 |   486 +-
 lib/site/Tk/CursorControl.pm                  |  1828 +--
 lib/site/Tk/ToolBar.pm                        |  2192 ++--
 lib/site/Tk/ToolBar/tkIcons                   |   390 +-
 lib/site/Tk/trans_cur.mask                    |     8 +-
 lib/site/Tk/trans_cur.xbm                     |    12 +-
 lib/site/Win32/TieRegistry.pm                 |  7602 +++++------
 lib/site_win50/Win32/Registry.pm              |  1094 +-
 lib/site_win50/Win32API/Registry.pm           |  3584 +++---
 lib/site_win50/Win32API/Registry/cRegistry.pc |   174 +-
 lib/site_win56/Win32/Registry.pm              |  1094 +-
 lib/site_win56/Win32API/Registry.pm           |  3584 +++---
 lib/site_win56/Win32API/Registry/cRegistry.pc |   174 +-
 lib/site_win58/Win32/Registry.pm              |  1094 +-
 lib/site_win58/Win32API/Registry.pm           |  3584 +++---
 lib/site_win58/Win32API/Registry/cRegistry.pc |   174 +-
 lib/xPL_Items.pm                              |  2732 ++--
 web/bin/mhsoap.wsdl                           |    28 +-
 web/comics/dailystrips/strips.def.old         |  9254 +++++++-------
 web/comics/dailystrips/strips.def.old2        | 10432 ++++++++--------
 web/ia5/security/webcam.shtml                 |    28 +-
 web/iphone/icons/LICENSE.TXT                  |    14 +-
 web/lib/android.xsl                           |    22 +-
 web/lib/default.xsl                           |    22 +-
 web/lib/pod.css                               |    16 +-
 web/misc/actiontec_traffic.html               |   224 +-
 web/newclock/GlobeClock.html                  |   192 +-
 web/newclock/MapClock.html                    |   190 +-
 web/newclock/OriginalLED.html                 |   184 +-
 web/newclock/alarm.pl                         |   120 +-
 web/newclock/calendar.js                      |   350 +-
 web/newclock/index.html                       |   408 +-
 web/newclock/index.pl                         |   340 +-
 web/robots.txt                                |     8 +-
 web/test/ajax_example1.shtml                  |   222 +-
 web/test/ajax_example2.shtml                  |   230 +-
 web/test/ajax_example3.shtml                  |   154 +-
 web/test/index.shtml                          |    24 +-
 105 files changed, 51035 insertions(+), 51034 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..176a458f9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/bin/dir_to_file.bat b/bin/dir_to_file.bat
index 65e9dc5c3..a869a1876 100644
--- a/bin/dir_to_file.bat
+++ b/bin/dir_to_file.bat
@@ -1,3 +1,3 @@
-@echo off
-dir %1:\ > .\%2
-
+@echo off
+dir %1:\ > .\%2
+
diff --git a/bin/get_earthquakes.bat b/bin/get_earthquakes.bat
index 2281275ce..e01ea40c1 100755
--- a/bin/get_earthquakes.bat
+++ b/bin/get_earthquakes.bat
@@ -1 +1 @@
-@mh -run get_earthquakes %1 %2 %3 %4 %5 %6 %7 %8 %9
+@mh -run get_earthquakes %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/bin/holical.bat b/bin/holical.bat
index 8a3f1ffd9..bc4a38c21 100755
--- a/bin/holical.bat
+++ b/bin/holical.bat
@@ -1,2 +1,2 @@
-@mh -run holical %1 %2 %3
-@rem perl -S holical %1 %2 %3
+@mh -run holical %1 %2 %3
+@rem perl -S holical %1 %2 %3
diff --git a/bin/ical2vsdb.bat b/bin/ical2vsdb.bat
index 0e7df62d5..68dadf2b4 100755
--- a/bin/ical2vsdb.bat
+++ b/bin/ical2vsdb.bat
@@ -1,2 +1,2 @@
-@mh -run ical2vsdb %1 %2 %3
-@rem perl -S ical2vsdb %1 %2 %3
+@mh -run ical2vsdb %1 %2 %3
+@rem perl -S ical2vsdb %1 %2 %3
diff --git a/bin/xAP-speech.pl b/bin/xAP-speech.pl
index 544b1a012..7369534d4 100755
--- a/bin/xAP-speech.pl
+++ b/bin/xAP-speech.pl
@@ -1,247 +1,247 @@
-#!/usr/bin/perl
-
-=begin comment
-
-This program provides a simple xAP listener for the Festival text-to-speech synthesizer.
-
-Written by Chris Barrett, based on code provided by Bruce Winter.
-
-version 0.1 - 27 March 2005
-version 0.2 - 28 April 2005
-
-Modified by Tim Sailer to support festival, flite and swift TTS systems.
-11/07
-
-=cut
-
-my $debug = 0;
-
-use strict;
-use IO::Socket::INET;
-use Getopt::Long;
-                                # Setup constants
-my $FORCE_LOCAL_HUB  = 0;         # set to 0 if no hub or default operation
-my $XAP_PORT       = 3639;
-my $XAP_GUID       = 'FFBA8300';
-my $XAP_ME         = 'MHOUSE';
-# Use festival, flite, or swift for source
-my $XAP_SOURCE     = 'swift';
-my $XAP_INSTANCE;
-my $MAXLEN         = 1500;      # Max size of a UDP packet
-my $HBEAT_INTERVAL = 120;       # Send every 2 minutes
-my $fqfn;
-my $room;
-my $target;
-my $xap_listen;
-
-my $help;
-GetOptions(
-           'room=s', \$room,
-           'debug', \$debug,
-           'help|h|?', \$help
-          );
-if ($help)
-  {
-    print "usage: $0 [--room=room] [--debug] [--help|h|?]\n";
-    exit;
-  }
-
-if ($^O =~ /MSWin/i)
-  {
-    print "Sorry, but this only works on *nix systems\n";
-    exit;
-  }
-
-if ($room eq "")
-  {
-    my $hostname = `hostname`;
-    chomp $hostname;
-    $hostname =~ s/^(.*?)\.(.*)$/$1/;
-    print "A room was not specified using --room= so I'm using the hostname [$hostname]\n" if $debug;
-    $room = $hostname;
-  }
-$XAP_INSTANCE = $room;
-
-if ($XAP_SOURCE eq "festival")
-  {
-    $fqfn = `which festival`;
-    chomp $fqfn;
-    if ($fqfn =~ /no festival in/)
-      {
-	print "Could not find festival in the PATH\n";
-	exit;
-      }
-  }
-elsif ($XAP_SOURCE eq "flite")
-  {
-    $fqfn = `which flite`;
-    chomp $fqfn;
-    if (($fqfn =~ /no flite in/) || ($fqfn eq ""))
-      {
-	print "Could not find flite in the PATH\n";
-	exit;
-      }
-  }
-elsif ($XAP_SOURCE eq "swift")
-  {
-    $fqfn = `which swift`;
-    chomp $fqfn;
-    if (($fqfn =~ /no swift in/)||($fqfn eq ""))
-      {
-	if ( -e "/opt/swift/bin/swift")
-	  {
-	    $fqfn="/opt/swift/bin/swift";
-	  }
-	else
-	  {
-	    print "Could not find swift binary";
-	    exit;
-	  }
-      }
-  }
-
-
-print "Using $fqfn for speech\n" if $debug;
-
-my $my_address = lc("$XAP_ME.$XAP_SOURCE.$XAP_INSTANCE");
-print "My address is $my_address\n" if $debug;
-
-                                # Create a broadcast socket for sending data
-my $xap_send = new IO::Socket::INET
-  ->new(PeerPort => $XAP_PORT, Proto => 'udp', PeerAddr => inet_ntoa(INADDR_BROADCAST), Broadcast => 1 ) or
-  die "Could not create xap sender\n";
-
-if ($FORCE_LOCAL_HUB)
-{
-      for my $p (49152 .. 65535) {
-        $XAP_PORT = $p;
-        last if $xap_listen = new IO::Socket::INET
-          ->new(LocalAddr => 'localhost', LocalPort => $p, Proto => 'udp');
-      }
-}
-else
-{
-
-   $xap_listen = new IO::Socket::INET
-     ->new(LocalAddr=>inet_ntoa(INADDR_ANY), LocalPort => $XAP_PORT, Proto => 'udp', Broadcast => 1 );
-
-   # If a hub is not active, bind directly for listening
-   if ($xap_listen)
-     {
-      print "No hub active.  Listening on broadcast socket ", $xap_listen->sockport(), "\n" if $debug;
-   }
-else
-{
-      # Hub is active.  Loop until we find an available port
-      print "Hub is active, search for free relay port\n" if $debug;
-      for my $p (49152 .. 65535) {
-        $XAP_PORT = $p;
-        last if $xap_listen = new IO::Socket::INET
-          ->new(LocalAddr => 'localhost', LocalPort => $p, Proto => 'udp');
-      }
-      die "Could not create xap listener\n" unless $xap_listen;
-      print "Listening on relay socket ", $xap_listen->sockport(), "\n" if $debug;
-   }
-}
-
-&send_heartbeat;
-                                # Do a loop
-while (1)
-  {
-    select undef, undef, undef, 1.0; # Sleep a bit
-    my $time = time;
-    &send_heartbeat       if !($time % $HBEAT_INTERVAL);
-
-    # Check for incoming xap traffic
-    my $rin = '';
-    vec($rin, $xap_listen->fileno(), 1) = 1;
-    if (select($rin, undef, undef, 0))
-      {
-	my $xap_rx_msg;
-	recv($xap_listen, $xap_rx_msg, $MAXLEN, 0) or die "recv: $!";
-	print "\n------------- Incoming message -------------\n$xap_rx_msg\n" if $debug;
-
-        (my $header) = $xap_rx_msg =~ /xap-header\n\{(.*?)\}/is;
-        if ($header =~ /\nclass\=tts.speak\n/i)
-	  {
-	    print "header = [$header]\n" if $debug;
-	    ($target) = $header =~ /target=(.*?)\n/is;
-	    $target = lc $target;
-            print "target=[$target]\n" if $debug;
-            if ( ($target eq "") || ($target eq "*") || ($target eq "*.".$XAP_SOURCE.".*") || ($target eq $my_address))
-	      {
-		&handle_tts_speak($xap_rx_msg);
-            }
-	    else
-	      {
-		print "Not for me\n" if $debug;
-	      }
-	  }
-      }
-  }
-
-sub send_heartbeat
-  {
-    print "Sending heartbeat on port ", $xap_send->peerport, "\n" if ($debug);
-    print $xap_send "xap-hbeat\n{\nv=12\nhop=1\nuid=$XAP_GUID\nclass=xap-hbeat.alive\n" .
-      "source=$XAP_ME.$XAP_SOURCE.$XAP_INSTANCE\ninterval=$HBEAT_INTERVAL\nport=$XAP_PORT\npid=$$\n}\n";
-  }
-
-sub handle_tts_speak
-  {
-    my $xap_rx_msg = shift;
-
-    (my $block) = $xap_rx_msg =~ /tts.speak\n\{(.*?)\}/is;
-    print "block = [$block]\n" if $debug;
-
-    (my $present, my $say) = $block =~ /(say)=(.*?)\n/is;
-    print "say=[$say]\n" if ($present && $debug);
-
-    my $volume = 50;  # The SABLE spec says that the default is "medium"
-    (my $present, $volume) = $block =~ /(volume)=(.*?)\n/is;
-    print "volume=[$volume]\n" if ($present && $debug);
-
-    # The SABLE spec says that the default is the "default gender for the engine";
-    (my $present, my $voice) = $block =~ /(voice)=(.*?)\n/is;
-    print "voice=[$voice]\n" if ($present && $debug);
-
-    (my $present, my $priority) = $block =~ /(priority)=(.*?)\n/is;
-    print "priority=[$priority]\n" if ($present && $debug);
-
-    (my $present, my $rooms) = $block =~ /(rooms)=(.*?)\n/is;
-    print "rooms=[$rooms]\n" if ($present && $debug);
-    $rooms = lc($rooms);
-
-    if ( ($rooms eq "") || ($rooms eq "all") || ($rooms eq $room) ) {
-      &speak($say,$volume,$voice);
-    }
-  }
-
-sub speak
-  {
-    my $text = shift;
-    my $volume = shift;
-    my $voice = shift;
-    my $cmd;
-    $volume = $volume / 100; # SABLE uses a floating point-number between zero and 1 to represent volume.
-
-    #    The SABLE tags are currently not working properly - it's reading them out
-    #    $text = "<VOLUME LEVEL=".$volume.">".$text."<VOLUME>" if ($volume != 0.5);
-    #    $text = "<SPEAKER GENDER=".$voice.">".$text."</SPEAKER>" if ($voice ne "");
-
-    if ($XAP_SOURCE eq "festival")
-{
-    $cmd = "echo \"$text\" | $fqfn --tts";
-}
-elsif ($XAP_SOURCE eq "flite")
-{
-    $cmd = "$fqfn -t \"$text\"";
-}
-elsif  ($XAP_SOURCE eq "swift")
-{
-    $cmd = "$fqfn \"$text\"";
-}
-    print "cmd=[$cmd]\n" if $debug;
-    print "cmd=[$cmd]\n";
-    system $cmd;
+#!/usr/bin/perl
+
+=begin comment
+
+This program provides a simple xAP listener for the Festival text-to-speech synthesizer.
+
+Written by Chris Barrett, based on code provided by Bruce Winter.
+
+version 0.1 - 27 March 2005
+version 0.2 - 28 April 2005
+
+Modified by Tim Sailer to support festival, flite and swift TTS systems.
+11/07
+
+=cut
+
+my $debug = 0;
+
+use strict;
+use IO::Socket::INET;
+use Getopt::Long;
+                                # Setup constants
+my $FORCE_LOCAL_HUB  = 0;         # set to 0 if no hub or default operation
+my $XAP_PORT       = 3639;
+my $XAP_GUID       = 'FFBA8300';
+my $XAP_ME         = 'MHOUSE';
+# Use festival, flite, or swift for source
+my $XAP_SOURCE     = 'swift';
+my $XAP_INSTANCE;
+my $MAXLEN         = 1500;      # Max size of a UDP packet
+my $HBEAT_INTERVAL = 120;       # Send every 2 minutes
+my $fqfn;
+my $room;
+my $target;
+my $xap_listen;
+
+my $help;
+GetOptions(
+           'room=s', \$room,
+           'debug', \$debug,
+           'help|h|?', \$help
+          );
+if ($help)
+  {
+    print "usage: $0 [--room=room] [--debug] [--help|h|?]\n";
+    exit;
+  }
+
+if ($^O =~ /MSWin/i)
+  {
+    print "Sorry, but this only works on *nix systems\n";
+    exit;
+  }
+
+if ($room eq "")
+  {
+    my $hostname = `hostname`;
+    chomp $hostname;
+    $hostname =~ s/^(.*?)\.(.*)$/$1/;
+    print "A room was not specified using --room= so I'm using the hostname [$hostname]\n" if $debug;
+    $room = $hostname;
+  }
+$XAP_INSTANCE = $room;
+
+if ($XAP_SOURCE eq "festival")
+  {
+    $fqfn = `which festival`;
+    chomp $fqfn;
+    if ($fqfn =~ /no festival in/)
+      {
+	print "Could not find festival in the PATH\n";
+	exit;
+      }
+  }
+elsif ($XAP_SOURCE eq "flite")
+  {
+    $fqfn = `which flite`;
+    chomp $fqfn;
+    if (($fqfn =~ /no flite in/) || ($fqfn eq ""))
+      {
+	print "Could not find flite in the PATH\n";
+	exit;
+      }
+  }
+elsif ($XAP_SOURCE eq "swift")
+  {
+    $fqfn = `which swift`;
+    chomp $fqfn;
+    if (($fqfn =~ /no swift in/)||($fqfn eq ""))
+      {
+	if ( -e "/opt/swift/bin/swift")
+	  {
+	    $fqfn="/opt/swift/bin/swift";
+	  }
+	else
+	  {
+	    print "Could not find swift binary";
+	    exit;
+	  }
+      }
+  }
+
+
+print "Using $fqfn for speech\n" if $debug;
+
+my $my_address = lc("$XAP_ME.$XAP_SOURCE.$XAP_INSTANCE");
+print "My address is $my_address\n" if $debug;
+
+                                # Create a broadcast socket for sending data
+my $xap_send = new IO::Socket::INET
+  ->new(PeerPort => $XAP_PORT, Proto => 'udp', PeerAddr => inet_ntoa(INADDR_BROADCAST), Broadcast => 1 ) or
+  die "Could not create xap sender\n";
+
+if ($FORCE_LOCAL_HUB)
+{
+      for my $p (49152 .. 65535) {
+        $XAP_PORT = $p;
+        last if $xap_listen = new IO::Socket::INET
+          ->new(LocalAddr => 'localhost', LocalPort => $p, Proto => 'udp');
+      }
+}
+else
+{
+
+   $xap_listen = new IO::Socket::INET
+     ->new(LocalAddr=>inet_ntoa(INADDR_ANY), LocalPort => $XAP_PORT, Proto => 'udp', Broadcast => 1 );
+
+   # If a hub is not active, bind directly for listening
+   if ($xap_listen)
+     {
+      print "No hub active.  Listening on broadcast socket ", $xap_listen->sockport(), "\n" if $debug;
+   }
+else
+{
+      # Hub is active.  Loop until we find an available port
+      print "Hub is active, search for free relay port\n" if $debug;
+      for my $p (49152 .. 65535) {
+        $XAP_PORT = $p;
+        last if $xap_listen = new IO::Socket::INET
+          ->new(LocalAddr => 'localhost', LocalPort => $p, Proto => 'udp');
+      }
+      die "Could not create xap listener\n" unless $xap_listen;
+      print "Listening on relay socket ", $xap_listen->sockport(), "\n" if $debug;
+   }
+}
+
+&send_heartbeat;
+                                # Do a loop
+while (1)
+  {
+    select undef, undef, undef, 1.0; # Sleep a bit
+    my $time = time;
+    &send_heartbeat       if !($time % $HBEAT_INTERVAL);
+
+    # Check for incoming xap traffic
+    my $rin = '';
+    vec($rin, $xap_listen->fileno(), 1) = 1;
+    if (select($rin, undef, undef, 0))
+      {
+	my $xap_rx_msg;
+	recv($xap_listen, $xap_rx_msg, $MAXLEN, 0) or die "recv: $!";
+	print "\n------------- Incoming message -------------\n$xap_rx_msg\n" if $debug;
+
+        (my $header) = $xap_rx_msg =~ /xap-header\n\{(.*?)\}/is;
+        if ($header =~ /\nclass\=tts.speak\n/i)
+	  {
+	    print "header = [$header]\n" if $debug;
+	    ($target) = $header =~ /target=(.*?)\n/is;
+	    $target = lc $target;
+            print "target=[$target]\n" if $debug;
+            if ( ($target eq "") || ($target eq "*") || ($target eq "*.".$XAP_SOURCE.".*") || ($target eq $my_address))
+	      {
+		&handle_tts_speak($xap_rx_msg);
+            }
+	    else
+	      {
+		print "Not for me\n" if $debug;
+	      }
+	  }
+      }
+  }
+
+sub send_heartbeat
+  {
+    print "Sending heartbeat on port ", $xap_send->peerport, "\n" if ($debug);
+    print $xap_send "xap-hbeat\n{\nv=12\nhop=1\nuid=$XAP_GUID\nclass=xap-hbeat.alive\n" .
+      "source=$XAP_ME.$XAP_SOURCE.$XAP_INSTANCE\ninterval=$HBEAT_INTERVAL\nport=$XAP_PORT\npid=$$\n}\n";
+  }
+
+sub handle_tts_speak
+  {
+    my $xap_rx_msg = shift;
+
+    (my $block) = $xap_rx_msg =~ /tts.speak\n\{(.*?)\}/is;
+    print "block = [$block]\n" if $debug;
+
+    (my $present, my $say) = $block =~ /(say)=(.*?)\n/is;
+    print "say=[$say]\n" if ($present && $debug);
+
+    my $volume = 50;  # The SABLE spec says that the default is "medium"
+    (my $present, $volume) = $block =~ /(volume)=(.*?)\n/is;
+    print "volume=[$volume]\n" if ($present && $debug);
+
+    # The SABLE spec says that the default is the "default gender for the engine";
+    (my $present, my $voice) = $block =~ /(voice)=(.*?)\n/is;
+    print "voice=[$voice]\n" if ($present && $debug);
+
+    (my $present, my $priority) = $block =~ /(priority)=(.*?)\n/is;
+    print "priority=[$priority]\n" if ($present && $debug);
+
+    (my $present, my $rooms) = $block =~ /(rooms)=(.*?)\n/is;
+    print "rooms=[$rooms]\n" if ($present && $debug);
+    $rooms = lc($rooms);
+
+    if ( ($rooms eq "") || ($rooms eq "all") || ($rooms eq $room) ) {
+      &speak($say,$volume,$voice);
+    }
+  }
+
+sub speak
+  {
+    my $text = shift;
+    my $volume = shift;
+    my $voice = shift;
+    my $cmd;
+    $volume = $volume / 100; # SABLE uses a floating point-number between zero and 1 to represent volume.
+
+    #    The SABLE tags are currently not working properly - it's reading them out
+    #    $text = "<VOLUME LEVEL=".$volume.">".$text."<VOLUME>" if ($volume != 0.5);
+    #    $text = "<SPEAKER GENDER=".$voice.">".$text."</SPEAKER>" if ($voice ne "");
+
+    if ($XAP_SOURCE eq "festival")
+{
+    $cmd = "echo \"$text\" | $fqfn --tts";
+}
+elsif ($XAP_SOURCE eq "flite")
+{
+    $cmd = "$fqfn -t \"$text\"";
+}
+elsif  ($XAP_SOURCE eq "swift")
+{
+    $cmd = "$fqfn \"$text\"";
+}
+    print "cmd=[$cmd]\n" if $debug;
+    print "cmd=[$cmd]\n";
+    system $cmd;
   }
\ No newline at end of file
diff --git a/code/common/cm11_control.pl b/code/common/cm11_control.pl
index 3f3b3a3c5..c555a9c48 100644
--- a/code/common/cm11_control.pl
+++ b/code/common/cm11_control.pl
@@ -1,37 +1,37 @@
-# Category=X10
-#@ Stops and starts the cm11 automation controller
-#execute unstick if ack/done cycle fails
-
-$v_cm11_control1 = new Voice_Cmd "[Start,Stop,Reset] the CM11 port";
-if (said $v_cm11_control1) {
-    my $state = $v_cm11_control1->{state};
-
-    if (defined $main::Serial_Ports{'cm11'}{object}) {
-
-    if ($state eq 'Stop' or $state eq 'Reset') {
-        if ($main::Serial_Ports{'cm11'}{object}->close) {
-            print "CM11 port was closed\n";
-            delete $Serial_Ports{object_by_port}{$Serial_Ports{'cm11'}{port}};
-        }
-        else {
-            print "CM11 port failed to close\n";
-        }
-    }        
-
-    if ($state eq 'Start' or $state eq 'Reset') {
-        if (&main::serial_port_open('cm11')) {
-            print "CM11 port was re-opened\n";
-        }
-        else {
-            print "CM11 port failed to re-open\n";
-        }
-    }
-
-    $v_cm11_control1->respond("app=cm11 CM11 port has been set to $state.");
-
-    }
-    else {
- 	   $v_cm11_control1->respond("app=error CM11 port does not exist.");
-    }
-}
-
+# Category=X10
+#@ Stops and starts the cm11 automation controller
+#execute unstick if ack/done cycle fails
+
+$v_cm11_control1 = new Voice_Cmd "[Start,Stop,Reset] the CM11 port";
+if (said $v_cm11_control1) {
+    my $state = $v_cm11_control1->{state};
+
+    if (defined $main::Serial_Ports{'cm11'}{object}) {
+
+    if ($state eq 'Stop' or $state eq 'Reset') {
+        if ($main::Serial_Ports{'cm11'}{object}->close) {
+            print "CM11 port was closed\n";
+            delete $Serial_Ports{object_by_port}{$Serial_Ports{'cm11'}{port}};
+        }
+        else {
+            print "CM11 port failed to close\n";
+        }
+    }        
+
+    if ($state eq 'Start' or $state eq 'Reset') {
+        if (&main::serial_port_open('cm11')) {
+            print "CM11 port was re-opened\n";
+        }
+        else {
+            print "CM11 port failed to re-open\n";
+        }
+    }
+
+    $v_cm11_control1->respond("app=cm11 CM11 port has been set to $state.");
+
+    }
+    else {
+ 	   $v_cm11_control1->respond("app=error CM11 port does not exist.");
+    }
+}
+
diff --git a/code/common/cm11_monitor.pl b/code/common/cm11_monitor.pl
index c416f8a92..2739bfda1 100644
--- a/code/common/cm11_monitor.pl
+++ b/code/common/cm11_monitor.pl
@@ -1,99 +1,99 @@
-
-=begin comment 
-
-#@ Monitors the cm11 controller and resets if down (optionally "tickles" via a cm17 to ensure that the cm11 comes back up immediately.) Timeout is set with cm11_timeout parameter. cm11_tickle_address is the address sent by the cm17 on reset.  To disable automated resets, reset the cm11_auto_reset parameter (set it to 0.)
-
-=cut
-
-# Category = X10
-
-$cm11_monitor = new Generic_Item();
-$timer_x10_inactivity = new Timer();
-$v_cm11_control = new Voice_Cmd "[Start,Stop,Reset] the CM11 port";
-$v_cm11_control->set_info('Controls the CM11 X10 controller. Reset if it sticks.');
-if ($Reload) {
-	Serial_data_add_hook(\&cm11_monitor);
-        my $timeout = $config_parms{cm11_timeout};
-        $timeout = 1800 unless $timeout;
-	set $timer_x10_inactivity $timeout, \&cm11_unstick;
-}
-
-sub cm11_monitor {
-    my $state = shift; 
-    my $current_unit;
-    return unless $state =~ /^X/;
-
-    # *** These signals could come from a different controller (like a Lynx or proxy, etc.)
-    # Need way to do this (inside of cm11 object makes most sense.)
-
-    $current_unit = $1 if ($state =~ /^X([A-P][1-9A-G])/);
-
-    set $cm11_monitor 'up' if ($cm11_monitor->{state} ne 'up');
-
-    print_log "Reset cm11 inactivity timer $current_unit $state" if $config_parms{x10_errata} >= 3;
-    set $timer_x10_inactivity 1800, \&cm11_unstick; #every half hour without activity triggers a restart.  Otherwise cm11 remains lost in space."
-}
-
-sub cm11_unstick {
-    set $cm11_monitor 'down';
-    if (!defined $config_parms{'cm11_auto_reset'} or $config_parms{'cm11_auto_reset'}) {
-        speak "app=system Restarting automation controller after inactivity.";
- 	# default is to reset the port after inactivity (can be turned off with 0)
-        &cm11_control('Reset');
-        set $cm11_monitor 'reset';
-    }
-    my $timeout = $config_parms{cm11_timeout};
-    $timeout = 1800 unless $timeout;
-    set $timer_x10_inactivity $timeout, \&cm11_unstick;
-}
-
-sub cm11_control {
-    my $state = shift;
-
-    if (defined $main::Serial_Ports{'cm11'}{object}) {
-
-    if ($state eq 'Stop' or $state eq 'Reset') {
-        if ($main::Serial_Ports{'cm11'}{object}->close) {
-            print "CM11 port was closed\n" if $Debug{cm11};
-            delete $Serial_Ports{object_by_port}{$Serial_Ports{'cm11'}{port}};
-        }
-        else {
-            print "CM11 port failed to close\n" if $Debug{cm11};
-        }
-    }        
-
-    if ($state eq 'Start' or $state eq 'Reset') {
-        if (&main::serial_port_open('cm11')) {
-            print "CM11 port was re-opened\n" if $Debug{cm11};
-        }
-        else {
-            print "CM11 port failed to re-open\n" if $Debug{cm11};
-        }
-    }
-
-	# "Tickle" controller w/ X10 signal via CM17 (if exists)
-
-    if ($state eq 'Reset') {
-        if (&main::serial_port_open('cm17')) {
-            print "Sending X10 signal via CM17\n" if $Debug{cm11};
-
-ControlX10::CM17::send(($config_parms{'cm11_tickle_address'}?$config_parms{'cm11_tickle_address'}:'A1') . 'K'); # send an off command to the dummy tickle address
-
-        }
-    }
-
-
-    $v_cm11_control->respond("app=cm11 CM11 port has been set to $state.");
-
-    }
-    else {
- 	   $v_cm11_control->respond("app=error CM11 port does not exist.");
-    }
-
-
-
-}
-
-if (said $v_cm11_control) {
-	&cm11_control($v_cm11_control->{state});
+
+=begin comment 
+
+#@ Monitors the cm11 controller and resets if down (optionally "tickles" via a cm17 to ensure that the cm11 comes back up immediately.) Timeout is set with cm11_timeout parameter. cm11_tickle_address is the address sent by the cm17 on reset.  To disable automated resets, reset the cm11_auto_reset parameter (set it to 0.)
+
+=cut
+
+# Category = X10
+
+$cm11_monitor = new Generic_Item();
+$timer_x10_inactivity = new Timer();
+$v_cm11_control = new Voice_Cmd "[Start,Stop,Reset] the CM11 port";
+$v_cm11_control->set_info('Controls the CM11 X10 controller. Reset if it sticks.');
+if ($Reload) {
+	Serial_data_add_hook(\&cm11_monitor);
+        my $timeout = $config_parms{cm11_timeout};
+        $timeout = 1800 unless $timeout;
+	set $timer_x10_inactivity $timeout, \&cm11_unstick;
+}
+
+sub cm11_monitor {
+    my $state = shift; 
+    my $current_unit;
+    return unless $state =~ /^X/;
+
+    # *** These signals could come from a different controller (like a Lynx or proxy, etc.)
+    # Need way to do this (inside of cm11 object makes most sense.)
+
+    $current_unit = $1 if ($state =~ /^X([A-P][1-9A-G])/);
+
+    set $cm11_monitor 'up' if ($cm11_monitor->{state} ne 'up');
+
+    print_log "Reset cm11 inactivity timer $current_unit $state" if $config_parms{x10_errata} >= 3;
+    set $timer_x10_inactivity 1800, \&cm11_unstick; #every half hour without activity triggers a restart.  Otherwise cm11 remains lost in space."
+}
+
+sub cm11_unstick {
+    set $cm11_monitor 'down';
+    if (!defined $config_parms{'cm11_auto_reset'} or $config_parms{'cm11_auto_reset'}) {
+        speak "app=system Restarting automation controller after inactivity.";
+ 	# default is to reset the port after inactivity (can be turned off with 0)
+        &cm11_control('Reset');
+        set $cm11_monitor 'reset';
+    }
+    my $timeout = $config_parms{cm11_timeout};
+    $timeout = 1800 unless $timeout;
+    set $timer_x10_inactivity $timeout, \&cm11_unstick;
+}
+
+sub cm11_control {
+    my $state = shift;
+
+    if (defined $main::Serial_Ports{'cm11'}{object}) {
+
+    if ($state eq 'Stop' or $state eq 'Reset') {
+        if ($main::Serial_Ports{'cm11'}{object}->close) {
+            print "CM11 port was closed\n" if $Debug{cm11};
+            delete $Serial_Ports{object_by_port}{$Serial_Ports{'cm11'}{port}};
+        }
+        else {
+            print "CM11 port failed to close\n" if $Debug{cm11};
+        }
+    }        
+
+    if ($state eq 'Start' or $state eq 'Reset') {
+        if (&main::serial_port_open('cm11')) {
+            print "CM11 port was re-opened\n" if $Debug{cm11};
+        }
+        else {
+            print "CM11 port failed to re-open\n" if $Debug{cm11};
+        }
+    }
+
+	# "Tickle" controller w/ X10 signal via CM17 (if exists)
+
+    if ($state eq 'Reset') {
+        if (&main::serial_port_open('cm17')) {
+            print "Sending X10 signal via CM17\n" if $Debug{cm11};
+
+ControlX10::CM17::send(($config_parms{'cm11_tickle_address'}?$config_parms{'cm11_tickle_address'}:'A1') . 'K'); # send an off command to the dummy tickle address
+
+        }
+    }
+
+
+    $v_cm11_control->respond("app=cm11 CM11 port has been set to $state.");
+
+    }
+    else {
+ 	   $v_cm11_control->respond("app=error CM11 port does not exist.");
+    }
+
+
+
+}
+
+if (said $v_cm11_control) {
+	&cm11_control($v_cm11_control->{state});
 }
\ No newline at end of file
diff --git a/code/common/dvd_player.pl b/code/common/dvd_player.pl
index 1e17a3edd..8b03ffa92 100644
--- a/code/common/dvd_player.pl
+++ b/code/common/dvd_player.pl
@@ -1,78 +1,78 @@
-# Category=Entertainment
-
-#@ Set dvd_program to DVD player program path. For example:
-#@   dvd_program=C:\program files\intervideo\dvd6\windvd.exe # NOTE spaces are allowed
-#@ Set dvd_archives_folder to folder with ripped DVD's.
-#@   dvd_archives_folder=F:\archives\dvds
-#@ Set dvd_favorites to list of favorite DVD's.
-#@   dvd_favorites=Hulk,Indiana Jones and the Last Crusade,King Kong
-
-# WinDVD only for now (tested with v6.)
-
-use DVDPlayer;
-#***Don't even create these objects if no WinDVD (look for above by default)  Do nothing on Linux
-$dvd_player = new DVDPlayer();
-$dvd_marquee = new Generic_Item;
-#&tk_entry('DVD', $dvd_marquee);
-#noloop=start
-my %dvd_states = (play=>'play',stop=>'stop',pause=>'pause',rewind=>'rewind','fast forward'=>'fast forward',step=>'step','skip forward'=>'skip forward','instant replay'=>'instant replay','root menu'=>'root menu','title menu'=>'title menu','volume up'=>'vol +','volume down'=>'vol -',mute=>'mute',unzoom=>'unzoom',pan=>'pan',angle=>'angle',subtitle=>'subtitle','previous chapter'=>'previous chapter','next chapter'=>'next chapter','eject'=>'eject','brightness up'=>'brightness up','brightness down'=>'brightness down',on=>'on',off=>'off','full screen'=>'full screen');
-my $dvd_states;
-$dvd_states = join(',',keys %dvd_states);
-#***Point voice commands to error messages if objects not created!
-#***Set info, icons? Use info in help
-$v_dvd_control = new Voice_Cmd("DVD movie [$dvd_states]", 0);
-$v_dvd_movie = new Voice_Cmd("Show DVD movie [$config_parms{dvd_favorites}]", 0);
-$v_dvd_attractions = new Voice_Cmd("What is showing on DVD",0);
-$v_dvd_help = new Voice_Cmd("DVD movie help",0);
-$f_dvd = new File_Item("$Pgm_Path/dvd.txt");
-$p_dvd = new Process_Item("dir_to_file $config_parms{dvd_drive} dvd.txt");
-#noloop=stop
-
-sub refresh_marquee {
-	start $p_dvd;
-}
-
-# *** trigger
-
-&refresh_marquee() if $Reload;
-
-if (done_now $p_dvd) {
-
-	my $dir = read_all $f_dvd;
-
-	my ($title) = $dir =~ /volume in drive.*is (\S*)/i;
-
-	$title =~ s/_/\x20/g;
-	$title = ucfirst(lc($title));
-
-	set $dvd_marquee $title;
-	unlink $f_dvd->{name};
-}
-
-
-if ($state = said $v_dvd_help) {	
-	my @commands = join(', ', sort keys %dvd_states);
-	&respond("app=movie Commands are: @commands");
-}
-if ($state = said $v_dvd_attractions) {	
-	&refresh_marquee();
-	&respond("app=movie mode=rotates $config_parms{dvd_favorites}" . (($dvd_marquee->{state})?" plus $dvd_marquee->{state}":''));
-}
-if ($state = said $v_dvd_control) {
-	&refresh_marquee() if $state eq 'play';
-	&respond("app=dvd " . ucfirst($state));
-	&dvd_control($state);
-}
-if ($state = said $v_dvd_movie) {
-	&respond("app=movie $state Now Showing");
-	&dvd_movie($state);
-}
-sub dvd_control {
-    my ($command) = @_;
-    set $dvd_player $dvd_states{$command};
-}
-sub dvd_movie {
-    my ($movie) = @_;
-    set $dvd_marquee $movie;
-    set $dvd_player "play \"$movie\"";
+# Category=Entertainment
+
+#@ Set dvd_program to DVD player program path. For example:
+#@   dvd_program=C:\program files\intervideo\dvd6\windvd.exe # NOTE spaces are allowed
+#@ Set dvd_archives_folder to folder with ripped DVD's.
+#@   dvd_archives_folder=F:\archives\dvds
+#@ Set dvd_favorites to list of favorite DVD's.
+#@   dvd_favorites=Hulk,Indiana Jones and the Last Crusade,King Kong
+
+# WinDVD only for now (tested with v6.)
+
+use DVDPlayer;
+#***Don't even create these objects if no WinDVD (look for above by default)  Do nothing on Linux
+$dvd_player = new DVDPlayer();
+$dvd_marquee = new Generic_Item;
+#&tk_entry('DVD', $dvd_marquee);
+#noloop=start
+my %dvd_states = (play=>'play',stop=>'stop',pause=>'pause',rewind=>'rewind','fast forward'=>'fast forward',step=>'step','skip forward'=>'skip forward','instant replay'=>'instant replay','root menu'=>'root menu','title menu'=>'title menu','volume up'=>'vol +','volume down'=>'vol -',mute=>'mute',unzoom=>'unzoom',pan=>'pan',angle=>'angle',subtitle=>'subtitle','previous chapter'=>'previous chapter','next chapter'=>'next chapter','eject'=>'eject','brightness up'=>'brightness up','brightness down'=>'brightness down',on=>'on',off=>'off','full screen'=>'full screen');
+my $dvd_states;
+$dvd_states = join(',',keys %dvd_states);
+#***Point voice commands to error messages if objects not created!
+#***Set info, icons? Use info in help
+$v_dvd_control = new Voice_Cmd("DVD movie [$dvd_states]", 0);
+$v_dvd_movie = new Voice_Cmd("Show DVD movie [$config_parms{dvd_favorites}]", 0);
+$v_dvd_attractions = new Voice_Cmd("What is showing on DVD",0);
+$v_dvd_help = new Voice_Cmd("DVD movie help",0);
+$f_dvd = new File_Item("$Pgm_Path/dvd.txt");
+$p_dvd = new Process_Item("dir_to_file $config_parms{dvd_drive} dvd.txt");
+#noloop=stop
+
+sub refresh_marquee {
+	start $p_dvd;
+}
+
+# *** trigger
+
+&refresh_marquee() if $Reload;
+
+if (done_now $p_dvd) {
+
+	my $dir = read_all $f_dvd;
+
+	my ($title) = $dir =~ /volume in drive.*is (\S*)/i;
+
+	$title =~ s/_/\x20/g;
+	$title = ucfirst(lc($title));
+
+	set $dvd_marquee $title;
+	unlink $f_dvd->{name};
+}
+
+
+if ($state = said $v_dvd_help) {	
+	my @commands = join(', ', sort keys %dvd_states);
+	&respond("app=movie Commands are: @commands");
+}
+if ($state = said $v_dvd_attractions) {	
+	&refresh_marquee();
+	&respond("app=movie mode=rotates $config_parms{dvd_favorites}" . (($dvd_marquee->{state})?" plus $dvd_marquee->{state}":''));
+}
+if ($state = said $v_dvd_control) {
+	&refresh_marquee() if $state eq 'play';
+	&respond("app=dvd " . ucfirst($state));
+	&dvd_control($state);
+}
+if ($state = said $v_dvd_movie) {
+	&respond("app=movie $state Now Showing");
+	&dvd_movie($state);
+}
+sub dvd_control {
+    my ($command) = @_;
+    set $dvd_player $dvd_states{$command};
+}
+sub dvd_movie {
+    my ($movie) = @_;
+    set $dvd_marquee $movie;
+    set $dvd_player "play \"$movie\"";
 }
\ No newline at end of file
diff --git a/code/common/email_marketplace_sales.pl b/code/common/email_marketplace_sales.pl
index 89ebc1122..9e7379096 100644
--- a/code/common/email_marketplace_sales.pl
+++ b/code/common/email_marketplace_sales.pl
@@ -1,221 +1,221 @@
-
-# Category = eCommerce
-
-# $Date$
-# $Revision$
-
-#@ Check incoming email for sales.  Venues supported are: Amazon, Amazon Canada, Alibris and eBay
-#@ NOTE: Does nothing with multiple-item sales (names are not on the subject line.)
-#@ Results are announced and logged with the $cash_register object.
-#@ Requires internet_mail.pl
-
-#noloop=start
-
-$cash_register = new Generic_Item;
-$v_email_marketplace = new Voice_Cmd 'Process email sales';
-$v_email_sales = new Voice_Cmd 'How many sales [today,this week,this month]';
-$v_email_questions = new Voice_Cmd 'How many questions [today,this week,this month]';
-my $daily_sales = 0;
-my $daily_questions = 0;
-my $weekly_sales = 0;
-my $weekly_questions = 0;
-my $monthly_sales = 0;
-my $monthly_questions = 0;
-&load_sales();
-#noloop=stop
-
-if ($MW and $Reload) {
-	&tk_label_new(3, \$Save{marketplace_sales_day});
-	&tk_label_new(3, \$Save{marketplace_sales_week});
-	&tk_label_new(3, \$Save{marketplace_sales_month});
-}
-
-
-if (said $v_email_sales) {
-	my $state = $v_email_sales->{state};
-	my $message;
-
-	if ($state eq 'today') {
-		$message = "$daily_sales today.";
-	}
-	elsif ($state eq 'this week') {
-		$message = "$weekly_sales this week.";
-	}
-	else {
-		$message = "$monthly_sales this month.";
-	}
-	$v_email_sales->respond("app=cashier $message");
-}
-
-if (said $v_email_questions) {
-	my $state = $v_email_questions->{state};
-	my $message;
-
-	if ($state eq 'today') {
-		$message = "$daily_questions today.";
-	}
-	elsif ($state eq 'this week') {
-		$message = "$weekly_questions this week.";
-	}
-	else {
-		$message = "$monthly_questions this month.";
-	}
-	$v_email_questions->respond("app=cashier $message");
-}
-
-
-
-                                # get_email_scan_file and $p_get_email are created by internet_mail.pl
-if (done_now $p_get_email and -e $get_email_scan_file or said $v_email_marketplace) {
-    print "marketplace: checking $get_email_scan_file\n" if $Debug{email};
-    my @msgs;
-    my $total_sales = 0;
-    my $total_questions = 0;
-    for my $line (file_read $get_email_scan_file) {
-	print "marketplace: mail =$line\n" if $Debug{email};
-        my ($msg, $from, $to, $subject, $body) = $line =~ /Msg: (\d+) From:(.+?) To:(.+?) Subject:(.+?) Body:(.+)/;
-
-	my $message = '';
-
-        if ($subject =~ /^ *Sold, Ship Now\. (\d{5}) (.*)/i or $subject =~ /^ Sold -- Ship Now! (\d{5}) (.*)/i) {
-            $message = "app=cashier $2 just sold on Amazon.";
-	    set $cash_register $2;
-	    print "marketplace: Found Amazon email: $subject\n" if $Debug{email};
-	    $total_sales++;
-        }
-	elsif ($subject =~ /^ *eBay Store Inventory Sold: (.*) \(\d+\)/) {
-            $message = "$1 just sold in eBay Store.";
-	    set $cash_register $1;
-	    print "marketplace: Found eBay store email: $subject\n" if $Debug{email};		
-	    $total_sales++;
-	}
-	elsif ($subject =~ /^ *eBay Item Sold: (.*) \(\d+\)/) {
-            $message = "$1 just sold on eBay.";
-	    set $cash_register $1;
-	    print "marketplace: Found eBay auction email: $subject\n" if $Debug{email};		
-	    $total_sales++;
-	}
-	elsif ($subject =~ /^ *Alibris Purchase Notification # (\d+-\d+) - (.*)/) {
-            $message = "$2 just sold on Alibris.";
-	    set $cash_register $2;
-	    print "marketplace: Found Alibris email: $subject\n" if $Debug{email};		
-	    $total_sales++;
-	}
-	elsif ($subject =~ /^ *You've made a sale - Please ship your item/i) {
-            $message = "Item just sold on Half.com.";
-	    set $cash_register "Half.com item";
-	    print "marketplace: Found Half email: $subject\n" if $Debug{email};
-	    $total_sales++;
-	}
-	elsif ($subject =~ /^ *Sold -- ship now! \(\d+ listings\/(\d+) items\)/i or $subject =~ /^ *Sold -- ship now! \(\d+ listings\/(\d+) items\)/i) {
-            $message = "$1 item(s) just sold on Amazon.";
-	    set $cash_register "$1 Amazon item(s)";
-	    print "marketplace: Found Amazon email: $subject\n" if $Debug{email};		
-	    $total_sales += int($1);
-	}
-	elsif ($subject =~ /^ *Message from eBay Member/i) {
-            $message = "Message received from eBay member.";
-	    print "marketplace: Found eBay message email: $subject\n" if $Debug{email};
-	    $total_questions++;
-	}
-	elsif ($subject =~ /^ *Question for item #(\d+) - (.*)/i) {
-            $message = "Question received from eBay member about $2.";
-	    print "marketplace: Found eBay question email: $subject\n" if $Debug{email};
-	    $total_questions++;
-	}
-	elsif ($subject =~ /^ *Alibris Inquiry: (.*?); Rec #(\d+)/i) {
-            $message = "Question received from Alibris customer about SKU $2.";
-	    print "marketplace: Found Alibris question email: $subject\n" if $Debug{email};
-	    $total_questions++;
-	}
-	elsif ($subject =~ /^ *Please send me total amount for eBay item #(\d+), (.*)/i) {
-            $message = "Customer would like an invoice for $2.";
-	    print "marketplace: Found eBay request for invoice email: $subject\n" if $Debug{email};
-	    $total_questions++;
-	}
-	elsif ($subject =~ /^ *Re: Order information from Amazon seller/i) {
-            $message = "Customer replied to Amazon communique.";
-	    print "marketplace: Found Amazon customer reply email: $subject from $from\n" if $Debug{email};
-	    $total_questions++;
-	}
-	elsif ($subject =~ /^ *Product details inquiry from Amazon customer (.*)/i) {
-            $message = "$1 wants to know more about an Amazon listing...";
-	    print "marketplace: Found Amazon customer inquiry email: $subject from $from\n" if $Debug{email};
-	    $total_questions++;
-	}
-	elsif ($subject =~ /^ *RE: Your Amazon Marketplace Purchase/i) {
-            $message = "$1 has a complaint about their purchase...";
-	    print "marketplace: Found Amazon customer complaint email: $subject from $from\n" if $Debug{email};
-	    $total_questions++;
-	}
-	elsif ($subject =~ /^ *Product Details/i) {
-            $message = "$1 wants to know more about an amazon listing...";
-	    print "marketplace: Found Amazon customer inquiry email: $subject from $from\n" if $Debug{email};
-	    $total_questions++;
-	}
-	elsif ($subject =~ /^ *Question\/Comment regarding Half.com Transaction #: (\d+)/i) {
-            $message = "Customer wants to know more about a Half.com transaction...";
-	    print "marketplace: Found Half.com order inquiry email: $subject from $from\n" if $Debug{email};
-	    $total_questions++;
-	}
-	elsif ($subject =~ /^ *Re: Question\/Comment regarding Half.com Transaction #: (\d+)/i) {
-            $message = "Half.com customer replied to your answer.";
-	    print "marketplace: Found Half.com answer reply email: $subject from $from\n" if $Debug{email};
-	    $total_questions++;
-	}
-
-	# *** Need to un-associate the chime from this app (pass explicitly if $total_sales)
-
-	my $chime = ($total_sales == 0)?'sound_nature/*.wav':'cash_register';
-
-	speak "app=cashier chime=$chime $message" if ($message);
-    }
-
-    if ($total_sales) {
-	$daily_sales += $total_sales;
-	$daily_questions += $total_questions;
-	$weekly_sales += $total_sales;
-	$monthly_sales += $total_sales;
-	speak "app=cashier no_chime=1 $total_sales new sale(s). That's $daily_sales on the day, $weekly_sales for the week and $monthly_sales this month.";
-	speak "app=cashier no_chime=1 $daily_questions questions received today." if $daily_questions;
-	&persist_sales();
-    }
-
-}
-
-sub persist_sales {
-    $Save{marketplace_sales_day} = $daily_sales;
-    $Save{marketplace_questions_day} = $daily_questions;
-    $Save{marketplace_sales_week} = $weekly_sales;
-    $Save{marketplace_questions_week} = $weekly_questions;
-    $Save{marketplace_sales_month} = $monthly_sales;
-    $Save{marketplace_questions_month} = $monthly_questions;
-}
-
-sub load_sales {
-    $daily_sales = $Save{marketplace_sales_day} if $Save{marketplace_sales_day};
-    $daily_questions = $Save{marketplace_questions_day} if $Save{marketplace_questions_day};
-    $weekly_sales = $Save{marketplace_sales_week} if $Save{marketplace_sales_week};
-    $monthly_sales = $Save{marketplace_sales_month} if $Save{marketplace_sales_month};
-}
-
-
-if ($New_Day) {
-    $daily_sales = 0;
-    $daily_questions = 0;
-    &persist_sales();
-}
-
-if ($New_Week) {
-    $weekly_sales = 0;
-    $weekly_questions = 0;
-    &persist_sales();
-}
-
-if ($New_Month) {
-    $monthly_sales = 0;
-    $monthly_questions = 0;
-    &persist_sales();
-}
-
-
+
+# Category = eCommerce
+
+# $Date$
+# $Revision$
+
+#@ Check incoming email for sales.  Venues supported are: Amazon, Amazon Canada, Alibris and eBay
+#@ NOTE: Does nothing with multiple-item sales (names are not on the subject line.)
+#@ Results are announced and logged with the $cash_register object.
+#@ Requires internet_mail.pl
+
+#noloop=start
+
+$cash_register = new Generic_Item;
+$v_email_marketplace = new Voice_Cmd 'Process email sales';
+$v_email_sales = new Voice_Cmd 'How many sales [today,this week,this month]';
+$v_email_questions = new Voice_Cmd 'How many questions [today,this week,this month]';
+my $daily_sales = 0;
+my $daily_questions = 0;
+my $weekly_sales = 0;
+my $weekly_questions = 0;
+my $monthly_sales = 0;
+my $monthly_questions = 0;
+&load_sales();
+#noloop=stop
+
+if ($MW and $Reload) {
+	&tk_label_new(3, \$Save{marketplace_sales_day});
+	&tk_label_new(3, \$Save{marketplace_sales_week});
+	&tk_label_new(3, \$Save{marketplace_sales_month});
+}
+
+
+if (said $v_email_sales) {
+	my $state = $v_email_sales->{state};
+	my $message;
+
+	if ($state eq 'today') {
+		$message = "$daily_sales today.";
+	}
+	elsif ($state eq 'this week') {
+		$message = "$weekly_sales this week.";
+	}
+	else {
+		$message = "$monthly_sales this month.";
+	}
+	$v_email_sales->respond("app=cashier $message");
+}
+
+if (said $v_email_questions) {
+	my $state = $v_email_questions->{state};
+	my $message;
+
+	if ($state eq 'today') {
+		$message = "$daily_questions today.";
+	}
+	elsif ($state eq 'this week') {
+		$message = "$weekly_questions this week.";
+	}
+	else {
+		$message = "$monthly_questions this month.";
+	}
+	$v_email_questions->respond("app=cashier $message");
+}
+
+
+
+                                # get_email_scan_file and $p_get_email are created by internet_mail.pl
+if (done_now $p_get_email and -e $get_email_scan_file or said $v_email_marketplace) {
+    print "marketplace: checking $get_email_scan_file\n" if $Debug{email};
+    my @msgs;
+    my $total_sales = 0;
+    my $total_questions = 0;
+    for my $line (file_read $get_email_scan_file) {
+	print "marketplace: mail =$line\n" if $Debug{email};
+        my ($msg, $from, $to, $subject, $body) = $line =~ /Msg: (\d+) From:(.+?) To:(.+?) Subject:(.+?) Body:(.+)/;
+
+	my $message = '';
+
+        if ($subject =~ /^ *Sold, Ship Now\. (\d{5}) (.*)/i or $subject =~ /^ Sold -- Ship Now! (\d{5}) (.*)/i) {
+            $message = "app=cashier $2 just sold on Amazon.";
+	    set $cash_register $2;
+	    print "marketplace: Found Amazon email: $subject\n" if $Debug{email};
+	    $total_sales++;
+        }
+	elsif ($subject =~ /^ *eBay Store Inventory Sold: (.*) \(\d+\)/) {
+            $message = "$1 just sold in eBay Store.";
+	    set $cash_register $1;
+	    print "marketplace: Found eBay store email: $subject\n" if $Debug{email};		
+	    $total_sales++;
+	}
+	elsif ($subject =~ /^ *eBay Item Sold: (.*) \(\d+\)/) {
+            $message = "$1 just sold on eBay.";
+	    set $cash_register $1;
+	    print "marketplace: Found eBay auction email: $subject\n" if $Debug{email};		
+	    $total_sales++;
+	}
+	elsif ($subject =~ /^ *Alibris Purchase Notification # (\d+-\d+) - (.*)/) {
+            $message = "$2 just sold on Alibris.";
+	    set $cash_register $2;
+	    print "marketplace: Found Alibris email: $subject\n" if $Debug{email};		
+	    $total_sales++;
+	}
+	elsif ($subject =~ /^ *You've made a sale - Please ship your item/i) {
+            $message = "Item just sold on Half.com.";
+	    set $cash_register "Half.com item";
+	    print "marketplace: Found Half email: $subject\n" if $Debug{email};
+	    $total_sales++;
+	}
+	elsif ($subject =~ /^ *Sold -- ship now! \(\d+ listings\/(\d+) items\)/i or $subject =~ /^ *Sold -- ship now! \(\d+ listings\/(\d+) items\)/i) {
+            $message = "$1 item(s) just sold on Amazon.";
+	    set $cash_register "$1 Amazon item(s)";
+	    print "marketplace: Found Amazon email: $subject\n" if $Debug{email};		
+	    $total_sales += int($1);
+	}
+	elsif ($subject =~ /^ *Message from eBay Member/i) {
+            $message = "Message received from eBay member.";
+	    print "marketplace: Found eBay message email: $subject\n" if $Debug{email};
+	    $total_questions++;
+	}
+	elsif ($subject =~ /^ *Question for item #(\d+) - (.*)/i) {
+            $message = "Question received from eBay member about $2.";
+	    print "marketplace: Found eBay question email: $subject\n" if $Debug{email};
+	    $total_questions++;
+	}
+	elsif ($subject =~ /^ *Alibris Inquiry: (.*?); Rec #(\d+)/i) {
+            $message = "Question received from Alibris customer about SKU $2.";
+	    print "marketplace: Found Alibris question email: $subject\n" if $Debug{email};
+	    $total_questions++;
+	}
+	elsif ($subject =~ /^ *Please send me total amount for eBay item #(\d+), (.*)/i) {
+            $message = "Customer would like an invoice for $2.";
+	    print "marketplace: Found eBay request for invoice email: $subject\n" if $Debug{email};
+	    $total_questions++;
+	}
+	elsif ($subject =~ /^ *Re: Order information from Amazon seller/i) {
+            $message = "Customer replied to Amazon communique.";
+	    print "marketplace: Found Amazon customer reply email: $subject from $from\n" if $Debug{email};
+	    $total_questions++;
+	}
+	elsif ($subject =~ /^ *Product details inquiry from Amazon customer (.*)/i) {
+            $message = "$1 wants to know more about an Amazon listing...";
+	    print "marketplace: Found Amazon customer inquiry email: $subject from $from\n" if $Debug{email};
+	    $total_questions++;
+	}
+	elsif ($subject =~ /^ *RE: Your Amazon Marketplace Purchase/i) {
+            $message = "$1 has a complaint about their purchase...";
+	    print "marketplace: Found Amazon customer complaint email: $subject from $from\n" if $Debug{email};
+	    $total_questions++;
+	}
+	elsif ($subject =~ /^ *Product Details/i) {
+            $message = "$1 wants to know more about an amazon listing...";
+	    print "marketplace: Found Amazon customer inquiry email: $subject from $from\n" if $Debug{email};
+	    $total_questions++;
+	}
+	elsif ($subject =~ /^ *Question\/Comment regarding Half.com Transaction #: (\d+)/i) {
+            $message = "Customer wants to know more about a Half.com transaction...";
+	    print "marketplace: Found Half.com order inquiry email: $subject from $from\n" if $Debug{email};
+	    $total_questions++;
+	}
+	elsif ($subject =~ /^ *Re: Question\/Comment regarding Half.com Transaction #: (\d+)/i) {
+            $message = "Half.com customer replied to your answer.";
+	    print "marketplace: Found Half.com answer reply email: $subject from $from\n" if $Debug{email};
+	    $total_questions++;
+	}
+
+	# *** Need to un-associate the chime from this app (pass explicitly if $total_sales)
+
+	my $chime = ($total_sales == 0)?'sound_nature/*.wav':'cash_register';
+
+	speak "app=cashier chime=$chime $message" if ($message);
+    }
+
+    if ($total_sales) {
+	$daily_sales += $total_sales;
+	$daily_questions += $total_questions;
+	$weekly_sales += $total_sales;
+	$monthly_sales += $total_sales;
+	speak "app=cashier no_chime=1 $total_sales new sale(s). That's $daily_sales on the day, $weekly_sales for the week and $monthly_sales this month.";
+	speak "app=cashier no_chime=1 $daily_questions questions received today." if $daily_questions;
+	&persist_sales();
+    }
+
+}
+
+sub persist_sales {
+    $Save{marketplace_sales_day} = $daily_sales;
+    $Save{marketplace_questions_day} = $daily_questions;
+    $Save{marketplace_sales_week} = $weekly_sales;
+    $Save{marketplace_questions_week} = $weekly_questions;
+    $Save{marketplace_sales_month} = $monthly_sales;
+    $Save{marketplace_questions_month} = $monthly_questions;
+}
+
+sub load_sales {
+    $daily_sales = $Save{marketplace_sales_day} if $Save{marketplace_sales_day};
+    $daily_questions = $Save{marketplace_questions_day} if $Save{marketplace_questions_day};
+    $weekly_sales = $Save{marketplace_sales_week} if $Save{marketplace_sales_week};
+    $monthly_sales = $Save{marketplace_sales_month} if $Save{marketplace_sales_month};
+}
+
+
+if ($New_Day) {
+    $daily_sales = 0;
+    $daily_questions = 0;
+    &persist_sales();
+}
+
+if ($New_Week) {
+    $weekly_sales = 0;
+    $weekly_questions = 0;
+    &persist_sales();
+}
+
+if ($New_Month) {
+    $monthly_sales = 0;
+    $monthly_questions = 0;
+    &persist_sales();
+}
+
+
diff --git a/code/common/froggyrita.pl b/code/common/froggyrita.pl
index 780d99236..b303bfddd 100644
--- a/code/common/froggyrita.pl
+++ b/code/common/froggyrita.pl
@@ -1,71 +1,71 @@
-# Category = HVAC
-
-use strict;
-use FroggyRita;
-
-my $command_waiting; #noloop
-
-$Froggy = new FroggyRita;
-$v_froggy_indoor_temperature = new Voice_Cmd('[What is] the indoor temperature',0);
-$v_froggy_indoor_humidity = new Voice_Cmd('[What is] the indoor humidity',0);
-$v_froggy_indoor_check = new Voice_Cmd('Check indoor conditions',0);
-
-if (said $v_froggy_indoor_check) {
-		respond "app=frog Checking indoor conditions...";
-		$command_waiting = $v_froggy_indoor_check;
-		set $Froggy 'status', $v_froggy_indoor_check;
-}
-
-
-if (said $v_froggy_indoor_temperature) {
-
-		if (defined $Weather{TempIndoor}) {
-			respond "app=frog It is $Weather{TempIndoor} degrees fahrenheit indoors.";
-		}
-		else {
-			respond "app=frog I don't know the temperature at the moment. Try again in a few minutes...";
-		}
-
-}
-
-if (my $state = said $v_froggy_indoor_humidity) {
-	if (defined $Froggy->humidity()) {
-		respond "app=frog It is " . $Froggy->humidity() . "% indoors.";
-	}
-	else {
-		respond "app=frog I do not know at the moment. Try again in a few minutes...";
-	}
-
-}
-
-if (my $state = state_now $Froggy) {
-	my $temperature = $Froggy->temperature();
-
-	$temperature = ($config_parms{weather_uom_temp} eq 'C' ? (int($temperature * 100 + .5)/100):int((($temperature * 180) + 3200) + .5)/100 if defined $temperature;
-
-
-	if ($command_waiting and $state ne 'status') {
-		if (defined $temperature) {
-			$command_waiting->respond('app=frog connected=0 Indoor temperature is ' . $temperature . ' degrees fahrenheit. Humidity is ' . $Froggy->humidity() . '%');
-		}
-		else {
-			$command_waiting->respond('app=frog connected=0 I do not know at the moment. Try again in a few minutes...');
-
-		}
-		$command_waiting = undef;
-	}
-	$Weather{TempIndoor} = $temperature if defined $temperature;
-        $Weather{HumidIndoor} = $Froggy->humidity() if defined $Froggy->humidity();
-}
-
-sub get_froggy_status {
-	set $Froggy 'status', 'time';
-}
-
- # trigger
-
-if ($Reload) {
-    &trigger_set("new_minute 5",
-                 "&get_froggy_status()", 'NoExpire', 'get frog status')
-      unless &trigger_get('get frog status');
-}
+# Category = HVAC
+
+use strict;
+use FroggyRita;
+
+my $command_waiting; #noloop
+
+$Froggy = new FroggyRita;
+$v_froggy_indoor_temperature = new Voice_Cmd('[What is] the indoor temperature',0);
+$v_froggy_indoor_humidity = new Voice_Cmd('[What is] the indoor humidity',0);
+$v_froggy_indoor_check = new Voice_Cmd('Check indoor conditions',0);
+
+if (said $v_froggy_indoor_check) {
+		respond "app=frog Checking indoor conditions...";
+		$command_waiting = $v_froggy_indoor_check;
+		set $Froggy 'status', $v_froggy_indoor_check;
+}
+
+
+if (said $v_froggy_indoor_temperature) {
+
+		if (defined $Weather{TempIndoor}) {
+			respond "app=frog It is $Weather{TempIndoor} degrees fahrenheit indoors.";
+		}
+		else {
+			respond "app=frog I don't know the temperature at the moment. Try again in a few minutes...";
+		}
+
+}
+
+if (my $state = said $v_froggy_indoor_humidity) {
+	if (defined $Froggy->humidity()) {
+		respond "app=frog It is " . $Froggy->humidity() . "% indoors.";
+	}
+	else {
+		respond "app=frog I do not know at the moment. Try again in a few minutes...";
+	}
+
+}
+
+if (my $state = state_now $Froggy) {
+	my $temperature = $Froggy->temperature();
+
+	$temperature = ($config_parms{weather_uom_temp} eq 'C' ? (int($temperature * 100 + .5)/100):int((($temperature * 180) + 3200) + .5)/100 if defined $temperature;
+
+
+	if ($command_waiting and $state ne 'status') {
+		if (defined $temperature) {
+			$command_waiting->respond('app=frog connected=0 Indoor temperature is ' . $temperature . ' degrees fahrenheit. Humidity is ' . $Froggy->humidity() . '%');
+		}
+		else {
+			$command_waiting->respond('app=frog connected=0 I do not know at the moment. Try again in a few minutes...');
+
+		}
+		$command_waiting = undef;
+	}
+	$Weather{TempIndoor} = $temperature if defined $temperature;
+        $Weather{HumidIndoor} = $Froggy->humidity() if defined $Froggy->humidity();
+}
+
+sub get_froggy_status {
+	set $Froggy 'status', 'time';
+}
+
+ # trigger
+
+if ($Reload) {
+    &trigger_set("new_minute 5",
+                 "&get_froggy_status()", 'NoExpire', 'get frog status')
+      unless &trigger_get('get frog status');
+}
diff --git a/code/common/holiday_ical.pl b/code/common/holiday_ical.pl
index fd93d590c..dd2dc43e4 100755
--- a/code/common/holiday_ical.pl
+++ b/code/common/holiday_ical.pl
@@ -1,52 +1,52 @@
-# Category = Time
-
-#@ Generate ical compatible holiday information every year
-#@ Can be used with ical2vsdb to reimport holiday information back into MH
-
-=begin comment
-
-mh.ini parameters required
-
-holiday_definition_file = path to filename that has holiday definitions
+# Category = Time
+
+#@ Generate ical compatible holiday information every year
+#@ Can be used with ical2vsdb to reimport holiday information back into MH
+
+=begin comment
+
+mh.ini parameters required
+
+holiday_definition_file = path to filename that has holiday definitions
 ie holiday_definition_file = $Pgm_Root/data/holidays.ca_ab for Alberta, Canada
-
-optional
-
-   holiday_ical_filename = filename of generated holiday information (defaults to $Pgm_Root/web/holical.ics)
-   holiday_no_stats = 1 to not generate stat holidays (next business day if the holiday is on a weekend)
+
+optional
+
+   holiday_ical_filename = filename of generated holiday information (defaults to $Pgm_Root/web/holical.ics)
+   holiday_no_stats = 1 to not generate stat holidays (next business day if the holiday is on a weekend)
 
 -------------------------------------------------------------------------------------
 Note: $Pgm_Root/bin/holical (ical creator helper program) has several dependencies:
 
 Date::Easter, Date::Manip, Date::ICal, Data::ICal, Data::ICal::Entry::Event
 -------------------------------------------------------------------------------------
-
-=cut
-
-
-$p_holical = new Process_Item();
-
-$v_generate_holidays = new Voice_Cmd('Generate holiday information for [1,2,3,4] year(s)');
-$v_generate_holidays->set_info('Generate ical compatible holiday information');
-$v_generate_holidays->set_authority('anyone');
-my $holiday_output_filename = $config_parms{holiday_ical_filename};
-$holiday_output_filename = "$Pgm_Root/web/holical.ics" if !$holiday_output_filename;
-
-
+
+=cut
+
+
+$p_holical = new Process_Item();
+
+$v_generate_holidays = new Voice_Cmd('Generate holiday information for [1,2,3,4] year(s)');
+$v_generate_holidays->set_info('Generate ical compatible holiday information');
+$v_generate_holidays->set_authority('anyone');
+my $holiday_output_filename = $config_parms{holiday_ical_filename};
+$holiday_output_filename = "$Pgm_Root/web/holical.ics" if !$holiday_output_filename;
+
+
 if ((said $v_generate_holidays) or ($New_Year) or
-    (($Reload) and !(-e $holiday_output_filename))) {
-
-	print_log "MH_Holidays: Starting holiday generation process...";
-	my $options;
-	$options = "-n" if $config_parms{holiday_no_stats};
-	my $years;
-	$years = said $v_generate_holidays;
-        $years = "0" if !$years;
-
-	if (-e $config_parms{holiday_definition_file}) {
-	  $p_holical->set("holical -y +$years $options -f $holiday_output_filename $config_parms{holiday_definition_file} ");
-	  start $p_holical;
-	} else {
-	  print_log "MH_Holidays: Error, cannot find holiday definition file!";
-	}
-}
+    (($Reload) and !(-e $holiday_output_filename))) {
+
+	print_log "MH_Holidays: Starting holiday generation process...";
+	my $options;
+	$options = "-n" if $config_parms{holiday_no_stats};
+	my $years;
+	$years = said $v_generate_holidays;
+        $years = "0" if !$years;
+
+	if (-e $config_parms{holiday_definition_file}) {
+	  $p_holical->set("holical -y +$years $options -f $holiday_output_filename $config_parms{holiday_definition_file} ");
+	  start $p_holical;
+	} else {
+	  print_log "MH_Holidays: Error, cannot find holiday definition file!";
+	}
+}
diff --git a/code/common/mp3_dj.pl b/code/common/mp3_dj.pl
index 7f190905e..f8f2e71e8 100644
--- a/code/common/mp3_dj.pl
+++ b/code/common/mp3_dj.pl
@@ -1,287 +1,287 @@
-# Category=Music
-
-# $Date$
-# $Revision$
-
-#@
-#@ Jukebox DJ-tested with Winamp/httpq, but should work with all that can respond with now playing info (including elapsed time of course!)  Also lowers and restores player volume during speech.
-#@ Requires: mp3 and a player module (ex. mp3_winamp)
-
-#noloop=start
-my $trivia_question_asked = 1;
-my $trivia_question_answered = 1;
-my $dj_flag = ($config_parms{dj})?$config_parms{dj}:1;
-my $speech_lowered_volume = 0;
-#noloop=stop
-
-$timer_voice_over = new Timer;
-
-$v_dj = new Voice_Cmd('[Start,Stop] the DJ');
-$v_dj->set_info('Starts or stops the virtual disc jockey');
-
-if (said $v_dj) {
-	my $state = $v_dj->{state};
-	$v_dj->respond("app=dj $state" . 'ing the disc jockey...');
-	$dj_flag = ($state eq 'Start');
-}
-
-sub voice_over {
-	return if !$dj_flag;
-	my $now_playing_formatted;
-	my $last_track = shift;
-	my $now_playing = &dj_now_playing();	
-	my $speech;
-
-	my $mptimestr = &mp3_get_output_timestr();
-      
-   	my ( $mpelapse, $mprest ) = split ( /\//,$mptimestr );
-	my ( $mpmin,  $mpsec ) = split ( /:/,$mpelapse );
-	$mpelapse = ( $mpmin * 60 ) + $mpsec ;
-
-	print "DJ Voice over: $last_track-$now_playing-$mpelapse\n" if $Debug{dj};
-
-
-	if ($now_playing ne $last_track and &mp3_playing() and $mpelapse < 7) {
-		my ($voice, $pitch);
-		my $time_slot;
-		$now_playing_formatted = format_track($now_playing);
-
-				if (time_greater_than("12:00 AM") and time_less_than("6:00 AM")) {
-					$time_slot = 'early morning';
-
-					$voice = 'male';
-				}
-				if (time_greater_than("6:00 AM") and time_less_than("12:00 PM")) {
-					$time_slot = 'morning';
-					$voice = 'random'; # Morning zoo
-				}
-				elsif (time_greater_than("5:30 AM") and time_less_than("06:00 PM")) {
-					$time_slot = 'afternoon';
-					$voice = 'female';
-				}
-				elsif (time_greater_than("6:00 PM") and time_less_than("11:59 PM")) {
-					$time_slot = 'evening';
-					$voice = 'female';
-				}
-
-		$voice = $config_parms{"dj_voice_$time_slot"} if $config_parms{"dj_voice_$time_slot"};
-		
-
-
-
-
-
-		if ($now_playing_formatted) {
-			if (not $trivia_question_asked) {
-				my $f_trivia_question = new File_Item("$config_parms{data_dir}/trivia_question.txt");				
-				my $trivia_question =  read_all $f_trivia_question;
-				$speech = "Time for today's trivia question. $trivia_question";
-				$trivia_question_asked = 1;
-			}
-			elsif ($trivia_question_asked and not $trivia_question_answered) {
-				my $f_trivia_answer = new File_Item("$config_parms{data_dir}/trivia_answer.txt");
-				my $trivia_answer =  read_all $f_trivia_answer;
-				$speech = "And now the answer to today's trivia question. $trivia_answer";
-				$trivia_question_answered = 1;
-			}
-			elsif (rand(10) > 7) {
-				if (rand(10) > 4) {
-					if ($time_slot eq 'morning') {
-						play(app => 'dj', file => "fun/*.wav");
-						$speech = "Good morning. ";
-					}
-					elsif ($time_slot eq 'afternoon') {
-						$speech = "Good afternoon. ";
-					}
-					elsif ($time_slot eq 'evening') {
-						$speech = "Good evening. ";
-					}
-					else {
-						$speech = "Still up?  So are we! ";
-					}
-					if (rand(10) > 4 and $speech) {
-						$speech = " Hey, " . lcfirst($speech);
-					}
-					$speech .= "The outdoor temperature is " . $Weather{TempOutdoor} . '. ' if (defined $Weather{TempOutdoor});
-					$speech .= "Inside it is " . $Weather{TempIndoor} . " degrees. " if ($Weather{TempIndoor});
-					$speech .= $Weather{chance_of_rain} . ' ' if ($Weather{chance_of_rain} and rand(10) > 4);
-					$speech .= "There is mail in the mailbox. " if ($Save{mail_delivered} eq "1" and $Save{mail_retrieved} eq "");
-
-				        if (defined $Weather{ChanceOfRainPercent} and $Weather{ChanceOfRainPercent} > 60) {
-						$speech .= "Looks like rain. "; 
-					}
-					else {
-						$speech .= "It is raining. " if defined $Weather{IsRaining} and $Weather{IsRaining};
-					}
-					$speech .= "Tonight is a full moon. " if ($Moon{phase} eq 'Full');
-
-			
-				}
-
-				$speech .= "Now here's " . $now_playing_formatted;
-				if (rand(10) > 5) { 
-					$speech .= ' on W M H--the voice of Misterhouse.';
-					if (rand(10) > 6) {
-						$speech .= ' Keep it right here.';
-					}
-					else {
-						$speech .= " I like this one.";
-					}
-				}
-				else {
-					$speech .= '. Misterhouse... Rocks!';
-				}
-			}
-			else {
-				if (rand(10) > 4) {
-					$speech = "That was " . format_track($last_track);
-				}
-				elsif (rand(10) > 7) {
-
-				        my $conditions;
-					$conditions = $Weather{Summary_Short};
-
-					$speech = "It is $Time_Now";	
-					$speech .= ". $conditions" if (rand(10) > 6 and $conditions);
-					$speech .= ". In the stock market " . $Save{stock_results} if (rand(10) > 8 and $Save{stock_results});
-				}
-				else {
-
-					my @forecast_days;
-				        my $forecast;
-					@forecast_days = split /\|/, $Weather{"Forecast Days"};
-
-					my $forecast_day = $forecast_days[($forecast_days[0] =~ /warning/)?1:0];
-					$forecast = $Weather{"Forecast $forecast_day"};
-
-					$speech = "How are you? It is $Time_Now";	
-					$speech .= " and time for the weather forecast. " . $forecast if ($forecast and rand(10) > 6);
-
-
-				}
-				my ($previous_artist) = $last_track =~ /(.+)\s+-\s+(.+)/;
-				my ($artist,$title) = $now_playing =~ /(.+)\s+-\s+(.+)/;			
-				if ($artist eq $previous_artist) {
-					$speech .= ". Now here's another by " . $artist;
-				}
-				else {
-					$speech .= ". Now it's " . $artist;
-				}
-				if (rand(10) > 3) { 
-					$speech .= ' on W M H.';
-					$speech .= ' Keep it right here.' if (rand(10) > 6) ;
-				}
-				else {
-					$speech .= '. Stay tuned...';
-				}
-			}
-			
-			&speak("app=dj no_chime=1 voice=$voice " . ((defined $pitch)?" pitch=$pitch":'') . $speech);
-		}
-	}
-}
-
-sub dj_now_playing {
-   my $ref = &mp3_get_playlist();
-   my $track;
-
-   if ($ref) {
-      my $pos = &mp3_get_playlist_pos();
-      if ($pos >= 0) {
-         $track = ${$ref}[$pos] if $ref;	 
-      } else {
-         $track = &mp3_get_curr_song();
-      }
-   }
-   return $track;
-}
-
-sub dj {
-   my $mptimestr = &mp3_get_output_timestr();
-
-   my $last_track = &dj_now_playing();
-      
-   my ( $mpelapse, $mprest ) = split ( /\//,$mptimestr );
-   my ( $mpmin,  $mpsec ) = split ( /:/,$mpelapse );
-   $mpelapse = ( $mpmin * 60 ) + $mpsec ;
-
-   my $mpisrun = &mp3_playing();
-
-   if ($mpisrun) {
-
-   my ( $mptime, $mpperct ) = split ( / /,$mprest ) ;
-      ( $mpmin,  $mpsec ) = split ( /:/,$mptime );
-   $mptime = ( $mpmin * 60 ) + $mpsec ;
-
-
-	if ($mptime - $mpelapse > 5) {
-		$timer_voice_over->stop() unless inactive $timer_voice_over;
-		set $timer_voice_over $mptime - $mpelapse + 1, "voice_over(" . '"' . "$last_track" . '")';	
-	}
-    }
-}
-
-sub format_track {
-	my $playing = shift;
-	my ($artist,$title) = $playing =~ /(.+)\s+-\s+(.+)/;
-	
-	if ($artist) {
-		return $title . ' by ' . $artist;
-	}
-} 
-
-&dj() if (new_minute (($config_parms{dj_freq})?$config_parms{dj_freq}:7) or $Reload) and $dj_flag;
-
-# *** This is stupid (should use a time stamp for last time question asked!)
-
-if (new_hour 8) {
-	$trivia_question_asked = 0;
-	$trivia_question_answered = 0;
-}
-
-&Speak_pre_add_hook(\&dj_speech_hook) if $Reload;
-
-sub dj_speech_hook {
-    my %parms = &parse_func_parms(@_);
-
-    my $mode = $parms{mode};
-    my $app = $parms{app};
-
-    #lower volume if speech won't be muted
-
-		if (&mp3_playing() and !$speech_lowered_volume and !$parms{to_file} and $mode ne 'mute' and (($mode_mh->{state} ne 'mute' and $mode_mh->{state} ne 'offline') or $mode eq 'unmuted')) {
-			$speech_lowered_volume = 1;
-
-&mp3_control('volume down');
-&mp3_control('volume down');
-
-&mp3_control('volume down');
-&mp3_control('volume down');
-
-
-		}	
-}
-
-if (state_now $mh_speakers eq OFF) {	
-
-	# *** Need isspeaking check here (for speeches with chimes, volume is raised after sound file ends, not the speech!)
-
-	if ($speech_lowered_volume) {
-		for my $i (1..$speech_lowered_volume) {
-
-&mp3_control('volume up');
-&mp3_control('volume up');
-
-&mp3_control('volume up');
-&mp3_control('volume up');
-
-		}	
-	}
-	$speech_lowered_volume = 0;
-}
-
-
-
-
-
-
+# Category=Music
+
+# $Date$
+# $Revision$
+
+#@
+#@ Jukebox DJ-tested with Winamp/httpq, but should work with all that can respond with now playing info (including elapsed time of course!)  Also lowers and restores player volume during speech.
+#@ Requires: mp3 and a player module (ex. mp3_winamp)
+
+#noloop=start
+my $trivia_question_asked = 1;
+my $trivia_question_answered = 1;
+my $dj_flag = ($config_parms{dj})?$config_parms{dj}:1;
+my $speech_lowered_volume = 0;
+#noloop=stop
+
+$timer_voice_over = new Timer;
+
+$v_dj = new Voice_Cmd('[Start,Stop] the DJ');
+$v_dj->set_info('Starts or stops the virtual disc jockey');
+
+if (said $v_dj) {
+	my $state = $v_dj->{state};
+	$v_dj->respond("app=dj $state" . 'ing the disc jockey...');
+	$dj_flag = ($state eq 'Start');
+}
+
+sub voice_over {
+	return if !$dj_flag;
+	my $now_playing_formatted;
+	my $last_track = shift;
+	my $now_playing = &dj_now_playing();	
+	my $speech;
+
+	my $mptimestr = &mp3_get_output_timestr();
+      
+   	my ( $mpelapse, $mprest ) = split ( /\//,$mptimestr );
+	my ( $mpmin,  $mpsec ) = split ( /:/,$mpelapse );
+	$mpelapse = ( $mpmin * 60 ) + $mpsec ;
+
+	print "DJ Voice over: $last_track-$now_playing-$mpelapse\n" if $Debug{dj};
+
+
+	if ($now_playing ne $last_track and &mp3_playing() and $mpelapse < 7) {
+		my ($voice, $pitch);
+		my $time_slot;
+		$now_playing_formatted = format_track($now_playing);
+
+				if (time_greater_than("12:00 AM") and time_less_than("6:00 AM")) {
+					$time_slot = 'early morning';
+
+					$voice = 'male';
+				}
+				if (time_greater_than("6:00 AM") and time_less_than("12:00 PM")) {
+					$time_slot = 'morning';
+					$voice = 'random'; # Morning zoo
+				}
+				elsif (time_greater_than("5:30 AM") and time_less_than("06:00 PM")) {
+					$time_slot = 'afternoon';
+					$voice = 'female';
+				}
+				elsif (time_greater_than("6:00 PM") and time_less_than("11:59 PM")) {
+					$time_slot = 'evening';
+					$voice = 'female';
+				}
+
+		$voice = $config_parms{"dj_voice_$time_slot"} if $config_parms{"dj_voice_$time_slot"};
+		
+
+
+
+
+
+		if ($now_playing_formatted) {
+			if (not $trivia_question_asked) {
+				my $f_trivia_question = new File_Item("$config_parms{data_dir}/trivia_question.txt");				
+				my $trivia_question =  read_all $f_trivia_question;
+				$speech = "Time for today's trivia question. $trivia_question";
+				$trivia_question_asked = 1;
+			}
+			elsif ($trivia_question_asked and not $trivia_question_answered) {
+				my $f_trivia_answer = new File_Item("$config_parms{data_dir}/trivia_answer.txt");
+				my $trivia_answer =  read_all $f_trivia_answer;
+				$speech = "And now the answer to today's trivia question. $trivia_answer";
+				$trivia_question_answered = 1;
+			}
+			elsif (rand(10) > 7) {
+				if (rand(10) > 4) {
+					if ($time_slot eq 'morning') {
+						play(app => 'dj', file => "fun/*.wav");
+						$speech = "Good morning. ";
+					}
+					elsif ($time_slot eq 'afternoon') {
+						$speech = "Good afternoon. ";
+					}
+					elsif ($time_slot eq 'evening') {
+						$speech = "Good evening. ";
+					}
+					else {
+						$speech = "Still up?  So are we! ";
+					}
+					if (rand(10) > 4 and $speech) {
+						$speech = " Hey, " . lcfirst($speech);
+					}
+					$speech .= "The outdoor temperature is " . $Weather{TempOutdoor} . '. ' if (defined $Weather{TempOutdoor});
+					$speech .= "Inside it is " . $Weather{TempIndoor} . " degrees. " if ($Weather{TempIndoor});
+					$speech .= $Weather{chance_of_rain} . ' ' if ($Weather{chance_of_rain} and rand(10) > 4);
+					$speech .= "There is mail in the mailbox. " if ($Save{mail_delivered} eq "1" and $Save{mail_retrieved} eq "");
+
+				        if (defined $Weather{ChanceOfRainPercent} and $Weather{ChanceOfRainPercent} > 60) {
+						$speech .= "Looks like rain. "; 
+					}
+					else {
+						$speech .= "It is raining. " if defined $Weather{IsRaining} and $Weather{IsRaining};
+					}
+					$speech .= "Tonight is a full moon. " if ($Moon{phase} eq 'Full');
+
+			
+				}
+
+				$speech .= "Now here's " . $now_playing_formatted;
+				if (rand(10) > 5) { 
+					$speech .= ' on W M H--the voice of Misterhouse.';
+					if (rand(10) > 6) {
+						$speech .= ' Keep it right here.';
+					}
+					else {
+						$speech .= " I like this one.";
+					}
+				}
+				else {
+					$speech .= '. Misterhouse... Rocks!';
+				}
+			}
+			else {
+				if (rand(10) > 4) {
+					$speech = "That was " . format_track($last_track);
+				}
+				elsif (rand(10) > 7) {
+
+				        my $conditions;
+					$conditions = $Weather{Summary_Short};
+
+					$speech = "It is $Time_Now";	
+					$speech .= ". $conditions" if (rand(10) > 6 and $conditions);
+					$speech .= ". In the stock market " . $Save{stock_results} if (rand(10) > 8 and $Save{stock_results});
+				}
+				else {
+
+					my @forecast_days;
+				        my $forecast;
+					@forecast_days = split /\|/, $Weather{"Forecast Days"};
+
+					my $forecast_day = $forecast_days[($forecast_days[0] =~ /warning/)?1:0];
+					$forecast = $Weather{"Forecast $forecast_day"};
+
+					$speech = "How are you? It is $Time_Now";	
+					$speech .= " and time for the weather forecast. " . $forecast if ($forecast and rand(10) > 6);
+
+
+				}
+				my ($previous_artist) = $last_track =~ /(.+)\s+-\s+(.+)/;
+				my ($artist,$title) = $now_playing =~ /(.+)\s+-\s+(.+)/;			
+				if ($artist eq $previous_artist) {
+					$speech .= ". Now here's another by " . $artist;
+				}
+				else {
+					$speech .= ". Now it's " . $artist;
+				}
+				if (rand(10) > 3) { 
+					$speech .= ' on W M H.';
+					$speech .= ' Keep it right here.' if (rand(10) > 6) ;
+				}
+				else {
+					$speech .= '. Stay tuned...';
+				}
+			}
+			
+			&speak("app=dj no_chime=1 voice=$voice " . ((defined $pitch)?" pitch=$pitch":'') . $speech);
+		}
+	}
+}
+
+sub dj_now_playing {
+   my $ref = &mp3_get_playlist();
+   my $track;
+
+   if ($ref) {
+      my $pos = &mp3_get_playlist_pos();
+      if ($pos >= 0) {
+         $track = ${$ref}[$pos] if $ref;	 
+      } else {
+         $track = &mp3_get_curr_song();
+      }
+   }
+   return $track;
+}
+
+sub dj {
+   my $mptimestr = &mp3_get_output_timestr();
+
+   my $last_track = &dj_now_playing();
+      
+   my ( $mpelapse, $mprest ) = split ( /\//,$mptimestr );
+   my ( $mpmin,  $mpsec ) = split ( /:/,$mpelapse );
+   $mpelapse = ( $mpmin * 60 ) + $mpsec ;
+
+   my $mpisrun = &mp3_playing();
+
+   if ($mpisrun) {
+
+   my ( $mptime, $mpperct ) = split ( / /,$mprest ) ;
+      ( $mpmin,  $mpsec ) = split ( /:/,$mptime );
+   $mptime = ( $mpmin * 60 ) + $mpsec ;
+
+
+	if ($mptime - $mpelapse > 5) {
+		$timer_voice_over->stop() unless inactive $timer_voice_over;
+		set $timer_voice_over $mptime - $mpelapse + 1, "voice_over(" . '"' . "$last_track" . '")';	
+	}
+    }
+}
+
+sub format_track {
+	my $playing = shift;
+	my ($artist,$title) = $playing =~ /(.+)\s+-\s+(.+)/;
+	
+	if ($artist) {
+		return $title . ' by ' . $artist;
+	}
+} 
+
+&dj() if (new_minute (($config_parms{dj_freq})?$config_parms{dj_freq}:7) or $Reload) and $dj_flag;
+
+# *** This is stupid (should use a time stamp for last time question asked!)
+
+if (new_hour 8) {
+	$trivia_question_asked = 0;
+	$trivia_question_answered = 0;
+}
+
+&Speak_pre_add_hook(\&dj_speech_hook) if $Reload;
+
+sub dj_speech_hook {
+    my %parms = &parse_func_parms(@_);
+
+    my $mode = $parms{mode};
+    my $app = $parms{app};
+
+    #lower volume if speech won't be muted
+
+		if (&mp3_playing() and !$speech_lowered_volume and !$parms{to_file} and $mode ne 'mute' and (($mode_mh->{state} ne 'mute' and $mode_mh->{state} ne 'offline') or $mode eq 'unmuted')) {
+			$speech_lowered_volume = 1;
+
+&mp3_control('volume down');
+&mp3_control('volume down');
+
+&mp3_control('volume down');
+&mp3_control('volume down');
+
+
+		}	
+}
+
+if (state_now $mh_speakers eq OFF) {	
+
+	# *** Need isspeaking check here (for speeches with chimes, volume is raised after sound file ends, not the speech!)
+
+	if ($speech_lowered_volume) {
+		for my $i (1..$speech_lowered_volume) {
+
+&mp3_control('volume up');
+&mp3_control('volume up');
+
+&mp3_control('volume up');
+&mp3_control('volume up');
+
+		}	
+	}
+	$speech_lowered_volume = 0;
+}
+
+
+
+
+
+
diff --git a/code/examples/SOAP_examples/vb.net/AssemblyInfo.vb b/code/examples/SOAP_examples/vb.net/AssemblyInfo.vb
index 06899e48f..ad055b9b3 100755
--- a/code/examples/SOAP_examples/vb.net/AssemblyInfo.vb
+++ b/code/examples/SOAP_examples/vb.net/AssemblyInfo.vb
@@ -1,32 +1,32 @@
-Imports System
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-
-' General Information about an assembly is controlled through the following 
-' set of attributes. Change these attribute values to modify the information
-' associated with an assembly.
-
-' Review the values of the assembly attributes
-
-<Assembly: AssemblyTitle("")> 
-<Assembly: AssemblyDescription("")> 
-<Assembly: AssemblyCompany("")> 
-<Assembly: AssemblyProduct("")> 
-<Assembly: AssemblyCopyright("")> 
-<Assembly: AssemblyTrademark("")> 
-<Assembly: CLSCompliant(True)> 
-
-'The following GUID is for the ID of the typelib if this project is exposed to COM
-<Assembly: Guid("18487A7D-817D-492D-A77D-E98D7B34C831")> 
-
-' Version information for an assembly consists of the following four values:
-'
-'      Major Version
-'      Minor Version 
-'      Build Number
-'      Revision
-'
-' You can specify all the values or you can default the Build and Revision Numbers 
-' by using the '*' as shown below:
-
-<Assembly: AssemblyVersion("1.0.*")> 
+Imports System
+Imports System.Reflection
+Imports System.Runtime.InteropServices
+
+' General Information about an assembly is controlled through the following 
+' set of attributes. Change these attribute values to modify the information
+' associated with an assembly.
+
+' Review the values of the assembly attributes
+
+<Assembly: AssemblyTitle("")> 
+<Assembly: AssemblyDescription("")> 
+<Assembly: AssemblyCompany("")> 
+<Assembly: AssemblyProduct("")> 
+<Assembly: AssemblyCopyright("")> 
+<Assembly: AssemblyTrademark("")> 
+<Assembly: CLSCompliant(True)> 
+
+'The following GUID is for the ID of the typelib if this project is exposed to COM
+<Assembly: Guid("18487A7D-817D-492D-A77D-E98D7B34C831")> 
+
+' Version information for an assembly consists of the following four values:
+'
+'      Major Version
+'      Minor Version 
+'      Build Number
+'      Revision
+'
+' You can specify all the values or you can default the Build and Revision Numbers 
+' by using the '*' as shown below:
+
+<Assembly: AssemblyVersion("1.0.*")> 
diff --git a/code/examples/SOAP_examples/vb.net/Form1.resx b/code/examples/SOAP_examples/vb.net/Form1.resx
index 91df5cc7d..d62ac83b0 100755
--- a/code/examples/SOAP_examples/vb.net/Form1.resx
+++ b/code/examples/SOAP_examples/vb.net/Form1.resx
@@ -1,211 +1,211 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 1.3
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">1.3</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1">this is my long string</data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        [base64 mime encoded serialized .NET Framework object]
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        [base64 mime encoded string representing a byte array form of the .NET Framework object]
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used forserialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>1.3</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="ComboBox1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="ComboBox1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="ComboBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="ListBox1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="ListBox1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="ListBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="txtURL.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="txtURL.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="txtURL.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="Label1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="Label1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="Label1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="cmdConnect.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="cmdConnect.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="cmdConnect.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="Label2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="Label2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="Label2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="lblState.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="lblState.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="lblState.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="txtNewState.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="txtNewState.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="txtNewState.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="cmdSetState.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="cmdSetState.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="cmdSetState.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>(Default)</value>
-  </data>
-  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>8, 8</value>
-  </data>
-  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </data>
-  <data name="$this.Name">
-    <value>Form1</value>
-  </data>
-  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>80</value>
-  </data>
-  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </data>
-  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ComboBox1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="ComboBox1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="ComboBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="ListBox1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="ListBox1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="ListBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="txtURL.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="txtURL.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="txtURL.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="Label1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="Label1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="Label1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="cmdConnect.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="cmdConnect.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="cmdConnect.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="Label2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="Label2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="Label2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="lblState.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="lblState.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="lblState.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="txtNewState.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="txtNewState.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="txtNewState.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="cmdSetState.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="cmdSetState.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="cmdSetState.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>(Default)</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.Name">
+    <value>Form1</value>
+  </data>
+  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>80</value>
+  </data>
+  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/code/examples/SOAP_examples/vb.net/Form1.vb b/code/examples/SOAP_examples/vb.net/Form1.vb
index aa573d063..151ab5e54 100755
--- a/code/examples/SOAP_examples/vb.net/Form1.vb
+++ b/code/examples/SOAP_examples/vb.net/Form1.vb
@@ -1,232 +1,232 @@
-Public Class Form1
-    Inherits System.Windows.Forms.Form
-
-    Private ws As MySoapRef.mhsoap
-
-#Region " Windows Form Designer generated code "
-
-    Public Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-        
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Friend WithEvents ComboBox1 As System.Windows.Forms.ComboBox
-    Friend WithEvents ListBox1 As System.Windows.Forms.ListBox
-    Friend WithEvents Label1 As System.Windows.Forms.Label
-    Friend WithEvents cmdConnect As System.Windows.Forms.Button
-    Friend WithEvents Label2 As System.Windows.Forms.Label
-    Friend WithEvents txtNewState As System.Windows.Forms.TextBox
-    Friend WithEvents cmdSetState As System.Windows.Forms.Button
-    Friend WithEvents txtURL As System.Windows.Forms.TextBox
-    Friend WithEvents lblState As System.Windows.Forms.Label
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Me.ComboBox1 = New System.Windows.Forms.ComboBox
-        Me.ListBox1 = New System.Windows.Forms.ListBox
-        Me.txtURL = New System.Windows.Forms.TextBox
-        Me.Label1 = New System.Windows.Forms.Label
-        Me.cmdConnect = New System.Windows.Forms.Button
-        Me.Label2 = New System.Windows.Forms.Label
-        Me.lblState = New System.Windows.Forms.Label
-        Me.txtNewState = New System.Windows.Forms.TextBox
-        Me.cmdSetState = New System.Windows.Forms.Button
-        Me.SuspendLayout()
-        '
-        'ComboBox1
-        '
-        Me.ComboBox1.Location = New System.Drawing.Point(8, 72)
-        Me.ComboBox1.Name = "ComboBox1"
-        Me.ComboBox1.Size = New System.Drawing.Size(272, 21)
-        Me.ComboBox1.TabIndex = 0
-        Me.ComboBox1.Text = "Press Connect to fill me"
-        '
-        'ListBox1
-        '
-        Me.ListBox1.Location = New System.Drawing.Point(8, 104)
-        Me.ListBox1.Name = "ListBox1"
-        Me.ListBox1.Size = New System.Drawing.Size(272, 199)
-        Me.ListBox1.TabIndex = 1
-        '
-        'txtURL
-        '
-        Me.txtURL.Location = New System.Drawing.Point(136, 24)
-        Me.txtURL.Name = "txtURL"
-        Me.txtURL.Size = New System.Drawing.Size(136, 20)
-        Me.txtURL.TabIndex = 2
-        Me.txtURL.Text = "http://misterhouse:8080"
-        '
-        'Label1
-        '
-        Me.Label1.Location = New System.Drawing.Point(16, 24)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(112, 16)
-        Me.Label1.TabIndex = 3
-        Me.Label1.Text = "Misterhouse URL"
-        '
-        'cmdConnect
-        '
-        Me.cmdConnect.Location = New System.Drawing.Point(336, 24)
-        Me.cmdConnect.Name = "cmdConnect"
-        Me.cmdConnect.Size = New System.Drawing.Size(104, 24)
-        Me.cmdConnect.TabIndex = 4
-        Me.cmdConnect.Text = "Connect"
-        '
-        'Label2
-        '
-        Me.Label2.Location = New System.Drawing.Point(296, 112)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(40, 16)
-        Me.Label2.TabIndex = 5
-        Me.Label2.Text = "State :"
-        '
-        'lblState
-        '
-        Me.lblState.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.lblState.Location = New System.Drawing.Point(360, 112)
-        Me.lblState.Name = "lblState"
-        Me.lblState.Size = New System.Drawing.Size(80, 16)
-        Me.lblState.TabIndex = 6
-        Me.lblState.Text = "Unknown"
-        '
-        'txtNewState
-        '
-        Me.txtNewState.Location = New System.Drawing.Point(360, 136)
-        Me.txtNewState.Name = "txtNewState"
-        Me.txtNewState.Size = New System.Drawing.Size(80, 20)
-        Me.txtNewState.TabIndex = 7
-        Me.txtNewState.Text = ""
-        '
-        'cmdSetState
-        '
-        Me.cmdSetState.Location = New System.Drawing.Point(296, 136)
-        Me.cmdSetState.Name = "cmdSetState"
-        Me.cmdSetState.Size = New System.Drawing.Size(48, 24)
-        Me.cmdSetState.TabIndex = 8
-        Me.cmdSetState.Text = "Set"
-        '
-        'Form1
-        '
-        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
-        Me.ClientSize = New System.Drawing.Size(472, 318)
-        Me.Controls.Add(Me.cmdSetState)
-        Me.Controls.Add(Me.txtNewState)
-        Me.Controls.Add(Me.lblState)
-        Me.Controls.Add(Me.Label2)
-        Me.Controls.Add(Me.cmdConnect)
-        Me.Controls.Add(Me.Label1)
-        Me.Controls.Add(Me.txtURL)
-        Me.Controls.Add(Me.ListBox1)
-        Me.Controls.Add(Me.ComboBox1)
-        Me.Name = "Form1"
-        Me.Text = "Misterhouse Test Client"
-        Me.ResumeLayout(False)
-
-    End Sub
-
-#End Region
-
-
-    Private Sub Form1_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles MyBase.Load
-        System.Net.ServicePointManager.Expect100Continue = False
-
-        ws = New MySoapRef.mhsoap
-        
-    End Sub
-
-    
-
-    Private Sub ComboBox1_SelectedValueChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles ComboBox1.SelectedValueChanged
-        Dim results As String()
-        Dim i As Integer
-
-        results = ws.ListObjectsByType(ComboBox1.Text)
-
-        With ListBox1
-            .BeginUpdate()
-            For i = .Items.Count - 1 To 0 Step -1
-                .Items.Remove(.Items(0))
-            Next i
-
-            For i = 0 To UBound(results)
-                .Items.Add(results(i))
-            Next i
-            .EndUpdate()
-        End With
-    End Sub
-
-    Private Sub cmdConnect_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles cmdConnect.Click
-        Dim i As Integer
-        Dim results As String()
-
-        ws.Url = txtURL.Text & "/bin/soapcgi.pl"
-
-        results = ws.ListObjectTypes()
-
-        With ComboBox1
-            .Text = "Choose Type"
-            For i = 0 To UBound(results)
-                .Items.Add(results(i))
-            Next
-        End With
-    End Sub
-
-    Private Sub ListBox1_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ListBox1.SelectedIndexChanged
-
-    End Sub
-
-    Private Sub ListBox1_SelectedValueChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles ListBox1.SelectedValueChanged
-        Dim stState As String
-
-        Dim stItem As String
-
-        stItem = ListBox1.SelectedItem
-
-        If Mid(stItem, 1, 1) = "$" Then
-            stItem = stItem.Remove(0, 1)
-        End If
-
-        stState = ws.GetItemState(stItem)
-
-        lblState.Text = stState
-
-    End Sub
-
-    Private Sub cmdSetState_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles cmdSetState.Click
-
-        Dim iReturn As Integer
-        Dim stItem As String
-        Dim stState As String
-
-        stItem = ListBox1.SelectedItem
-
-        If Mid(stItem, 1, 1) = "$" Then
-            stItem = stItem.Remove(0, 1)
-        End If
-
-        stState = txtNewState.Text
-        iReturn = ws.SetItemState(stItem, stState)
-
-        lblState.Text = txtNewState.Text
-
-    End Sub
-End Class
+Public Class Form1
+    Inherits System.Windows.Forms.Form
+
+    Private ws As MySoapRef.mhsoap
+
+#Region " Windows Form Designer generated code "
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+        
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Friend WithEvents ComboBox1 As System.Windows.Forms.ComboBox
+    Friend WithEvents ListBox1 As System.Windows.Forms.ListBox
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents cmdConnect As System.Windows.Forms.Button
+    Friend WithEvents Label2 As System.Windows.Forms.Label
+    Friend WithEvents txtNewState As System.Windows.Forms.TextBox
+    Friend WithEvents cmdSetState As System.Windows.Forms.Button
+    Friend WithEvents txtURL As System.Windows.Forms.TextBox
+    Friend WithEvents lblState As System.Windows.Forms.Label
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Me.ComboBox1 = New System.Windows.Forms.ComboBox
+        Me.ListBox1 = New System.Windows.Forms.ListBox
+        Me.txtURL = New System.Windows.Forms.TextBox
+        Me.Label1 = New System.Windows.Forms.Label
+        Me.cmdConnect = New System.Windows.Forms.Button
+        Me.Label2 = New System.Windows.Forms.Label
+        Me.lblState = New System.Windows.Forms.Label
+        Me.txtNewState = New System.Windows.Forms.TextBox
+        Me.cmdSetState = New System.Windows.Forms.Button
+        Me.SuspendLayout()
+        '
+        'ComboBox1
+        '
+        Me.ComboBox1.Location = New System.Drawing.Point(8, 72)
+        Me.ComboBox1.Name = "ComboBox1"
+        Me.ComboBox1.Size = New System.Drawing.Size(272, 21)
+        Me.ComboBox1.TabIndex = 0
+        Me.ComboBox1.Text = "Press Connect to fill me"
+        '
+        'ListBox1
+        '
+        Me.ListBox1.Location = New System.Drawing.Point(8, 104)
+        Me.ListBox1.Name = "ListBox1"
+        Me.ListBox1.Size = New System.Drawing.Size(272, 199)
+        Me.ListBox1.TabIndex = 1
+        '
+        'txtURL
+        '
+        Me.txtURL.Location = New System.Drawing.Point(136, 24)
+        Me.txtURL.Name = "txtURL"
+        Me.txtURL.Size = New System.Drawing.Size(136, 20)
+        Me.txtURL.TabIndex = 2
+        Me.txtURL.Text = "http://misterhouse:8080"
+        '
+        'Label1
+        '
+        Me.Label1.Location = New System.Drawing.Point(16, 24)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(112, 16)
+        Me.Label1.TabIndex = 3
+        Me.Label1.Text = "Misterhouse URL"
+        '
+        'cmdConnect
+        '
+        Me.cmdConnect.Location = New System.Drawing.Point(336, 24)
+        Me.cmdConnect.Name = "cmdConnect"
+        Me.cmdConnect.Size = New System.Drawing.Size(104, 24)
+        Me.cmdConnect.TabIndex = 4
+        Me.cmdConnect.Text = "Connect"
+        '
+        'Label2
+        '
+        Me.Label2.Location = New System.Drawing.Point(296, 112)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(40, 16)
+        Me.Label2.TabIndex = 5
+        Me.Label2.Text = "State :"
+        '
+        'lblState
+        '
+        Me.lblState.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        Me.lblState.Location = New System.Drawing.Point(360, 112)
+        Me.lblState.Name = "lblState"
+        Me.lblState.Size = New System.Drawing.Size(80, 16)
+        Me.lblState.TabIndex = 6
+        Me.lblState.Text = "Unknown"
+        '
+        'txtNewState
+        '
+        Me.txtNewState.Location = New System.Drawing.Point(360, 136)
+        Me.txtNewState.Name = "txtNewState"
+        Me.txtNewState.Size = New System.Drawing.Size(80, 20)
+        Me.txtNewState.TabIndex = 7
+        Me.txtNewState.Text = ""
+        '
+        'cmdSetState
+        '
+        Me.cmdSetState.Location = New System.Drawing.Point(296, 136)
+        Me.cmdSetState.Name = "cmdSetState"
+        Me.cmdSetState.Size = New System.Drawing.Size(48, 24)
+        Me.cmdSetState.TabIndex = 8
+        Me.cmdSetState.Text = "Set"
+        '
+        'Form1
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
+        Me.ClientSize = New System.Drawing.Size(472, 318)
+        Me.Controls.Add(Me.cmdSetState)
+        Me.Controls.Add(Me.txtNewState)
+        Me.Controls.Add(Me.lblState)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.cmdConnect)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.txtURL)
+        Me.Controls.Add(Me.ListBox1)
+        Me.Controls.Add(Me.ComboBox1)
+        Me.Name = "Form1"
+        Me.Text = "Misterhouse Test Client"
+        Me.ResumeLayout(False)
+
+    End Sub
+
+#End Region
+
+
+    Private Sub Form1_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles MyBase.Load
+        System.Net.ServicePointManager.Expect100Continue = False
+
+        ws = New MySoapRef.mhsoap
+        
+    End Sub
+
+    
+
+    Private Sub ComboBox1_SelectedValueChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles ComboBox1.SelectedValueChanged
+        Dim results As String()
+        Dim i As Integer
+
+        results = ws.ListObjectsByType(ComboBox1.Text)
+
+        With ListBox1
+            .BeginUpdate()
+            For i = .Items.Count - 1 To 0 Step -1
+                .Items.Remove(.Items(0))
+            Next i
+
+            For i = 0 To UBound(results)
+                .Items.Add(results(i))
+            Next i
+            .EndUpdate()
+        End With
+    End Sub
+
+    Private Sub cmdConnect_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles cmdConnect.Click
+        Dim i As Integer
+        Dim results As String()
+
+        ws.Url = txtURL.Text & "/bin/soapcgi.pl"
+
+        results = ws.ListObjectTypes()
+
+        With ComboBox1
+            .Text = "Choose Type"
+            For i = 0 To UBound(results)
+                .Items.Add(results(i))
+            Next
+        End With
+    End Sub
+
+    Private Sub ListBox1_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ListBox1.SelectedIndexChanged
+
+    End Sub
+
+    Private Sub ListBox1_SelectedValueChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles ListBox1.SelectedValueChanged
+        Dim stState As String
+
+        Dim stItem As String
+
+        stItem = ListBox1.SelectedItem
+
+        If Mid(stItem, 1, 1) = "$" Then
+            stItem = stItem.Remove(0, 1)
+        End If
+
+        stState = ws.GetItemState(stItem)
+
+        lblState.Text = stState
+
+    End Sub
+
+    Private Sub cmdSetState_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles cmdSetState.Click
+
+        Dim iReturn As Integer
+        Dim stItem As String
+        Dim stState As String
+
+        stItem = ListBox1.SelectedItem
+
+        If Mid(stItem, 1, 1) = "$" Then
+            stItem = stItem.Remove(0, 1)
+        End If
+
+        stState = txtNewState.Text
+        iReturn = ws.SetItemState(stItem, stState)
+
+        lblState.Text = txtNewState.Text
+
+    End Sub
+End Class
diff --git a/code/examples/SOAP_examples/vb.net/Web References/MySoapRef/Reference.map b/code/examples/SOAP_examples/vb.net/Web References/MySoapRef/Reference.map
index 6c75b6170..b5c7d41f6 100755
--- a/code/examples/SOAP_examples/vb.net/Web References/MySoapRef/Reference.map	
+++ b/code/examples/SOAP_examples/vb.net/Web References/MySoapRef/Reference.map	
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<DiscoveryClientResultsFile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="file:///C:/Projects/Misterhouse/trunk/web/my_mh/mhsoap.wsdl" filename="mhsoap.wsdl" />
-  </Results>
+<?xml version="1.0" encoding="utf-8"?>
+<DiscoveryClientResultsFile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Results>
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="file:///C:/Projects/Misterhouse/trunk/web/my_mh/mhsoap.wsdl" filename="mhsoap.wsdl" />
+  </Results>
 </DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/code/examples/SOAP_examples/vb.net/Web References/MySoapRef/Reference.vb b/code/examples/SOAP_examples/vb.net/Web References/MySoapRef/Reference.vb
index fc947a21b..ef4362036 100755
--- a/code/examples/SOAP_examples/vb.net/Web References/MySoapRef/Reference.vb	
+++ b/code/examples/SOAP_examples/vb.net/Web References/MySoapRef/Reference.vb	
@@ -1,113 +1,113 @@
-'------------------------------------------------------------------------------
-' <autogenerated>
-'     This code was generated by a tool.
-'     Runtime Version: 1.1.4322.2032
-'
-'     Changes to this file may cause incorrect behavior and will be lost if 
-'     the code is regenerated.
-' </autogenerated>
-'------------------------------------------------------------------------------
-
-Option Strict Off
-Option Explicit On
-
-Imports System
-Imports System.ComponentModel
-Imports System.Diagnostics
-Imports System.Web.Services
-Imports System.Web.Services.Protocols
-Imports System.Xml.Serialization
-
-'
-'This source code was auto-generated by Microsoft.VSDesigner, Version 1.1.4322.2032.
-'
-Namespace MySoapRef
-    
-    '<remarks/>
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.ComponentModel.DesignerCategoryAttribute("code"),  _
-     System.Web.Services.WebServiceBindingAttribute(Name:="mhsoapServiceSoap", [Namespace]:="urn:mhsoap")>  _
-    Public Class mhsoap
-        Inherits System.Web.Services.Protocols.SoapHttpClientProtocol
-        
-        '<remarks/>
-        Public Sub New()
-            MyBase.New
-            Me.Url = "http://misterhouse:8080/bin/soapcgi.pl"
-        End Sub
-        
-        '<remarks/>
-        <System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:mhsoap/ListObjectTypes", RequestNamespace:="urn:mhsoap", ResponseNamespace:="urn:mhsoap")>  _
-        Public Function ListObjectTypes() As <System.Xml.Serialization.SoapElementAttribute("return")> String()
-            Dim results() As Object = Me.Invoke("ListObjectTypes", New Object(-1) {})
-            Return CType(results(0),String())
-        End Function
-        
-        '<remarks/>
-        Public Function BeginListObjectTypes(ByVal callback As System.AsyncCallback, ByVal asyncState As Object) As System.IAsyncResult
-            Return Me.BeginInvoke("ListObjectTypes", New Object(-1) {}, callback, asyncState)
-        End Function
-        
-        '<remarks/>
-        Public Function EndListObjectTypes(ByVal asyncResult As System.IAsyncResult) As String()
-            Dim results() As Object = Me.EndInvoke(asyncResult)
-            Return CType(results(0),String())
-        End Function
-        
-        '<remarks/>
-        <System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:mhsoap/ListObjectsByType", RequestNamespace:="urn:mhsoap", ResponseNamespace:="urn:mhsoap")>  _
-        Public Function ListObjectsByType(ByVal object_type As String) As <System.Xml.Serialization.SoapElementAttribute("return")> String()
-            Dim results() As Object = Me.Invoke("ListObjectsByType", New Object() {object_type})
-            Return CType(results(0),String())
-        End Function
-        
-        '<remarks/>
-        Public Function BeginListObjectsByType(ByVal object_type As String, ByVal callback As System.AsyncCallback, ByVal asyncState As Object) As System.IAsyncResult
-            Return Me.BeginInvoke("ListObjectsByType", New Object() {object_type}, callback, asyncState)
-        End Function
-        
-        '<remarks/>
-        Public Function EndListObjectsByType(ByVal asyncResult As System.IAsyncResult) As String()
-            Dim results() As Object = Me.EndInvoke(asyncResult)
-            Return CType(results(0),String())
-        End Function
-        
-        '<remarks/>
-        <System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:mhsoap/SetItemState", RequestNamespace:="urn:mhsoap", ResponseNamespace:="urn:mhsoap")>  _
-        Public Function SetItemState(ByVal ItemToSet As String, ByRef State As String) As <System.Xml.Serialization.SoapElementAttribute("return")> Integer
-            Dim results() As Object = Me.Invoke("SetItemState", New Object() {ItemToSet, State})
-            State = CType(results(1),String)
-            Return CType(results(0),Integer)
-        End Function
-        
-        '<remarks/>
-        Public Function BeginSetItemState(ByVal ItemToSet As String, ByVal State As String, ByVal callback As System.AsyncCallback, ByVal asyncState As Object) As System.IAsyncResult
-            Return Me.BeginInvoke("SetItemState", New Object() {ItemToSet, State}, callback, asyncState)
-        End Function
-        
-        '<remarks/>
-        Public Function EndSetItemState(ByVal asyncResult As System.IAsyncResult, ByRef State As String) As Integer
-            Dim results() As Object = Me.EndInvoke(asyncResult)
-            State = CType(results(1),String)
-            Return CType(results(0),Integer)
-        End Function
-        
-        '<remarks/>
-        <System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:mhsoap/GetItemState", RequestNamespace:="urn:mhsoap", ResponseNamespace:="urn:mhsoap")>  _
-        Public Function GetItemState(ByVal ItemToGet As String) As <System.Xml.Serialization.SoapElementAttribute("return")> String
-            Dim results() As Object = Me.Invoke("GetItemState", New Object() {ItemToGet})
-            Return CType(results(0),String)
-        End Function
-        
-        '<remarks/>
-        Public Function BeginGetItemState(ByVal ItemToGet As String, ByVal callback As System.AsyncCallback, ByVal asyncState As Object) As System.IAsyncResult
-            Return Me.BeginInvoke("GetItemState", New Object() {ItemToGet}, callback, asyncState)
-        End Function
-        
-        '<remarks/>
-        Public Function EndGetItemState(ByVal asyncResult As System.IAsyncResult) As String
-            Dim results() As Object = Me.EndInvoke(asyncResult)
-            Return CType(results(0),String)
-        End Function
-    End Class
-End Namespace
+'------------------------------------------------------------------------------
+' <autogenerated>
+'     This code was generated by a tool.
+'     Runtime Version: 1.1.4322.2032
+'
+'     Changes to this file may cause incorrect behavior and will be lost if 
+'     the code is regenerated.
+' </autogenerated>
+'------------------------------------------------------------------------------
+
+Option Strict Off
+Option Explicit On
+
+Imports System
+Imports System.ComponentModel
+Imports System.Diagnostics
+Imports System.Web.Services
+Imports System.Web.Services.Protocols
+Imports System.Xml.Serialization
+
+'
+'This source code was auto-generated by Microsoft.VSDesigner, Version 1.1.4322.2032.
+'
+Namespace MySoapRef
+    
+    '<remarks/>
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.ComponentModel.DesignerCategoryAttribute("code"),  _
+     System.Web.Services.WebServiceBindingAttribute(Name:="mhsoapServiceSoap", [Namespace]:="urn:mhsoap")>  _
+    Public Class mhsoap
+        Inherits System.Web.Services.Protocols.SoapHttpClientProtocol
+        
+        '<remarks/>
+        Public Sub New()
+            MyBase.New
+            Me.Url = "http://misterhouse:8080/bin/soapcgi.pl"
+        End Sub
+        
+        '<remarks/>
+        <System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:mhsoap/ListObjectTypes", RequestNamespace:="urn:mhsoap", ResponseNamespace:="urn:mhsoap")>  _
+        Public Function ListObjectTypes() As <System.Xml.Serialization.SoapElementAttribute("return")> String()
+            Dim results() As Object = Me.Invoke("ListObjectTypes", New Object(-1) {})
+            Return CType(results(0),String())
+        End Function
+        
+        '<remarks/>
+        Public Function BeginListObjectTypes(ByVal callback As System.AsyncCallback, ByVal asyncState As Object) As System.IAsyncResult
+            Return Me.BeginInvoke("ListObjectTypes", New Object(-1) {}, callback, asyncState)
+        End Function
+        
+        '<remarks/>
+        Public Function EndListObjectTypes(ByVal asyncResult As System.IAsyncResult) As String()
+            Dim results() As Object = Me.EndInvoke(asyncResult)
+            Return CType(results(0),String())
+        End Function
+        
+        '<remarks/>
+        <System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:mhsoap/ListObjectsByType", RequestNamespace:="urn:mhsoap", ResponseNamespace:="urn:mhsoap")>  _
+        Public Function ListObjectsByType(ByVal object_type As String) As <System.Xml.Serialization.SoapElementAttribute("return")> String()
+            Dim results() As Object = Me.Invoke("ListObjectsByType", New Object() {object_type})
+            Return CType(results(0),String())
+        End Function
+        
+        '<remarks/>
+        Public Function BeginListObjectsByType(ByVal object_type As String, ByVal callback As System.AsyncCallback, ByVal asyncState As Object) As System.IAsyncResult
+            Return Me.BeginInvoke("ListObjectsByType", New Object() {object_type}, callback, asyncState)
+        End Function
+        
+        '<remarks/>
+        Public Function EndListObjectsByType(ByVal asyncResult As System.IAsyncResult) As String()
+            Dim results() As Object = Me.EndInvoke(asyncResult)
+            Return CType(results(0),String())
+        End Function
+        
+        '<remarks/>
+        <System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:mhsoap/SetItemState", RequestNamespace:="urn:mhsoap", ResponseNamespace:="urn:mhsoap")>  _
+        Public Function SetItemState(ByVal ItemToSet As String, ByRef State As String) As <System.Xml.Serialization.SoapElementAttribute("return")> Integer
+            Dim results() As Object = Me.Invoke("SetItemState", New Object() {ItemToSet, State})
+            State = CType(results(1),String)
+            Return CType(results(0),Integer)
+        End Function
+        
+        '<remarks/>
+        Public Function BeginSetItemState(ByVal ItemToSet As String, ByVal State As String, ByVal callback As System.AsyncCallback, ByVal asyncState As Object) As System.IAsyncResult
+            Return Me.BeginInvoke("SetItemState", New Object() {ItemToSet, State}, callback, asyncState)
+        End Function
+        
+        '<remarks/>
+        Public Function EndSetItemState(ByVal asyncResult As System.IAsyncResult, ByRef State As String) As Integer
+            Dim results() As Object = Me.EndInvoke(asyncResult)
+            State = CType(results(1),String)
+            Return CType(results(0),Integer)
+        End Function
+        
+        '<remarks/>
+        <System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:mhsoap/GetItemState", RequestNamespace:="urn:mhsoap", ResponseNamespace:="urn:mhsoap")>  _
+        Public Function GetItemState(ByVal ItemToGet As String) As <System.Xml.Serialization.SoapElementAttribute("return")> String
+            Dim results() As Object = Me.Invoke("GetItemState", New Object() {ItemToGet})
+            Return CType(results(0),String)
+        End Function
+        
+        '<remarks/>
+        Public Function BeginGetItemState(ByVal ItemToGet As String, ByVal callback As System.AsyncCallback, ByVal asyncState As Object) As System.IAsyncResult
+            Return Me.BeginInvoke("GetItemState", New Object() {ItemToGet}, callback, asyncState)
+        End Function
+        
+        '<remarks/>
+        Public Function EndGetItemState(ByVal asyncResult As System.IAsyncResult) As String
+            Dim results() As Object = Me.EndInvoke(asyncResult)
+            Return CType(results(0),String)
+        End Function
+    End Class
+End Namespace
diff --git a/code/examples/SOAP_examples/vb.net/Web References/MySoapRef/mhsoap.wsdl b/code/examples/SOAP_examples/vb.net/Web References/MySoapRef/mhsoap.wsdl
index a22f1af8b..173074943 100755
--- a/code/examples/SOAP_examples/vb.net/Web References/MySoapRef/mhsoap.wsdl	
+++ b/code/examples/SOAP_examples/vb.net/Web References/MySoapRef/mhsoap.wsdl	
@@ -1,100 +1,100 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:s0="urn:mhsoap/schema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="urn:mhsoap" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="urn:mhsoap" name="mhsoap" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <s:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:mhsoap/schema">
-      <s:complexType name="ArrayOfString">
-        <s:complexContent mixed="false">
-          <s:restriction base="soapenc:Array">
-            <s:attribute wsdl:arrayType="s:string[]" ref="soapenc:arrayType" />
-          </s:restriction>
-        </s:complexContent>
-      </s:complexType>
-    </s:schema>
-  </wsdl:types>
-  <wsdl:message name="ListObjectTypesRequest" />
-  <wsdl:message name="ListObjectTypesResponse">
-    <wsdl:part name="return" type="s0:ArrayOfString" />
-  </wsdl:message>
-  <wsdl:message name="ListObjectsByTypeRequest">
-    <wsdl:part name="object_type" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="ListObjectsByTypeResponse">
-    <wsdl:part name="return" type="s0:ArrayOfString" />
-  </wsdl:message>
-  <wsdl:message name="SetItemStateRequest">
-    <wsdl:part name="ItemToSet" type="s:string" />
-    <wsdl:part name="State" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="SetItemStateResponse">
-    <wsdl:part name="return" type="s:int" />
-    <wsdl:part name="State" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="GetItemStateRequest">
-    <wsdl:part name="ItemToGet" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="GetItemStateResponse">
-    <wsdl:part name="return" type="s:string" />
-  </wsdl:message>
-  <wsdl:portType name="mhsoapServiceSoap">
-    <wsdl:operation name="ListObjectTypes">
-      <wsdl:input message="tns:ListObjectTypesRequest" />
-      <wsdl:output message="tns:ListObjectTypesResponse" />
-    </wsdl:operation>
-    <wsdl:operation name="ListObjectsByType">
-      <wsdl:input message="tns:ListObjectsByTypeRequest" />
-      <wsdl:output message="tns:ListObjectsByTypeResponse" />
-    </wsdl:operation>
-    <wsdl:operation name="SetItemState">
-      <wsdl:input message="tns:SetItemStateRequest" />
-      <wsdl:output message="tns:SetItemStateResponse" />
-    </wsdl:operation>
-    <wsdl:operation name="GetItemState">
-      <wsdl:input message="tns:GetItemStateRequest" />
-      <wsdl:output message="tns:GetItemStateResponse" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="mhsoapServiceSoap" type="tns:mhsoapServiceSoap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
-    <wsdl:operation name="ListObjectTypes">
-      <soap:operation soapAction="urn:mhsoap/ListObjectTypes" />
-      <wsdl:input>
-        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="ListObjectsByType">
-      <soap:operation soapAction="urn:mhsoap/ListObjectsByType" />
-      <wsdl:input>
-        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SetItemState">
-      <soap:operation soapAction="urn:mhsoap/SetItemState" />
-      <wsdl:input>
-        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetItemState">
-      <soap:operation soapAction="urn:mhsoap/GetItemState" />
-      <wsdl:input>
-        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="mhsoap">
-    <wsdl:port name="mhsoapService" binding="tns:mhsoapServiceSoap">
-      <soap:address location="http://misterhouse:8080/bin/soapcgi.pl" />
-    </wsdl:port>
-  </wsdl:service>
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:s0="urn:mhsoap/schema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="urn:mhsoap" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="urn:mhsoap" name="mhsoap" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <s:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:mhsoap/schema">
+      <s:complexType name="ArrayOfString">
+        <s:complexContent mixed="false">
+          <s:restriction base="soapenc:Array">
+            <s:attribute wsdl:arrayType="s:string[]" ref="soapenc:arrayType" />
+          </s:restriction>
+        </s:complexContent>
+      </s:complexType>
+    </s:schema>
+  </wsdl:types>
+  <wsdl:message name="ListObjectTypesRequest" />
+  <wsdl:message name="ListObjectTypesResponse">
+    <wsdl:part name="return" type="s0:ArrayOfString" />
+  </wsdl:message>
+  <wsdl:message name="ListObjectsByTypeRequest">
+    <wsdl:part name="object_type" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="ListObjectsByTypeResponse">
+    <wsdl:part name="return" type="s0:ArrayOfString" />
+  </wsdl:message>
+  <wsdl:message name="SetItemStateRequest">
+    <wsdl:part name="ItemToSet" type="s:string" />
+    <wsdl:part name="State" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="SetItemStateResponse">
+    <wsdl:part name="return" type="s:int" />
+    <wsdl:part name="State" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="GetItemStateRequest">
+    <wsdl:part name="ItemToGet" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="GetItemStateResponse">
+    <wsdl:part name="return" type="s:string" />
+  </wsdl:message>
+  <wsdl:portType name="mhsoapServiceSoap">
+    <wsdl:operation name="ListObjectTypes">
+      <wsdl:input message="tns:ListObjectTypesRequest" />
+      <wsdl:output message="tns:ListObjectTypesResponse" />
+    </wsdl:operation>
+    <wsdl:operation name="ListObjectsByType">
+      <wsdl:input message="tns:ListObjectsByTypeRequest" />
+      <wsdl:output message="tns:ListObjectsByTypeResponse" />
+    </wsdl:operation>
+    <wsdl:operation name="SetItemState">
+      <wsdl:input message="tns:SetItemStateRequest" />
+      <wsdl:output message="tns:SetItemStateResponse" />
+    </wsdl:operation>
+    <wsdl:operation name="GetItemState">
+      <wsdl:input message="tns:GetItemStateRequest" />
+      <wsdl:output message="tns:GetItemStateResponse" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="mhsoapServiceSoap" type="tns:mhsoapServiceSoap">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
+    <wsdl:operation name="ListObjectTypes">
+      <soap:operation soapAction="urn:mhsoap/ListObjectTypes" />
+      <wsdl:input>
+        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="ListObjectsByType">
+      <soap:operation soapAction="urn:mhsoap/ListObjectsByType" />
+      <wsdl:input>
+        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SetItemState">
+      <soap:operation soapAction="urn:mhsoap/SetItemState" />
+      <wsdl:input>
+        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="GetItemState">
+      <soap:operation soapAction="urn:mhsoap/GetItemState" />
+      <wsdl:input>
+        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="encoded" namespace="urn:mhsoap" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="mhsoap">
+    <wsdl:port name="mhsoapService" binding="tns:mhsoapServiceSoap">
+      <soap:address location="http://misterhouse:8080/bin/soapcgi.pl" />
+    </wsdl:port>
+  </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/code/examples/SOAP_examples/vb.net/WebServiceTest.vbproj b/code/examples/SOAP_examples/vb.net/WebServiceTest.vbproj
index 1cdf2bfae..4e0be1650 100755
--- a/code/examples/SOAP_examples/vb.net/WebServiceTest.vbproj
+++ b/code/examples/SOAP_examples/vb.net/WebServiceTest.vbproj
@@ -1,144 +1,144 @@
-<VisualStudioProject>
-    <VisualBasic
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{4DAFD70C-488F-4F56-AF6F-845773BF86CB}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "WebServiceTest"
-                AssemblyOriginatorKeyFile = ""
-                AssemblyOriginatorKeyMode = "None"
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "WinExe"
-                OptionCompare = "Binary"
-                OptionExplicit = "On"
-                OptionStrict = "Off"
-                RootNamespace = "WebServiceTest"
-                StartupObject = "WebServiceTest.Form1"
-            >
-                <Config
-                    Name = "Debug"
-                    BaseAddress = "285212672"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = ""
-                    DefineDebug = "true"
-                    DefineTrace = "true"
-                    DebugSymbols = "true"
-                    IncrementalBuild = "true"
-                    Optimize = "false"
-                    OutputPath = "bin\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "1"
-                />
-                <Config
-                    Name = "Release"
-                    BaseAddress = "285212672"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = ""
-                    DefineDebug = "false"
-                    DefineTrace = "true"
-                    DebugSymbols = "false"
-                    IncrementalBuild = "false"
-                    Optimize = "true"
-                    OutputPath = "bin\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "1"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                />
-                <Reference
-                    Name = "System.Drawing"
-                    AssemblyName = "System.Drawing"
-                />
-                <Reference
-                    Name = "System.Windows.Forms"
-                    AssemblyName = "System.Windows.Forms"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                />
-                <Reference
-                    Name = "System.Web.Services"
-                    AssemblyName = "System.Web.Services"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.Services.dll"
-                />
-            </References>
-            <Imports>
-                <Import Namespace = "Microsoft.VisualBasic" />
-                <Import Namespace = "System" />
-                <Import Namespace = "System.Collections" />
-                <Import Namespace = "System.Data" />
-                <Import Namespace = "System.Drawing" />
-                <Import Namespace = "System.Diagnostics" />
-                <Import Namespace = "System.Windows.Forms" />
-            </Imports>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "AssemblyInfo.vb"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Form1.vb"
-                    SubType = "Form"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Form1.resx"
-                    DependentUpon = "Form1.vb"
-                    BuildAction = "EmbeddedResource"
-                />
-                <File
-                    RelPath = "Web References\MySoapRef\mhsoap.wsdl"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "Web References\MySoapRef\Reference.map"
-                    BuildAction = "None"
-                    Generator = "MSDiscoCodeGenerator"
-                    LastGenOutput = "Reference.vb"
-                />
-                <File
-                    RelPath = "Web References\MySoapRef\Reference.vb"
-                    DependentUpon = "Reference.map"
-                    SubType = "code"
-                    BuildAction = "Compile"
-                    DesignTime = "True"
-                    AutoGen = "True"
-                />
-                <Folder
-                    RelPath = "Web References\MySoapRef\"
-                    WebReferenceUrl = "C:\Projects\Misterhouse\trunk\web\my_mh\mhsoap.wsdl"
-                    UrlBehavior = "Static"
-                />
-                <Folder
-                    RelPath = "Web References\"
-                    WebReferences = "TRUE"
-                />
-            </Include>
-        </Files>
-    </VisualBasic>
-</VisualStudioProject>
-
+<VisualStudioProject>
+    <VisualBasic
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{4DAFD70C-488F-4F56-AF6F-845773BF86CB}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "WebServiceTest"
+                AssemblyOriginatorKeyFile = ""
+                AssemblyOriginatorKeyMode = "None"
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "WinExe"
+                OptionCompare = "Binary"
+                OptionExplicit = "On"
+                OptionStrict = "Off"
+                RootNamespace = "WebServiceTest"
+                StartupObject = "WebServiceTest.Form1"
+            >
+                <Config
+                    Name = "Debug"
+                    BaseAddress = "285212672"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = ""
+                    DefineDebug = "true"
+                    DefineTrace = "true"
+                    DebugSymbols = "true"
+                    IncrementalBuild = "true"
+                    Optimize = "false"
+                    OutputPath = "bin\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "1"
+                />
+                <Config
+                    Name = "Release"
+                    BaseAddress = "285212672"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = ""
+                    DefineDebug = "false"
+                    DefineTrace = "true"
+                    DebugSymbols = "false"
+                    IncrementalBuild = "false"
+                    Optimize = "true"
+                    OutputPath = "bin\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "1"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                />
+                <Reference
+                    Name = "System.Windows.Forms"
+                    AssemblyName = "System.Windows.Forms"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                />
+                <Reference
+                    Name = "System.Web.Services"
+                    AssemblyName = "System.Web.Services"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.Services.dll"
+                />
+            </References>
+            <Imports>
+                <Import Namespace = "Microsoft.VisualBasic" />
+                <Import Namespace = "System" />
+                <Import Namespace = "System.Collections" />
+                <Import Namespace = "System.Data" />
+                <Import Namespace = "System.Drawing" />
+                <Import Namespace = "System.Diagnostics" />
+                <Import Namespace = "System.Windows.Forms" />
+            </Imports>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.vb"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Form1.vb"
+                    SubType = "Form"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Form1.resx"
+                    DependentUpon = "Form1.vb"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web References\MySoapRef\mhsoap.wsdl"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Web References\MySoapRef\Reference.map"
+                    BuildAction = "None"
+                    Generator = "MSDiscoCodeGenerator"
+                    LastGenOutput = "Reference.vb"
+                />
+                <File
+                    RelPath = "Web References\MySoapRef\Reference.vb"
+                    DependentUpon = "Reference.map"
+                    SubType = "code"
+                    BuildAction = "Compile"
+                    DesignTime = "True"
+                    AutoGen = "True"
+                />
+                <Folder
+                    RelPath = "Web References\MySoapRef\"
+                    WebReferenceUrl = "C:\Projects\Misterhouse\trunk\web\my_mh\mhsoap.wsdl"
+                    UrlBehavior = "Static"
+                />
+                <Folder
+                    RelPath = "Web References\"
+                    WebReferences = "TRUE"
+                />
+            </Include>
+        </Files>
+    </VisualBasic>
+</VisualStudioProject>
+
diff --git a/code/examples/SOAP_examples/vb.net/WebServiceTest.vbproj.user b/code/examples/SOAP_examples/vb.net/WebServiceTest.vbproj.user
index cebfc896c..c0fd212a9 100755
--- a/code/examples/SOAP_examples/vb.net/WebServiceTest.vbproj.user
+++ b/code/examples/SOAP_examples/vb.net/WebServiceTest.vbproj.user
@@ -1,48 +1,48 @@
-<VisualStudioProject>
-    <VisualBasic LastOpenVersion = "7.10.3077" >
-        <Build>
-            <Settings ReferencePath = "" >
-                <Config
-                    Name = "Debug"
-                    EnableASPDebugging = "false"
-                    EnableASPXDebugging = "false"
-                    EnableUnmanagedDebugging = "false"
-                    EnableSQLServerDebugging = "false"
-                    RemoteDebugEnabled = "false"
-                    RemoteDebugMachine = ""
-                    StartAction = "Project"
-                    StartArguments = ""
-                    StartPage = ""
-                    StartProgram = ""
-                    StartURL = ""
-                    StartWorkingDirectory = ""
-                    StartWithIE = "false"
-                />
-                <Config
-                    Name = "Release"
-                    EnableASPDebugging = "false"
-                    EnableASPXDebugging = "false"
-                    EnableUnmanagedDebugging = "false"
-                    EnableSQLServerDebugging = "false"
-                    RemoteDebugEnabled = "false"
-                    RemoteDebugMachine = ""
-                    StartAction = "Project"
-                    StartArguments = ""
-                    StartPage = ""
-                    StartProgram = ""
-                    StartURL = ""
-                    StartWorkingDirectory = ""
-                    StartWithIE = "false"
-                />
-            </Settings>
-        </Build>
-        <OtherProjectSettings
-            CopyProjectDestinationFolder = ""
-            CopyProjectUncPath = ""
-            CopyProjectOption = "0"
-            ProjectView = "ProjectFiles"
-            ProjectTrust = "0"
-        />
-    </VisualBasic>
-</VisualStudioProject>
-
+<VisualStudioProject>
+    <VisualBasic LastOpenVersion = "7.10.3077" >
+        <Build>
+            <Settings ReferencePath = "" >
+                <Config
+                    Name = "Debug"
+                    EnableASPDebugging = "false"
+                    EnableASPXDebugging = "false"
+                    EnableUnmanagedDebugging = "false"
+                    EnableSQLServerDebugging = "false"
+                    RemoteDebugEnabled = "false"
+                    RemoteDebugMachine = ""
+                    StartAction = "Project"
+                    StartArguments = ""
+                    StartPage = ""
+                    StartProgram = ""
+                    StartURL = ""
+                    StartWorkingDirectory = ""
+                    StartWithIE = "false"
+                />
+                <Config
+                    Name = "Release"
+                    EnableASPDebugging = "false"
+                    EnableASPXDebugging = "false"
+                    EnableUnmanagedDebugging = "false"
+                    EnableSQLServerDebugging = "false"
+                    RemoteDebugEnabled = "false"
+                    RemoteDebugMachine = ""
+                    StartAction = "Project"
+                    StartArguments = ""
+                    StartPage = ""
+                    StartProgram = ""
+                    StartURL = ""
+                    StartWorkingDirectory = ""
+                    StartWithIE = "false"
+                />
+            </Settings>
+        </Build>
+        <OtherProjectSettings
+            CopyProjectDestinationFolder = ""
+            CopyProjectUncPath = ""
+            CopyProjectOption = "0"
+            ProjectView = "ProjectFiles"
+            ProjectTrust = "0"
+        />
+    </VisualBasic>
+</VisualStudioProject>
+
diff --git a/code/examples/iButton_weather_station.pl b/code/examples/iButton_weather_station.pl
index c092f9967..e3a71bf30 100755
--- a/code/examples/iButton_weather_station.pl
+++ b/code/examples/iButton_weather_station.pl
@@ -1,231 +1,231 @@
-# Category=Weather
-#
-# Interface to DS2450 based 1-Wire weather stations.
-# Max Lock 12/08.
-
-use iButton;
-use Weather_Common;
-
-$ib_wind_dir = new iButton '2000000000F521';
-$ib_wind_speed = new iButton '1D0000000151A3';
-$ib_temp_outside = new iButton '100008000948F7';
-
-use vars '%weather';
-my $delta_i;
-my %delta;
-my %iButton_data_avg_data;
-my $wind_time2;
-my $last_wind_count;
-my @wind_speed;
-my @wind_cos;
-my @wind_sin;
-
-&read_iButton_temp($ib_temp_outside) if $New_Second and ($Second == 45 or $Second == 15);
-&iButton_wind_read if ($New_Second and !($Second % 15));
-
-&setup_ds2450($ib_wind_dir) if $Startup;
-
-#if (time_cron('* * * * *') || $Startup) {
-if (time_cron('* * * * *')) {
-  #
-  # Define the source variables
-  $Weather{DewOutdoor}; # used in status line
-  $Weather{TempOutdoor} = state $ib_temp_outside; # used in status line
-  $Weather{WindDir} = state $ib_wind_dir;
-  $Weather{WindSpeed} = state $ib_wind_speed;
-  #
-  # Define the derived variables
-  $Weather{WindGustDir} = $Weather{WindDir}; # Whats the relation between Dir and GustDir?
-  $Weather{WindAvgDir} = &average_wind_dir($Weather{WindDir});
-  $Weather{WindGustSpeed} = $Weather{WindSpeed} if $Weather{WindSpeed} > $Weather{WindGustSpeed};
-  $Weather{WindAvgSpeed} = &average_wind_speed($Weather{WindSpeed});
-  $Weather{WindChill} = &windchill($Weather{TempOutdoor}, $Weather{WindAvgSpeed});
-  #
-  # Log variables
-  $Weather{SummaryWind} = sprintf("cur/avg %s(%3.1f)/%s(%3.1f) %3.1f%s/%3.1f%s",(&convert_wind_dir_to_abbr($Weather{WindDir})),$Weather{WindDir},(&convert_wind_dir_to_abbr($Weather{WindAvgDir})),$Weather{WindAvgDir},$Weather{WindSpeed},$main::config_parms{weather_uom_wind},$Weather{WindAvgSpeed},$main::config_parms{weather_uom_wind});
-  $Weather{SummaryTemp} = sprintf("%3.1f%s",$Weather{TempOutdoor},$main::config_parms{weather_uom_temp});
-  #
-  print_log "Wind $Weather{SummaryWind}, Temperature $Weather{SummaryTemp}";
-  &Weather_Common::weather_updated;
-}
-
-### Only subroutines below this point ###
-
-sub deg_to_rad { ($_[0]/180) * (4 * atan2(1,1)) } # convert degrees to radians
-
-sub rad_to_deg { ($_[0] / (4 * atan2(1,1))) * 180 } # convert radians to degrees
-
-sub average_wind_dir {
-  my $readings = 10;
-  my $sum_wind_sin;
-  my $sum_wind_cos;
-  push (@wind_sin, sin(&deg_to_rad($_[0])));
-  push (@wind_cos, cos(&deg_to_rad($_[0])));
-  if ((scalar(@wind_cos)) == ($readings + 1)){shift @wind_cos};
-  if ((scalar(@wind_sin)) == ($readings + 1)){shift @wind_sin};
-  foreach (@wind_sin) {$sum_wind_sin += $_};
-  foreach (@wind_cos) {$sum_wind_cos += $_};
-  my $avg_wind_dir = &rad_to_deg(atan2($sum_wind_sin,$sum_wind_cos));
-  if($avg_wind_dir < 0){$avg_wind_dir += 359; };
-  $avg_wind_dir = sprintf("%.0f",$avg_wind_dir);
-  return $avg_wind_dir;
-}
-
-sub average_wind_speed {
-  my $readings = 10;
-  my $avg_wind_speed;
-  push (@wind_speed, $_[0]);
-  if ((scalar(@wind_speed)) == ($readings + 1)){shift @wind_speed};
-  foreach (@wind_speed) {$avg_wind_speed += $_};
-  $avg_wind_speed = $avg_wind_speed / scalar(@wind_speed);
-  return $avg_wind_speed;
-}
-
-sub convert_wind_dir_to_abbr {
-  my ($dir)=@_;
-  return 'unknown' if $dir !~ /^[\d \.]+$/;
-  if ($dir >= 0 and $dir <= 360) {
-    return qw{North NNE NE ENE East ESE SE SSE South SSW SW WSW West WNW NW NNW North}[(($dir+11.25)/22.5)%16];
-  }
-  return 'unknown';
-}
-
-sub windchill {
-  my $temp = shift;
-  my $wind = shift;
-  my $chill;
-
-  if (($wind<5) || ($wind>100) || ($temp<-50) || ($temp>5)) {
-    $chill = '';
-  }
-  else {
-    $chill=(13.12 + 0.6215*$temp - 11.37*($wind**0.16) + 0.3965*$temp*($wind**0.16));
-    $chill=int($chill+0.5);
-    print "temp $temp wind $wind chill $chill\n";
-  }
-  return $chill;
-}
-
-sub iButton_wind_read {
-  #
-  #wind speed (mph)
-  #
-  my $wind_time1 = &get_tickcount;
-  my $count = $ib_wind_speed->Hardware::iButton::Device::DS2423::read_counter();
-  #
-  if ($wind_time2) {
-    my $revolution_sec = (($count - $last_wind_count) * 1000) / ($wind_time1 - $wind_time2) / 2.0;
-    set $ib_wind_speed sprintf("%3.2f",$revolution_sec * 2.453); 
-  } 
-  #
-  $last_wind_count = $count;
-  $wind_time2 = $wind_time1;
-  $Save{WindGustMax} = 0 if $New_Day;
-  #
-  # wind direction (c)
-  #
-  my %position_lookup=();
-  $position_lookup{'HHLH'}=1;
-  $position_lookup{'HMMH'}=2;
-  $position_lookup{'HLHH'}=3;
-  $position_lookup{'MMHH'}=4;
-  $position_lookup{'LHHH'}=5;
-  $position_lookup{'LHHZ'}=6;
-  $position_lookup{'HHHZ'}=7;
-  $position_lookup{'HHZZ'}=8;
-  $position_lookup{'HHZH'}=9;
-  $position_lookup{'HZZH'}=10;
-  $position_lookup{'HZHH'}=11;
-  $position_lookup{'ZZHH'}=12;
-  $position_lookup{'ZHHH'}=13;
-  $position_lookup{'ZHHL'}=14;
-  $position_lookup{'HHHL'}=15;
-  $position_lookup{'HHMM'}=16;
-  #
-  my $wind_adc_states = &read_ds2450($ib_wind_dir);
-  my $wind_position = $position_lookup{$wind_adc_states};
-  $Weather{WindDir} = sprintf("%3.1f",($wind_position  * 22.5));
-  set $ib_wind_dir $Weather{WindDir};
-}
-
-sub read_iButton_temp {
-  my @ib_list = @_;
-    for my $ib (@ib_list) {
-    my $temp = $ib->read_temperature_hires();
-    next if $temp < -20 or $temp > 120;
-    my $temp_c = sprintf("%3.2f", $temp);
-    my $temp_f = sprintf("%3.2f", $temp*9/5 +32);
-    my $serial = $ib->serial();
-    
-    # Average the last 5 entries
-    if (defined @{$iButton_data_avg_data{$serial}}) {
-      unshift(@{$iButton_data_avg_data{$serial}}, $temp_c);
-      pop(@{$iButton_data_avg_data{$serial}});
-    }
-    else {
-      @{$iButton_data_avg_data{$serial}} = ($temp_c) x 5;
-    }
-
-    my $iButton_data_avg = 0;
-    grep($iButton_data_avg += $_, @{$iButton_data_avg_data{$serial}});
-    $iButton_data_avg /= 5;
-    $ib->{state} = sprintf("%3.1f", $iButton_data_avg);
-  }
-}
-
-sub read_ds2450 {
-  # Read ds2450 adc's and return a 4 character string representing their states
-  # H=high,M=medium,L=low,Z=zero
-  #
-  $ib_wind_dir->Hardware::iButton::Device::DS2450::convert('all');
-  my ($A,$B,$C,$D) = $ib_wind_dir->Hardware::iButton::Device::DS2450::readAD('all');
-  my $channel_A_state = &volts_to_state($A);
-  my $channel_B_state = &volts_to_state($B);
-  my $channel_C_state = &volts_to_state($C);
-  my $channel_D_state = &volts_to_state($D);
-  return $channel_A_state.$channel_B_state.$channel_C_state.$channel_D_state;
-}
-
-sub volts_to_state {
-  # Calculate state from voltage
-  my $volts = $_[0];
-  my $state = 'Z';
-  if ($volts >= 2){$state = 'L'};
-  if ($volts >= 3){$state = 'M'};
-  if ($volts >= 4){$state = 'H'};
-  return $state;
-}
-
-sub setup_ds2450 {
-  my $ibutton = $_[0];
-  my $VCC = 0;
-  my %A;
-  my %B;
-  my %C;
-  my %D;
-  my $setupds2450 = 0;
-  until ($setupds2450 == 1) {
-    #
-    $A{type} = "AD";
-    $A{resolution} = 4;
-    $A{range} = 5.12;
-    $B{type} = "AD";
-    $B{resolution} = 4;
-    $B{range} = 5.12;
-    $C{type} = "AD";
-    $C{resolution} = 4;
-    $C{range} = 5.12;
-    $D{type} = "AD";
-    $D{resolution} = 4;
-    $D{range} = 5.12;
-    #
-    if ($ib_wind_dir->Hardware::iButton::Device::DS2450::setup($VCC,\%A,\%B,\%C,\%D)){$setupds2450 = 1};
-    if ($setupds2450 = 1) {
-      print_log "Initialised weather station DS2450";
-    }else{
-      print_log "Failed to initialise weather station DS2450, retrying...";
-      sleep 1;
-    }
-  }
-}
-
+# Category=Weather
+#
+# Interface to DS2450 based 1-Wire weather stations.
+# Max Lock 12/08.
+
+use iButton;
+use Weather_Common;
+
+$ib_wind_dir = new iButton '2000000000F521';
+$ib_wind_speed = new iButton '1D0000000151A3';
+$ib_temp_outside = new iButton '100008000948F7';
+
+use vars '%weather';
+my $delta_i;
+my %delta;
+my %iButton_data_avg_data;
+my $wind_time2;
+my $last_wind_count;
+my @wind_speed;
+my @wind_cos;
+my @wind_sin;
+
+&read_iButton_temp($ib_temp_outside) if $New_Second and ($Second == 45 or $Second == 15);
+&iButton_wind_read if ($New_Second and !($Second % 15));
+
+&setup_ds2450($ib_wind_dir) if $Startup;
+
+#if (time_cron('* * * * *') || $Startup) {
+if (time_cron('* * * * *')) {
+  #
+  # Define the source variables
+  $Weather{DewOutdoor}; # used in status line
+  $Weather{TempOutdoor} = state $ib_temp_outside; # used in status line
+  $Weather{WindDir} = state $ib_wind_dir;
+  $Weather{WindSpeed} = state $ib_wind_speed;
+  #
+  # Define the derived variables
+  $Weather{WindGustDir} = $Weather{WindDir}; # Whats the relation between Dir and GustDir?
+  $Weather{WindAvgDir} = &average_wind_dir($Weather{WindDir});
+  $Weather{WindGustSpeed} = $Weather{WindSpeed} if $Weather{WindSpeed} > $Weather{WindGustSpeed};
+  $Weather{WindAvgSpeed} = &average_wind_speed($Weather{WindSpeed});
+  $Weather{WindChill} = &windchill($Weather{TempOutdoor}, $Weather{WindAvgSpeed});
+  #
+  # Log variables
+  $Weather{SummaryWind} = sprintf("cur/avg %s(%3.1f)/%s(%3.1f) %3.1f%s/%3.1f%s",(&convert_wind_dir_to_abbr($Weather{WindDir})),$Weather{WindDir},(&convert_wind_dir_to_abbr($Weather{WindAvgDir})),$Weather{WindAvgDir},$Weather{WindSpeed},$main::config_parms{weather_uom_wind},$Weather{WindAvgSpeed},$main::config_parms{weather_uom_wind});
+  $Weather{SummaryTemp} = sprintf("%3.1f%s",$Weather{TempOutdoor},$main::config_parms{weather_uom_temp});
+  #
+  print_log "Wind $Weather{SummaryWind}, Temperature $Weather{SummaryTemp}";
+  &Weather_Common::weather_updated;
+}
+
+### Only subroutines below this point ###
+
+sub deg_to_rad { ($_[0]/180) * (4 * atan2(1,1)) } # convert degrees to radians
+
+sub rad_to_deg { ($_[0] / (4 * atan2(1,1))) * 180 } # convert radians to degrees
+
+sub average_wind_dir {
+  my $readings = 10;
+  my $sum_wind_sin;
+  my $sum_wind_cos;
+  push (@wind_sin, sin(&deg_to_rad($_[0])));
+  push (@wind_cos, cos(&deg_to_rad($_[0])));
+  if ((scalar(@wind_cos)) == ($readings + 1)){shift @wind_cos};
+  if ((scalar(@wind_sin)) == ($readings + 1)){shift @wind_sin};
+  foreach (@wind_sin) {$sum_wind_sin += $_};
+  foreach (@wind_cos) {$sum_wind_cos += $_};
+  my $avg_wind_dir = &rad_to_deg(atan2($sum_wind_sin,$sum_wind_cos));
+  if($avg_wind_dir < 0){$avg_wind_dir += 359; };
+  $avg_wind_dir = sprintf("%.0f",$avg_wind_dir);
+  return $avg_wind_dir;
+}
+
+sub average_wind_speed {
+  my $readings = 10;
+  my $avg_wind_speed;
+  push (@wind_speed, $_[0]);
+  if ((scalar(@wind_speed)) == ($readings + 1)){shift @wind_speed};
+  foreach (@wind_speed) {$avg_wind_speed += $_};
+  $avg_wind_speed = $avg_wind_speed / scalar(@wind_speed);
+  return $avg_wind_speed;
+}
+
+sub convert_wind_dir_to_abbr {
+  my ($dir)=@_;
+  return 'unknown' if $dir !~ /^[\d \.]+$/;
+  if ($dir >= 0 and $dir <= 360) {
+    return qw{North NNE NE ENE East ESE SE SSE South SSW SW WSW West WNW NW NNW North}[(($dir+11.25)/22.5)%16];
+  }
+  return 'unknown';
+}
+
+sub windchill {
+  my $temp = shift;
+  my $wind = shift;
+  my $chill;
+
+  if (($wind<5) || ($wind>100) || ($temp<-50) || ($temp>5)) {
+    $chill = '';
+  }
+  else {
+    $chill=(13.12 + 0.6215*$temp - 11.37*($wind**0.16) + 0.3965*$temp*($wind**0.16));
+    $chill=int($chill+0.5);
+    print "temp $temp wind $wind chill $chill\n";
+  }
+  return $chill;
+}
+
+sub iButton_wind_read {
+  #
+  #wind speed (mph)
+  #
+  my $wind_time1 = &get_tickcount;
+  my $count = $ib_wind_speed->Hardware::iButton::Device::DS2423::read_counter();
+  #
+  if ($wind_time2) {
+    my $revolution_sec = (($count - $last_wind_count) * 1000) / ($wind_time1 - $wind_time2) / 2.0;
+    set $ib_wind_speed sprintf("%3.2f",$revolution_sec * 2.453); 
+  } 
+  #
+  $last_wind_count = $count;
+  $wind_time2 = $wind_time1;
+  $Save{WindGustMax} = 0 if $New_Day;
+  #
+  # wind direction (c)
+  #
+  my %position_lookup=();
+  $position_lookup{'HHLH'}=1;
+  $position_lookup{'HMMH'}=2;
+  $position_lookup{'HLHH'}=3;
+  $position_lookup{'MMHH'}=4;
+  $position_lookup{'LHHH'}=5;
+  $position_lookup{'LHHZ'}=6;
+  $position_lookup{'HHHZ'}=7;
+  $position_lookup{'HHZZ'}=8;
+  $position_lookup{'HHZH'}=9;
+  $position_lookup{'HZZH'}=10;
+  $position_lookup{'HZHH'}=11;
+  $position_lookup{'ZZHH'}=12;
+  $position_lookup{'ZHHH'}=13;
+  $position_lookup{'ZHHL'}=14;
+  $position_lookup{'HHHL'}=15;
+  $position_lookup{'HHMM'}=16;
+  #
+  my $wind_adc_states = &read_ds2450($ib_wind_dir);
+  my $wind_position = $position_lookup{$wind_adc_states};
+  $Weather{WindDir} = sprintf("%3.1f",($wind_position  * 22.5));
+  set $ib_wind_dir $Weather{WindDir};
+}
+
+sub read_iButton_temp {
+  my @ib_list = @_;
+    for my $ib (@ib_list) {
+    my $temp = $ib->read_temperature_hires();
+    next if $temp < -20 or $temp > 120;
+    my $temp_c = sprintf("%3.2f", $temp);
+    my $temp_f = sprintf("%3.2f", $temp*9/5 +32);
+    my $serial = $ib->serial();
+    
+    # Average the last 5 entries
+    if (defined @{$iButton_data_avg_data{$serial}}) {
+      unshift(@{$iButton_data_avg_data{$serial}}, $temp_c);
+      pop(@{$iButton_data_avg_data{$serial}});
+    }
+    else {
+      @{$iButton_data_avg_data{$serial}} = ($temp_c) x 5;
+    }
+
+    my $iButton_data_avg = 0;
+    grep($iButton_data_avg += $_, @{$iButton_data_avg_data{$serial}});
+    $iButton_data_avg /= 5;
+    $ib->{state} = sprintf("%3.1f", $iButton_data_avg);
+  }
+}
+
+sub read_ds2450 {
+  # Read ds2450 adc's and return a 4 character string representing their states
+  # H=high,M=medium,L=low,Z=zero
+  #
+  $ib_wind_dir->Hardware::iButton::Device::DS2450::convert('all');
+  my ($A,$B,$C,$D) = $ib_wind_dir->Hardware::iButton::Device::DS2450::readAD('all');
+  my $channel_A_state = &volts_to_state($A);
+  my $channel_B_state = &volts_to_state($B);
+  my $channel_C_state = &volts_to_state($C);
+  my $channel_D_state = &volts_to_state($D);
+  return $channel_A_state.$channel_B_state.$channel_C_state.$channel_D_state;
+}
+
+sub volts_to_state {
+  # Calculate state from voltage
+  my $volts = $_[0];
+  my $state = 'Z';
+  if ($volts >= 2){$state = 'L'};
+  if ($volts >= 3){$state = 'M'};
+  if ($volts >= 4){$state = 'H'};
+  return $state;
+}
+
+sub setup_ds2450 {
+  my $ibutton = $_[0];
+  my $VCC = 0;
+  my %A;
+  my %B;
+  my %C;
+  my %D;
+  my $setupds2450 = 0;
+  until ($setupds2450 == 1) {
+    #
+    $A{type} = "AD";
+    $A{resolution} = 4;
+    $A{range} = 5.12;
+    $B{type} = "AD";
+    $B{resolution} = 4;
+    $B{range} = 5.12;
+    $C{type} = "AD";
+    $C{resolution} = 4;
+    $C{range} = 5.12;
+    $D{type} = "AD";
+    $D{resolution} = 4;
+    $D{range} = 5.12;
+    #
+    if ($ib_wind_dir->Hardware::iButton::Device::DS2450::setup($VCC,\%A,\%B,\%C,\%D)){$setupds2450 = 1};
+    if ($setupds2450 = 1) {
+      print_log "Initialised weather station DS2450";
+    }else{
+      print_log "Failed to initialise weather station DS2450, retrying...";
+      sleep 1;
+    }
+  }
+}
+
diff --git a/code/examples/network_items_web.pl b/code/examples/network_items_web.pl
index 63280aada..495ff6621 100644
--- a/code/examples/network_items_web.pl
+++ b/code/examples/network_items_web.pl
@@ -43,23 +43,23 @@ sub web_networkitems {
    $html_hdr =  &html_header ("Network Devices: $nd_up on and $nd_down off ");
    $html_hdr .= "<table width=100% cellspacing=2><tbody><font face=COURIER size=2><tr id='resultrow' bgcolor='#9999CC' class='wvtheader'><th align='left'>Network Device</th><th align='left'>Status</th><th align='left'>Control ON</th><th align='left'>Control OFF</th>\n";
 
-    my $html = "<html>
-<head>
-<style>
-TR.wvtrow {font-family:Arial; font-size:11; color:#000000}
-TR.wvtheader {font-family:Tahoma; font-size:11; color:#101010}
-</style>
-</head>
-<body>";
-
+    my $html = "<html>
+<head>
+<style>
+TR.wvtrow {font-family:Arial; font-size:11; color:#000000}
+TR.wvtheader {font-family:Tahoma; font-size:11; color:#101010}
+</style>
+</head>
+<body>";
+
   $html .=  $html_hdr . $html_data;
 
 
  $html .= "</body>";
-
-
-  my $html_page = &html_page('', $html);
-  return &html_page('', $html);
+
+
+  my $html_page = &html_page('', $html);
+  return &html_page('', $html);
 
 }
 
diff --git a/code/examples/test_weather_item.pl b/code/examples/test_weather_item.pl
index 760795580..f1db22fd3 100644
--- a/code/examples/test_weather_item.pl
+++ b/code/examples/test_weather_item.pl
@@ -1,13 +1,13 @@
-
-$Weather{temp_test}++   if new_second 5;
-$Weather{temp_test} = 0 if new_second 30;
-
-$w_test1 = new Weather_Item 'temp_test';
-$w_test2 = new Weather_Item 'temp_test > 4';
-$w_test3 = new Weather_Item 'temp_test == 0';
-
-print "Weather change 1: $temp\n"          if defined ($temp = state_now $w_test1);
-print "Weather change 2: $Weather{test}\n" if state_now $w_test2;
-print "Weather change 3: $Weather{test}\n" if state_now $w_test3;
-
-
+
+$Weather{temp_test}++   if new_second 5;
+$Weather{temp_test} = 0 if new_second 30;
+
+$w_test1 = new Weather_Item 'temp_test';
+$w_test2 = new Weather_Item 'temp_test > 4';
+$w_test3 = new Weather_Item 'temp_test == 0';
+
+print "Weather change 1: $temp\n"          if defined ($temp = state_now $w_test1);
+print "Weather change 2: $Weather{test}\n" if state_now $w_test2;
+print "Weather change 3: $Weather{test}\n" if state_now $w_test3;
+
+
diff --git a/code/public/Brian/flagreminders.pl b/code/public/Brian/flagreminders.pl
index 4a867f02b..6600c6515 100644
--- a/code/public/Brian/flagreminders.pl
+++ b/code/public/Brian/flagreminders.pl
@@ -1,77 +1,77 @@
-##########################
-#  Klier Home Automation #
-##########################
-
-####################>>>  Timed Events
-# TIME_CRON EVENTS - 1st digit = Minute(s) separated by commas
-#                    2nd digit = Hour(s) separated by commas
-#                    3rd digit = Day(s) separated by commas
-#                    4th digit = Month(s) separated by commas
-#                    5th digit = Day of week(s) 0=Sun 1=Mon 2=Tue, etc.
-#                            * = Ignore this field
-
-if (time_cron('20 8 1 1 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 17 1 1 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 6 12 2 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 17 12 2 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 6 22 2 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 17 22 2 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 6 15 5 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 20 15 5 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 6 15 5 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 20 15 5 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 6 14 6 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 20 14 6 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 6 4 7 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 20 4 7 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 6 27 7 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 20 27 7 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 6 11 9 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 20 11 9 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 6 17 9 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 20 17 9 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 6 27 10 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 18 27 10 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 6 11 11 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 17 11 11 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 6 7 12 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 17 7 12 *')) {speak "Notice: Please take the flag in."};
-if (time_cron('20 8 25 12 *')) {speak "Notice: Please put the flag out."};
-if (time_cron('20 17 25 12 *')) {speak "Notice: Please take the flag in."};
-
-#                                                   Week 1 > 0 < 7
-#                                                   Week 2 > 7 < 14
-#                                                   Week 3 > 14 < 21
-#                                                   Week 4 > 21 < 32
-
-# First Week of the month Events
-if ($Day > 0 and $Day < 7) {
-	if (time_cron('20 6 * 9 1')) {speak "Notice: Please put the flag out."};
-	if (time_cron('20 20 * 9 1')) {speak "Notice: Please take the flag in."};
-	if (time_cron('20 6 * 11 2')) {speak "Notice: Please put the flag out."};
-	if (time_cron('20 17 * 11 2')) {speak "Notice: Please take the flag in."};
-}
-
-# 2nd Week of the month Events
-if ($Day > 7 and $Day < 14) {
-	if (time_cron('20 6 * 5 0')) {speak "Notice: Please put the flag out."};
-	if (time_cron('20 20 * 5 0')) {speak "Notice: Please take the flag in."};
-	if (time_cron('20 6 * 10 1')) {speak "Notice: Please put the flag out."};
-	if (time_cron('20 17 * 10 1')) {speak "Notice: Please take the flag in."};
-}
-
-# 3rd Week of the month Events
-if ($Day > 14 and $Day < 21) {
-	if (time_cron('20 6 * 4 1')) {speak "Notice: Please put the flag out."};
-	if (time_cron('20 20 * 4 1')) {speak "Notice: Please take the flag in."};
-	if (time_cron('20 6 * 5 6')) {speak "Notice: Please put the flag out."};
-	if (time_cron('20 20 * 5 6')) {speak "Notice: Please take the flag in."};
-	if (time_cron('20 6 * 6 0')) {speak "Notice: Please put the flag out."};
-	if (time_cron('20 20 * 6 0')) {speak "Notice: Please take the flag in."};
-}
-
-# 4th Week of the month Events
-if ($Day > 21 and $Day < 28) {
-	if (time_cron('20 6 * 11 4')) {speak "Notice: Please put the flag out."};
-	if (time_cron('20 17 * 11 4')) {speak "Notice: Please take the flag in."};
+##########################
+#  Klier Home Automation #
+##########################
+
+####################>>>  Timed Events
+# TIME_CRON EVENTS - 1st digit = Minute(s) separated by commas
+#                    2nd digit = Hour(s) separated by commas
+#                    3rd digit = Day(s) separated by commas
+#                    4th digit = Month(s) separated by commas
+#                    5th digit = Day of week(s) 0=Sun 1=Mon 2=Tue, etc.
+#                            * = Ignore this field
+
+if (time_cron('20 8 1 1 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 17 1 1 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 6 12 2 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 17 12 2 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 6 22 2 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 17 22 2 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 6 15 5 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 20 15 5 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 6 15 5 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 20 15 5 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 6 14 6 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 20 14 6 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 6 4 7 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 20 4 7 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 6 27 7 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 20 27 7 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 6 11 9 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 20 11 9 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 6 17 9 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 20 17 9 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 6 27 10 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 18 27 10 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 6 11 11 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 17 11 11 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 6 7 12 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 17 7 12 *')) {speak "Notice: Please take the flag in."};
+if (time_cron('20 8 25 12 *')) {speak "Notice: Please put the flag out."};
+if (time_cron('20 17 25 12 *')) {speak "Notice: Please take the flag in."};
+
+#                                                   Week 1 > 0 < 7
+#                                                   Week 2 > 7 < 14
+#                                                   Week 3 > 14 < 21
+#                                                   Week 4 > 21 < 32
+
+# First Week of the month Events
+if ($Day > 0 and $Day < 7) {
+	if (time_cron('20 6 * 9 1')) {speak "Notice: Please put the flag out."};
+	if (time_cron('20 20 * 9 1')) {speak "Notice: Please take the flag in."};
+	if (time_cron('20 6 * 11 2')) {speak "Notice: Please put the flag out."};
+	if (time_cron('20 17 * 11 2')) {speak "Notice: Please take the flag in."};
+}
+
+# 2nd Week of the month Events
+if ($Day > 7 and $Day < 14) {
+	if (time_cron('20 6 * 5 0')) {speak "Notice: Please put the flag out."};
+	if (time_cron('20 20 * 5 0')) {speak "Notice: Please take the flag in."};
+	if (time_cron('20 6 * 10 1')) {speak "Notice: Please put the flag out."};
+	if (time_cron('20 17 * 10 1')) {speak "Notice: Please take the flag in."};
+}
+
+# 3rd Week of the month Events
+if ($Day > 14 and $Day < 21) {
+	if (time_cron('20 6 * 4 1')) {speak "Notice: Please put the flag out."};
+	if (time_cron('20 20 * 4 1')) {speak "Notice: Please take the flag in."};
+	if (time_cron('20 6 * 5 6')) {speak "Notice: Please put the flag out."};
+	if (time_cron('20 20 * 5 6')) {speak "Notice: Please take the flag in."};
+	if (time_cron('20 6 * 6 0')) {speak "Notice: Please put the flag out."};
+	if (time_cron('20 20 * 6 0')) {speak "Notice: Please take the flag in."};
+}
+
+# 4th Week of the month Events
+if ($Day > 21 and $Day < 28) {
+	if (time_cron('20 6 * 11 4')) {speak "Notice: Please put the flag out."};
+	if (time_cron('20 17 * 11 4')) {speak "Notice: Please take the flag in."};
 }
\ No newline at end of file
diff --git a/code/public/Brian/grlevel3.lst b/code/public/Brian/grlevel3.lst
index 155cfd93e..3400387a1 100644
--- a/code/public/Brian/grlevel3.lst
+++ b/code/public/Brian/grlevel3.lst
@@ -1,6 +1,6 @@
-n0qvc-9
-wa0ssn-9
-n0pcd-9
-kc0ouz-9
-kc0uuv-9
-n0pqk-5
+n0qvc-9
+wa0ssn-9
+n0pcd-9
+kc0ouz-9
+kc0uuv-9
+n0pqk-5
diff --git a/code/public/Brian/grlevel3.pl b/code/public/Brian/grlevel3.pl
index a041395c5..6a6ea6b8c 100644
--- a/code/public/Brian/grlevel3.pl
+++ b/code/public/Brian/grlevel3.pl
@@ -1,124 +1,124 @@
-####################################################
-# Dynamic Placefile generation from Findu          #
-# For Selected Stations                            #
-# Version 1.0                                      #
-# By: Brian Klier, N0QVC                           #
-# brian@kliernetwork.net, http://kliernetwork.net  #
-# You are free to modify and redistribute this     #
-# script as long as this box remains on the top of #
-# the code.  Feel free to add your own name as     #
-# well.                                            #
-####################################################
-
-# Category = Vehicles
-
-my ($ItsRunning, @callretlines, $Temp, $get_url_string, @QVCArray, $StripInfo, $QVCArrayBit);
-my ($ValidReport, $TimeStamp, $GRLatitude, $GRLongitude, $GRDirection, $GRSpeed, $GRTest, $FinalOutput);
-my ($ShortCallsign, $ShortCallsignLength, $OtherStuff);
-
-$p_get_track_data = new Process_Item;
-$v_create_placefile = new  Voice_Cmd('Create GRLEVEL3 Place File');
-
-if (time_cron('3,8,13,18,23,28,33,38,43,48,53,58 * * * *')) {run_voice_cmd "Create GRLEVEL3 Place File"};
-if ($ItsRunning eq '' and said $v_create_placefile) {
-    $ItsRunning = "1";
-    $p_get_track_data = new Process_Item;
-    open(APRSLOG, ">c:/mh/data/web/grlevel3.txt");  # Log it
-    print APRSLOG "Refresh: 1\n";
-    print APRSLOG "Color: 255 255 255\n";
-    print APRSLOG 'IconFile: 1, 16, 16, 8, 8, "http://kliers.net/skywarn/APRS.png"';
-    print APRSLOG "\n";
-    print APRSLOG 'Font: 1, 11, 1, "Courier New"';
-    print APRSLOG "\n";
-    #remmed out 2/19/06
-    #print APRSLOG 'Font: 2, 8, 1, "Arial"';
-    print APRSLOG 'Font: 2, 8, 0, "Arial"';
-    print APRSLOG "\n";
-    close APRSLOG;
-
-    # Load List of callsigns to retrieve
-    open(CALLRET, "$config_parms{code_dir}/grlevel3.lst");
-    @callretlines = <CALLRET>;
-    close CALLRET;
-
-    foreach $Temp (@callretlines) {
-        chomp $Temp;   # get rid of CR/LF
-        $get_url_string = "get_url http://www.findu.com/cgi-bin/posit.cgi?call=";
-        $get_url_string .= $Temp;
-        $get_url_string .= "\&time=1\&comma=1 c:/mh/data/web/";
-        $get_url_string .= $Temp;
-        $get_url_string .= ".txt";
-
-        add $p_get_track_data $get_url_string;
-        start $p_get_track_data;
-    }
-}
-
-if (done_now $p_get_track_data) {
-    
-    foreach $Temp (@callretlines) {
-        $ValidReport = 1;   # assume valid report
-        chomp $Temp;   # get rid of CR/LF
-        $get_url_string = "c:/mh/data/web/";
-        $get_url_string .= $Temp;
-        $get_url_string .= ".txt";
-
-        $StripInfo = file_read($get_url_string);
-        my $text = &html_to_text($StripInfo);
-        $text =~ s/\240/ /g;
-        if ($text =~ /osition/) {
-            $ValidReport = 0;
-        }
-        file_write($get_url_string, $text);
-        
-        $StripInfo = file_read($get_url_string);
-        open(QVCINFO, $get_url_string);
-        @QVCArray = <QVCINFO>;
-        close QVCINFO;
-
-        foreach $QVCArrayBit (@QVCArray) {
-            ($TimeStamp, $GRLatitude, $GRLongitude, $GRDirection, $GRSpeed) = (split(',', $QVCArrayBit))[0, 1, 2, 3, 4];
-        }
-
-        if ($ValidReport eq '1') {
-            ($ShortCallsign, $OtherStuff) = (split('-', $Temp))[0, 1];
-            $ShortCallsignLength = (length($ShortCallsign));
-            $ShortCallsign = substr($ShortCallsign, ($ShortCallsignLength-3), 3);
-
-            open(APRSLOG, ">>c:/mh/data/web/grlevel3.txt");
-            print APRSLOG "Object: ";
-            print APRSLOG $GRLatitude;
-            print APRSLOG ",";
-            print APRSLOG $GRLongitude;
-            print APRSLOG "\n";
-            print APRSLOG "Threshold: 999";
-            print APRSLOG "\n";
-            print APRSLOG "Icon: 0,0,0,1,181,";
-            print APRSLOG '"';
-            print APRSLOG uc($Temp);
-            print APRSLOG ": Heading ";
-            print APRSLOG $GRDirection;
-            print APRSLOG " at $GRSpeed";
-            print APRSLOG '"';
-            print APRSLOG "\n";
-            print APRSLOG "Threshold: 150";
-            print APRSLOG "\n";
-            print APRSLOG "Text: 6, 6, 2, ";
-            print APRSLOG '"';
-            #print APRSLOG uc($Temp);
-            print APRSLOG uc($ShortCallsign);
-            print APRSLOG '"';
-            print APRSLOG "\n";
-            print APRSLOG "End:";
-            print APRSLOG "\n";
-            close APRSLOG;
-        }
-
-    }
-
-net_ftp(
-                file => 'c:/mh/data/web/grlevel3.txt', file_remote => '/public_html/skywarn/grlevel3.txt',
-                passive => '1', command => 'put', server => 'kliers.net',
-                user => 'myusername', password => 'mypassword');
-$ItsRunning = '';
-}
+####################################################
+# Dynamic Placefile generation from Findu          #
+# For Selected Stations                            #
+# Version 1.0                                      #
+# By: Brian Klier, N0QVC                           #
+# brian@kliernetwork.net, http://kliernetwork.net  #
+# You are free to modify and redistribute this     #
+# script as long as this box remains on the top of #
+# the code.  Feel free to add your own name as     #
+# well.                                            #
+####################################################
+
+# Category = Vehicles
+
+my ($ItsRunning, @callretlines, $Temp, $get_url_string, @QVCArray, $StripInfo, $QVCArrayBit);
+my ($ValidReport, $TimeStamp, $GRLatitude, $GRLongitude, $GRDirection, $GRSpeed, $GRTest, $FinalOutput);
+my ($ShortCallsign, $ShortCallsignLength, $OtherStuff);
+
+$p_get_track_data = new Process_Item;
+$v_create_placefile = new  Voice_Cmd('Create GRLEVEL3 Place File');
+
+if (time_cron('3,8,13,18,23,28,33,38,43,48,53,58 * * * *')) {run_voice_cmd "Create GRLEVEL3 Place File"};
+if ($ItsRunning eq '' and said $v_create_placefile) {
+    $ItsRunning = "1";
+    $p_get_track_data = new Process_Item;
+    open(APRSLOG, ">c:/mh/data/web/grlevel3.txt");  # Log it
+    print APRSLOG "Refresh: 1\n";
+    print APRSLOG "Color: 255 255 255\n";
+    print APRSLOG 'IconFile: 1, 16, 16, 8, 8, "http://kliers.net/skywarn/APRS.png"';
+    print APRSLOG "\n";
+    print APRSLOG 'Font: 1, 11, 1, "Courier New"';
+    print APRSLOG "\n";
+    #remmed out 2/19/06
+    #print APRSLOG 'Font: 2, 8, 1, "Arial"';
+    print APRSLOG 'Font: 2, 8, 0, "Arial"';
+    print APRSLOG "\n";
+    close APRSLOG;
+
+    # Load List of callsigns to retrieve
+    open(CALLRET, "$config_parms{code_dir}/grlevel3.lst");
+    @callretlines = <CALLRET>;
+    close CALLRET;
+
+    foreach $Temp (@callretlines) {
+        chomp $Temp;   # get rid of CR/LF
+        $get_url_string = "get_url http://www.findu.com/cgi-bin/posit.cgi?call=";
+        $get_url_string .= $Temp;
+        $get_url_string .= "\&time=1\&comma=1 c:/mh/data/web/";
+        $get_url_string .= $Temp;
+        $get_url_string .= ".txt";
+
+        add $p_get_track_data $get_url_string;
+        start $p_get_track_data;
+    }
+}
+
+if (done_now $p_get_track_data) {
+    
+    foreach $Temp (@callretlines) {
+        $ValidReport = 1;   # assume valid report
+        chomp $Temp;   # get rid of CR/LF
+        $get_url_string = "c:/mh/data/web/";
+        $get_url_string .= $Temp;
+        $get_url_string .= ".txt";
+
+        $StripInfo = file_read($get_url_string);
+        my $text = &html_to_text($StripInfo);
+        $text =~ s/\240/ /g;
+        if ($text =~ /osition/) {
+            $ValidReport = 0;
+        }
+        file_write($get_url_string, $text);
+        
+        $StripInfo = file_read($get_url_string);
+        open(QVCINFO, $get_url_string);
+        @QVCArray = <QVCINFO>;
+        close QVCINFO;
+
+        foreach $QVCArrayBit (@QVCArray) {
+            ($TimeStamp, $GRLatitude, $GRLongitude, $GRDirection, $GRSpeed) = (split(',', $QVCArrayBit))[0, 1, 2, 3, 4];
+        }
+
+        if ($ValidReport eq '1') {
+            ($ShortCallsign, $OtherStuff) = (split('-', $Temp))[0, 1];
+            $ShortCallsignLength = (length($ShortCallsign));
+            $ShortCallsign = substr($ShortCallsign, ($ShortCallsignLength-3), 3);
+
+            open(APRSLOG, ">>c:/mh/data/web/grlevel3.txt");
+            print APRSLOG "Object: ";
+            print APRSLOG $GRLatitude;
+            print APRSLOG ",";
+            print APRSLOG $GRLongitude;
+            print APRSLOG "\n";
+            print APRSLOG "Threshold: 999";
+            print APRSLOG "\n";
+            print APRSLOG "Icon: 0,0,0,1,181,";
+            print APRSLOG '"';
+            print APRSLOG uc($Temp);
+            print APRSLOG ": Heading ";
+            print APRSLOG $GRDirection;
+            print APRSLOG " at $GRSpeed";
+            print APRSLOG '"';
+            print APRSLOG "\n";
+            print APRSLOG "Threshold: 150";
+            print APRSLOG "\n";
+            print APRSLOG "Text: 6, 6, 2, ";
+            print APRSLOG '"';
+            #print APRSLOG uc($Temp);
+            print APRSLOG uc($ShortCallsign);
+            print APRSLOG '"';
+            print APRSLOG "\n";
+            print APRSLOG "End:";
+            print APRSLOG "\n";
+            close APRSLOG;
+        }
+
+    }
+
+net_ftp(
+                file => 'c:/mh/data/web/grlevel3.txt', file_remote => '/public_html/skywarn/grlevel3.txt',
+                passive => '1', command => 'put', server => 'kliers.net',
+                user => 'myusername', password => 'mypassword');
+$ItsRunning = '';
+}
diff --git a/code/public/Brian/klier.mht b/code/public/Brian/klier.mht
index 7d7ca063d..4c582e07c 100644
--- a/code/public/Brian/klier.mht
+++ b/code/public/Brian/klier.mht
@@ -1,124 +1,124 @@
-Format = A
-#
-# See mh/lib/read_table_A.pl  for definition of Format=A items
-#
-#
-# Type  	Address	Name					Groups				Other Info
-#
-GROUP,              Garage,             Property(0;0;20;20)
-GROUP, Living_Room, Property(20;0;30;20)
-GROUP, Bedroom,     Property(50;0;20;20)
-GROUP, Backyard,    Property(0;20;70;15)
-GROUP, Computer_Room, Property(0;40;70;15)
-GROUP, Kitchen,     Property(0;60;70;15)
-
-###OCCUPANCY,	        om,
-
-VOICE,			All_Lights,				All Lights [on,off]
-
-##### A house code - North Motion Detectors (+ setback)
-X10A,		A1,	unused_xcvr,				Appliances
-VOICE,			unused_xcvr,				Unused Transceiver [on,off]
-X10MS,              A2,                 motion_detector_backdoor, Sensors|Kitchen,    MS13
-MOTION,			motion_detector_backdoor,		motion_backdoor,	Kitchen
-X10MS,              A5,                 motion_detector_kitchen, Sensors|Kitchen,    MS13
-MOTION,			motion_detector_kitchen,		motion_kitchen,		Kitchen
-#SERIAL,		XA6BJ,	low_light_kitchen,			,on
-#SERIAL,		XA6BK,	low_light_kitchen,			,off
-PHOTOCELL,          	motion_detector_kitchen, low_light_kitchen,  Sensors|Kitchen
-# A11
-X10MS,              AB,                 motion_detector_trailer, Sensors|Backyard,   MS13
-MOTION,			motion_detector_trailer,		motion_trailer,		Backyard
-# A16
-X10A,		AG,	thermostat_setback,			Appliances|HVAC|Living_Room(5;12)
-VOICE,			thermostat_setback,			Thermostat Setback [on,off]
-
-##### B house code - Lighting and HVAC Control
-X10I,		B1,	living_room_light,			All_Lights|ambient_lights|Living_Room
-VOICE,			living_room_light,			Living Room Light [on,off]
-X10I,		B2,	bedroom_light,				All_Lights|ambient_lights|Bedroom
-VOICE,			bedroom_light,				Bedroom Light [on,off]
-X10I,		B3,	computer_room_light,			All_Lights|ambient_lights|Computer_Room
-VOICE,                  computer_room_light,                    Computer Room Light [on,off]
-SERIAL,		XB4BJ,	request_time_stuff,			HIDDEN,on
-SERIAL,		XB4BK,	request_time_stuff,			HIDDEN,off
-X10A,               B5,                 boombox_bedroom,    HIDDEN|Appliances|Bedroom
-VOICE,			boombox_bedroom,			Boombox [on,off]
-SERIAL,		XB6BJ,	morning_alarm_buttons,			HIDDEN,on
-SERIAL,		XB6BK,	morning_alarm_buttons,			HIDDEN,off
-SERIAL,             XB7BJ,              request_music_stuff, HIDDEN,             on
-SERIAL,             XB7BK,              request_music_stuff, HIDDEN,             off
-SERIAL,		XB8BJ,	request_wx_stuff,			HIDDEN,on
-SERIAL,		XB8BK,	request_wx_stuff,			HIDDEN,off
-X10A,		B9,	circ_fan,				Appliances|Bedroom
-VOICE,			circ_fan,				Circulation Fan [on,off]
-# B10
-X10I,               BA,                 kitchen_light,      All_Lights|Kitchen
-VOICE,			kitchen_light,				Kitchen Light [on,off]
-# B11
-X10A,		BB,	bed_heater,				Appliances|HVAC|Bedroom
-VOICE,			bed_heater,				Bed Heater [on,off]
-# B12
-SERIAL,		XBCBJ,	whats_on_tv,				HIDDEN,on
-SERIAL,		XBCBK,	whats_on_tv,				HIDDEN,off
-# B13
-X10A,               BD,                 projector,          HIDDEN|Appliances|Living_Room
-VOICE,			projector,				Projector [on,off]
-# B14
-X10A,		BE,	air_cond_fan,				Appliances|HVAC|Living_Room
-VOICE,			air_cond_fan,				Air Conditioner Fan [on,off]
-# B15
-X10I,		BF,	back_porch_light,			All_Lights|Backyard
-VOICE,			back_porch_light,			Back Porch Light [on,off]
-# B16
-SERIAL,             XBGBJ,              come_home_stuff,    HIDDEN,             on
-SERIAL,             XBGBK,              come_home_stuff,    HIDDEN,             off
-
-##### C house code - Garage
-X10I,           C1,     garage_light,                            All_Lights|Garage
-VOICE,                  garage_light,                           Garage Light [on,off]
-X10MS,              C2,                 motion_detector_garage, Sensors|Garage,     MS13
-MOTION,			motion_detector_garage,			motion_garage,		Garage
-# C3
-#SERIAL,		XC3BJ,	low_light_garage,			,on
-#SERIAL,		XC3BK,	low_light_garage,			,off
-PHOTOCELL,	        motion_detector_garage, low_light_garage,   Sensors|Garage
-
-##### D house code - Security Cameras
-X10A,		D1,	security_camera_backdoor,		HIDDEN|Security|security_cameras
-X10A,		D2,	security_camera_garage,			HIDDEN|Security|security_cameras
-X10A,		D3,	security_camera_frontdoor,		HIDDEN|Security|security_cameras
-X10A,		D4,	security_camera_driveway,		HIDDEN|Security|security_cameras
-
-##### E house code - Christmas Lights
-X10I,		E1,	christmas_lights,			Christmas|Backyard
-VOICE,			christmas_lights,			Christmas Lights [on,off]
-X10I,		E2,	christmas_tree,				Christmas|Living_Room
-VOICE,			christmas_tree,				Christmas Tree [on,off]
-
-##### F house code - South Motion Detectors
-X10MS,              F2,                 motion_detector_living_room, Sensors|Living_Room, MS13
-MOTION,			motion_detector_living_room,		motion_living_room,	Living_Room
-#SERIAL,		XF3BJ,	low_light_living_room,			,on
-#SERIAL,		XF3BK,	low_light_living_room,			,off
-PHOTOCELL,		motion_detector_living_room, low_light_living_room, Sensors|Living_Room
-X10MS,              F4,                 motion_detector_frontdoor, Sensors|Computer_Room, MS13
-MOTION,			motion_detector_frontdoor,		motion_frontdoor,	Computer_Room
-#SERIAL,		XF5BJ,	low_light_frontdoor,			,on
-#SERIAL,		XF5BK,	low_light_frontdoor,			,off
-PHOTOCELL,	        motion_detector_frontdoor, low_light_frontdoor, Sensors|Computer_Room
-
-##### O house code - Alarm System
-SERIAL,		XO1BJ,	alarm_lights,				HIDDEN,on
-SERIAL,		XO1BK,	alarm_lights,				HIDDEN,off
-SERIAL,		XO2BJ,	alarm_detected,				HIDDEN,on
-SERIAL,		XO2BK,	alarm_detected,				HIDDEN,off
-X10A,		O5,	cctv_record_alarm,			HIDDEN|Security
-
-#LIGHT,			kitchen_light,				x10_kitchen_light,		Kitchen
-#MOTION,			motion_detector_kitchen,		x10_motion_detector_kitchen,	Kitchen
-#PRESENCE,		x10_motion_detector_kitchen,		om,				presence_kitchen
-
-#LIGHT,			back_porch_light,			x10_back_porch_light,		Backyard
-#MOTION,			motion_detector_backdoor,		x10_motion_detector_backdoor,	Backyard
-#PRESENCE,		x10_motion_detector_backdoor,		om,				presence_backdoor
+Format = A
+#
+# See mh/lib/read_table_A.pl  for definition of Format=A items
+#
+#
+# Type  	Address	Name					Groups				Other Info
+#
+GROUP,              Garage,             Property(0;0;20;20)
+GROUP, Living_Room, Property(20;0;30;20)
+GROUP, Bedroom,     Property(50;0;20;20)
+GROUP, Backyard,    Property(0;20;70;15)
+GROUP, Computer_Room, Property(0;40;70;15)
+GROUP, Kitchen,     Property(0;60;70;15)
+
+###OCCUPANCY,	        om,
+
+VOICE,			All_Lights,				All Lights [on,off]
+
+##### A house code - North Motion Detectors (+ setback)
+X10A,		A1,	unused_xcvr,				Appliances
+VOICE,			unused_xcvr,				Unused Transceiver [on,off]
+X10MS,              A2,                 motion_detector_backdoor, Sensors|Kitchen,    MS13
+MOTION,			motion_detector_backdoor,		motion_backdoor,	Kitchen
+X10MS,              A5,                 motion_detector_kitchen, Sensors|Kitchen,    MS13
+MOTION,			motion_detector_kitchen,		motion_kitchen,		Kitchen
+#SERIAL,		XA6BJ,	low_light_kitchen,			,on
+#SERIAL,		XA6BK,	low_light_kitchen,			,off
+PHOTOCELL,          	motion_detector_kitchen, low_light_kitchen,  Sensors|Kitchen
+# A11
+X10MS,              AB,                 motion_detector_trailer, Sensors|Backyard,   MS13
+MOTION,			motion_detector_trailer,		motion_trailer,		Backyard
+# A16
+X10A,		AG,	thermostat_setback,			Appliances|HVAC|Living_Room(5;12)
+VOICE,			thermostat_setback,			Thermostat Setback [on,off]
+
+##### B house code - Lighting and HVAC Control
+X10I,		B1,	living_room_light,			All_Lights|ambient_lights|Living_Room
+VOICE,			living_room_light,			Living Room Light [on,off]
+X10I,		B2,	bedroom_light,				All_Lights|ambient_lights|Bedroom
+VOICE,			bedroom_light,				Bedroom Light [on,off]
+X10I,		B3,	computer_room_light,			All_Lights|ambient_lights|Computer_Room
+VOICE,                  computer_room_light,                    Computer Room Light [on,off]
+SERIAL,		XB4BJ,	request_time_stuff,			HIDDEN,on
+SERIAL,		XB4BK,	request_time_stuff,			HIDDEN,off
+X10A,               B5,                 boombox_bedroom,    HIDDEN|Appliances|Bedroom
+VOICE,			boombox_bedroom,			Boombox [on,off]
+SERIAL,		XB6BJ,	morning_alarm_buttons,			HIDDEN,on
+SERIAL,		XB6BK,	morning_alarm_buttons,			HIDDEN,off
+SERIAL,             XB7BJ,              request_music_stuff, HIDDEN,             on
+SERIAL,             XB7BK,              request_music_stuff, HIDDEN,             off
+SERIAL,		XB8BJ,	request_wx_stuff,			HIDDEN,on
+SERIAL,		XB8BK,	request_wx_stuff,			HIDDEN,off
+X10A,		B9,	circ_fan,				Appliances|Bedroom
+VOICE,			circ_fan,				Circulation Fan [on,off]
+# B10
+X10I,               BA,                 kitchen_light,      All_Lights|Kitchen
+VOICE,			kitchen_light,				Kitchen Light [on,off]
+# B11
+X10A,		BB,	bed_heater,				Appliances|HVAC|Bedroom
+VOICE,			bed_heater,				Bed Heater [on,off]
+# B12
+SERIAL,		XBCBJ,	whats_on_tv,				HIDDEN,on
+SERIAL,		XBCBK,	whats_on_tv,				HIDDEN,off
+# B13
+X10A,               BD,                 projector,          HIDDEN|Appliances|Living_Room
+VOICE,			projector,				Projector [on,off]
+# B14
+X10A,		BE,	air_cond_fan,				Appliances|HVAC|Living_Room
+VOICE,			air_cond_fan,				Air Conditioner Fan [on,off]
+# B15
+X10I,		BF,	back_porch_light,			All_Lights|Backyard
+VOICE,			back_porch_light,			Back Porch Light [on,off]
+# B16
+SERIAL,             XBGBJ,              come_home_stuff,    HIDDEN,             on
+SERIAL,             XBGBK,              come_home_stuff,    HIDDEN,             off
+
+##### C house code - Garage
+X10I,           C1,     garage_light,                            All_Lights|Garage
+VOICE,                  garage_light,                           Garage Light [on,off]
+X10MS,              C2,                 motion_detector_garage, Sensors|Garage,     MS13
+MOTION,			motion_detector_garage,			motion_garage,		Garage
+# C3
+#SERIAL,		XC3BJ,	low_light_garage,			,on
+#SERIAL,		XC3BK,	low_light_garage,			,off
+PHOTOCELL,	        motion_detector_garage, low_light_garage,   Sensors|Garage
+
+##### D house code - Security Cameras
+X10A,		D1,	security_camera_backdoor,		HIDDEN|Security|security_cameras
+X10A,		D2,	security_camera_garage,			HIDDEN|Security|security_cameras
+X10A,		D3,	security_camera_frontdoor,		HIDDEN|Security|security_cameras
+X10A,		D4,	security_camera_driveway,		HIDDEN|Security|security_cameras
+
+##### E house code - Christmas Lights
+X10I,		E1,	christmas_lights,			Christmas|Backyard
+VOICE,			christmas_lights,			Christmas Lights [on,off]
+X10I,		E2,	christmas_tree,				Christmas|Living_Room
+VOICE,			christmas_tree,				Christmas Tree [on,off]
+
+##### F house code - South Motion Detectors
+X10MS,              F2,                 motion_detector_living_room, Sensors|Living_Room, MS13
+MOTION,			motion_detector_living_room,		motion_living_room,	Living_Room
+#SERIAL,		XF3BJ,	low_light_living_room,			,on
+#SERIAL,		XF3BK,	low_light_living_room,			,off
+PHOTOCELL,		motion_detector_living_room, low_light_living_room, Sensors|Living_Room
+X10MS,              F4,                 motion_detector_frontdoor, Sensors|Computer_Room, MS13
+MOTION,			motion_detector_frontdoor,		motion_frontdoor,	Computer_Room
+#SERIAL,		XF5BJ,	low_light_frontdoor,			,on
+#SERIAL,		XF5BK,	low_light_frontdoor,			,off
+PHOTOCELL,	        motion_detector_frontdoor, low_light_frontdoor, Sensors|Computer_Room
+
+##### O house code - Alarm System
+SERIAL,		XO1BJ,	alarm_lights,				HIDDEN,on
+SERIAL,		XO1BK,	alarm_lights,				HIDDEN,off
+SERIAL,		XO2BJ,	alarm_detected,				HIDDEN,on
+SERIAL,		XO2BK,	alarm_detected,				HIDDEN,off
+X10A,		O5,	cctv_record_alarm,			HIDDEN|Security
+
+#LIGHT,			kitchen_light,				x10_kitchen_light,		Kitchen
+#MOTION,			motion_detector_kitchen,		x10_motion_detector_kitchen,	Kitchen
+#PRESENCE,		x10_motion_detector_kitchen,		om,				presence_kitchen
+
+#LIGHT,			back_porch_light,			x10_back_porch_light,		Backyard
+#MOTION,			motion_detector_backdoor,		x10_motion_detector_backdoor,	Backyard
+#PRESENCE,		x10_motion_detector_backdoor,		om,				presence_backdoor
diff --git a/code/public/Brian/old stuff i don't use anymore/calllog.pl b/code/public/Brian/old stuff i don't use anymore/calllog.pl
index 4960a863d..1264e3d62 100644
--- a/code/public/Brian/old stuff i don't use anymore/calllog.pl	
+++ b/code/public/Brian/old stuff i don't use anymore/calllog.pl	
@@ -1,258 +1,258 @@
-############################################################
-#  Klier Home Automation - Caller ID Module for Rockwell   #
-#  Version 2.2 Release                                     #
-#  By: Brian J. Klier, N0QVC                               #
-#  Thanks for the mucho help from: Bruce Winter            #
-#  E-Mail: klier@lakes.com                                 #
-#  Webpage: http://www.faribault.k12.mn.us/brian           #
-############################################################
-
-# Category=Phone
-
-# New in Version 2.2:
-# - Added ability to recite phone numbers of callers with no name given.
-
-# Modem Caller ID Information looks like the following
-# DATE = 990305
-# TIME = 1351
-# NMBR = 5073336399
-# NAME = KLIER BRIAN J
-
-# Declare Variables
-
-use vars qw($PhoneName $PhoneNumber $PhoneTime $PhoneDate);
-
-my ($PhoneModemString, $NameDone, $NumberDone, $i, $j);
-my (@rejloglines, $NumofCalls);
-my (@callloglines, $CallLogTempLine, $RejLogTempLine);
-my ($PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog);
-my ($last, $first, $middle, $areacode, $local_number, $caller);
-
-$phone_modem = new Serial_Item ('AT#CID=1','init','serial2');
-$timer_hangup = new Timer;
-
-#-----> Provide PalmPad Controller Access for some Items
-$request_phone_stuff = new X10_Item('B6');
-
-# Web Interface Commands
-
-$v_phone_lastcaller = new Voice_Cmd('Show Recent Call Log');
-if ((said $v_phone_lastcaller) || (state_now $request_phone_stuff eq 'on')) {
-    open(CALLLOG, "$config_parms{code_dir}/calllog.log"); # Open for input
-    @callloglines = <CALLLOG>;                            # Open array and
-                                                          # read in data
-    close CALLLOG;                                        # Close the file
-
-    print_log "Announced Recent Callers.";
-
-    $NumofCalls = 0;
-
-    foreach $CallLogTempLine (@callloglines) {
-        $NumofCalls = $NumofCalls + 1;
-        ($PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog) = (split('`', $CallLogTempLine))[0, 1, 2, 3];
-        if ($PhoneNameLog eq 'Out of the Area' and $PhoneDateLog ne $Date_Now
-            and $PhoneNumberLog eq '') {
-            speak "At $PhoneTimeLog on $PhoneDateLog, an unidentified party called.";
-        }
-        if ($PhoneNameLog eq 'Out of the Area' and $PhoneDateLog eq $Date_Now
-            and $PhoneNumberLog eq '') {
-            speak "At $PhoneTimeLog, an unidentified party called.";
-        }
-        if ($PhoneNameLog eq 'Out of the Area' and $PhoneDateLog ne $Date_Now
-            and $PhoneNumberLog ne '') {
-            speak "At $PhoneTimeLog on $PhoneDateLog, an unidentified party called. Call back at $PhoneNumberLog.";
-        }
-        if ($PhoneNameLog eq 'Out of the Area' and $PhoneDateLog eq $Date_Now
-            and $PhoneNumberLog ne '') {
-            speak "At $PhoneTimeLog, an unidentified party called. Call back at $PhoneNumberLog.";
-        }
-        if ($PhoneNameLog ne 'Out of the Area' and $PhoneDateLog ne $Date_Now) {
-            speak "At $PhoneTimeLog on $PhoneDateLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
-        }
-        if ($PhoneNameLog ne 'Out of the Area' and $PhoneDateLog eq $Date_Now) {
-            speak "At $PhoneTimeLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
-        }
-    }
-    speak "$NumofCalls total calls.";
-}
-
-$v_phone_clearlog = new Voice_Cmd('Clear Recent Call Log');
-if ((said $v_phone_clearlog) || (state_now $request_phone_stuff eq 'off')) {
-    open(CALLLOG, ">$config_parms{code_dir}/calllog.log");     # CLEAR Log
-    close CALLLOG;
-    print_log "Call Log Cleared.";
-    speak "Call Log Cleared.";
-}
-
-#$v_phone_log = new Voice_Cmd('Run Display Callers');
-#if (said $v_phone_log) {
-#    print_log "Running Display Callers...";
-#    undef @ARGV;
-#    do "$Pgm_Path/display_callers";
-#    print_log "Done.";
-#}
-
-# Set MODEM Init Strings on Startup
-
-if ($Startup or $Reload) {
-    set $phone_modem 'init';               # Initialize MODEM
-
-    open(REJLOG, "$config_parms{code_dir}/rejlog.log");   # Open for input
-    @rejloglines = <REJLOG>;                              # Open array and
-                                                          # read in data
-    close REJLOG;                                         # Close the file
-
-    print_msg "Caller ID Interface has been Initialized...";
-    print_log "Caller ID Interface has been Initialized...";
-}
-
-# Timer Information for Phone Hangup (Reject List)
-
-if (expired $timer_hangup) {
-    set $phone_modem 'ATH';
-    set $timer_hangup 0;
-}
-
-# Display Incoming Serial Data
-
-if ($PhoneModemString = said $phone_modem) {
-    print_msg "PHONE: $PhoneModemString";
-
-    if (substr($PhoneModemString, 0, 4) eq 'RING') {
-        #run_voice_cmd "Stop Music";
-        #set $boombox_bedroom 'off';
-    }
-
-    if (substr($PhoneModemString, 0, 4) eq 'NAME') {
-        $NameDone = "yes";
-        $PhoneName = (substr($PhoneModemString, 7, 15));
-
-        # Switch name strings so first last, not last first.
-        # Use only the 1st two blank delimited fields, as the 3rd, 4th are usually just initials or incomplete
-        # Last First M
-        # Last M First
-
-        ($last, $first, $middle) = (split(' ', $PhoneName))[0, 1, 2];
-        $first = ucfirst(lc($first));
-        $first = ucfirst(lc($middle)) if length($first) == 1; # Last M First format
-        $last  = ucfirst(lc($last));
-        $caller = "$first $last";
-    }
-
-    if (substr($PhoneModemString, 0, 4) eq 'NMBR') {
-        $NumberDone = "yes";
-        $PhoneNumber = (substr($PhoneModemString, 7, 10));
-        $areacode = (substr($PhoneNumber, 0, 3));
-        $local_number = (substr($PhoneNumber, 3, 7));
-
-        if ($PhoneNumber eq "O") {
-            $PhoneNumber = "";
-            $areacode = "";
-            $local_number = "";
-        }
-    }
-
-    if (substr($PhoneModemString, 0, 13) eq 'MESG = 08014F') {
-        $NameDone = "yes";
-        $NumberDone = "yes";
-        $PhoneName = "Out of the Area";
-        $caller = "Out of the Area";
-    }
-
-    if ($NumberDone eq "yes" and $NameDone eq "yes") {
-        $NumberDone = 0;
-        $NameDone = 0;
-        $PhoneDate = $Date_Now;
-        $PhoneTime = $Time_Now;
-
-        # Log the data for use by display_callers
-
-        logit("$Pgm_Path/../data/phone/logs/callerid.$Year_Month_Now.log", "$PhoneNumber $PhoneName");
-        logit_dbm("$Pgm_Path/../data/phone/callerid.dbm", $PhoneNumber, "$Time_Now $Date_Now $Year name=$PhoneName");
-
-        # Check to see if callers phone number is in reject table.  If so,
-        # let them have it.
-
-        foreach $RejLogTempLine (@rejloglines) {
-            if (substr($RejLogTempLine, 0, 10) eq $PhoneNumber) {
-                print_log "$PhoneName is calling, and is in reject list!";
-                speak "$PhoneName is calling, and is in reject list!";
-                set $phone_modem 'ATA';
-                set $timer_hangup 5;
-            }
-        }
-
-        # If the incoming area code is the same, drop it from being spoken.
-
-        if ($areacode eq $config_parms{local_area_code}) {
-            $PhoneNumber = $local_number;
-        }
-
-        # Put pauses in between area code, exchange, and number for
-        # announce reasons
-
-        if ((length($PhoneNumber) == 7)) {$PhoneNumber = substr($PhoneNumber, 0, 3) . "." . substr($PhoneNumber, 3, 4)};
-        if ((length($PhoneNumber) == 10)) {$PhoneNumber = substr($PhoneNumber, 0, 3) . "." . substr($PhoneNumber, 3, 3) . "." . substr($PhoneNumber, 6, 4)};
-
-        # Put Spaces in the Phone Number for Announce Reasons
-
-        $j = '';
-        for ($i = 0; $i != (length($PhoneNumber)); ++$i) {
-            $j = $j . substr($PhoneNumber, $i, 1);
-            $j = $j . " ";
-        }
-
-        $PhoneNumber = $j;
-
-        # Log the data in a special file to announce from Palmpad
-
-        open(CALLLOG, ">>$config_parms{code_dir}/calllog.log");  # Log it
-        print CALLLOG "$PhoneDate`$PhoneTime`$caller`$PhoneNumber\n";
-        close CALLLOG;
-
-        if ($PhoneName eq "Out of the Area" and $PhoneNumber eq '') {
-            print_msg "PHONE: Caller's Identification not available.";
-            speak "Caller's Identification not available.";
-        }
-        elsif ($PhoneName eq "Out of the Area" and $PhoneNumber ne '') {
-            print_msg "PHONE: Caller's Identification not available.";
-            speak "Unknown caller calling. Number is $PhoneNumber.";
-        }
-        else {
-            print_msg "PHONE: $caller is calling. Number is $PhoneNumber.";
-            speak "$caller is calling. Number is $PhoneNumber.";
-        }
-    }
-}
-
-# Monthly Phone Log Backup
-
-if ($New_Month) {
-    my $dbm_file = "$Pgm_Path\\..\\data\\phone\\callerid.dbm";
-    print_log "Backing up Phone Log to logs\\$dbm_file.$Year_Month_Now";
-
-    copy("$dbm_file.dir", "$dbm_file.$Year_Month_Now.dir") or print_log "Error in phone dbm copy 1: $!";
-    copy("$dbm_file.pag", "$dbm_file.$Year_Month_Now.pag") or print_log "Error in phone dbm copy 2: $!";
-
-    # dbm_copy will delete any bad entries (those with binary characters) from the file.
-
-    system("dbm_copy $dbm_file");
-    copy("$dbm_file.backup.dir", "$dbm_file.dir") or print_log "Error in phone dbm copy 3: $!";
-    copy("$dbm_file.backup.pag", "$dbm_file.pag") or print_log "Error in phone dbm copy 4: $!";
-}
-
-# Example on how to start and stop a serial port
-$v_port_control1 = new Voice_Cmd("[Start,Stop] Serial Port Monitoring");
-if ($state = said $v_port_control1) {
-    print_log "Serial Port now in $state position.";
-    ($state eq 'start') ? start $phone_modem : stop $phone_modem;
-}
-
-# Re-start the port, if it is not in use
-if ($New_Minute and is_stopped $phone_modem and is_available $phone_modem) {
-    start $phone_modem;
-    set $phone_modem 'init';
-    print_msg "MODEM Reinitialized...";
-    print_log "MODEM Reinitialized...";
-}
-
+############################################################
+#  Klier Home Automation - Caller ID Module for Rockwell   #
+#  Version 2.2 Release                                     #
+#  By: Brian J. Klier, N0QVC                               #
+#  Thanks for the mucho help from: Bruce Winter            #
+#  E-Mail: klier@lakes.com                                 #
+#  Webpage: http://www.faribault.k12.mn.us/brian           #
+############################################################
+
+# Category=Phone
+
+# New in Version 2.2:
+# - Added ability to recite phone numbers of callers with no name given.
+
+# Modem Caller ID Information looks like the following
+# DATE = 990305
+# TIME = 1351
+# NMBR = 5073336399
+# NAME = KLIER BRIAN J
+
+# Declare Variables
+
+use vars qw($PhoneName $PhoneNumber $PhoneTime $PhoneDate);
+
+my ($PhoneModemString, $NameDone, $NumberDone, $i, $j);
+my (@rejloglines, $NumofCalls);
+my (@callloglines, $CallLogTempLine, $RejLogTempLine);
+my ($PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog);
+my ($last, $first, $middle, $areacode, $local_number, $caller);
+
+$phone_modem = new Serial_Item ('AT#CID=1','init','serial2');
+$timer_hangup = new Timer;
+
+#-----> Provide PalmPad Controller Access for some Items
+$request_phone_stuff = new X10_Item('B6');
+
+# Web Interface Commands
+
+$v_phone_lastcaller = new Voice_Cmd('Show Recent Call Log');
+if ((said $v_phone_lastcaller) || (state_now $request_phone_stuff eq 'on')) {
+    open(CALLLOG, "$config_parms{code_dir}/calllog.log"); # Open for input
+    @callloglines = <CALLLOG>;                            # Open array and
+                                                          # read in data
+    close CALLLOG;                                        # Close the file
+
+    print_log "Announced Recent Callers.";
+
+    $NumofCalls = 0;
+
+    foreach $CallLogTempLine (@callloglines) {
+        $NumofCalls = $NumofCalls + 1;
+        ($PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog) = (split('`', $CallLogTempLine))[0, 1, 2, 3];
+        if ($PhoneNameLog eq 'Out of the Area' and $PhoneDateLog ne $Date_Now
+            and $PhoneNumberLog eq '') {
+            speak "At $PhoneTimeLog on $PhoneDateLog, an unidentified party called.";
+        }
+        if ($PhoneNameLog eq 'Out of the Area' and $PhoneDateLog eq $Date_Now
+            and $PhoneNumberLog eq '') {
+            speak "At $PhoneTimeLog, an unidentified party called.";
+        }
+        if ($PhoneNameLog eq 'Out of the Area' and $PhoneDateLog ne $Date_Now
+            and $PhoneNumberLog ne '') {
+            speak "At $PhoneTimeLog on $PhoneDateLog, an unidentified party called. Call back at $PhoneNumberLog.";
+        }
+        if ($PhoneNameLog eq 'Out of the Area' and $PhoneDateLog eq $Date_Now
+            and $PhoneNumberLog ne '') {
+            speak "At $PhoneTimeLog, an unidentified party called. Call back at $PhoneNumberLog.";
+        }
+        if ($PhoneNameLog ne 'Out of the Area' and $PhoneDateLog ne $Date_Now) {
+            speak "At $PhoneTimeLog on $PhoneDateLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
+        }
+        if ($PhoneNameLog ne 'Out of the Area' and $PhoneDateLog eq $Date_Now) {
+            speak "At $PhoneTimeLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
+        }
+    }
+    speak "$NumofCalls total calls.";
+}
+
+$v_phone_clearlog = new Voice_Cmd('Clear Recent Call Log');
+if ((said $v_phone_clearlog) || (state_now $request_phone_stuff eq 'off')) {
+    open(CALLLOG, ">$config_parms{code_dir}/calllog.log");     # CLEAR Log
+    close CALLLOG;
+    print_log "Call Log Cleared.";
+    speak "Call Log Cleared.";
+}
+
+#$v_phone_log = new Voice_Cmd('Run Display Callers');
+#if (said $v_phone_log) {
+#    print_log "Running Display Callers...";
+#    undef @ARGV;
+#    do "$Pgm_Path/display_callers";
+#    print_log "Done.";
+#}
+
+# Set MODEM Init Strings on Startup
+
+if ($Startup or $Reload) {
+    set $phone_modem 'init';               # Initialize MODEM
+
+    open(REJLOG, "$config_parms{code_dir}/rejlog.log");   # Open for input
+    @rejloglines = <REJLOG>;                              # Open array and
+                                                          # read in data
+    close REJLOG;                                         # Close the file
+
+    print_msg "Caller ID Interface has been Initialized...";
+    print_log "Caller ID Interface has been Initialized...";
+}
+
+# Timer Information for Phone Hangup (Reject List)
+
+if (expired $timer_hangup) {
+    set $phone_modem 'ATH';
+    set $timer_hangup 0;
+}
+
+# Display Incoming Serial Data
+
+if ($PhoneModemString = said $phone_modem) {
+    print_msg "PHONE: $PhoneModemString";
+
+    if (substr($PhoneModemString, 0, 4) eq 'RING') {
+        #run_voice_cmd "Stop Music";
+        #set $boombox_bedroom 'off';
+    }
+
+    if (substr($PhoneModemString, 0, 4) eq 'NAME') {
+        $NameDone = "yes";
+        $PhoneName = (substr($PhoneModemString, 7, 15));
+
+        # Switch name strings so first last, not last first.
+        # Use only the 1st two blank delimited fields, as the 3rd, 4th are usually just initials or incomplete
+        # Last First M
+        # Last M First
+
+        ($last, $first, $middle) = (split(' ', $PhoneName))[0, 1, 2];
+        $first = ucfirst(lc($first));
+        $first = ucfirst(lc($middle)) if length($first) == 1; # Last M First format
+        $last  = ucfirst(lc($last));
+        $caller = "$first $last";
+    }
+
+    if (substr($PhoneModemString, 0, 4) eq 'NMBR') {
+        $NumberDone = "yes";
+        $PhoneNumber = (substr($PhoneModemString, 7, 10));
+        $areacode = (substr($PhoneNumber, 0, 3));
+        $local_number = (substr($PhoneNumber, 3, 7));
+
+        if ($PhoneNumber eq "O") {
+            $PhoneNumber = "";
+            $areacode = "";
+            $local_number = "";
+        }
+    }
+
+    if (substr($PhoneModemString, 0, 13) eq 'MESG = 08014F') {
+        $NameDone = "yes";
+        $NumberDone = "yes";
+        $PhoneName = "Out of the Area";
+        $caller = "Out of the Area";
+    }
+
+    if ($NumberDone eq "yes" and $NameDone eq "yes") {
+        $NumberDone = 0;
+        $NameDone = 0;
+        $PhoneDate = $Date_Now;
+        $PhoneTime = $Time_Now;
+
+        # Log the data for use by display_callers
+
+        logit("$Pgm_Path/../data/phone/logs/callerid.$Year_Month_Now.log", "$PhoneNumber $PhoneName");
+        logit_dbm("$Pgm_Path/../data/phone/callerid.dbm", $PhoneNumber, "$Time_Now $Date_Now $Year name=$PhoneName");
+
+        # Check to see if callers phone number is in reject table.  If so,
+        # let them have it.
+
+        foreach $RejLogTempLine (@rejloglines) {
+            if (substr($RejLogTempLine, 0, 10) eq $PhoneNumber) {
+                print_log "$PhoneName is calling, and is in reject list!";
+                speak "$PhoneName is calling, and is in reject list!";
+                set $phone_modem 'ATA';
+                set $timer_hangup 5;
+            }
+        }
+
+        # If the incoming area code is the same, drop it from being spoken.
+
+        if ($areacode eq $config_parms{local_area_code}) {
+            $PhoneNumber = $local_number;
+        }
+
+        # Put pauses in between area code, exchange, and number for
+        # announce reasons
+
+        if ((length($PhoneNumber) == 7)) {$PhoneNumber = substr($PhoneNumber, 0, 3) . "." . substr($PhoneNumber, 3, 4)};
+        if ((length($PhoneNumber) == 10)) {$PhoneNumber = substr($PhoneNumber, 0, 3) . "." . substr($PhoneNumber, 3, 3) . "." . substr($PhoneNumber, 6, 4)};
+
+        # Put Spaces in the Phone Number for Announce Reasons
+
+        $j = '';
+        for ($i = 0; $i != (length($PhoneNumber)); ++$i) {
+            $j = $j . substr($PhoneNumber, $i, 1);
+            $j = $j . " ";
+        }
+
+        $PhoneNumber = $j;
+
+        # Log the data in a special file to announce from Palmpad
+
+        open(CALLLOG, ">>$config_parms{code_dir}/calllog.log");  # Log it
+        print CALLLOG "$PhoneDate`$PhoneTime`$caller`$PhoneNumber\n";
+        close CALLLOG;
+
+        if ($PhoneName eq "Out of the Area" and $PhoneNumber eq '') {
+            print_msg "PHONE: Caller's Identification not available.";
+            speak "Caller's Identification not available.";
+        }
+        elsif ($PhoneName eq "Out of the Area" and $PhoneNumber ne '') {
+            print_msg "PHONE: Caller's Identification not available.";
+            speak "Unknown caller calling. Number is $PhoneNumber.";
+        }
+        else {
+            print_msg "PHONE: $caller is calling. Number is $PhoneNumber.";
+            speak "$caller is calling. Number is $PhoneNumber.";
+        }
+    }
+}
+
+# Monthly Phone Log Backup
+
+if ($New_Month) {
+    my $dbm_file = "$Pgm_Path\\..\\data\\phone\\callerid.dbm";
+    print_log "Backing up Phone Log to logs\\$dbm_file.$Year_Month_Now";
+
+    copy("$dbm_file.dir", "$dbm_file.$Year_Month_Now.dir") or print_log "Error in phone dbm copy 1: $!";
+    copy("$dbm_file.pag", "$dbm_file.$Year_Month_Now.pag") or print_log "Error in phone dbm copy 2: $!";
+
+    # dbm_copy will delete any bad entries (those with binary characters) from the file.
+
+    system("dbm_copy $dbm_file");
+    copy("$dbm_file.backup.dir", "$dbm_file.dir") or print_log "Error in phone dbm copy 3: $!";
+    copy("$dbm_file.backup.pag", "$dbm_file.pag") or print_log "Error in phone dbm copy 4: $!";
+}
+
+# Example on how to start and stop a serial port
+$v_port_control1 = new Voice_Cmd("[Start,Stop] Serial Port Monitoring");
+if ($state = said $v_port_control1) {
+    print_log "Serial Port now in $state position.";
+    ($state eq 'start') ? start $phone_modem : stop $phone_modem;
+}
+
+# Re-start the port, if it is not in use
+if ($New_Minute and is_stopped $phone_modem and is_available $phone_modem) {
+    start $phone_modem;
+    set $phone_modem 'init';
+    print_msg "MODEM Reinitialized...";
+    print_log "MODEM Reinitialized...";
+}
+
diff --git a/code/public/Brian/old stuff i don't use anymore/callog.pl b/code/public/Brian/old stuff i don't use anymore/callog.pl
index dd00a3c2d..2bbb16f92 100644
--- a/code/public/Brian/old stuff i don't use anymore/callog.pl	
+++ b/code/public/Brian/old stuff i don't use anymore/callog.pl	
@@ -1,232 +1,232 @@
-###########################################################
-# Klier Home Automation - Caller ID Module for Rockwell   #
-# Version 2.1a Release                                    #
-# By: Brian J. Klier, N0QVC                               #
-# Thanks for the mucho help from: Bruce Winter            #
-# E-Mail: klier@lakes.com                                 #
-# Webpage: http://www.faribault.k12.mn.us/brian           #
-###########################################################
- 
-# Category=Phone
-
-# Modem Caller ID Information looks like the following
-# DATE = 990305
-# TIME = 1351
-# NMBR = 5073336399
-# NAME = KLIER BRIAN J
-
-# Declare Variables
-
-my ($PhoneModemString, $PhoneNumber, $PhoneName, $NameDone, $NumberDone, $i, $j);
-my (@rejloglines, $NumofCalls);
-my ($PhoneDate, $PhoneTime, @callloglines, $CallLogTempLine, $RejLogTempLine);
-my ($PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog);
-my ($last, $first, $middle, $areacode, $local_number, $caller);
-
-$phone_modem = new Serial_Item ('AT#CID=1','init','serial2');
-$timer_hangup = new Timer;
-
-#-----> Provide PalmPad Controller Access for some Items
-$request_phone_stuff = new X10_Item('B6');
-
-# Web Interface Commands
-
-$v_phone_lastcaller = new Voice_Cmd('Show Recent Call Log');
-if ((said $v_phone_lastcaller) || (state_now $request_phone_stuff eq 'on')) {
-    open(CALLLOG, "$config_parms{code_dir}/calllog.log"); # Open for input
-    @callloglines = <CALLLOG>;                            # Open array and
-                                                          # read in data
-    close CALLLOG;                                        # Close the file
-
-    print_log "Announced Recent Callers.";
-
-    $NumofCalls = 0;
-
-    foreach $CallLogTempLine (@callloglines) {
-        $NumofCalls = $NumofCalls + 1;
-        ($PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog) = (split('`', $CallLogTempLine))[0, 1, 2, 3];
-        if ($PhoneNameLog eq 'Out of the Area' and $PhoneDateLog ne $Date_Now) {
-            speak "At $PhoneTimeLog on $PhoneDateLog, a person from out of the area called.";
-        }
-        if ($PhoneNameLog eq 'Out of the Area' and $PhoneDateLog eq $Date_Now) {
-            speak "At $PhoneTimeLog, a person from out of the area called.";
-        }
-        if ($PhoneNameLog ne 'Out of the Area' and $PhoneDateLog ne $Date_Now) {
-            speak "At $PhoneTimeLog on $PhoneDateLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
-        }
-        if ($PhoneNameLog ne 'Out of the Area' and $PhoneDateLog eq $Date_Now) {
-            speak "At $PhoneTimeLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
-        }
-    }
-    speak "$NumofCalls total calls.";
-}
-
-$v_phone_clearlog = new Voice_Cmd('Clear Recent Call Log');
-if ((said $v_phone_clearlog) || (state_now $request_phone_stuff eq 'off')) {
-    open(CALLLOG, ">$config_parms{code_dir}/calllog.log");     # CLEAR Log
-    close CALLLOG;
-    print_log "Call Log Cleared.";
-    speak "Call Log Cleared.";
-}
-
-#$v_phone_log = new Voice_Cmd('Run Display Callers');
-#if (said $v_phone_log) {
-#    print_log "Running Display Callers...";
-#    undef @ARGV;
-#    do "$Pgm_Path/display_callers";
-#    print_log "Done.";
-#}
-
-# Set MODEM Init Strings on Startup
-
-if ($Startup or $Reload) {
-    set $phone_modem 'init';               # Initialize MODEM
-
-    open(REJLOG, "$config_parms{code_dir}/rejlog.log");   # Open for input
-    @rejloglines = <REJLOG>;                              # Open array and
-                                                          # read in data
-    close REJLOG;                                         # Close the file
-
-    print_msg "Caller ID Interface has been Initialized...";
-    print_log "Caller ID Interface has been Initialized...";
-}
-
-# Timer Information for Phone Hangup (Reject List)
-
-if (expired $timer_hangup) {
-    set $phone_modem 'ATH';
-    set $timer_hangup 0;
-}
-
-# Display Incoming Serial Data
-
-if ($PhoneModemString = said $phone_modem) {
-    print_msg "PHONE: $PhoneModemString";
-
-    if (substr($PhoneModemString, 0, 4) eq 'RING') {
-        #run_voice_cmd "Stop Music";
-        #set $boombox_bedroom 'off';
-    }
-
-    if (substr($PhoneModemString, 0, 4) eq 'NAME') {
-        $NameDone = "yes";
-        $PhoneName = (substr($PhoneModemString, 7, 15));
-
-        # Switch name strings so first last, not last first.
-        # Use only the 1st two blank delimited fields, as the 3rd, 4th are usually just initials or incomplete
-        # Last First M
-        # Last M First
-
-        ($last, $first, $middle) = (split(' ', $PhoneName))[0, 1, 2];
-        $first = ucfirst(lc($first));
-        $first = ucfirst(lc($middle)) if length($first) == 1; # Last M First format
-        $last  = ucfirst(lc($last));
-        $caller = "$first $last";
-    }
-
-    if (substr($PhoneModemString, 0, 4) eq 'NMBR') {
-        $NumberDone = "yes";
-        $PhoneNumber = (substr($PhoneModemString, 7, 10));
-        $areacode = (substr($PhoneNumber, 0, 3));
-        $local_number = (substr($PhoneNumber, 3, 7));
-
-        if ($PhoneNumber eq "O") {
-            $PhoneNumber = "";
-            $areacode = "";
-            $local_number = "";
-        }
-    }
-
-    if (substr($PhoneModemString, 0, 13) eq 'MESG = 08014F') {
-        $NameDone = "yes";
-        $NumberDone = "yes";
-        $PhoneName = "Out of the Area";
-        $caller = "Out of the Area";
-    }
-
-    if ($NumberDone eq "yes" and $NameDone eq "yes") {
-        $NumberDone = 0;
-        $NameDone = 0;
-        $PhoneDate = $Date_Now;
-        $PhoneTime = $Time_Now;
-
-        # Log the data for use by display_callers
-
-        logit("$Pgm_Path/../data/phone/logs/callerid.$Year_Month_Now.log", "$PhoneNumber $PhoneName");
-        logit_dbm("$Pgm_Path/../data/phone/callerid.dbm", $PhoneNumber, "$Time_Now $Date_Now $Year name=$PhoneName");
-
-        # Check to see if callers phone number is in reject table.  If so,
-        # let them have it.
-
-        foreach $RejLogTempLine (@rejloglines) {
-            if (substr($RejLogTempLine, 0, 10) eq $PhoneNumber) {
-                print_log "$PhoneName is calling, and is in reject list!";
-                speak "$PhoneName is calling, and is in reject list!";
-                set $phone_modem 'ATA';
-                set $timer_hangup 5;
-            }
-        }
-
-        # If the incoming area code is the same, drop it from being spoken.
-
-        if ($areacode eq $config_parms{local_area_code}) {
-            $PhoneNumber = $local_number;
-        }
-
-        # Put Spaces in the Phone Number for Announce Reasons
-
-        $j = '';
-        for ($i = 0; $i != (length($PhoneNumber)); ++$i) {
-            $j = $j . substr($PhoneNumber, $i, 1);
-            $j = $j . " ";
-        }
-
-        $PhoneNumber = $j;
-
-        # Log the data in a special file to announce from Palmpad
-
-        open(CALLLOG, ">>$config_parms{code_dir}/calllog.log");  # Log it
-        print CALLLOG "$PhoneDate`$PhoneTime`$caller`$PhoneNumber\n";
-        close CALLLOG;
-
-        if ($PhoneName eq "Out of the Area") {
-            print_msg "PHONE: Out of area phone call.";
-            speak "Out of area phone call.";
-        }
-        else {
-            print_msg "PHONE: $caller is calling. Number is $PhoneNumber.";
-            speak "$caller is calling. Number is $PhoneNumber.";
-        }
-    }
-}
-
-# Monthly Phone Log Backup
-
-if ($New_Month) {
-    my $dbm_file = "$Pgm_Path\\..\\data\\phone\\callerid.dbm";
-    print_log "Backing up Phone Log to logs\\$dbm_file.$Year_Month_Now";
-
-    copy("$dbm_file.dir", "$dbm_file.$Year_Month_Now.dir") or print_log "Error in phone dbm copy 1: $!";
-    copy("$dbm_file.pag", "$dbm_file.$Year_Month_Now.pag") or print_log "Error in phone dbm copy 2: $!";
-
-    # dbm_copy will delete any bad entries (those with binary characters) from the file.
-
-    system("dbm_copy $dbm_file");
-    copy("$dbm_file.backup.dir", "$dbm_file.dir") or print_log "Error in phone dbm copy 3: $!";
-    copy("$dbm_file.backup.pag", "$dbm_file.pag") or print_log "Error in phone dbm copy 4: $!";
-}
-
-# Example on how to start and stop a serial port
-$v_port_control1 = new Voice_Cmd("[Start,Stop] Serial Port Monitoring");
-if ($state = said $v_port_control1) {
-    print_log "Serial Port now in $state position.";
-    ($state eq 'start') ? start $phone_modem : stop $phone_modem;
-}
-
-# Re-start the port, if it is not in use
-if ($New_Minute and is_stopped $phone_modem and is_available $phone_modem) {
-    start $phone_modem;
-    set $phone_modem 'init';
-    print_msg "MODEM Reinitialized...";
-    print_log "MODEM Reinitialized...";
-}
+###########################################################
+# Klier Home Automation - Caller ID Module for Rockwell   #
+# Version 2.1a Release                                    #
+# By: Brian J. Klier, N0QVC                               #
+# Thanks for the mucho help from: Bruce Winter            #
+# E-Mail: klier@lakes.com                                 #
+# Webpage: http://www.faribault.k12.mn.us/brian           #
+###########################################################
+ 
+# Category=Phone
+
+# Modem Caller ID Information looks like the following
+# DATE = 990305
+# TIME = 1351
+# NMBR = 5073336399
+# NAME = KLIER BRIAN J
+
+# Declare Variables
+
+my ($PhoneModemString, $PhoneNumber, $PhoneName, $NameDone, $NumberDone, $i, $j);
+my (@rejloglines, $NumofCalls);
+my ($PhoneDate, $PhoneTime, @callloglines, $CallLogTempLine, $RejLogTempLine);
+my ($PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog);
+my ($last, $first, $middle, $areacode, $local_number, $caller);
+
+$phone_modem = new Serial_Item ('AT#CID=1','init','serial2');
+$timer_hangup = new Timer;
+
+#-----> Provide PalmPad Controller Access for some Items
+$request_phone_stuff = new X10_Item('B6');
+
+# Web Interface Commands
+
+$v_phone_lastcaller = new Voice_Cmd('Show Recent Call Log');
+if ((said $v_phone_lastcaller) || (state_now $request_phone_stuff eq 'on')) {
+    open(CALLLOG, "$config_parms{code_dir}/calllog.log"); # Open for input
+    @callloglines = <CALLLOG>;                            # Open array and
+                                                          # read in data
+    close CALLLOG;                                        # Close the file
+
+    print_log "Announced Recent Callers.";
+
+    $NumofCalls = 0;
+
+    foreach $CallLogTempLine (@callloglines) {
+        $NumofCalls = $NumofCalls + 1;
+        ($PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog) = (split('`', $CallLogTempLine))[0, 1, 2, 3];
+        if ($PhoneNameLog eq 'Out of the Area' and $PhoneDateLog ne $Date_Now) {
+            speak "At $PhoneTimeLog on $PhoneDateLog, a person from out of the area called.";
+        }
+        if ($PhoneNameLog eq 'Out of the Area' and $PhoneDateLog eq $Date_Now) {
+            speak "At $PhoneTimeLog, a person from out of the area called.";
+        }
+        if ($PhoneNameLog ne 'Out of the Area' and $PhoneDateLog ne $Date_Now) {
+            speak "At $PhoneTimeLog on $PhoneDateLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
+        }
+        if ($PhoneNameLog ne 'Out of the Area' and $PhoneDateLog eq $Date_Now) {
+            speak "At $PhoneTimeLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
+        }
+    }
+    speak "$NumofCalls total calls.";
+}
+
+$v_phone_clearlog = new Voice_Cmd('Clear Recent Call Log');
+if ((said $v_phone_clearlog) || (state_now $request_phone_stuff eq 'off')) {
+    open(CALLLOG, ">$config_parms{code_dir}/calllog.log");     # CLEAR Log
+    close CALLLOG;
+    print_log "Call Log Cleared.";
+    speak "Call Log Cleared.";
+}
+
+#$v_phone_log = new Voice_Cmd('Run Display Callers');
+#if (said $v_phone_log) {
+#    print_log "Running Display Callers...";
+#    undef @ARGV;
+#    do "$Pgm_Path/display_callers";
+#    print_log "Done.";
+#}
+
+# Set MODEM Init Strings on Startup
+
+if ($Startup or $Reload) {
+    set $phone_modem 'init';               # Initialize MODEM
+
+    open(REJLOG, "$config_parms{code_dir}/rejlog.log");   # Open for input
+    @rejloglines = <REJLOG>;                              # Open array and
+                                                          # read in data
+    close REJLOG;                                         # Close the file
+
+    print_msg "Caller ID Interface has been Initialized...";
+    print_log "Caller ID Interface has been Initialized...";
+}
+
+# Timer Information for Phone Hangup (Reject List)
+
+if (expired $timer_hangup) {
+    set $phone_modem 'ATH';
+    set $timer_hangup 0;
+}
+
+# Display Incoming Serial Data
+
+if ($PhoneModemString = said $phone_modem) {
+    print_msg "PHONE: $PhoneModemString";
+
+    if (substr($PhoneModemString, 0, 4) eq 'RING') {
+        #run_voice_cmd "Stop Music";
+        #set $boombox_bedroom 'off';
+    }
+
+    if (substr($PhoneModemString, 0, 4) eq 'NAME') {
+        $NameDone = "yes";
+        $PhoneName = (substr($PhoneModemString, 7, 15));
+
+        # Switch name strings so first last, not last first.
+        # Use only the 1st two blank delimited fields, as the 3rd, 4th are usually just initials or incomplete
+        # Last First M
+        # Last M First
+
+        ($last, $first, $middle) = (split(' ', $PhoneName))[0, 1, 2];
+        $first = ucfirst(lc($first));
+        $first = ucfirst(lc($middle)) if length($first) == 1; # Last M First format
+        $last  = ucfirst(lc($last));
+        $caller = "$first $last";
+    }
+
+    if (substr($PhoneModemString, 0, 4) eq 'NMBR') {
+        $NumberDone = "yes";
+        $PhoneNumber = (substr($PhoneModemString, 7, 10));
+        $areacode = (substr($PhoneNumber, 0, 3));
+        $local_number = (substr($PhoneNumber, 3, 7));
+
+        if ($PhoneNumber eq "O") {
+            $PhoneNumber = "";
+            $areacode = "";
+            $local_number = "";
+        }
+    }
+
+    if (substr($PhoneModemString, 0, 13) eq 'MESG = 08014F') {
+        $NameDone = "yes";
+        $NumberDone = "yes";
+        $PhoneName = "Out of the Area";
+        $caller = "Out of the Area";
+    }
+
+    if ($NumberDone eq "yes" and $NameDone eq "yes") {
+        $NumberDone = 0;
+        $NameDone = 0;
+        $PhoneDate = $Date_Now;
+        $PhoneTime = $Time_Now;
+
+        # Log the data for use by display_callers
+
+        logit("$Pgm_Path/../data/phone/logs/callerid.$Year_Month_Now.log", "$PhoneNumber $PhoneName");
+        logit_dbm("$Pgm_Path/../data/phone/callerid.dbm", $PhoneNumber, "$Time_Now $Date_Now $Year name=$PhoneName");
+
+        # Check to see if callers phone number is in reject table.  If so,
+        # let them have it.
+
+        foreach $RejLogTempLine (@rejloglines) {
+            if (substr($RejLogTempLine, 0, 10) eq $PhoneNumber) {
+                print_log "$PhoneName is calling, and is in reject list!";
+                speak "$PhoneName is calling, and is in reject list!";
+                set $phone_modem 'ATA';
+                set $timer_hangup 5;
+            }
+        }
+
+        # If the incoming area code is the same, drop it from being spoken.
+
+        if ($areacode eq $config_parms{local_area_code}) {
+            $PhoneNumber = $local_number;
+        }
+
+        # Put Spaces in the Phone Number for Announce Reasons
+
+        $j = '';
+        for ($i = 0; $i != (length($PhoneNumber)); ++$i) {
+            $j = $j . substr($PhoneNumber, $i, 1);
+            $j = $j . " ";
+        }
+
+        $PhoneNumber = $j;
+
+        # Log the data in a special file to announce from Palmpad
+
+        open(CALLLOG, ">>$config_parms{code_dir}/calllog.log");  # Log it
+        print CALLLOG "$PhoneDate`$PhoneTime`$caller`$PhoneNumber\n";
+        close CALLLOG;
+
+        if ($PhoneName eq "Out of the Area") {
+            print_msg "PHONE: Out of area phone call.";
+            speak "Out of area phone call.";
+        }
+        else {
+            print_msg "PHONE: $caller is calling. Number is $PhoneNumber.";
+            speak "$caller is calling. Number is $PhoneNumber.";
+        }
+    }
+}
+
+# Monthly Phone Log Backup
+
+if ($New_Month) {
+    my $dbm_file = "$Pgm_Path\\..\\data\\phone\\callerid.dbm";
+    print_log "Backing up Phone Log to logs\\$dbm_file.$Year_Month_Now";
+
+    copy("$dbm_file.dir", "$dbm_file.$Year_Month_Now.dir") or print_log "Error in phone dbm copy 1: $!";
+    copy("$dbm_file.pag", "$dbm_file.$Year_Month_Now.pag") or print_log "Error in phone dbm copy 2: $!";
+
+    # dbm_copy will delete any bad entries (those with binary characters) from the file.
+
+    system("dbm_copy $dbm_file");
+    copy("$dbm_file.backup.dir", "$dbm_file.dir") or print_log "Error in phone dbm copy 3: $!";
+    copy("$dbm_file.backup.pag", "$dbm_file.pag") or print_log "Error in phone dbm copy 4: $!";
+}
+
+# Example on how to start and stop a serial port
+$v_port_control1 = new Voice_Cmd("[Start,Stop] Serial Port Monitoring");
+if ($state = said $v_port_control1) {
+    print_log "Serial Port now in $state position.";
+    ($state eq 'start') ? start $phone_modem : stop $phone_modem;
+}
+
+# Re-start the port, if it is not in use
+if ($New_Minute and is_stopped $phone_modem and is_available $phone_modem) {
+    start $phone_modem;
+    set $phone_modem 'init';
+    print_msg "MODEM Reinitialized...";
+    print_log "MODEM Reinitialized...";
+}
diff --git a/code/public/Brian/old stuff i don't use anymore/radar.pl b/code/public/Brian/old stuff i don't use anymore/radar.pl
index c2e72d4f0..19336d156 100644
--- a/code/public/Brian/old stuff i don't use anymore/radar.pl	
+++ b/code/public/Brian/old stuff i don't use anymore/radar.pl	
@@ -1,80 +1,80 @@
-# Category = Vehicles
-
-$radar_active = new Generic_Item;
-
-$timer_aftercon = new Timer;
-$timer_beforedis = new Timer;
-
-my ($ManualRadarFlag);
-
-if ($Startup or $Reload) {
-    set $radar_active 'no';
-}
-
-$p_get_radar = new Process_Item("get_url http://www.findu.com/cgi-bin/radar-find.cgi?call=n0qvc-1&nocall=1&offsetx=40&offsety=35 $config_parms{data_dir}/web/radar.png");
-#$p_get_radar2 = new Process_Item("get_url http://www.swiftwx.com/warnings/warnings.aspx $config_parms{data_dir}/web/warnings.asp");
-#$p_get_radar3 = new Process_Item("get_url http://www.swiftwx.com/warnings/watches.aspx $config_parms{data_dir}/web/watches.asp");
-
-$v_get_radar = new  Voice_Cmd('Retrieve Chicklet Radar');
-if (said $v_get_radar) {
-    $ManualRadarFlag = 'yes';
-    start $p_get_radar;
-    #start $p_get_radar2;
-    #start $p_get_radar3;
-    speak "Retrieving RADAR";
-}
-
-# Main Loop
-
-#if ((substr($APRSString, 0, 7) eq '*** CON') ||   # If a packet comes in,
-#   (substr($APRSString, 0, 11) eq 'cmd:*** CON')) { # and we are connected,
-#    speak "We're connected!";
-#    set $tnc_output "$HamCall Radar Retrieval System";
-#    set $radar_active 'yes';
-#    set $enable_transmit 'no';
-#    start $p_get_radar;
-#    #start $p_get_radar2;
-#    #start $p_get_radar3;
-#    speak "Retrieving RADAR";
-#}
-
-# If the TNC shows we are disconnected, force a disconnect and re-enter
-# converse mode.
-if ((substr($APRSString, 0, 7) eq '*** DIS') ||
-    (substr($APRSString, 0, 11) eq 'cmd:*** DIS') ||
-    (substr($APRSString, 0, 15) eq 'cmd:cmd:*** DIS')) {
-    set $timer_beforedis 1;
-    speak "Disconnected!";
-    set $enable_transmit 'yes';
-    set $radar_active 'no';
-    set $tnc_output pack('C',3);                  # Send Control-C
-    set $tnc_output 'CONV';                       # Enter Converse Mode
-}
-
-# Force a disconnect
-if (expired $timer_beforedis) {
-    set $timer_beforedis 0;
-    set $enable_transmit 'yes';
-    set $radar_active 'no';
-    set $tnc_output pack('C',3);                  # Send Control-C
-    set $tnc_output 'D';                          # Go to Disconnect
-    set $tnc_output 'CONV';                       # Enter Converse Mode
-}
-
-# After we retrieve the radar, pause for 15 seconds to allow uuencode to
-# do it's thing.
-if (done_now $p_get_radar) {
-    speak "Done Retrieving Radar";
-    if ($ManualRadarFlag ne 'yes') {set $timer_aftercon 15};
-    $ManualRadarFlag = '';
-    run qq[uueradar];
-}
-
-# After the 15 seconds is up, go ahead and send the data to the remote
-# station.
-if (expired $timer_aftercon) {
-    set $timer_aftercon 0;
-    my $RadarBase64 = file_read("$config_parms{data_dir}/web/radar.001");
-    set $tnc_output $RadarBase64;
-    set $timer_beforedis 360;
-}
+# Category = Vehicles
+
+$radar_active = new Generic_Item;
+
+$timer_aftercon = new Timer;
+$timer_beforedis = new Timer;
+
+my ($ManualRadarFlag);
+
+if ($Startup or $Reload) {
+    set $radar_active 'no';
+}
+
+$p_get_radar = new Process_Item("get_url http://www.findu.com/cgi-bin/radar-find.cgi?call=n0qvc-1&nocall=1&offsetx=40&offsety=35 $config_parms{data_dir}/web/radar.png");
+#$p_get_radar2 = new Process_Item("get_url http://www.swiftwx.com/warnings/warnings.aspx $config_parms{data_dir}/web/warnings.asp");
+#$p_get_radar3 = new Process_Item("get_url http://www.swiftwx.com/warnings/watches.aspx $config_parms{data_dir}/web/watches.asp");
+
+$v_get_radar = new  Voice_Cmd('Retrieve Chicklet Radar');
+if (said $v_get_radar) {
+    $ManualRadarFlag = 'yes';
+    start $p_get_radar;
+    #start $p_get_radar2;
+    #start $p_get_radar3;
+    speak "Retrieving RADAR";
+}
+
+# Main Loop
+
+#if ((substr($APRSString, 0, 7) eq '*** CON') ||   # If a packet comes in,
+#   (substr($APRSString, 0, 11) eq 'cmd:*** CON')) { # and we are connected,
+#    speak "We're connected!";
+#    set $tnc_output "$HamCall Radar Retrieval System";
+#    set $radar_active 'yes';
+#    set $enable_transmit 'no';
+#    start $p_get_radar;
+#    #start $p_get_radar2;
+#    #start $p_get_radar3;
+#    speak "Retrieving RADAR";
+#}
+
+# If the TNC shows we are disconnected, force a disconnect and re-enter
+# converse mode.
+if ((substr($APRSString, 0, 7) eq '*** DIS') ||
+    (substr($APRSString, 0, 11) eq 'cmd:*** DIS') ||
+    (substr($APRSString, 0, 15) eq 'cmd:cmd:*** DIS')) {
+    set $timer_beforedis 1;
+    speak "Disconnected!";
+    set $enable_transmit 'yes';
+    set $radar_active 'no';
+    set $tnc_output pack('C',3);                  # Send Control-C
+    set $tnc_output 'CONV';                       # Enter Converse Mode
+}
+
+# Force a disconnect
+if (expired $timer_beforedis) {
+    set $timer_beforedis 0;
+    set $enable_transmit 'yes';
+    set $radar_active 'no';
+    set $tnc_output pack('C',3);                  # Send Control-C
+    set $tnc_output 'D';                          # Go to Disconnect
+    set $tnc_output 'CONV';                       # Enter Converse Mode
+}
+
+# After we retrieve the radar, pause for 15 seconds to allow uuencode to
+# do it's thing.
+if (done_now $p_get_radar) {
+    speak "Done Retrieving Radar";
+    if ($ManualRadarFlag ne 'yes') {set $timer_aftercon 15};
+    $ManualRadarFlag = '';
+    run qq[uueradar];
+}
+
+# After the 15 seconds is up, go ahead and send the data to the remote
+# station.
+if (expired $timer_aftercon) {
+    set $timer_aftercon 0;
+    my $RadarBase64 = file_read("$config_parms{data_dir}/web/radar.001");
+    set $tnc_output $RadarBase64;
+    set $timer_beforedis 360;
+}
diff --git a/code/public/Brian/old stuff i don't use anymore/tk_frames.pl b/code/public/Brian/old stuff i don't use anymore/tk_frames.pl
index 736d199cc..41e8aa912 100644
--- a/code/public/Brian/old stuff i don't use anymore/tk_frames.pl	
+++ b/code/public/Brian/old stuff i don't use anymore/tk_frames.pl	
@@ -1,79 +1,79 @@
- 
-# Position=1                    Load before any tk_widget code
-
-# This file determines the layout of the mh Tk window
-
-                                # Re-create tk widgets on startup or if this file has changed on code reload
-if ($MW and $Reload) {
-
-                                # If this file has not changed, only re-create the tk widget grid
-    if (!$Startup and !file_change("$config_parms{code_dir}/tk_frames.pl")) {
-        print "Deleteing old grid frame\n";
-        $Tk_objects{grid}->destroy;
-        $Tk_objects{grid} = $Tk_objects{ft}->Frame->pack(qw/-side right -anchor n/); 
-    }
-
-                                # This file changed, so re-create all frames
-    else {
-        file_change("$config_parms{code_dir}/tk_frames.pl") if $Startup; # Set file change time stamp
-
-        unless ($Startup) {
-            print "Deleteing old tk frames\n";
-            $Tk_objects{ft}->destroy;
-            $Tk_objects{fb}->destroy;
-        }
-        print "Creating new tk frames\n";
-
-                                # Create top and bottom frames
-        $Tk_objects{ft}   = $MW->Frame->pack(qw/-side top -fill both -expand 1/); 
-        $Tk_objects{fb}   = $MW->Frame->pack(qw/-side top -fill both -expand 1/); 
-
-                                # Create top left and tk grid frames
-        $Tk_objects{ftl}  = $Tk_objects{ft}->Frame->pack(qw/-side left -fill both -expand 1/); 
-        $Tk_objects{grid} = $Tk_objects{ft}->Frame->pack(qw/-side right -anchor n/); 
-
-                                # Add command list and msg windows to top left frame
-        $Tk_objects{cmd_list} = &tk_command_list($Tk_objects{ftl});
-        $Tk_objects{cmd_list}->pack(qw/-side top -expand 1 -fill both/);
-
-        $Tk_objects{cmd_list}->insert(0, ' ', ' ', ' ', &list_voice_cmds_match('')) if $Startup; # Init with all commands
-
-
-        $Tk_objects{msg_window} = $Tk_objects{ftl}->
-            Scrolled('Text', -height=> 5, -width => 30, -bg => 'white', -wrap => 'none', -scrollbars => 'se')->
-                pack(qw/-side top -expand 1 -fill both/);
-        &print_msg("Started");
-
-                                # Add speak and log windows to bottom frame
-        $Tk_objects{speak_window} = $Tk_objects{fb}->
-            Scrolled('Text', -height => 7, -width => 40, -bg => 'cyan', -wrap => 'none', -scrollbars => 'se',
-                     -setgrid => 'true', -font => 'Courier* 10 bold')->
-                         pack(qw/-side top -expand 1 -fill both/);
-
-        $Tk_objects{log_window} = $Tk_objects{fb}->
-            Scrolled('Text', -height => 7, -width => 40, -bg => 'cyan', -wrap => 'none', -scrollbars => 'se',
-                     -setgrid => 'true', -font => 'Courier* 10 bold')->
-                         pack(qw/-side top -expand 1 -fill both/);
-
-
-                                # Allow geometry resizing on reload, but only if it has changed, 
-                                # so we don't mess up manual changes.
-        if ($config_parms{tk_geometry} and
-            ($Startup or 
-             $config_parms{tk_geometry} ne $config_parms{tk_geometry_startup})) {
-            $MW->geometry($config_parms{tk_geometry});
-            $config_parms{tk_geometry_startup} = $config_parms{tk_geometry};
-        }
-    }
-
-                                # Show the window (it is hidden during statup)
-    if ($Startup) {
-        $MW->deiconify;
-        $MW->raise;
-        $MW->focusForce;
-#       $MW->focus("-force"); 
-#       $MW->grabGlobal;
-#       $MW->grab("-global"); 
-    }
-
-}
+ 
+# Position=1                    Load before any tk_widget code
+
+# This file determines the layout of the mh Tk window
+
+                                # Re-create tk widgets on startup or if this file has changed on code reload
+if ($MW and $Reload) {
+
+                                # If this file has not changed, only re-create the tk widget grid
+    if (!$Startup and !file_change("$config_parms{code_dir}/tk_frames.pl")) {
+        print "Deleteing old grid frame\n";
+        $Tk_objects{grid}->destroy;
+        $Tk_objects{grid} = $Tk_objects{ft}->Frame->pack(qw/-side right -anchor n/); 
+    }
+
+                                # This file changed, so re-create all frames
+    else {
+        file_change("$config_parms{code_dir}/tk_frames.pl") if $Startup; # Set file change time stamp
+
+        unless ($Startup) {
+            print "Deleteing old tk frames\n";
+            $Tk_objects{ft}->destroy;
+            $Tk_objects{fb}->destroy;
+        }
+        print "Creating new tk frames\n";
+
+                                # Create top and bottom frames
+        $Tk_objects{ft}   = $MW->Frame->pack(qw/-side top -fill both -expand 1/); 
+        $Tk_objects{fb}   = $MW->Frame->pack(qw/-side top -fill both -expand 1/); 
+
+                                # Create top left and tk grid frames
+        $Tk_objects{ftl}  = $Tk_objects{ft}->Frame->pack(qw/-side left -fill both -expand 1/); 
+        $Tk_objects{grid} = $Tk_objects{ft}->Frame->pack(qw/-side right -anchor n/); 
+
+                                # Add command list and msg windows to top left frame
+        $Tk_objects{cmd_list} = &tk_command_list($Tk_objects{ftl});
+        $Tk_objects{cmd_list}->pack(qw/-side top -expand 1 -fill both/);
+
+        $Tk_objects{cmd_list}->insert(0, ' ', ' ', ' ', &list_voice_cmds_match('')) if $Startup; # Init with all commands
+
+
+        $Tk_objects{msg_window} = $Tk_objects{ftl}->
+            Scrolled('Text', -height=> 5, -width => 30, -bg => 'white', -wrap => 'none', -scrollbars => 'se')->
+                pack(qw/-side top -expand 1 -fill both/);
+        &print_msg("Started");
+
+                                # Add speak and log windows to bottom frame
+        $Tk_objects{speak_window} = $Tk_objects{fb}->
+            Scrolled('Text', -height => 7, -width => 40, -bg => 'cyan', -wrap => 'none', -scrollbars => 'se',
+                     -setgrid => 'true', -font => 'Courier* 10 bold')->
+                         pack(qw/-side top -expand 1 -fill both/);
+
+        $Tk_objects{log_window} = $Tk_objects{fb}->
+            Scrolled('Text', -height => 7, -width => 40, -bg => 'cyan', -wrap => 'none', -scrollbars => 'se',
+                     -setgrid => 'true', -font => 'Courier* 10 bold')->
+                         pack(qw/-side top -expand 1 -fill both/);
+
+
+                                # Allow geometry resizing on reload, but only if it has changed, 
+                                # so we don't mess up manual changes.
+        if ($config_parms{tk_geometry} and
+            ($Startup or 
+             $config_parms{tk_geometry} ne $config_parms{tk_geometry_startup})) {
+            $MW->geometry($config_parms{tk_geometry});
+            $config_parms{tk_geometry_startup} = $config_parms{tk_geometry};
+        }
+    }
+
+                                # Show the window (it is hidden during statup)
+    if ($Startup) {
+        $MW->deiconify;
+        $MW->raise;
+        $MW->focusForce;
+#       $MW->focus("-force"); 
+#       $MW->grabGlobal;
+#       $MW->grab("-global"); 
+    }
+
+}
diff --git a/code/public/Brian/old stuff i don't use anymore/tk_widgets.pl b/code/public/Brian/old stuff i don't use anymore/tk_widgets.pl
index 14c3df12f..5827d0d06 100644
--- a/code/public/Brian/old stuff i don't use anymore/tk_widgets.pl	
+++ b/code/public/Brian/old stuff i don't use anymore/tk_widgets.pl	
@@ -1,38 +1,38 @@
- 
-# Position=2                    Load after tk_frames
-
-# This file adds to the tk widget grid frame
-
-                                # Re-create tk widgets on reload
-if ($MW and $Reload) {
-
-    &tk_mbutton('Help', \&help);
-
-    &tk_button('Reload(F1)', \&read_code, 'Pause (F2)', \&pause, ' Exit (F3) ', \&sig_handler,
-               'Debug(F4)', \&toggle_debug, 'Log(F5)', \&toggle_log);
-    $MW->bind('<F1>' => \&read_code);
-    $MW->bind('<F2>' => \&pause);
-    $MW->bind('<F3>' => \&sig_handler); 
-    $MW->bind('<F4>' => \&toggle_debug); 
-    $MW->bind('<F5>' => \&toggle_log); 
-
-    &tk_label(\$Tk_objects{label_time});
-    &tk_label(\$Tk_objects{label_uptime_cpu});
-    &tk_label(\$Tk_objects{label_uptime_mh});
-    &tk_label(\$Tk_objects{label_cpu_used});
-    &tk_label(\$Tk_objects{label_cpu_loops});
-
-#    &tk_entry("Sleep time:", \$Loop_Sleep_Time);
-#    &tk_entry("Tk passes:", \$Loop_Tk_Passes);
-
-#    &tk_entry("Test data:", \$Save{test_data});
-
-    &tk_radiobutton('Mode',  \$Save{mode}, ['normal', 'mute', 'offline'], ['Normal', 'Mute', 'Offline']);
-
-#   &tk_radiobutton('Debug', \$config_parms{debug}, [1, 0], ['On', 'Off']);
-#   &tk_checkbutton('Debug on', \$config_parms{debug});
-
-    &tk_radiobutton('Tracking', \$config_parms{tracking_speakflag}, [0,1,2,3], ['None', 'GPS', 'WX', 'All']);
-
-    &tk_radiobutton('Weekday Callout', \$Save{Autocall}, ['on', 'off'], ['On', 'Off']);
-}
+ 
+# Position=2                    Load after tk_frames
+
+# This file adds to the tk widget grid frame
+
+                                # Re-create tk widgets on reload
+if ($MW and $Reload) {
+
+    &tk_mbutton('Help', \&help);
+
+    &tk_button('Reload(F1)', \&read_code, 'Pause (F2)', \&pause, ' Exit (F3) ', \&sig_handler,
+               'Debug(F4)', \&toggle_debug, 'Log(F5)', \&toggle_log);
+    $MW->bind('<F1>' => \&read_code);
+    $MW->bind('<F2>' => \&pause);
+    $MW->bind('<F3>' => \&sig_handler); 
+    $MW->bind('<F4>' => \&toggle_debug); 
+    $MW->bind('<F5>' => \&toggle_log); 
+
+    &tk_label(\$Tk_objects{label_time});
+    &tk_label(\$Tk_objects{label_uptime_cpu});
+    &tk_label(\$Tk_objects{label_uptime_mh});
+    &tk_label(\$Tk_objects{label_cpu_used});
+    &tk_label(\$Tk_objects{label_cpu_loops});
+
+#    &tk_entry("Sleep time:", \$Loop_Sleep_Time);
+#    &tk_entry("Tk passes:", \$Loop_Tk_Passes);
+
+#    &tk_entry("Test data:", \$Save{test_data});
+
+    &tk_radiobutton('Mode',  \$Save{mode}, ['normal', 'mute', 'offline'], ['Normal', 'Mute', 'Offline']);
+
+#   &tk_radiobutton('Debug', \$config_parms{debug}, [1, 0], ['On', 'Off']);
+#   &tk_checkbutton('Debug on', \$config_parms{debug});
+
+    &tk_radiobutton('Tracking', \$config_parms{tracking_speakflag}, [0,1,2,3], ['None', 'GPS', 'WX', 'All']);
+
+    &tk_radiobutton('Weekday Callout', \$Save{Autocall}, ['on', 'off'], ['On', 'Off']);
+}
diff --git a/code/public/Brian/old stuff i don't use anymore/tracking.pl b/code/public/Brian/old stuff i don't use anymore/tracking.pl
index 960d5708e..447e61f98 100644
--- a/code/public/Brian/old stuff i don't use anymore/tracking.pl	
+++ b/code/public/Brian/old stuff i don't use anymore/tracking.pl	
@@ -1,1394 +1,1394 @@
-
-######################################################
-# Klier Home Automation - Tracking Module            #
-# Version 4.92 (release for MH 2.??)                 #
-# By: Brian J. Klier, N0QVC                          #
-# June 16, 2001                                      #
-# E-Mail: brian@kliernetwork.net                     #
-# Webpage: http://www.kliernetwork.net               #
-######################################################
-
-=begin comment
-
-mh.ini parms:
-
-tracking_trackself=1                    # This parameter should equal "1" if
-                                        # GPS Speaking is off and you still want
-                                        # to hear tracking from your own mobile
-tracking_shortannounce=1                #  0 = When Speaking Tracking
-                                        #      Information, this will
-                                        #      announce both distance from
-                                        #      this station and distance
-                                        #      from waypoint.
-                                        #  1 = Only Distance from waypoint.
-tracking_withname=1                     #  0 = If tracking.nam available,
-                                        #      announce callsign instead
-                                        #      of given name.
-                                        #  1 = Announce Given name instead
-                                        #      of callsign.
-                                        #  2 = Announce given name AND
-                                        #      callsign.
-
-=cut
-
-# For more information on hardware needed for this system to function:
-#   - Check out http://www.kliernetwork.net/aprs    and
-#               http://www.kliernetwork.net/aprs/mine
-#
-# New in Version 4.92:
-#   - Added Roger Bille's "Longitude Hundreds" Fix
-#
-# New in Version 4.91:
-#   - Fixed bugs in "EMAIL2" Procedure
-#   - Added ALPHA Procedure to take data from Telnet Port and transmit
-#     on the air (for WinAPRS Connectivity)
-#
-# New in Version 4.9:
-#   - Fixed bugs in the HTML Based Logging System.
-#
-# New in Version 4.8 and 4.8a:
-#   - Added HTML Based Logging (from Bruce's tracking_bruce.pl) for GPS's.
-#
-# New in Version 4.7:
-#   - Added Speaking of POSFILE Positions for Weather Stations
-#
-# New in Version 4.62:
-#   - Fixed problem with tracking_withname and speaking EVERY position
-#     instead of checking to see if it was the same as the last one.
-#   - Added ability to respond to ?WX? queries with current temperature.
-#
-# New in Version 4.6:
-#   - 4.61 ALPHA - Continued work on proper implementation.
-#   - Added tracking_shortannounce and tracking_withname variables.
-#   - NOTE: I STILL need to implement tracking_withname=2!!!
-#
-# New in Version 4.5:
-#   - 4.52 ALPHA - MHATS now ignores "acks" that are sent - does not talk
-#                  to them.  Also added msg # to "msg received" messages.
-#   - 4.51 ALPHA - Fix Small Bug in X-10 Message Response...
-#   - ALPHA - Working on Temperature Graphs
-#   - Changed "EMAIL" gateway to "EMAIL2" so it doesn't interfere with the
-#     main APRS IGATES.
-#
-# New in Version 4.4:
-#   - Fixed all the messaging/X10 Packet Remote Control stuff.
-#   - Bulletin feature still needs to be tested for operation.
-#
-# Next Version Wishlist:
-#   - Check for duplicate messages in a row (like when they pass through
-#     a digipeater to make sure an X10 command isn't sent twice)
-#   - System to execute X-10 commands when a station is a certain distance from home
-
-# Declare Variables
-
-use vars '$GPSSpeakString', '$GPSSpeakString2', '$WXSpeakString', '$WXSpeakString2', '$CurrentTemp', '$CurrentChill', '$WXWindDirVoice', '$WXWindSpeed', '$WXHrPrecip';
-
-my ($APRSFoundAPRS, $APRSPacketDigi, $GPSTime, $APRSStatus, $MsgLine);
-my ($GPSLatitudeDegrees, $GPSLatitudeMinutes, $GPSLongitudeDegrees, $GPSCallsign);
-my ($GPSLongitudeMinutes, $GPSLatitude, $GPSLongitude, $GPSDistance, $GPSLongitudeMinutes100);
-my ($GPSLstBr, $GPSLstBrLat, $GPSLstBrLon);
-
-my (@gpscomplines, $GPSTempCompPlace, $GPSTempCompDist, $GPSTempCompLine);
-my ($GPSTempCompLat, $GPSTempCompLong);
-my ($GPSCompPlace, $GPSCompLat, $GPSCompLong, $GPSCompDist);
-my ($GPSCompLstBr, $GPSCompLstBrLat, $GPSCompLstBrLon);
-
-# Added 4.7
-my ($WXTempCompPlace, $WXTempCompDist, $WXTempCompLine);
-my ($WXTempCompLat, $WXTempCompLong);
-my ($WXCompPlace, $WXCompLat, $WXCompLong, $WXCompDist);
-my ($WXCompLstBr, $WXCompLstBrLat, $WXCompLstBrLon);
-
-my (@namelines, $TempName, $TempNameCall, $TempNameName);
-
-my (@wxgraphinlines, $WXTempGraphLine, $WXTempGraphTime);
-my ($WXTempGraphDOW, $WXTempGraphDaytime, $WXTempGraphDate, $WXTempGraphTemp);
-my ($WXTempGraphWindDir, $WXTempGraphWindSpeed, $WXTempGraphHrPrecip);
-my ($WXTempGraph24HrPrecip, $WXTempGraphHour, $WXTempGraphMin);
-my ($WXTempGraphAMPM);
-
-my ($i, $j, $k, $CallsignPart, $PacketPart, $GPSSpeed, $GPSCourse, $GPSCourseVoice);
-my ($ToCallsignPart, $LastGPSCallsign, $LastGPSDistance, $LastGPSLstBr);
-my ($APRSCallsign, $APRSStringLength, $APRSString, $MessageX10Command);
-my ($MessageX10Action);
-my ($GPSSpeakString3, $MessageAck, $APRSCallsignVoice, $HamCall, $HamName);
-my ($WXTime, $WXLatitudeDegrees, $WXLatitudeMinutes, $WXLongitudeDegrees);
-my ($WXLongitudeMinutes, $WXLatitude, $WXLongitude, $WXDistance, $WXTemp);
-my ($WXLstBr, $WXLstBrLat, $WXLstBrLon);
-my ($WXCallsign, $WXWindDir, $WX24HrPrecip, $RealAPRSCallsign);
-my ($CurrentTempDist, $WXWindChill);
-my ($LastWXCallsign, $LastWXTemp, $LastWXDistance, $LastWXWindDir);
-my ($LastWXWindSpeed, $LastWXWindChill, $APRSCallsignNoSSID);
-my ($LastWXHrPrecip, $LastWX24HrPrecip, $CurrentHrPrecip, $Current24HrPrecip);
-
-# Setup TELNET Server 2 (port 14439) to output what the TNC hears
-
-$server2 = new Socket_Item('#Welcome to MisterHouse APRS Tracking!', 'APRSWelcome', 'server2');
-# Send Welcome Message out port 2 if connected.
-set $server2 'APRSWelcome' if active_now $server2;
-set $server2 'APRSERVE>APRS:javaTITLE:N0QVC MisterHouse - tracking.pl - Brian Klier, N0QVC' if active_now $server2;
-
-my $socket_speak_loop;
-if (my $telnetdata = said $server2) {
-    print_log "Data Transmitted from Telnet Port: $telnetdata";
-    set $tnc_output $telnetdata;
-}
-
-# TNC Output Lines
-
-$tnc_output = new Serial_Item ('CONV','converse','serial1');
-$tnc_output -> add            ('?WX?','wxquery','serial1');
-$tnc_output -> add            (sprintf("=%2d%05.02fN/0%2d%05.02fW- *** %s MisterHouse Tracking System - ICQ#659962 ***",
-                                       int($config_parms{latitude}),
-                                       abs ($config_parms{latitude} - int($config_parms{latitude}))*60,
-                                       int($config_parms{longitude}),
-                                       abs ($config_parms{longitude} -int($config_parms{longitude}))*60,
-                                       $config_parms{tracking_callsign}),
-                                       ,'position','serial1');
-
-# Set TNC to Converse and send position on Startup
-
-if ($Reload) {
-    $HamCall = $config_parms{tracking_callsign};         # Feed in my Tracking Callsign
-    open(GPSCOMP, "$config_parms{code_dir}/tracking.pos"); # Open for input
-    @gpscomplines = <GPSCOMP>;                           # Open array and
-                                                         # read in data
-    close GPSCOMP;                                       # Close the file
-
-    open(GPSNAME, "$config_parms{code_dir}/tracking.nam"); # Open for input
-    @namelines = <GPSNAME>;                              # Open array and
-                                                         # read in data
-    close GPSNAME;                                       # Close the file
-}
-
-if ($Startup) {
-    mkdir "$Pgm_Root/web/javAPRS",777 unless -d "$Pgm_Root/web/javAPRS";
-
-    open(APRSLOG, ">$Pgm_Root/web/javAPRS/aprs.tnc");    # CLEAR Log
-    close APRSLOG;
-
-#    set $tnc_output pack('C',3);
-#    set $tnc_output 'MRPT OFF';           # Do NOT Show Digipeater Path
-#    set $tnc_output 'HEADERLN OFF';       # Keep Header and data on the same line
-    set $tnc_output 'converse';
-    set $tnc_output 'position';
-    print_msg "Tracking Interface has been Initialized...Callsign $HamCall";
-    print_log "Tracking Interface has been Initialized...Callsign $HamCall";
-}
-
-# Voice Responses
-$v_send_position = new Voice_Cmd("Send my Position");
-
-if ($state = said $v_send_position) {
-    set $tnc_output 'position';
-    print_log "Position Sent.";
-    speak "Position Sent.";
-}
-
-$v_send_status = new Voice_Cmd("Send my Status Report");
-
-if ($state = said $v_send_status) {
-    $APRSStatus = ">Frnt Move $motion_detector_frontdoor->{state}-Bck Move $motion_detector_backdoor->{state}-Kitc Move $motion_detector_kitchen->{state}-Garg Move $motion_detector_garage->{state}-Temp: $CurrentTemp";
-    set $tnc_output $APRSStatus;
-    print_log "Status Sent.";
-    speak "Status Sent.";
-}
-
-$v_wx_query = new Voice_Cmd("Weather Query");
-
-if ($state = said $v_wx_query) {
-    set $tnc_output 'wxquery';
-    print_log "Weather Query Requested.";
-    speak "Weather Query Requested.";
-}
-
-$v_last_callsign = new Voice_Cmd("Last Callsign");
-
-if ($state = said $v_last_callsign and $APRSCallsign ne '') {
-    print_log "Callsign is $APRSCallsign.";
-    speak "Call sign is $APRSCallsign.";
-}
-elsif ($state = said $v_last_callsign and $APRSCallsign eq '') {
-    print_log "No packets received.";
-    speak "No packets received.";
-}
-
-$v_last_mobile = new Voice_Cmd("Last Mobile Report");
-
-if ($state = said $v_last_mobile and $GPSCallsign ne '') {
-    print_log "$GPSSpeakString";
-    speak $GPSSpeakString;
-}
-elsif ($state = said $v_last_mobile and $GPSCallsign eq '') {
-    print_log "No mobile packets received.";
-    speak "No mobile packets received.";
-}
-
-$v_last_wxrpt = new Voice_Cmd("Last Weather Report");
-
-if ($state = said $v_last_wxrpt) {
-    if ($WXTemp ne '') {
-        print_log "$WXSpeakString";
-        speak $WXSpeakString;
-    }
-    elsif ($WXTemp eq '') {
-        print_log "No weather packets received.";
-        speak "No weather packets received.";
-    }
-}
-
-$v_curr_cond = new Voice_Cmd("Current Conditions");
-
-if ($state = said $v_curr_cond) {
-    if ($CurrentTemp ne '') {
-        if ($CurrentTemp eq $CurrentChill) {
-            print_log "Temperature is $CurrentTemp degrees.";
-            speak "Temperature is $CurrentTemp degrees.";
-        }
-        if ($CurrentTemp ne $CurrentChill) {
-            print_log "Temperature is $CurrentTemp degrees.  Wind Chill is $CurrentChill degrees.";
-            speak "Temperature is $CurrentTemp degrees.  Winnd Chill is $CurrentChill degrees.";
-        }
-        if ($CurrentHrPrecip != 0) {
-            print_log "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
-            speak "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
-        }
-    }
-    elsif ($CurrentTemp eq '') {
-        print_log "No weather packets received.";
-        speak "No weather packets received.";
-    }
-}
-
-$v_curr_precip = new Voice_Cmd("Current Precipitation");
-
-if ($state = said $v_curr_precip) {
-    if ($CurrentHrPrecip != 0) {
-        print_log "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
-        speak "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
-    }
-    elsif ($CurrentTemp eq '') {
-        print_log "No weather packets received.";
-        speak "No weather packets received.";
-    }
-    else {
-        print_log "No rain to report.";
-        speak "No rain to report.";
-    }
-}
-
-$v_send_test_email = new Voice_Cmd("Send test email to myself");
-
-if ($state = said $v_send_test_email) {
-    $i = ":EMAIL    :$config_parms{net_mail_user}\@$config_parms{net_mail_server} Test E-Mail - " . $CurrentTemp . "deg.{0";
-    set $tnc_output $i;
-}
-
-$v_send_test_icq = new Voice_Cmd("Send test ICQ msg to myself");
-
-if ($state = said $v_send_test_icq) {
-    $i = ":ICQSERVE :659962 Test Message - " . $CurrentTemp . " degrees.{1";
-    set $tnc_output $i;
-}
-
-# Added 4.7
-$v_register_icqserve = new Voice_Cmd("Register on ICQServe (Do Once)");
-
-if ($state = said $v_register_icqserve) {
-    $i = ":ICQSERVE :REGISTER 659962 {1";
-    set $tnc_output $i;
-}
-
-# Procedure to Log Temperature and Stats every 10 minutes
-
-if (time_cron('0,10,20,30,40,50 * * * *') or $Startup) {
-    logit("$Pgm_Path/../web/mh/weather.html", "<FONT SIZE=-2>Temp: $CurrentTemp &nbsp;&nbsp;&nbsp;Wind Chill: $CurrentChill &nbsp;&nbsp;&nbsp;Wind: $LastWXWindDir/$LastWXWindSpeed &nbsp;&nbsp;&nbsp;Precipitation: $WXHrPrecip/$WX24HrPrecip<BR></FONT>");
-    logit("$Pgm_Path/../data/logs/weather.log", ",$CurrentTemp,$LastWXWindDir,$LastWXWindSpeed,$WXHrPrecip,$WX24HrPrecip");
-}
-
-# Daily Weather Log Backup
-
-if (time_cron('0 0 * * *')) {
-    print_log "Backing up Weather Log.";
-    open(WXGRAPHIN, ">$Pgm_Path/../data/logs/weather.log");    # CLEAR Log
-    close WXGRAPHIN;
-    open(WXGRAPHIN, ">$Pgm_Path/../web/mh/weather.html");      # CLEAR Log
-    close WXGRAPHIN;
-    #copy("$Pgm_Path/../data/logs/weather.log", "$Pgm_Path/../data/logs/weather.bak.log") or print_log "Error in copying: $!";
-}
-
-# Procedure to Make a series of Graphs with Temperature and Stats
-
-$v_make_graph = new Voice_Cmd("Make Weather Graph Now");
-if (time_cron('15 * * * *') or $Startup or $Reload or $state = said $v_make_graph) {
-    open(WXGRAPHOUT, ">$Pgm_Path/../web/mh/wxgraph.html");  # Log it
-    print WXGRAPHOUT "<html>\n<title>Weather Graphs</title>\n";
-    print WXGRAPHOUT "<applet code=plot_xy.class width=400 height=200>\n";
-    print WXGRAPHOUT "<param name=title value=\"Temp (F)\">\n";
-    print WXGRAPHOUT "<param name=plot_data value=\"";
-
-    open(WXGRAPHIN, "$Pgm_Path/../data/logs/weather.log"); # Open for input
-    @wxgraphinlines = <WXGRAPHIN>;                       # Open array and
-                                                         # read in data
-    close WXGRAPHIN;                                     # Close the file
-
-    foreach $WXTempGraphLine (@wxgraphinlines) {
-        ($WXTempGraphDOW, $WXTempGraphDaytime, $WXTempGraphTemp, $WXTempGraphWindDir, $WXTempGraphWindSpeed, $WXTempGraphHrPrecip, $WXTempGraph24HrPrecip) = (split(',', $WXTempGraphLine))[0, 1, 2, 3, 4, 5, 6];
-        $WXTempGraphDate = substr($WXTempGraphDaytime, 5, 2);     # Day
-        $WXTempGraphHour = substr($WXTempGraphDaytime, 8, 2);     # Hour
-        $WXTempGraphMin = substr($WXTempGraphDaytime, 11, 2);     # Minute
-        $WXTempGraphAMPM = substr($WXTempGraphDaytime, 14, 1);    # A/P
-
-        if ($WXTempGraphAMPM eq 'A' and $WXTempGraphHour eq '12') {$WXTempGraphHour = '0'};
-        if ($WXTempGraphAMPM eq 'P' and $WXTempGraphHour ne '12') {$WXTempGraphHour = $WXTempGraphHour + 12};
-        $WXTempGraphMin = $WXTempGraphMin / 60;
-        $WXTempGraphTime = $WXTempGraphHour + $WXTempGraphMin;
-
-        if ($WXTempGraphTemp ne '') {        # If the Temp isn't blank,
-            print WXGRAPHOUT "$WXTempGraphTime,$WXTempGraphTemp ";
-        }
-    }
-
-    print WXGRAPHOUT "\">\n</applet>\n";
-    print WXGRAPHOUT "<applet code=plot_xy.class width=400 height=200>\n";
-    print WXGRAPHOUT "<param name=title value=\"Wind Speed (MPH)\">\n";
-    print WXGRAPHOUT "<param name=plot_data value=\"";
-
-    open(WXGRAPHIN, "$Pgm_Path/../data/logs/weather.log"); # Open for input
-    @wxgraphinlines = <WXGRAPHIN>;                       # Open array and
-                                                         # read in data
-    close WXGRAPHIN;                                     # Close the file
-
-    foreach $WXTempGraphLine (@wxgraphinlines) {
-        ($WXTempGraphDOW, $WXTempGraphDaytime, $WXTempGraphTemp, $WXTempGraphWindDir, $WXTempGraphWindSpeed, $WXTempGraphHrPrecip, $WXTempGraph24HrPrecip) = (split(',', $WXTempGraphLine))[0, 1, 2, 3, 4, 5, 6];
-        $WXTempGraphDate = substr($WXTempGraphDaytime, 5, 2);     # Day
-        $WXTempGraphHour = substr($WXTempGraphDaytime, 8, 2);     # Hour
-        $WXTempGraphMin = substr($WXTempGraphDaytime, 11, 2);     # Minute
-        $WXTempGraphAMPM = substr($WXTempGraphDaytime, 14, 1);    # A/P
-
-        if ($WXTempGraphAMPM eq 'A' and $WXTempGraphHour eq '12') {$WXTempGraphHour = '0'};
-        if ($WXTempGraphAMPM eq 'P' and $WXTempGraphHour ne '12') {$WXTempGraphHour = $WXTempGraphHour + 12};
-        $WXTempGraphMin = $WXTempGraphMin / 60;
-        $WXTempGraphTime = $WXTempGraphHour + $WXTempGraphMin;
-
-        if ($WXTempGraphWindSpeed ne '') {        # If the Speed isn't blank,
-            print WXGRAPHOUT "$WXTempGraphTime,$WXTempGraphWindSpeed ";
-        }
-    }
-
-    print WXGRAPHOUT "\">\n</applet>\n</html>";
-    close WXGRAPHOUT;
-}
-
-# Procedure to occasionally send out APRS Position Report and Status String
-
-if (time_cron('0,30 * * * *')) {
-    set $tnc_output 'converse';
-    set $tnc_output 'position';
-    $APRSStatus = ">Frnt Move $motion_detector_frontdoor->{state}-Bck Move $motion_detector_backdoor->{state}-Kitc Move $motion_detector_kitchen->{state}-Garg Move $motion_detector_garage->{state}-Temp: $CurrentTemp";
-    set $tnc_output $APRSStatus;
-}
-
-# Main TNC Parse Procedure
-
-if ($APRSString = said $tnc_output) {
-
-    open(APRSLOG, ">>$Pgm_Root/web/javAPRS/aprs.tnc");  # Log it
-    print APRSLOG "$APRSString\n";
-    close APRSLOG;
-
-    print_msg "TRACK: $APRSString";                     # Monitor to Msg Window
-
-    $APRSFoundAPRS = "";                                # Reset Found Flag
-    # $APRSPacketDigi = "";
-    $APRSStringLength = (length($APRSString));          # Save Length of Ser
-
-    # Send the packet out TELNET if connected...
-    set $server2 $APRSString if active $server2;
-
-    # Decode the Callsign and different parts from the Packet
-
-    ($CallsignPart, $MsgLine) = (split('::', $APRSString))[0, 1]; #New Line for Msging
-    ($CallsignPart, $PacketPart) = (split(':', $APRSString))[0, 1];
-    ($APRSCallsign, $ToCallsignPart) = (split('>', $CallsignPart))[0, 1];
-    ($APRSCallsignNoSSID, $j) = (split('-', $APRSCallsign))[0, 1];
-
-    # Save the APRS Callsign for Message Reading Procedure (non-spaced)
-
-    $RealAPRSCallsign = $APRSCallsign;
-
-    # Make APRS Callsign so it is spoken properly
-
-    $j = '';
-    for ($i = 0; $i != (length($APRSCallsign)); ++$i) {
-        $j = $j . substr($APRSCallsign, $i, 1);
-        $j = $j . " ";
-    }
-    $APRSCallsign = $j;
-
-    # MAIN LOOP
-
-    if ($APRSFoundAPRS != 1) {
-        # If it's a $GPRMC, $GPGGA, or Mic-E statement for GPS,
-        if ((substr($PacketPart, 0, 6) eq '$GPRMC') ||
-            (substr($PacketPart, 0, 6) eq '$GPGGA') ||
-            (substr($PacketPart, 0, 1) eq '`') ||
-            (substr($PacketPart, 0, 1) eq "'")) {
-            $APRSFoundAPRS = 1;                         # Found an APRS String
-            $GPSCallsign = $APRSCallsign;               # Reset Variables
-            $GPSTime = "";
-            $GPSLatitudeDegrees = "";
-            $GPSLatitudeMinutes = "";
-            $GPSLongitudeDegrees = "";
-            $GPSLongitudeMinutes = "";
-            $GPSLatitude = "";
-            $GPSLongitude = "";
-            $GPSDistance = "";
-            $GPSSpeed = "";
-            $GPSCourse = "";
-            $GPSCourseVoice = "";
-            $GPSLstBr = "";
-            $GPSLstBrLat = "";
-            $GPSLstBrLon = "";
-            $GPSCompPlace = "";
-            $GPSCompLat = "";
-            $GPSCompLong = "";
-            $GPSCompDist = "9999";
-            $GPSSpeakString2 = "";
-            $GPSTempCompPlace = "";
-            $GPSTempCompDist = "";
-
-            # Find out the user defined "name" for this callsign.
-
-            $j = '0';
-
-            foreach $TempName (@namelines) {
-                if ($j eq '0') {
-                    ($TempNameCall, $TempNameName) = (split(',', $TempName))[0, 1];
-                    if ($TempNameCall eq $APRSCallsignNoSSID) {
-                        $HamName = $TempNameName;
-                        chomp $HamName;
-                        $j = '1';
-                    }
-                }
-            }
-
-            # If there is NO defined name, make $HamName equal to the callsign
-
-            if ($j eq '0') {
-                $HamName = $APRSCallsign;
-                print_msg "$APRSString -> No callsign Found\n";
-            }
-
-
-            if (substr($PacketPart, 0, 6) eq '$GPRMC') {
-                ($GPSTime, $GPSLatitude, $GPSLongitude, $GPSSpeed, $GPSCourse) = (split(',', $PacketPart))[1, 3, 5, 7, 8];
-            }
-
-            if (substr($PacketPart, 0, 6) eq '$GPGGA') {
-                ($GPSTime, $GPSLatitude, $GPSLongitude) = (split(',', $PacketPart))[1, 2, 4];
-            }
-
-            if ((substr($PacketPart, 0, 6) eq '$GPRMC') ||
-                (substr($PacketPart, 0, 6) eq '$GPGGA')) {
-
-                $GPSTime = (substr($GPSTime, 0, 6));    # Get the GPS Time
-                $GPSLatitudeDegrees = (substr($GPSLatitude, 0, 2));
-                $GPSLatitudeMinutes = (substr($GPSLatitude, 2, 8));
-                $GPSLatitude = ($GPSLatitudeDegrees + ($GPSLatitudeMinutes / 60));
-                $GPSLongitudeDegrees = (substr($GPSLongitude, 0, 3));
-                $GPSLongitudeMinutes = (substr($GPSLongitude, 3, 8));
-                $GPSLongitude = ($GPSLongitudeDegrees + ($GPSLongitudeMinutes / 60));
-
-                # Convert the GPS Speed to MPH
-                $GPSSpeed = ($GPSSpeed * 1.853248) / 1.609344;
-            }
-
-            if ((substr($PacketPart, 0, 1) eq '`') ||            # If a Mic-E,
-                (substr($PacketPart, 0, 1) eq "'")) {
-
-                $GPSLongitudeDegrees = (substr($PacketPart, 1, 1));
-                $GPSLongitudeDegrees = (unpack('C', $GPSLongitudeDegrees)) - 28;
-                if ($GPSLongitudeDegrees >= 180 and $GPSLongitudeDegrees <= 189) {$GPSLongitudeDegrees = $GPSLongitudeDegrees - 80};
-                if ($GPSLongitudeDegrees >= 190 and $GPSLongitudeDegrees <= 199) {$GPSLongitudeDegrees = $GPSLongitudeDegrees - 190};
-
-                $GPSLongitudeMinutes = (substr($PacketPart, 2, 1));
-                $GPSLongitudeMinutes = (unpack('C', $GPSLongitudeMinutes)) - 28;
-                if ($GPSLongitudeMinutes > 60) {$GPSLongitudeMinutes = $GPSLongitudeMinutes - 60};
-
-                # Added Lines from Roger
-                $GPSLongitudeMinutes100 = (substr($PacketPart, 3, 1));
-                $GPSLongitudeMinutes100 = (unpack('C', $GPSLongitudeMinutes100)) - 28;
-                #
-
-                $GPSLongitude = ($GPSLongitudeDegrees + ($GPSLongitudeMinutes / 60)+ ($GPSLongitudeMinutes100 / 6000));
-                # old -> $GPSLongitude = ($GPSLongitudeDegrees + ($GPSLongitudeMinutes / 60));
-
-                $GPSSpeed = (substr($PacketPart, 4, 1));
-                $GPSSpeed = ((unpack('C', $GPSSpeed)) - 28) * 10;
-                # $CallsignPart simply used as a temp variable
-                $CallsignPart = (substr($PacketPart, 5, 1));
-                $GPSSpeed = (((unpack('C', $CallsignPart)) - 28) / 10) + $GPSSpeed;
-
-                $GPSCourse = ((unpack('C', $CallsignPart)) - 28) % 10;
-                # $CallsignPart simply used as a temp variable
-                $CallsignPart = (substr($PacketPart, 6, 1));
-                $GPSCourse = ((unpack('C', $CallsignPart)) - 28) + $GPSCourse;
-
-                # Last minute course and speed adjustments per specs
-                if ($GPSSpeed >= 800) {$GPSSpeed = $GPSSpeed - 800};
-                if ($GPSCourse >= 400) {$GPSCourse = $GPSCourse - 400};
-
-                # Convert the GPS Speed to MPH
-                $GPSSpeed = ($GPSSpeed * 1.853248) / 1.609344;
-
-                # Truncate Course to max of 3 numbers for parsing below
-                $GPSCourse = substr($GPSCourse, 0, 3);
-
-                # Round the Speed to the nearest integer
-                $GPSSpeed = round($GPSSpeed);
-
-                # Load the tens digit of Degrees Latitude
-                $GPSLatitudeDegrees = (substr($ToCallsignPart, 0, 1));
-                $GPSLatitudeDegrees = (unpack('C', $GPSLatitudeDegrees)) - 32;
-                $GPSLatitudeDegrees = ($GPSLatitudeDegrees & 15) * 10;
-
-                # Load the ones digit of Degrees Latitude (temp variable used)
-                $GPSDistance = (substr($ToCallsignPart, 1, 1));
-                $GPSDistance = (unpack('C', $GPSDistance)) - 32;
-                $GPSDistance = ($GPSDistance & 15);
-
-                # Here's our Degrees Latitude
-                $GPSLatitudeDegrees = $GPSLatitudeDegrees + $GPSDistance;
-
-                # Load the tens digit of Minutes Latitude
-                $GPSLatitudeMinutes = (substr($ToCallsignPart, 2, 1));
-                $GPSLatitudeMinutes = (unpack('C', $GPSLatitudeMinutes)) - 32;
-                $GPSLatitudeMinutes = ($GPSLatitudeMinutes & 15) * 10;
-
-                # Load the ones digit of Minutes Latitude (temp variable used)
-                $GPSDistance = (substr($ToCallsignPart, 3, 1));
-                $GPSDistance = (unpack('C', $GPSDistance)) - 32;
-                $GPSDistance = ($GPSDistance & 15);
-
-                # Here's our Minutes Latitude
-                $GPSLatitudeMinutes = $GPSLatitudeMinutes + $GPSDistance;
-
-                # Load the tens digit of hundreds of Minutes Latitude
-                # $CallsignPart simply used as a temp variable
-                $CallsignPart = (substr($ToCallsignPart, 4, 1));
-                $CallsignPart = (unpack('C', $CallsignPart)) - 32;
-                $CallsignPart = ($CallsignPart & 15) * 10;
-
-                # Load the ones digit of hundreds of Minutes Latitude
-                # (temp variable used)
-                $GPSDistance = (substr($ToCallsignPart, 5, 1));
-                $GPSDistance = (unpack('C', $GPSDistance)) - 32;
-                $GPSDistance = ($GPSDistance & 15);
-
-                # Here's our hundreds of Minutes Latitude
-                $CallsignPart = $CallsignPart + $GPSDistance;
-
-                $GPSLatitude = ($GPSLatitudeDegrees + ($GPSLatitudeMinutes / 60) + ($CallsignPart / 6000));
-            }
-
-            # --- Do the following for all received GPS Strings
-
-            # Calculate distance station is away
-		$GPSDistance = &great_circle_distance($GPSLatitude, $GPSLongitude, $config_parms{latitude}, $config_parms{longitude});
-            #$GPSDistance = (sin $GPSLatitude) * (sin $config_parms{latitude}) + (cos $GPSLatitude) * (cos $config_parms{latitude}) * (cos ($config_parms{longitude}-$GPSLongitude));
-            #$GPSDistance = 1.852 * 60 * atan2(sqrt(1 - $GPSDistance * $GPSDistance), $GPSDistance);
-            #$GPSDistance = $GPSDistance / 1.6093440;
-            $GPSDistance = round($GPSDistance, 1);
-
-            # Calculate bearing from the Position file
-            foreach $GPSTempCompLine (@gpscomplines) {
-                ($GPSTempCompPlace, $GPSTempCompLat, $GPSTempCompLong) = (split(',', $GPSTempCompLine))[0, 1, 2];
-
-                # Calculate distance station is away from pos file
-		    $GPSTempCompDist = &great_circle_distance($GPSLatitude, $GPSLongitude, $GPSTempCompLat, $GPSTempCompLong);
-                #$GPSTempCompDist = (sin $GPSLatitude) * (sin $GPSTempCompLat) + (cos $GPSLatitude) * (cos $GPSTempCompLat) * (cos ($GPSTempCompLong-$GPSLongitude));
-                #$GPSTempCompDist = 1.852 * 60 * atan2(sqrt(1 - $GPSTempCompDist * $GPSTempCompDist), $GPSTempCompDist);
-                #$GPSTempCompDist = $GPSTempCompDist / 1.6093440;
-                $GPSTempCompDist = round($GPSTempCompDist, 1);
-
-                if ($GPSTempCompDist < 15 and $GPSTempCompDist < $GPSCompDist) {
-                    $GPSCompPlace = $GPSTempCompPlace;
-                    $GPSCompDist = $GPSTempCompDist;
-                    $GPSCompLat = $GPSTempCompLat;
-                    $GPSCompLong = $GPSTempCompLong;
-                }
-            }
-
-            # Calculate if station is north/west/east/south of POSFILE
-            $GPSCompLstBrLat = ($GPSCompLat - $GPSLatitude);
-            $GPSCompLstBrLon = ($GPSCompLong - $GPSLongitude);
-            if ($GPSCompLstBrLat < 0 and $GPSCompLstBrLon < 0) {$GPSCompLstBr = 'northwest'};
-            if ($GPSCompLstBrLat > 0 and $GPSCompLstBrLon < 0) {$GPSCompLstBr = 'southwest'};
-            if ($GPSCompLstBrLat < 0 and $GPSCompLstBrLon > 0) {$GPSCompLstBr = 'northeast'};
-            if ($GPSCompLstBrLat > 0 and $GPSCompLstBrLon > 0) {$GPSCompLstBr = 'southeast'};
-            if ($GPSCompLstBrLat <= 0 and (abs($GPSCompLstBrLon) * 2) < abs($GPSCompLstBrLat)) {$GPSCompLstBr = 'north'};
-            if ($GPSCompLstBrLat >= 0 and (abs($GPSCompLstBrLon) * 2) < abs($GPSCompLstBrLat)) {$GPSCompLstBr = 'south'};
-            if ($GPSCompLstBrLon <= 0 and (abs($GPSCompLstBrLat) * 2) < abs($GPSCompLstBrLon)) {$GPSCompLstBr = 'west'};
-            if ($GPSCompLstBrLon >= 0 and (abs($GPSCompLstBrLat) * 2) < abs($GPSCompLstBrLon)) {$GPSCompLstBr = 'east'};
-
-            # Calculate if station is north/west/east/south of ours
-            $GPSLstBrLat = ($config_parms{latitude} - $GPSLatitude);
-            $GPSLstBrLon = ($config_parms{longitude} - $GPSLongitude);
-            if ($GPSLstBrLat < 0 and $GPSLstBrLon < 0) {$GPSLstBr = 'northwest'};
-            if ($GPSLstBrLat > 0 and $GPSLstBrLon < 0) {$GPSLstBr = 'southwest'};
-            if ($GPSLstBrLat < 0 and $GPSLstBrLon > 0) {$GPSLstBr = 'northeast'};
-            if ($GPSLstBrLat > 0 and $GPSLstBrLon > 0) {$GPSLstBr = 'southeast'};
-            if ($GPSLstBrLat <= 0 and (abs($GPSLstBrLon) * 2) < abs($GPSLstBrLat)) {$GPSLstBr = 'north'};
-            if ($GPSLstBrLat >= 0 and (abs($GPSLstBrLon) * 2) < abs($GPSLstBrLat)) {$GPSLstBr = 'south'};
-            if ($GPSLstBrLon <= 0 and (abs($GPSLstBrLat) * 2) < abs($GPSLstBrLon)) {$GPSLstBr = 'west'};
-            if ($GPSLstBrLon >= 0 and (abs($GPSLstBrLat) * 2) < abs($GPSLstBrLon)) {$GPSLstBr = 'east'};
-
-            # Add bearing from station in position file IF it's a new position report
-            if ((($GPSCallsign ne $LastGPSCallsign) || ($GPSDistance ne $LastGPSDistance)) and ($GPSCompDist ne '9999')) {
-                $GPSSpeakString2 = "Currently $GPSCompDist miles $GPSCompLstBr of $GPSCompPlace.";
-                # and form a special speak string just for on the air
-                $GPSSpeakString3 = ">$RealAPRSCallsign $GPSCompDist mi $GPSCompLstBr of $GPSCompPlace.";
-
-###             # Added in 4.9
-                if ($GPSDistance <= 0.2) {
-                    $GPSSpeakString2 = "Currently near $GPSCompPlace.";
-                    $GPSSpeakString3 = ">$RealAPRSCallsign near $GPSCompPlace.";
-                }
-                if ((substr($PacketPart, 0, 6) eq '$GPRMC') and
-                ($GPSDistance <= 0.1) and
-                ($GPSSpeed <= 1)) {
-                    $GPSSpeakString2 = "Currently parked at $GPSCompPlace.";
-                    $GPSSpeakString3 = ">$RealAPRSCallsign parked at $GPSCompPlace.";
-                }
-                if ((substr($PacketPart, 0, 6) eq '$GPGGA') and
-                ($GPSDistance <= 0.1)) {
-                    $GPSSpeakString2 = "Currently at $GPSCompPlace.";
-                    $GPSSpeakString3 = ">$RealAPRSCallsign at $GPSCompPlace.";
-                }
-##
-
-                set $tnc_output $GPSSpeakString3;
-            }
-
-            # If It's a $GPRMC or Mic-E String,
-
-            if ((substr($PacketPart, 0, 6) eq '$GPRMC') ||
-                (substr($PacketPart, 0, 1) eq '`')) {
-
-                # Only Calculate Course & Speed if it's a $GPRMC string,
-                if (substr($PacketPart, 0, 6) eq '$GPRMC') {
-
-                    # Truncate Course to max of 3 numbers for parsing below
-                    $GPSCourse = substr($GPSCourse, 0, 3);
-
-                    # Round the Speed to the nearest integer
-                    $GPSSpeed = round($GPSSpeed);
-                }
-
-                $GPSCourseVoice = "north" if ($GPSCourse >= 0 and $GPSCourse <= 11);
-                $GPSCourseVoice = "north-northeast" if ($GPSCourse >= 12 and $GPSCourse <= 33);
-                $GPSCourseVoice = "northeast" if ($GPSCourse >= 34 and $GPSCourse <= 55);
-                $GPSCourseVoice = "east-northeast" if ($GPSCourse >= 56 and $GPSCourse <= 77);
-                $GPSCourseVoice = "east" if ($GPSCourse >= 78 and $GPSCourse <= 99);
-                $GPSCourseVoice = "east-southeast" if ($GPSCourse >= 100 and $GPSCourse <= 121);
-                $GPSCourseVoice = "southeast" if ($GPSCourse >= 122 and $GPSCourse <= 143);
-                $GPSCourseVoice = "south-southeast" if ($GPSCourse >= 144 and $GPSCourse <= 165);
-                $GPSCourseVoice = "south" if ($GPSCourse >= 166 and $GPSCourse <= 187);
-                $GPSCourseVoice = "south-southwest" if ($GPSCourse >= 188 and $GPSCourse <= 209);
-                $GPSCourseVoice = "southwest" if ($GPSCourse >= 210 and $GPSCourse <= 231);
-                $GPSCourseVoice = "west-southwest" if ($GPSCourse >= 232 and $GPSCourse <= 253);
-                $GPSCourseVoice = "west" if ($GPSCourse >= 254 and $GPSCourse <= 275);
-                $GPSCourseVoice = "west-northwest" if ($GPSCourse >= 276 and $GPSCourse <= 297);
-                $GPSCourseVoice = "northwest" if ($GPSCourse >= 298 and $GPSCourse <= 319);
-                $GPSCourseVoice = "north-northwest" if ($GPSCourse >= 320 and $GPSCourse <= 341);
-                $GPSCourseVoice = "north" if ($GPSCourse >= 342 and $GPSCourse <= 360);
-
-                if ($config_parms{tracking_withname} == 1)
-                    {$GPSCallsign = $HamName};
-
-                # If It's not the same as the last report, say it.
-
-                if ((($GPSCallsign ne $LastGPSCallsign) || ($GPSDistance ne $LastGPSDistance)) and ($GPSSpeed ne '0')) {
-
-                    if ($config_parms{tracking_shortannounce} == 0)
-                        {$GPSSpeakString = "$GPSCallsign is $GPSDistance miles $GPSLstBr of us, heading $GPSCourseVoice at $GPSSpeed miles an hour.  $GPSSpeakString2"};
-
-                    if ($config_parms{tracking_shortannounce} == 1) {
-                        $GPSSpeakString = "$GPSCallsign is $GPSSpeakString2";
-                        if ($GPSSpeakString2 eq '') {$GPSSpeakString = "$GPSCallsign is $GPSDistance miles $GPSLstBr of us, heading $GPSCourseVoice at $GPSSpeed miles an hour."};
-                    }
-
-                    print_log "$GPSSpeakString";
-
-                    if (($config_parms{tracking_speakflag} == 1) ||
-                        ($config_parms{tracking_speakflag} == 3))
-                        {speak $GPSSpeakString};
-
-                    if ($config_parms{tracking_trackself} == 1 and
-                        $APRSCallsignNoSSID eq $HamCall)
-                        {speak $GPSSpeakString};
-                }
-
-                # If the GPS is Stationary, say the following.
-
-                if ((($GPSCallsign ne $LastGPSCallsign) || ($GPSDistance ne $LastGPSDistance)) and ($GPSSpeed eq '0')) {
-
-                    if ($config_parms{tracking_shortannounce} == 0)
-                        {$GPSSpeakString = "$GPSCallsign is parked $GPSDistance miles $GPSLstBr of us.  $GPSSpeakString2"};
-
-                    if ($config_parms{tracking_shortannounce} == 1) {
-                        $GPSSpeakString = "$GPSCallsign is $GPSSpeakString2";
-                        if ($GPSSpeakString2 eq '') {$GPSSpeakString = "$GPSCallsign is parked $GPSDistance miles $GPSLstBr of us."};
-                    }
-
-                    print_log "$GPSSpeakString";
-
-                    if (($config_parms{tracking_speakflag} == 1) ||
-                        ($config_parms{tracking_speakflag} == 3))
-                        {speak $GPSSpeakString};
-
-                    if ($config_parms{tracking_trackself} == 1 and
-                        $APRSCallsignNoSSID eq $HamCall)
-                        {speak $GPSSpeakString};
-                }
-            }
-
-            # If It's a $GPGGA String,
-
-            if (substr($PacketPart, 0, 6) eq '$GPGGA') {
-
-                if ($config_parms{tracking_withname} == 1)
-                    {$GPSCallsign = $HamName};
-
-                if (($GPSCallsign ne $LastGPSCallsign) || ($GPSDistance ne $LastGPSDistance)) {
-
-                    if ($config_parms{tracking_shortannounce} == 0)
-                        {$GPSSpeakString = "$GPSCallsign is $GPSDistance miles $GPSLstBr of us.  $GPSSpeakString2"};
-
-                    if ($config_parms{tracking_shortannounce} == 1) {
-                        $GPSSpeakString = "$GPSCallsign is $GPSSpeakString2";
-                        if ($GPSSpeakString2 eq '') {$GPSSpeakString = "$GPSCallsign is $GPSDistance miles $GPSLstBr of us."};
-                    }
-
-                    print_log "$GPSSpeakString";
-
-                    if (($config_parms{tracking_speakflag} == 1) ||
-                        ($config_parms{tracking_speakflag} == 3))
-                        {speak $GPSSpeakString};
-
-                    if ($config_parms{tracking_trackself} == 1 and
-                        $APRSCallsignNoSSID eq $HamCall)
-                        {speak $GPSSpeakString};
-                }
-            }
-
-            $LastGPSCallsign = $GPSCallsign;        # Save last GPS rpt
-            $LastGPSDistance = $GPSDistance;
-            $LastGPSLstBr = $GPSLstBr;
-
-            # NEW IN 4.8
-            # Prototype Log File Procedure for Tracking
-
-            $i = -$GPSLongitude;
-            $j = $GPSLatitude;
-
-            my $html  = qq[<FORM ACTION='/SET:last_response' target='speech';\n];
-            $html .= qq[<tr><td>$Date_Now $Time_Now</td><td>$GPSSpeakString</td>\n];
-            $html .= qq[<td><a href="http://www.mapblast.com/myblast/map.mb?];
-            $html .= qq|CT=$j\%3A$i\%3A10000">$GPSSpeakString2</a></td>\n|;
-            $html .= qq[<td><INPUT name=aprs_location_name type='text' SIZE=10 onChange=submit>\n];
-            $i = -$i;       # For logging form data in .pos
-            $html .= qq[<INPUT name=aprs_location_loc type='hidden' value='$j,$i'></td></tr></FORM>\n\n];
-
-            #$k = qq[<li>$Date_Now $Time_Now: <a href=\"http://www.mapblast.com/mblast/map.mb?];
-            #$k .= qq[&GC=X:$i|Y:$j|LT:$j|LN:$i|LS:16000|&IC=$j:$i:100:$GPSCallsign $GPSCourseVoice $GPSSpeed MPH&CMD=MAP\">];
-            #$k .= qq[\n$GPSSpeakString</a>\n\n];
-            logit "$config_parms{html_dir}/mh/tracking/today.html", $html, 0;
-            logit "$config_parms{html_dir}/mh/tracking/week1.html", $html, 0;
-
-            if ($New_Day) {
-                open(NEWDAY, ">$config_parms{html_dir}/mh/tracking/today.html");
-                close NEWDAY;
-		    my $html = qq[<link rel="STYLESHEET" href="/default.css" type="text/css">\n<table>\n];
-                $html .= qq[<tr><td><b>Date Time</b></td><td><b>Vehicle Heading and Speed</b></td><td><b>Location</b></td><td><b>New Location</b></td></tr>\n];
-                logit "$config_parms{html_dir}/mh/tracking/today.html", $html, 0, 1;
-                logit "$config_parms{html_dir}/mh/tracking/week1.html", "<hr>\n", 0, 1;
-            }
-
-            if ($New_Week) {
-                open(NEWWEEK, ">$config_parms{html_dir}/mh/tracking/week1.html");
-                close NEWWEEK;
-                #file_cat "$config_parms{html_dir}/mh/tracking/week2.html", "$config_parms{html_dir}/mh/tracking/old/${Year_Month_Now}.html";
-                #rename "$config_parms{html_dir}/mh/tracking/week1.html", "$config_parms{html_dir}/mh/tracking/week2.html"  or print_log "Error in aprs rename 2: $!";
-                my $html = qq[<link rel="STYLESHEET" href="/default.css" type="text/css">\n<table>\n];
-                $html .= qq[<tr><td><b>Date Time</b></td><td><b>Vehicle Heading and Speed</b></td><td><b>Location</b></td><td><b>New Location</b></td></tr>\n];
-                logit "$config_parms{html_dir}/mh/tracking/week1.html", $html, 1;
-            }
-
-            # Add an index entry for the new months entry in aprs/old
-
-            #if ($New_Month) {
-            #    my $html = qq[<li><a href=\"$Year_Month_Now.html\">$Year_Month_Now.html</a>\n];
-            #    logit "$config_parms{html_dir}/mh/tracking/old/index.html", $html, 1;
-            #}
-        }                                           #  **END** GPS Parse
-
-        # Send E-Mail from APRS messages with "EMAIL2"
-
-        if (substr($MsgLine, 0, 6) eq 'EMAIL2') {
-            $APRSFoundAPRS = 1;
-
-            ($MsgLine, $MessageAck) = (split('{', $MsgLine))[0, 1];
-            ($CallsignPart, $PacketPart) = (split(':', $MsgLine))[0, 1];
-            ($CallsignPart, $PacketPart) = (split(' ', $PacketPart))[0, 1];
-
-            # Let $i equals the number of spaces to put before :ack
-            $i = (9 - length($RealAPRSCallsign));
-            $k = ' ';
-            $k = ($k x $i);
-
-            print_log "Email gateway: Callsign=$RealAPRSCallsign, to=$CallsignPart data=$PacketPart\n";
-
-            # Send the mail!!
-            #if (&net_connect_check) {
-                $i = $RealAPRSCallsign . $k . ":ack" . $MessageAck;
-                set $tnc_output $i;
-                &net_mail_send(to => $CallsignPart, subject => "APRS Gateway",
-                             text => "From $HamCall APRS Gateway\n$PacketPart");
-                $i = ":" . $RealAPRSCallsign . $k . ":Your E-Mail Message has been sent.{7";
-                set $tnc_output $i;
-            #}
-            #else {
-            #    $i = $RealAPRSCallsign . $k . ":ack" . $MessageAck;
-            #    set $tnc_output $i;
-            #    $i = ":" . $RealAPRSCallsign . $k . ":Sorry, Gateway is currently closed.{8";
-            #    set $tnc_output $i;
-            #}
-        }
-
-        # Speak any incoming APRS Bulletins
-
-        if (substr($MsgLine, 0, 3) eq 'BLN') {
-            $APRSFoundAPRS = 1;
-
-#            ($CallsignPart, $PacketPart) = (split(':', $MsgLine))[0, 1];
-            ($CallsignPart, $CallsignPart, $PacketPart) = (split(':', $APRSString))[0, 1, 2];
-            print_log "Incoming Bulletin from $APRSCallsign: $PacketPart";
-            ## REMMED THIS NEXT STATEMENT OUT FOR SANITY
-            #speak "Incoming Bulletin from $APRSCallsign. $PacketPart";
-        }
-
-        # If It's an APRS Message, either say it or process the voice command:
-
-        if (substr($MsgLine, 0, length($HamCall)) eq $HamCall) {
-            $APRSFoundAPRS = 1;
-
-            ($MsgLine, $MessageAck) = (split('{', $MsgLine))[0, 1];
-            ($CallsignPart, $PacketPart) = (split(':', $MsgLine))[0, 1];
-
-            # Let $i equals the number of spaces to put before :ack
-            $i = (9 - length($RealAPRSCallsign));
-            $k = ' ';
-            $k = ($k x $i);
-
-            # Check to see if it is a voice command to process from our CALLSIGN:
-
-            if (substr($PacketPart, 0, 4) eq 'X10-' and
-                substr($RealAPRSCallsign, 0, length($HamCall)) eq $HamCall) {
-
-                # Split the line so $PacketPart is actually the message received to process.
-                ($CallsignPart, $PacketPart) = (split('-', $PacketPart))[0, 1];
-
-                run_voice_cmd $PacketPart;
-                print_log "X10 received from APRS: $PacketPart";
-                speak "X10 received from A P R S: $PacketPart";
-
-                $i = $RealAPRSCallsign . $k . ":ack" . $MessageAck;
-                set $tnc_output $i;
-                $i = ":" . $RealAPRSCallsign . $k . ":X-10 Message Received.{9";
-                set $tnc_output $i;
-                $MsgLine = "";
-            }
-
-            # NEW in 4.52 - Check to see if its an ack.  If so, don't speak it.
-
-            elsif (substr($PacketPart, 0, 3) eq 'ack') {
-                print_log "Acknowledgement received from $RealAPRSCallsign";
-            }
-
-            # NEW in 4.62 - Respond to ?WX? requests with the temperature.
-
-            elsif (substr($PacketPart, 0, 4) eq '?WX?') {
-                $i = $RealAPRSCallsign . $k . ":ack" . $MessageAck;
-                set $tnc_output $i;
-                $i = ":" . $RealAPRSCallsign . $k . ": Current Temperature: $CurrentTemp.{4";
-                set $tnc_output $i;
-                $MsgLine = "";
-            }
-
-            # NEW in 4.62 - Respond to ?PHONE? requests with last call.
-
-            elsif (substr($PacketPart, 0, 7) eq '?PHONE?') {
-                $i = $RealAPRSCallsign . $k . ":ack" . $MessageAck;
-                set $tnc_output $i;
-                $i = ":" . $RealAPRSCallsign . $k . ": Last Call: $PhoneName ($DisplayPhoneNumber){6";
-                set $tnc_output $i;
-                $MsgLine = "";
-            }
-
-            # If it's not a voice command, than assume it's a standard message:
-
-            else {
-                print_log "Incoming Message from $APRSCallsign: $PacketPart";
-                #speak "Incoming Message from $APRSCallsign. $PacketPart";
-                # THIS IS A STATUS PAGE EVENT
-                    #if (time_greater_than("22:00") and time_less_than("15:00")) {
-                    #$page_icq = "$PacketPart";
-                    #}
-
-                $i = $RealAPRSCallsign . $k . ":ack" . $MessageAck;
-                set $tnc_output $i;
-                set $tnc_output $i;
-                #$i = ":" . $RealAPRSCallsign . $k . ":Message Received.{2";
-                #set $tnc_output $i;
-
-                $MsgLine = "";
-            }
-        }
-
-        # If it's a U2k or UII Weather Station,
-        # AA0SM>APRSW,N0EST,WIDE*,WIDE:_02050122c168s005g010t011r000p000P000h91b10224wU2K
-
-        if ((substr($APRSString, ($APRSStringLength - 4), 2) eq 'dU')
-        || (substr($APRSString, ($APRSStringLength - 6), 6) eq 'dU2kFM')
-        || (substr($APRSString, ($APRSStringLength - 4), 2) eq 'wU')) {
-            $APRSFoundAPRS = 1;
-            $WXCallsign = $APRSCallsign;            # Reset Variables
-            $WXTime = "";
-            $WXLatitudeDegrees = "";
-            $WXLatitudeMinutes = "";
-            $WXLongitudeDegrees = "";
-            $WXLongitudeMinutes = "";
-            $WXLatitude = "";
-            $WXLongitude = "";
-            $WXDistance = "";
-            $WXTemp = "";
-            $WXWindDir = "";
-            $WXWindSpeed = "";
-            $WXWindChill = "";
-            $WXHrPrecip = "";
-            $WX24HrPrecip = "";
-            # Added in 4.7
-            $WXLstBr = "";
-            $WXLstBrLat = "";
-            $WXLstBrLon = "";
-            $WXCompPlace = "";
-            $WXCompLat = "";
-            $WXCompLong = "";
-            $WXCompDist = "9999";
-            $WXSpeakString2 = "";
-            $WXTempCompPlace = "";
-            $WXTempCompDist = "";
-
-            # If It's a DOS Weather String,
-
-            if ((substr($APRSString, ($APRSStringLength - 4), 2) eq 'dU')
-            || (substr($APRSString, ($APRSStringLength - 6), 6) eq 'dU2kFM')) {
-
-                $WXTime = (substr($PacketPart, 3, 4));  # Time of WX Report
-                $WXWindDir = (substr($PacketPart, 27, 3));  # Wind Direction
-                $WXWindSpeed = (substr($PacketPart, 31, 3));  # Wind Speed
-
-                # Get rid of those damn 0's in the Speed
-                if (substr($WXWindSpeed, 0, 2) eq '00') {$WXWindSpeed = (substr($WXWindSpeed, 2, 1))};
-                if ($WXWindSpeed ne '0') {       # Except if wind speed IS 0
-                    if (substr($WXWindSpeed, 0, 1) eq '0') {$WXWindSpeed = (substr($WXWindSpeed, 1, 2))};
-                }
-
-                $WXLatitudeDegrees = (substr($PacketPart, 8, 2));
-                $WXLatitudeMinutes = (substr($PacketPart, 10, 5));
-                $WXLatitude = ($WXLatitudeDegrees + ($WXLatitudeMinutes / 60));
-                $WXLongitudeDegrees = (substr($PacketPart, 17, 3));
-                $WXLongitudeMinutes = (substr($PacketPart, 20, 5));
-                $WXLongitude = ($WXLongitudeDegrees + ($WXLongitudeMinutes / 60));
-
-		    $WXDistance = &great_circle_distance($WXLatitude, $WXLongitude, $config_parms{latitude}, $config_parms{longitude});
-                #$WXDistance = (sin $WXLatitude) * (sin $config_parms{latitude}) + (cos $WXLatitude) * (cos $config_parms{latitude}) * (cos ($config_parms{longitude}-$WXLongitude));
-                #$WXDistance = 1.852 * 60 * atan2(sqrt(1 - $WXDistance * $WXDistance), $WXDistance);
-                #$WXDistance = $WXDistance / 1.6093440;
-                $WXDistance = round($WXDistance, 1);
-
-                # Calculate if station is north/west/east/south of ours
-                $WXLstBrLat = ($config_parms{latitude} - $WXLatitude);
-                $WXLstBrLon = ($config_parms{longitude} - $WXLongitude);
-                if ($WXLstBrLat < 0 and $WXLstBrLon < 0) {$WXLstBr = 'northwest'};
-                if ($WXLstBrLat > 0 and $WXLstBrLon < 0) {$WXLstBr = 'southwest'};
-                if ($WXLstBrLat < 0 and $WXLstBrLon > 0) {$WXLstBr = 'northeast'};
-                if ($WXLstBrLat > 0 and $WXLstBrLon > 0) {$WXLstBr = 'southeast'};
-                if ($WXLstBrLat <= 0 and (abs($WXLstBrLon) * 2) < abs($WXLstBrLat)) {$WXLstBr = 'north'};
-                if ($WXLstBrLat >= 0 and (abs($WXLstBrLon) * 2) < abs($WXLstBrLat)) {$WXLstBr = 'south'};
-                if ($WXLstBrLon <= 0 and (abs($WXLstBrLat) * 2) < abs($WXLstBrLon)) {$WXLstBr = 'west'};
-                if ($WXLstBrLon >= 0 and (abs($WXLstBrLat) * 2) < abs($WXLstBrLon)) {$WXLstBr = 'east'};
-            }
-
-            # For New Windows UII/U2000 String Only
-
-            if (substr($APRSString, ($APRSStringLength - 4), 2) eq 'wU') {
-                $WXTime = (substr($PacketPart, 5, 4));  # Time of WX Report
-                $WXWindDir = (substr($PacketPart, 10, 3));  # Wind Direction
-                $WXWindSpeed = (substr($PacketPart, 14, 3));  # Wind Speed
-
-                # Get rid of those damn 0's in the Speed
-                if (substr($WXWindSpeed, 0, 2) eq '00') {$WXWindSpeed = (substr($WXWindSpeed, 2, 1))};
-                if ($WXWindSpeed ne '0') {       # Except if wind speed IS 0
-                    if (substr($WXWindSpeed, 0, 1) eq '0') {$WXWindSpeed = (substr($WXWindSpeed, 1, 2))};
-                }
-            }
-
-            # All Weather Stations Process the Following
-
-            $WXWindDirVoice = "north" if ($WXWindDir >= 0 and $WXWindDir <= 11);
-            $WXWindDirVoice = "north-northeast" if ($WXWindDir >= 12 and $WXWindDir <= 33);
-            $WXWindDirVoice = "northeast" if ($WXWindDir >= 34 and $WXWindDir <= 55);
-            $WXWindDirVoice = "east-northeast" if ($WXWindDir >= 56 and $WXWindDir <= 77);
-            $WXWindDirVoice = "east" if ($WXWindDir >= 78 and $WXWindDir <= 99);
-            $WXWindDirVoice = "east-southeast" if ($WXWindDir >= 100 and $WXWindDir <= 121);
-            $WXWindDirVoice = "southeast" if ($WXWindDir >= 122 and $WXWindDir <= 143);
-            $WXWindDirVoice = "south-southeast" if ($WXWindDir >= 144 and $WXWindDir <= 165);
-            $WXWindDirVoice = "south" if ($WXWindDir >= 166 and $WXWindDir <= 187);
-            $WXWindDirVoice = "south-southwest" if ($WXWindDir >= 188 and $WXWindDir <= 209);
-            $WXWindDirVoice = "southwest" if ($WXWindDir >= 210 and $WXWindDir <= 231);
-            $WXWindDirVoice = "west-southwest" if ($WXWindDir >= 232 and $WXWindDir <= 253);
-            $WXWindDirVoice = "west" if ($WXWindDir >= 254 and $WXWindDir <= 275);
-            $WXWindDirVoice = "west-northwest" if ($WXWindDir >= 276 and $WXWindDir <= 297);
-            $WXWindDirVoice = "northwest" if ($WXWindDir >= 298 and $WXWindDir <= 319);
-            $WXWindDirVoice = "north-northwest" if ($WXWindDir >= 320 and $WXWindDir <= 341);
-            $WXWindDirVoice = "north" if ($WXWindDir >= 342 and $WXWindDir <= 360);
-
-#######
-# Added 4.7
-
-            # Calculate bearing from the Position file
-            foreach $WXTempCompLine (@gpscomplines) {
-                ($WXTempCompPlace, $WXTempCompLat, $WXTempCompLong) = (split(',', $WXTempCompLine))[0, 1, 2];
-
-                # Calculate distance station is away from pos file
-		    $WXTempCompDist = &great_circle_distance($WXLatitude, $WXLongitude, $WXTempCompLat, $WXTempCompLong);
-                #$WXTempCompDist = (sin $WXLatitude) * (sin $WXTempCompLat) + (cos $WXLatitude) * (cos $WXTempCompLat) * (cos ($WXTempCompLong-$WXLongitude));
-                #$WXTempCompDist = 1.852 * 60 * atan2(sqrt(1 - $WXTempCompDist * $WXTempCompDist), $WXTempCompDist);
-                #$WXTempCompDist = $WXTempCompDist / 1.6093440;
-                $WXTempCompDist = round($WXTempCompDist, 1);
-
-                if ($WXTempCompDist < 150 and $WXTempCompDist < $WXCompDist) {
-                    $WXCompPlace = $WXTempCompPlace;
-                    $WXCompDist = $WXTempCompDist;
-                    $WXCompLat = $WXTempCompLat;
-                    $WXCompLong = $WXTempCompLong;
-                }
-            }
-
-            # Calculate if station is north/west/east/south of POSFILE
-            $WXCompLstBrLat = ($WXCompLat - $WXLatitude);
-            $WXCompLstBrLon = ($WXCompLong - $WXLongitude);
-            if ($WXCompLstBrLat < 0 and $WXCompLstBrLon < 0) {$WXCompLstBr = 'northwest'};
-            if ($WXCompLstBrLat > 0 and $WXCompLstBrLon < 0) {$WXCompLstBr = 'southwest'};
-            if ($WXCompLstBrLat < 0 and $WXCompLstBrLon > 0) {$WXCompLstBr = 'northeast'};
-            if ($WXCompLstBrLat > 0 and $WXCompLstBrLon > 0) {$WXCompLstBr = 'southeast'};
-            if ($WXCompLstBrLat <= 0 and (abs($WXCompLstBrLon) * 2) < abs($WXCompLstBrLat)) {$WXCompLstBr = 'north'};
-            if ($WXCompLstBrLat >= 0 and (abs($WXCompLstBrLon) * 2) < abs($WXCompLstBrLat)) {$WXCompLstBr = 'south'};
-            if ($WXCompLstBrLon <= 0 and (abs($WXCompLstBrLat) * 2) < abs($WXCompLstBrLon)) {$WXCompLstBr = 'west'};
-            if ($WXCompLstBrLon >= 0 and (abs($WXCompLstBrLat) * 2) < abs($WXCompLstBrLon)) {$WXCompLstBr = 'east'};
-
-            # Add bearing from station in position file IF it's a new position report
-            if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance)) and ($GPSCompDist ne '9999')) {
-                $WXSpeakString2 = "Station is located $WXCompDist miles $WXCompLstBr of $WXCompPlace.";
-            }
-
-#######
-
-            if (substr($PacketPart, 35, 1) eq 'T') {  # If a traditional,
-                $WXTemp = (substr($PacketPart, 36, 3));
-                # Get rid of those damn 0's in the Temperature
-                if (substr($WXTemp, 0, 2) eq '00') {$WXTemp = (substr($WXTemp, 2, 1))};
-                if ($WXTemp ne '0') {        # Except if temp IS 0
-                    if (substr($WXTemp, 0, 1) eq '0') {$WXTemp = (substr($WXTemp, 1, 2))};
-                }
-
-                # Calculate Wind Chill if temp is less than 45 degrees
-                if ($WXTemp <= 45) {
-                    $WXWindChill = .0817 * (3.71 * sqrt($WXWindSpeed) + 5.81 - .25 * $WXWindSpeed) * ($WXTemp - 91.4) + 91.4;
-                    $WXWindChill = round($WXWindChill, 0);
-                    if ($WXWindSpeed <= 5) {$WXWindChill = $WXTemp};
-                }
-
-                # If Temperature is above freezing, make it equal.
-                if ($WXTemp >= 46) {
-                    $WXWindChill = $WXTemp;
-                }
-
-                # Add Readings for Last Hour Precip and Last 24 Hour Precip
-                $WXHrPrecip = (substr($PacketPart, 41, 3));
-                # Get rid of those damn 0's in the Precip
-                if (substr($WXHrPrecip, 0, 2) eq '00') {$WXHrPrecip = (substr($WXHrPrecip, 2, 1))};
-                if ($WXHrPrecip ne '0') {        # Except if precip IS 0
-                    if (substr($WXHrPrecip, 0, 1) eq '0') {$WXHrPrecip = (substr($WXHrPrecip, 1, 2))};
-                }
-                # Divide Precip by 10
-                $WXHrPrecip = $WXHrPrecip / 10;
-                $WX24HrPrecip = (substr($PacketPart, 45, 3));
-                # Get rid of those damn 0's in the 24 hr Precip
-                if (substr($WX24HrPrecip, 0, 2) eq '00') {$WX24HrPrecip = (substr($WX24HrPrecip, 2, 1))};
-                if ($WX24HrPrecip ne '0') {        # Except if precip IS 0
-                    if (substr($WX24HrPrecip, 0, 1) eq '0') {$WX24HrPrecip = (substr($WX24HrPrecip, 1, 2))};
-                }
-                # Divide Precip by 10
-                $WX24HrPrecip = $WX24HrPrecip / 10;
-
-                # If It's not the same as the last report, say it.
-
-                if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance) || ($WXTemp ne $LastWXTemp)) and ($WXWindSpeed ne '0')) {
-                    $WXSpeakString = "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is out of the $WXWindDirVoice at $WXWindSpeed miles an hour.";
-                    if ($WXTemp <= 45 and $WXTemp ne $WXWindChill) {$WXSpeakString = $WXSpeakString . "  The winnd chill is $WXWindChill."};
-                    if ($WXHrPrecip != 0) {$WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour."};
-                    # NEW in 4.7 - Add bearing from POSFILE
-                    $WXSpeakString = $WXSpeakString . "  $WXSpeakString2";
-
-                    print_log "$WXSpeakString";
-
-                    if (($config_parms{tracking_speakflag} == 2) ||
-                        ($config_parms{tracking_speakflag} == 3))
-                        {speak $WXSpeakString};
-                }
-
-                # If the wind is calm, say the following.
-
-                if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance) || ($WXTemp ne $LastWXTemp)) and ($WXWindSpeed eq '0')) {
-                    $WXSpeakString = "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is calm.";
-                    if ($WXHrPrecip != 0) {$WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour."};
-                    # NEW in 4.7 - Add bearing from POSFILE
-                    $WXSpeakString = $WXSpeakString . "  $WXSpeakString2";
-
-                    print_log "$WXSpeakString";
-
-                    if (($config_parms{tracking_speakflag} == 2) ||
-                        ($config_parms{tracking_speakflag} == 3))
-                        {speak $WXSpeakString};
-                }
-
-                $LastWXCallsign = $WXCallsign;          # Save last WX rpt information
-                $LastWXDistance = $WXDistance;
-                $LastWXTemp = $WXTemp;
-                $LastWXWindDir = $WXWindDir;
-                $LastWXWindSpeed = $WXWindSpeed;
-                $LastWXWindChill = $WXWindChill;
-                $LastWXHrPrecip = $WXHrPrecip;
-                $LastWX24HrPrecip = $WX24HrPrecip;
-
-            }
-
-            elsif (substr($PacketPart, 38, 1) eq 't') { # If a new format,
-                $WXTemp = (substr($PacketPart, 39, 3));
-                # Get rid of those damn 0's in the Temperature
-                if (substr($WXTemp, 0, 2) eq '00') {$WXTemp = (substr($WXTemp, 2, 1))};
-                if ($WXTemp ne '0') {        # Except if temp IS 0
-                    if (substr($WXTemp, 0, 1) eq '0') {$WXTemp = (substr($WXTemp, 1, 2))};
-                }
-
-                # Calculate Wind Chill if temp is less than 45 degrees
-                if ($WXTemp <= 45) {
-                    $WXWindChill = .0817 * (3.71 * sqrt($WXWindSpeed) + 5.81 - .25 * $WXWindSpeed) * ($WXTemp - 91.4) + 91.4;
-                    $WXWindChill = round($WXWindChill, 0);
-                    if ($WXWindSpeed <= 5) {$WXWindChill = $WXTemp};
-                }
-
-                # If Temperature is above freezing, make it equal.
-                if ($WXTemp >= 46) {
-                    $WXWindChill = $WXTemp;
-                }
-
-                # Add Readings for Last Hour Precip and Last 24 Hour Precip
-                $WXHrPrecip = (substr($PacketPart, 43, 3));
-                # Get rid of those damn 0's in the Precip
-                if (substr($WXHrPrecip, 0, 2) eq '00') {$WXHrPrecip = (substr($WXHrPrecip, 2, 1))};
-                if ($WXHrPrecip ne '0') {        # Except if precip IS 0
-                    if (substr($WXHrPrecip, 0, 1) eq '0') {$WXHrPrecip = (substr($WXHrPrecip, 1, 2))};
-                }
-                # Divide Precip by 10
-                $WXHrPrecip = $WXHrPrecip / 10;
-                $WX24HrPrecip = (substr($PacketPart, 47, 3));
-                # Get rid of those damn 0's in the 24 hr Precip
-                if (substr($WX24HrPrecip, 0, 2) eq '00') {$WX24HrPrecip = (substr($WX24HrPrecip, 2, 1))};
-                if ($WX24HrPrecip ne '0') {        # Except if precip IS 0
-                    if (substr($WX24HrPrecip, 0, 1) eq '0') {$WX24HrPrecip = (substr($WX24HrPrecip, 1, 2))};
-                }
-                # Divide Precip by 10
-                $WX24HrPrecip = $WX24HrPrecip / 10;
-
-                # If It's not the same as the last report, say it.
-
-                if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance) || ($WXTemp ne $LastWXTemp)) and ($WXWindSpeed ne '0')) {
-                    $WXSpeakString = "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is out of the $WXWindDirVoice at $WXWindSpeed miles an hour.";
-                    if ($WXTemp <= 45 and $WXTemp ne $WXWindChill) {$WXSpeakString = $WXSpeakString . "  The winnd chill is $WXWindChill."};
-                    if ($WXHrPrecip != 0) {$WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour."};
-                    # NEW in 4.7 - Add bearing from POSFILE
-                    $WXSpeakString = $WXSpeakString . "  $WXSpeakString2";
-
-                    print_log "$WXSpeakString";
-
-                    if (($config_parms{tracking_speakflag} == 2) ||
-                        ($config_parms{tracking_speakflag} == 3))
-                        {speak $WXSpeakString};
-                }
-
-                # If the wind is calm, say the following.
-
-                if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance) || ($WXTemp ne $LastWXTemp)) and ($WXWindSpeed eq '0')) {
-                    $WXSpeakString = "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is calm.";
-                    if ($WXHrPrecip != 0) {$WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour."};
-                    # NEW in 4.7 - Add bearing from POSFILE
-                    $WXSpeakString = $WXSpeakString . "  $WXSpeakString2";
-
-                    print_log "$WXSpeakString";
-
-                    if (($config_parms{tracking_speakflag} == 2) ||
-                        ($config_parms{tracking_speakflag} == 3))
-                        {speak $WXSpeakString};
-                }
-
-                $LastWXCallsign = $WXCallsign;          # Save last WX rpt information
-                $LastWXDistance = $WXDistance;
-                $LastWXTemp = $WXTemp;
-                $LastWXWindDir = $WXWindDir;
-                $LastWXWindSpeed = $WXWindSpeed;
-                $LastWXWindChill = $WXWindChill;
-                $LastWXHrPrecip = $WXHrPrecip;
-                $LastWX24HrPrecip = $WX24HrPrecip;
-
-            }
-
-            elsif (substr($PacketPart, 21, 1) eq 't') { # If WINDOWS format,
-                $WXDistance = 999.9;                    # Because we don't
-                                                        # have the position
-                $WXTemp = (substr($PacketPart, 22, 3));
-                # Get rid of those damn 0's in the Temperature
-                if (substr($WXTemp, 0, 2) eq '00') {$WXTemp = (substr($WXTemp, 2, 1))};
-                if ($WXTemp ne '0') {        # Except if temp IS 0
-                    if (substr($WXTemp, 0, 1) eq '0') {$WXTemp = (substr($WXTemp, 1, 2))};
-                }
-
-                # Calculate Wind Chill if temp is less than 45 degrees
-                if ($WXTemp <= 45) {
-                    $WXWindChill = .0817 * (3.71 * sqrt($WXWindSpeed) + 5.81 - .25 * $WXWindSpeed) * ($WXTemp - 91.4) + 91.4;
-                    $WXWindChill = round($WXWindChill, 0);
-                    if ($WXWindSpeed <= 5) {$WXWindChill = $WXTemp};
-                }
-
-                # If Temperature is above freezing, make it equal.
-                if ($WXTemp >= 45) {
-                    $WXWindChill = $WXTemp;
-                }
-
-                # Add Readings for Last Hour Precip and Last 24 Hour Precip
-                $WXHrPrecip = (substr($PacketPart, 26, 3));
-                # Get rid of those damn 0's in the Precip
-                if (substr($WXHrPrecip, 0, 2) eq '00') {$WXHrPrecip = (substr($WXHrPrecip, 2, 1))};
-                if ($WXHrPrecip ne '0') {        # Except if precip IS 0
-                    if (substr($WXHrPrecip, 0, 1) eq '0') {$WXHrPrecip = (substr($WXHrPrecip, 1, 2))};
-                }
-                # Divide Precip by 10
-                $WXHrPrecip = $WXHrPrecip / 10;
-                $WX24HrPrecip = (substr($PacketPart, 30, 3));
-                # Get rid of those damn 0's in the 24 hr Precip
-                if (substr($WX24HrPrecip, 0, 2) eq '00') {$WX24HrPrecip = (substr($WX24HrPrecip, 2, 1))};
-                if ($WX24HrPrecip ne '0') {        # Except if precip IS 0
-                    if (substr($WX24HrPrecip, 0, 1) eq '0') {$WX24HrPrecip = (substr($WX24HrPrecip, 1, 2))};
-                }
-                # Divide Precip by 10
-                $WX24HrPrecip = $WX24HrPrecip / 10;
-
-                # If It's not the same as the last report, say it.
-
-                if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance) || ($WXTemp ne $LastWXTemp)) and ($WXWindSpeed ne '0')) {
-                    $WXSpeakString = "$APRSCallsign reports temperature of $WXTemp degrees.  Winnd is out of the $WXWindDirVoice at $WXWindSpeed miles an hour.";
-                    if ($WXTemp <= 45 and $WXTemp ne $WXWindChill) {$WXSpeakString = $WXSpeakString . "  The winnd chill is $WXWindChill."};
-                    if ($WXHrPrecip != 0) {$WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour."};
-
-                    print_log "$WXSpeakString";
-
-                    if (($config_parms{tracking_speakflag} == 2) ||
-                        ($config_parms{tracking_speakflag} == 3))
-                        {speak $WXSpeakString};
-                }
-
-                # If the wind is calm, say the following.
-
-                if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance) || ($WXTemp ne $LastWXTemp)) and ($WXWindSpeed eq '0')) {
-                    $WXSpeakString = "$APRSCallsign reports temperature of $WXTemp degrees.  Winnd is calm.";
-                    if ($WXHrPrecip != 0) {$WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour."};
-
-                    print_log "$WXSpeakString";
-
-                    if (($config_parms{tracking_speakflag} == 2) ||
-                        ($config_parms{tracking_speakflag} == 3))
-                        {speak $WXSpeakString};
-                }
-
-                $LastWXCallsign = $WXCallsign;          # Save last WX rpt information
-                $LastWXDistance = $WXDistance;
-                $LastWXTemp = $WXTemp;
-                $LastWXWindDir = $WXWindDir;
-                $LastWXWindSpeed = $WXWindSpeed;
-                $LastWXWindChill = $WXWindChill;
-                $LastWXHrPrecip = $WXHrPrecip;
-                $LastWX24HrPrecip = $WX24HrPrecip;
-            }
-
-            else
-            {
-                print_log "A funny weather station.";
-            }
-
-            if ($CurrentTempDist >= $WXDistance) {    # If a closer rpt,
-                $CurrentTempDist = $WXDistance;       # change the current
-                $CurrentTemp = $WXTemp;               # temp variable.
-                $CurrentChill = $WXWindChill;
-                $CurrentHrPrecip = $WXHrPrecip;
-                $Current24HrPrecip = $WX24HrPrecip;
-            }
-
-            if ($CurrentTempDist eq '') {             # If 1st report
-                $CurrentTempDist = $WXDistance;       # of the day, change
-                $CurrentTemp = $WXTemp;               # the temp variable.
-                $CurrentChill = $WXWindChill;
-                $CurrentHrPrecip = $WXHrPrecip;
-                $Current24HrPrecip = $WX24HrPrecip;
-            }
-        }
-
-    #elsif (substr($APRSString, $i, 1) eq '*') {     # Else if we find a "*",
-    #    $APRSPacketDigi = 1;                        # It got digipeated
-    #    print_log "Packet was Digipeated.";
-    #}
-    #else
-    #{
-    #}
-
-    }
-}
-
-sub great_circle_distance {
-    my ($lat1, $lon1, $lat2, $lon2) = map {&degrees_to_radians($_)} @_;
-#   my $radius = 6367; # km
-    my $radius = 3956; # miles
-    my $d = (sin(($lat2 - $lat1) / 2)) ** 2  + cos($lat1) * cos($lat2) *
-(sin(($lon2 - $lon1) / 2)) ** 2;
-    $d = $radius * 2 * atan2(sqrt($d), sqrt(1 - $d));
-#   print "db d=$d l=$lat1,$lon1,$lat2,$lon2\n";
-    return round($d, 1);
-}
-
-#EGIN { $::pi = 4 * atan2(1,1); }
-sub degrees_to_radians {
-    return $_[0] * 3.14159265 / 180.0;
-}
+
+######################################################
+# Klier Home Automation - Tracking Module            #
+# Version 4.92 (release for MH 2.??)                 #
+# By: Brian J. Klier, N0QVC                          #
+# June 16, 2001                                      #
+# E-Mail: brian@kliernetwork.net                     #
+# Webpage: http://www.kliernetwork.net               #
+######################################################
+
+=begin comment
+
+mh.ini parms:
+
+tracking_trackself=1                    # This parameter should equal "1" if
+                                        # GPS Speaking is off and you still want
+                                        # to hear tracking from your own mobile
+tracking_shortannounce=1                #  0 = When Speaking Tracking
+                                        #      Information, this will
+                                        #      announce both distance from
+                                        #      this station and distance
+                                        #      from waypoint.
+                                        #  1 = Only Distance from waypoint.
+tracking_withname=1                     #  0 = If tracking.nam available,
+                                        #      announce callsign instead
+                                        #      of given name.
+                                        #  1 = Announce Given name instead
+                                        #      of callsign.
+                                        #  2 = Announce given name AND
+                                        #      callsign.
+
+=cut
+
+# For more information on hardware needed for this system to function:
+#   - Check out http://www.kliernetwork.net/aprs    and
+#               http://www.kliernetwork.net/aprs/mine
+#
+# New in Version 4.92:
+#   - Added Roger Bille's "Longitude Hundreds" Fix
+#
+# New in Version 4.91:
+#   - Fixed bugs in "EMAIL2" Procedure
+#   - Added ALPHA Procedure to take data from Telnet Port and transmit
+#     on the air (for WinAPRS Connectivity)
+#
+# New in Version 4.9:
+#   - Fixed bugs in the HTML Based Logging System.
+#
+# New in Version 4.8 and 4.8a:
+#   - Added HTML Based Logging (from Bruce's tracking_bruce.pl) for GPS's.
+#
+# New in Version 4.7:
+#   - Added Speaking of POSFILE Positions for Weather Stations
+#
+# New in Version 4.62:
+#   - Fixed problem with tracking_withname and speaking EVERY position
+#     instead of checking to see if it was the same as the last one.
+#   - Added ability to respond to ?WX? queries with current temperature.
+#
+# New in Version 4.6:
+#   - 4.61 ALPHA - Continued work on proper implementation.
+#   - Added tracking_shortannounce and tracking_withname variables.
+#   - NOTE: I STILL need to implement tracking_withname=2!!!
+#
+# New in Version 4.5:
+#   - 4.52 ALPHA - MHATS now ignores "acks" that are sent - does not talk
+#                  to them.  Also added msg # to "msg received" messages.
+#   - 4.51 ALPHA - Fix Small Bug in X-10 Message Response...
+#   - ALPHA - Working on Temperature Graphs
+#   - Changed "EMAIL" gateway to "EMAIL2" so it doesn't interfere with the
+#     main APRS IGATES.
+#
+# New in Version 4.4:
+#   - Fixed all the messaging/X10 Packet Remote Control stuff.
+#   - Bulletin feature still needs to be tested for operation.
+#
+# Next Version Wishlist:
+#   - Check for duplicate messages in a row (like when they pass through
+#     a digipeater to make sure an X10 command isn't sent twice)
+#   - System to execute X-10 commands when a station is a certain distance from home
+
+# Declare Variables
+
+use vars '$GPSSpeakString', '$GPSSpeakString2', '$WXSpeakString', '$WXSpeakString2', '$CurrentTemp', '$CurrentChill', '$WXWindDirVoice', '$WXWindSpeed', '$WXHrPrecip';
+
+my ($APRSFoundAPRS, $APRSPacketDigi, $GPSTime, $APRSStatus, $MsgLine);
+my ($GPSLatitudeDegrees, $GPSLatitudeMinutes, $GPSLongitudeDegrees, $GPSCallsign);
+my ($GPSLongitudeMinutes, $GPSLatitude, $GPSLongitude, $GPSDistance, $GPSLongitudeMinutes100);
+my ($GPSLstBr, $GPSLstBrLat, $GPSLstBrLon);
+
+my (@gpscomplines, $GPSTempCompPlace, $GPSTempCompDist, $GPSTempCompLine);
+my ($GPSTempCompLat, $GPSTempCompLong);
+my ($GPSCompPlace, $GPSCompLat, $GPSCompLong, $GPSCompDist);
+my ($GPSCompLstBr, $GPSCompLstBrLat, $GPSCompLstBrLon);
+
+# Added 4.7
+my ($WXTempCompPlace, $WXTempCompDist, $WXTempCompLine);
+my ($WXTempCompLat, $WXTempCompLong);
+my ($WXCompPlace, $WXCompLat, $WXCompLong, $WXCompDist);
+my ($WXCompLstBr, $WXCompLstBrLat, $WXCompLstBrLon);
+
+my (@namelines, $TempName, $TempNameCall, $TempNameName);
+
+my (@wxgraphinlines, $WXTempGraphLine, $WXTempGraphTime);
+my ($WXTempGraphDOW, $WXTempGraphDaytime, $WXTempGraphDate, $WXTempGraphTemp);
+my ($WXTempGraphWindDir, $WXTempGraphWindSpeed, $WXTempGraphHrPrecip);
+my ($WXTempGraph24HrPrecip, $WXTempGraphHour, $WXTempGraphMin);
+my ($WXTempGraphAMPM);
+
+my ($i, $j, $k, $CallsignPart, $PacketPart, $GPSSpeed, $GPSCourse, $GPSCourseVoice);
+my ($ToCallsignPart, $LastGPSCallsign, $LastGPSDistance, $LastGPSLstBr);
+my ($APRSCallsign, $APRSStringLength, $APRSString, $MessageX10Command);
+my ($MessageX10Action);
+my ($GPSSpeakString3, $MessageAck, $APRSCallsignVoice, $HamCall, $HamName);
+my ($WXTime, $WXLatitudeDegrees, $WXLatitudeMinutes, $WXLongitudeDegrees);
+my ($WXLongitudeMinutes, $WXLatitude, $WXLongitude, $WXDistance, $WXTemp);
+my ($WXLstBr, $WXLstBrLat, $WXLstBrLon);
+my ($WXCallsign, $WXWindDir, $WX24HrPrecip, $RealAPRSCallsign);
+my ($CurrentTempDist, $WXWindChill);
+my ($LastWXCallsign, $LastWXTemp, $LastWXDistance, $LastWXWindDir);
+my ($LastWXWindSpeed, $LastWXWindChill, $APRSCallsignNoSSID);
+my ($LastWXHrPrecip, $LastWX24HrPrecip, $CurrentHrPrecip, $Current24HrPrecip);
+
+# Setup TELNET Server 2 (port 14439) to output what the TNC hears
+
+$server2 = new Socket_Item('#Welcome to MisterHouse APRS Tracking!', 'APRSWelcome', 'server2');
+# Send Welcome Message out port 2 if connected.
+set $server2 'APRSWelcome' if active_now $server2;
+set $server2 'APRSERVE>APRS:javaTITLE:N0QVC MisterHouse - tracking.pl - Brian Klier, N0QVC' if active_now $server2;
+
+my $socket_speak_loop;
+if (my $telnetdata = said $server2) {
+    print_log "Data Transmitted from Telnet Port: $telnetdata";
+    set $tnc_output $telnetdata;
+}
+
+# TNC Output Lines
+
+$tnc_output = new Serial_Item ('CONV','converse','serial1');
+$tnc_output -> add            ('?WX?','wxquery','serial1');
+$tnc_output -> add            (sprintf("=%2d%05.02fN/0%2d%05.02fW- *** %s MisterHouse Tracking System - ICQ#659962 ***",
+                                       int($config_parms{latitude}),
+                                       abs ($config_parms{latitude} - int($config_parms{latitude}))*60,
+                                       int($config_parms{longitude}),
+                                       abs ($config_parms{longitude} -int($config_parms{longitude}))*60,
+                                       $config_parms{tracking_callsign}),
+                                       ,'position','serial1');
+
+# Set TNC to Converse and send position on Startup
+
+if ($Reload) {
+    $HamCall = $config_parms{tracking_callsign};         # Feed in my Tracking Callsign
+    open(GPSCOMP, "$config_parms{code_dir}/tracking.pos"); # Open for input
+    @gpscomplines = <GPSCOMP>;                           # Open array and
+                                                         # read in data
+    close GPSCOMP;                                       # Close the file
+
+    open(GPSNAME, "$config_parms{code_dir}/tracking.nam"); # Open for input
+    @namelines = <GPSNAME>;                              # Open array and
+                                                         # read in data
+    close GPSNAME;                                       # Close the file
+}
+
+if ($Startup) {
+    mkdir "$Pgm_Root/web/javAPRS",777 unless -d "$Pgm_Root/web/javAPRS";
+
+    open(APRSLOG, ">$Pgm_Root/web/javAPRS/aprs.tnc");    # CLEAR Log
+    close APRSLOG;
+
+#    set $tnc_output pack('C',3);
+#    set $tnc_output 'MRPT OFF';           # Do NOT Show Digipeater Path
+#    set $tnc_output 'HEADERLN OFF';       # Keep Header and data on the same line
+    set $tnc_output 'converse';
+    set $tnc_output 'position';
+    print_msg "Tracking Interface has been Initialized...Callsign $HamCall";
+    print_log "Tracking Interface has been Initialized...Callsign $HamCall";
+}
+
+# Voice Responses
+$v_send_position = new Voice_Cmd("Send my Position");
+
+if ($state = said $v_send_position) {
+    set $tnc_output 'position';
+    print_log "Position Sent.";
+    speak "Position Sent.";
+}
+
+$v_send_status = new Voice_Cmd("Send my Status Report");
+
+if ($state = said $v_send_status) {
+    $APRSStatus = ">Frnt Move $motion_detector_frontdoor->{state}-Bck Move $motion_detector_backdoor->{state}-Kitc Move $motion_detector_kitchen->{state}-Garg Move $motion_detector_garage->{state}-Temp: $CurrentTemp";
+    set $tnc_output $APRSStatus;
+    print_log "Status Sent.";
+    speak "Status Sent.";
+}
+
+$v_wx_query = new Voice_Cmd("Weather Query");
+
+if ($state = said $v_wx_query) {
+    set $tnc_output 'wxquery';
+    print_log "Weather Query Requested.";
+    speak "Weather Query Requested.";
+}
+
+$v_last_callsign = new Voice_Cmd("Last Callsign");
+
+if ($state = said $v_last_callsign and $APRSCallsign ne '') {
+    print_log "Callsign is $APRSCallsign.";
+    speak "Call sign is $APRSCallsign.";
+}
+elsif ($state = said $v_last_callsign and $APRSCallsign eq '') {
+    print_log "No packets received.";
+    speak "No packets received.";
+}
+
+$v_last_mobile = new Voice_Cmd("Last Mobile Report");
+
+if ($state = said $v_last_mobile and $GPSCallsign ne '') {
+    print_log "$GPSSpeakString";
+    speak $GPSSpeakString;
+}
+elsif ($state = said $v_last_mobile and $GPSCallsign eq '') {
+    print_log "No mobile packets received.";
+    speak "No mobile packets received.";
+}
+
+$v_last_wxrpt = new Voice_Cmd("Last Weather Report");
+
+if ($state = said $v_last_wxrpt) {
+    if ($WXTemp ne '') {
+        print_log "$WXSpeakString";
+        speak $WXSpeakString;
+    }
+    elsif ($WXTemp eq '') {
+        print_log "No weather packets received.";
+        speak "No weather packets received.";
+    }
+}
+
+$v_curr_cond = new Voice_Cmd("Current Conditions");
+
+if ($state = said $v_curr_cond) {
+    if ($CurrentTemp ne '') {
+        if ($CurrentTemp eq $CurrentChill) {
+            print_log "Temperature is $CurrentTemp degrees.";
+            speak "Temperature is $CurrentTemp degrees.";
+        }
+        if ($CurrentTemp ne $CurrentChill) {
+            print_log "Temperature is $CurrentTemp degrees.  Wind Chill is $CurrentChill degrees.";
+            speak "Temperature is $CurrentTemp degrees.  Winnd Chill is $CurrentChill degrees.";
+        }
+        if ($CurrentHrPrecip != 0) {
+            print_log "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
+            speak "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
+        }
+    }
+    elsif ($CurrentTemp eq '') {
+        print_log "No weather packets received.";
+        speak "No weather packets received.";
+    }
+}
+
+$v_curr_precip = new Voice_Cmd("Current Precipitation");
+
+if ($state = said $v_curr_precip) {
+    if ($CurrentHrPrecip != 0) {
+        print_log "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
+        speak "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
+    }
+    elsif ($CurrentTemp eq '') {
+        print_log "No weather packets received.";
+        speak "No weather packets received.";
+    }
+    else {
+        print_log "No rain to report.";
+        speak "No rain to report.";
+    }
+}
+
+$v_send_test_email = new Voice_Cmd("Send test email to myself");
+
+if ($state = said $v_send_test_email) {
+    $i = ":EMAIL    :$config_parms{net_mail_user}\@$config_parms{net_mail_server} Test E-Mail - " . $CurrentTemp . "deg.{0";
+    set $tnc_output $i;
+}
+
+$v_send_test_icq = new Voice_Cmd("Send test ICQ msg to myself");
+
+if ($state = said $v_send_test_icq) {
+    $i = ":ICQSERVE :659962 Test Message - " . $CurrentTemp . " degrees.{1";
+    set $tnc_output $i;
+}
+
+# Added 4.7
+$v_register_icqserve = new Voice_Cmd("Register on ICQServe (Do Once)");
+
+if ($state = said $v_register_icqserve) {
+    $i = ":ICQSERVE :REGISTER 659962 {1";
+    set $tnc_output $i;
+}
+
+# Procedure to Log Temperature and Stats every 10 minutes
+
+if (time_cron('0,10,20,30,40,50 * * * *') or $Startup) {
+    logit("$Pgm_Path/../web/mh/weather.html", "<FONT SIZE=-2>Temp: $CurrentTemp &nbsp;&nbsp;&nbsp;Wind Chill: $CurrentChill &nbsp;&nbsp;&nbsp;Wind: $LastWXWindDir/$LastWXWindSpeed &nbsp;&nbsp;&nbsp;Precipitation: $WXHrPrecip/$WX24HrPrecip<BR></FONT>");
+    logit("$Pgm_Path/../data/logs/weather.log", ",$CurrentTemp,$LastWXWindDir,$LastWXWindSpeed,$WXHrPrecip,$WX24HrPrecip");
+}
+
+# Daily Weather Log Backup
+
+if (time_cron('0 0 * * *')) {
+    print_log "Backing up Weather Log.";
+    open(WXGRAPHIN, ">$Pgm_Path/../data/logs/weather.log");    # CLEAR Log
+    close WXGRAPHIN;
+    open(WXGRAPHIN, ">$Pgm_Path/../web/mh/weather.html");      # CLEAR Log
+    close WXGRAPHIN;
+    #copy("$Pgm_Path/../data/logs/weather.log", "$Pgm_Path/../data/logs/weather.bak.log") or print_log "Error in copying: $!";
+}
+
+# Procedure to Make a series of Graphs with Temperature and Stats
+
+$v_make_graph = new Voice_Cmd("Make Weather Graph Now");
+if (time_cron('15 * * * *') or $Startup or $Reload or $state = said $v_make_graph) {
+    open(WXGRAPHOUT, ">$Pgm_Path/../web/mh/wxgraph.html");  # Log it
+    print WXGRAPHOUT "<html>\n<title>Weather Graphs</title>\n";
+    print WXGRAPHOUT "<applet code=plot_xy.class width=400 height=200>\n";
+    print WXGRAPHOUT "<param name=title value=\"Temp (F)\">\n";
+    print WXGRAPHOUT "<param name=plot_data value=\"";
+
+    open(WXGRAPHIN, "$Pgm_Path/../data/logs/weather.log"); # Open for input
+    @wxgraphinlines = <WXGRAPHIN>;                       # Open array and
+                                                         # read in data
+    close WXGRAPHIN;                                     # Close the file
+
+    foreach $WXTempGraphLine (@wxgraphinlines) {
+        ($WXTempGraphDOW, $WXTempGraphDaytime, $WXTempGraphTemp, $WXTempGraphWindDir, $WXTempGraphWindSpeed, $WXTempGraphHrPrecip, $WXTempGraph24HrPrecip) = (split(',', $WXTempGraphLine))[0, 1, 2, 3, 4, 5, 6];
+        $WXTempGraphDate = substr($WXTempGraphDaytime, 5, 2);     # Day
+        $WXTempGraphHour = substr($WXTempGraphDaytime, 8, 2);     # Hour
+        $WXTempGraphMin = substr($WXTempGraphDaytime, 11, 2);     # Minute
+        $WXTempGraphAMPM = substr($WXTempGraphDaytime, 14, 1);    # A/P
+
+        if ($WXTempGraphAMPM eq 'A' and $WXTempGraphHour eq '12') {$WXTempGraphHour = '0'};
+        if ($WXTempGraphAMPM eq 'P' and $WXTempGraphHour ne '12') {$WXTempGraphHour = $WXTempGraphHour + 12};
+        $WXTempGraphMin = $WXTempGraphMin / 60;
+        $WXTempGraphTime = $WXTempGraphHour + $WXTempGraphMin;
+
+        if ($WXTempGraphTemp ne '') {        # If the Temp isn't blank,
+            print WXGRAPHOUT "$WXTempGraphTime,$WXTempGraphTemp ";
+        }
+    }
+
+    print WXGRAPHOUT "\">\n</applet>\n";
+    print WXGRAPHOUT "<applet code=plot_xy.class width=400 height=200>\n";
+    print WXGRAPHOUT "<param name=title value=\"Wind Speed (MPH)\">\n";
+    print WXGRAPHOUT "<param name=plot_data value=\"";
+
+    open(WXGRAPHIN, "$Pgm_Path/../data/logs/weather.log"); # Open for input
+    @wxgraphinlines = <WXGRAPHIN>;                       # Open array and
+                                                         # read in data
+    close WXGRAPHIN;                                     # Close the file
+
+    foreach $WXTempGraphLine (@wxgraphinlines) {
+        ($WXTempGraphDOW, $WXTempGraphDaytime, $WXTempGraphTemp, $WXTempGraphWindDir, $WXTempGraphWindSpeed, $WXTempGraphHrPrecip, $WXTempGraph24HrPrecip) = (split(',', $WXTempGraphLine))[0, 1, 2, 3, 4, 5, 6];
+        $WXTempGraphDate = substr($WXTempGraphDaytime, 5, 2);     # Day
+        $WXTempGraphHour = substr($WXTempGraphDaytime, 8, 2);     # Hour
+        $WXTempGraphMin = substr($WXTempGraphDaytime, 11, 2);     # Minute
+        $WXTempGraphAMPM = substr($WXTempGraphDaytime, 14, 1);    # A/P
+
+        if ($WXTempGraphAMPM eq 'A' and $WXTempGraphHour eq '12') {$WXTempGraphHour = '0'};
+        if ($WXTempGraphAMPM eq 'P' and $WXTempGraphHour ne '12') {$WXTempGraphHour = $WXTempGraphHour + 12};
+        $WXTempGraphMin = $WXTempGraphMin / 60;
+        $WXTempGraphTime = $WXTempGraphHour + $WXTempGraphMin;
+
+        if ($WXTempGraphWindSpeed ne '') {        # If the Speed isn't blank,
+            print WXGRAPHOUT "$WXTempGraphTime,$WXTempGraphWindSpeed ";
+        }
+    }
+
+    print WXGRAPHOUT "\">\n</applet>\n</html>";
+    close WXGRAPHOUT;
+}
+
+# Procedure to occasionally send out APRS Position Report and Status String
+
+if (time_cron('0,30 * * * *')) {
+    set $tnc_output 'converse';
+    set $tnc_output 'position';
+    $APRSStatus = ">Frnt Move $motion_detector_frontdoor->{state}-Bck Move $motion_detector_backdoor->{state}-Kitc Move $motion_detector_kitchen->{state}-Garg Move $motion_detector_garage->{state}-Temp: $CurrentTemp";
+    set $tnc_output $APRSStatus;
+}
+
+# Main TNC Parse Procedure
+
+if ($APRSString = said $tnc_output) {
+
+    open(APRSLOG, ">>$Pgm_Root/web/javAPRS/aprs.tnc");  # Log it
+    print APRSLOG "$APRSString\n";
+    close APRSLOG;
+
+    print_msg "TRACK: $APRSString";                     # Monitor to Msg Window
+
+    $APRSFoundAPRS = "";                                # Reset Found Flag
+    # $APRSPacketDigi = "";
+    $APRSStringLength = (length($APRSString));          # Save Length of Ser
+
+    # Send the packet out TELNET if connected...
+    set $server2 $APRSString if active $server2;
+
+    # Decode the Callsign and different parts from the Packet
+
+    ($CallsignPart, $MsgLine) = (split('::', $APRSString))[0, 1]; #New Line for Msging
+    ($CallsignPart, $PacketPart) = (split(':', $APRSString))[0, 1];
+    ($APRSCallsign, $ToCallsignPart) = (split('>', $CallsignPart))[0, 1];
+    ($APRSCallsignNoSSID, $j) = (split('-', $APRSCallsign))[0, 1];
+
+    # Save the APRS Callsign for Message Reading Procedure (non-spaced)
+
+    $RealAPRSCallsign = $APRSCallsign;
+
+    # Make APRS Callsign so it is spoken properly
+
+    $j = '';
+    for ($i = 0; $i != (length($APRSCallsign)); ++$i) {
+        $j = $j . substr($APRSCallsign, $i, 1);
+        $j = $j . " ";
+    }
+    $APRSCallsign = $j;
+
+    # MAIN LOOP
+
+    if ($APRSFoundAPRS != 1) {
+        # If it's a $GPRMC, $GPGGA, or Mic-E statement for GPS,
+        if ((substr($PacketPart, 0, 6) eq '$GPRMC') ||
+            (substr($PacketPart, 0, 6) eq '$GPGGA') ||
+            (substr($PacketPart, 0, 1) eq '`') ||
+            (substr($PacketPart, 0, 1) eq "'")) {
+            $APRSFoundAPRS = 1;                         # Found an APRS String
+            $GPSCallsign = $APRSCallsign;               # Reset Variables
+            $GPSTime = "";
+            $GPSLatitudeDegrees = "";
+            $GPSLatitudeMinutes = "";
+            $GPSLongitudeDegrees = "";
+            $GPSLongitudeMinutes = "";
+            $GPSLatitude = "";
+            $GPSLongitude = "";
+            $GPSDistance = "";
+            $GPSSpeed = "";
+            $GPSCourse = "";
+            $GPSCourseVoice = "";
+            $GPSLstBr = "";
+            $GPSLstBrLat = "";
+            $GPSLstBrLon = "";
+            $GPSCompPlace = "";
+            $GPSCompLat = "";
+            $GPSCompLong = "";
+            $GPSCompDist = "9999";
+            $GPSSpeakString2 = "";
+            $GPSTempCompPlace = "";
+            $GPSTempCompDist = "";
+
+            # Find out the user defined "name" for this callsign.
+
+            $j = '0';
+
+            foreach $TempName (@namelines) {
+                if ($j eq '0') {
+                    ($TempNameCall, $TempNameName) = (split(',', $TempName))[0, 1];
+                    if ($TempNameCall eq $APRSCallsignNoSSID) {
+                        $HamName = $TempNameName;
+                        chomp $HamName;
+                        $j = '1';
+                    }
+                }
+            }
+
+            # If there is NO defined name, make $HamName equal to the callsign
+
+            if ($j eq '0') {
+                $HamName = $APRSCallsign;
+                print_msg "$APRSString -> No callsign Found\n";
+            }
+
+
+            if (substr($PacketPart, 0, 6) eq '$GPRMC') {
+                ($GPSTime, $GPSLatitude, $GPSLongitude, $GPSSpeed, $GPSCourse) = (split(',', $PacketPart))[1, 3, 5, 7, 8];
+            }
+
+            if (substr($PacketPart, 0, 6) eq '$GPGGA') {
+                ($GPSTime, $GPSLatitude, $GPSLongitude) = (split(',', $PacketPart))[1, 2, 4];
+            }
+
+            if ((substr($PacketPart, 0, 6) eq '$GPRMC') ||
+                (substr($PacketPart, 0, 6) eq '$GPGGA')) {
+
+                $GPSTime = (substr($GPSTime, 0, 6));    # Get the GPS Time
+                $GPSLatitudeDegrees = (substr($GPSLatitude, 0, 2));
+                $GPSLatitudeMinutes = (substr($GPSLatitude, 2, 8));
+                $GPSLatitude = ($GPSLatitudeDegrees + ($GPSLatitudeMinutes / 60));
+                $GPSLongitudeDegrees = (substr($GPSLongitude, 0, 3));
+                $GPSLongitudeMinutes = (substr($GPSLongitude, 3, 8));
+                $GPSLongitude = ($GPSLongitudeDegrees + ($GPSLongitudeMinutes / 60));
+
+                # Convert the GPS Speed to MPH
+                $GPSSpeed = ($GPSSpeed * 1.853248) / 1.609344;
+            }
+
+            if ((substr($PacketPart, 0, 1) eq '`') ||            # If a Mic-E,
+                (substr($PacketPart, 0, 1) eq "'")) {
+
+                $GPSLongitudeDegrees = (substr($PacketPart, 1, 1));
+                $GPSLongitudeDegrees = (unpack('C', $GPSLongitudeDegrees)) - 28;
+                if ($GPSLongitudeDegrees >= 180 and $GPSLongitudeDegrees <= 189) {$GPSLongitudeDegrees = $GPSLongitudeDegrees - 80};
+                if ($GPSLongitudeDegrees >= 190 and $GPSLongitudeDegrees <= 199) {$GPSLongitudeDegrees = $GPSLongitudeDegrees - 190};
+
+                $GPSLongitudeMinutes = (substr($PacketPart, 2, 1));
+                $GPSLongitudeMinutes = (unpack('C', $GPSLongitudeMinutes)) - 28;
+                if ($GPSLongitudeMinutes > 60) {$GPSLongitudeMinutes = $GPSLongitudeMinutes - 60};
+
+                # Added Lines from Roger
+                $GPSLongitudeMinutes100 = (substr($PacketPart, 3, 1));
+                $GPSLongitudeMinutes100 = (unpack('C', $GPSLongitudeMinutes100)) - 28;
+                #
+
+                $GPSLongitude = ($GPSLongitudeDegrees + ($GPSLongitudeMinutes / 60)+ ($GPSLongitudeMinutes100 / 6000));
+                # old -> $GPSLongitude = ($GPSLongitudeDegrees + ($GPSLongitudeMinutes / 60));
+
+                $GPSSpeed = (substr($PacketPart, 4, 1));
+                $GPSSpeed = ((unpack('C', $GPSSpeed)) - 28) * 10;
+                # $CallsignPart simply used as a temp variable
+                $CallsignPart = (substr($PacketPart, 5, 1));
+                $GPSSpeed = (((unpack('C', $CallsignPart)) - 28) / 10) + $GPSSpeed;
+
+                $GPSCourse = ((unpack('C', $CallsignPart)) - 28) % 10;
+                # $CallsignPart simply used as a temp variable
+                $CallsignPart = (substr($PacketPart, 6, 1));
+                $GPSCourse = ((unpack('C', $CallsignPart)) - 28) + $GPSCourse;
+
+                # Last minute course and speed adjustments per specs
+                if ($GPSSpeed >= 800) {$GPSSpeed = $GPSSpeed - 800};
+                if ($GPSCourse >= 400) {$GPSCourse = $GPSCourse - 400};
+
+                # Convert the GPS Speed to MPH
+                $GPSSpeed = ($GPSSpeed * 1.853248) / 1.609344;
+
+                # Truncate Course to max of 3 numbers for parsing below
+                $GPSCourse = substr($GPSCourse, 0, 3);
+
+                # Round the Speed to the nearest integer
+                $GPSSpeed = round($GPSSpeed);
+
+                # Load the tens digit of Degrees Latitude
+                $GPSLatitudeDegrees = (substr($ToCallsignPart, 0, 1));
+                $GPSLatitudeDegrees = (unpack('C', $GPSLatitudeDegrees)) - 32;
+                $GPSLatitudeDegrees = ($GPSLatitudeDegrees & 15) * 10;
+
+                # Load the ones digit of Degrees Latitude (temp variable used)
+                $GPSDistance = (substr($ToCallsignPart, 1, 1));
+                $GPSDistance = (unpack('C', $GPSDistance)) - 32;
+                $GPSDistance = ($GPSDistance & 15);
+
+                # Here's our Degrees Latitude
+                $GPSLatitudeDegrees = $GPSLatitudeDegrees + $GPSDistance;
+
+                # Load the tens digit of Minutes Latitude
+                $GPSLatitudeMinutes = (substr($ToCallsignPart, 2, 1));
+                $GPSLatitudeMinutes = (unpack('C', $GPSLatitudeMinutes)) - 32;
+                $GPSLatitudeMinutes = ($GPSLatitudeMinutes & 15) * 10;
+
+                # Load the ones digit of Minutes Latitude (temp variable used)
+                $GPSDistance = (substr($ToCallsignPart, 3, 1));
+                $GPSDistance = (unpack('C', $GPSDistance)) - 32;
+                $GPSDistance = ($GPSDistance & 15);
+
+                # Here's our Minutes Latitude
+                $GPSLatitudeMinutes = $GPSLatitudeMinutes + $GPSDistance;
+
+                # Load the tens digit of hundreds of Minutes Latitude
+                # $CallsignPart simply used as a temp variable
+                $CallsignPart = (substr($ToCallsignPart, 4, 1));
+                $CallsignPart = (unpack('C', $CallsignPart)) - 32;
+                $CallsignPart = ($CallsignPart & 15) * 10;
+
+                # Load the ones digit of hundreds of Minutes Latitude
+                # (temp variable used)
+                $GPSDistance = (substr($ToCallsignPart, 5, 1));
+                $GPSDistance = (unpack('C', $GPSDistance)) - 32;
+                $GPSDistance = ($GPSDistance & 15);
+
+                # Here's our hundreds of Minutes Latitude
+                $CallsignPart = $CallsignPart + $GPSDistance;
+
+                $GPSLatitude = ($GPSLatitudeDegrees + ($GPSLatitudeMinutes / 60) + ($CallsignPart / 6000));
+            }
+
+            # --- Do the following for all received GPS Strings
+
+            # Calculate distance station is away
+		$GPSDistance = &great_circle_distance($GPSLatitude, $GPSLongitude, $config_parms{latitude}, $config_parms{longitude});
+            #$GPSDistance = (sin $GPSLatitude) * (sin $config_parms{latitude}) + (cos $GPSLatitude) * (cos $config_parms{latitude}) * (cos ($config_parms{longitude}-$GPSLongitude));
+            #$GPSDistance = 1.852 * 60 * atan2(sqrt(1 - $GPSDistance * $GPSDistance), $GPSDistance);
+            #$GPSDistance = $GPSDistance / 1.6093440;
+            $GPSDistance = round($GPSDistance, 1);
+
+            # Calculate bearing from the Position file
+            foreach $GPSTempCompLine (@gpscomplines) {
+                ($GPSTempCompPlace, $GPSTempCompLat, $GPSTempCompLong) = (split(',', $GPSTempCompLine))[0, 1, 2];
+
+                # Calculate distance station is away from pos file
+		    $GPSTempCompDist = &great_circle_distance($GPSLatitude, $GPSLongitude, $GPSTempCompLat, $GPSTempCompLong);
+                #$GPSTempCompDist = (sin $GPSLatitude) * (sin $GPSTempCompLat) + (cos $GPSLatitude) * (cos $GPSTempCompLat) * (cos ($GPSTempCompLong-$GPSLongitude));
+                #$GPSTempCompDist = 1.852 * 60 * atan2(sqrt(1 - $GPSTempCompDist * $GPSTempCompDist), $GPSTempCompDist);
+                #$GPSTempCompDist = $GPSTempCompDist / 1.6093440;
+                $GPSTempCompDist = round($GPSTempCompDist, 1);
+
+                if ($GPSTempCompDist < 15 and $GPSTempCompDist < $GPSCompDist) {
+                    $GPSCompPlace = $GPSTempCompPlace;
+                    $GPSCompDist = $GPSTempCompDist;
+                    $GPSCompLat = $GPSTempCompLat;
+                    $GPSCompLong = $GPSTempCompLong;
+                }
+            }
+
+            # Calculate if station is north/west/east/south of POSFILE
+            $GPSCompLstBrLat = ($GPSCompLat - $GPSLatitude);
+            $GPSCompLstBrLon = ($GPSCompLong - $GPSLongitude);
+            if ($GPSCompLstBrLat < 0 and $GPSCompLstBrLon < 0) {$GPSCompLstBr = 'northwest'};
+            if ($GPSCompLstBrLat > 0 and $GPSCompLstBrLon < 0) {$GPSCompLstBr = 'southwest'};
+            if ($GPSCompLstBrLat < 0 and $GPSCompLstBrLon > 0) {$GPSCompLstBr = 'northeast'};
+            if ($GPSCompLstBrLat > 0 and $GPSCompLstBrLon > 0) {$GPSCompLstBr = 'southeast'};
+            if ($GPSCompLstBrLat <= 0 and (abs($GPSCompLstBrLon) * 2) < abs($GPSCompLstBrLat)) {$GPSCompLstBr = 'north'};
+            if ($GPSCompLstBrLat >= 0 and (abs($GPSCompLstBrLon) * 2) < abs($GPSCompLstBrLat)) {$GPSCompLstBr = 'south'};
+            if ($GPSCompLstBrLon <= 0 and (abs($GPSCompLstBrLat) * 2) < abs($GPSCompLstBrLon)) {$GPSCompLstBr = 'west'};
+            if ($GPSCompLstBrLon >= 0 and (abs($GPSCompLstBrLat) * 2) < abs($GPSCompLstBrLon)) {$GPSCompLstBr = 'east'};
+
+            # Calculate if station is north/west/east/south of ours
+            $GPSLstBrLat = ($config_parms{latitude} - $GPSLatitude);
+            $GPSLstBrLon = ($config_parms{longitude} - $GPSLongitude);
+            if ($GPSLstBrLat < 0 and $GPSLstBrLon < 0) {$GPSLstBr = 'northwest'};
+            if ($GPSLstBrLat > 0 and $GPSLstBrLon < 0) {$GPSLstBr = 'southwest'};
+            if ($GPSLstBrLat < 0 and $GPSLstBrLon > 0) {$GPSLstBr = 'northeast'};
+            if ($GPSLstBrLat > 0 and $GPSLstBrLon > 0) {$GPSLstBr = 'southeast'};
+            if ($GPSLstBrLat <= 0 and (abs($GPSLstBrLon) * 2) < abs($GPSLstBrLat)) {$GPSLstBr = 'north'};
+            if ($GPSLstBrLat >= 0 and (abs($GPSLstBrLon) * 2) < abs($GPSLstBrLat)) {$GPSLstBr = 'south'};
+            if ($GPSLstBrLon <= 0 and (abs($GPSLstBrLat) * 2) < abs($GPSLstBrLon)) {$GPSLstBr = 'west'};
+            if ($GPSLstBrLon >= 0 and (abs($GPSLstBrLat) * 2) < abs($GPSLstBrLon)) {$GPSLstBr = 'east'};
+
+            # Add bearing from station in position file IF it's a new position report
+            if ((($GPSCallsign ne $LastGPSCallsign) || ($GPSDistance ne $LastGPSDistance)) and ($GPSCompDist ne '9999')) {
+                $GPSSpeakString2 = "Currently $GPSCompDist miles $GPSCompLstBr of $GPSCompPlace.";
+                # and form a special speak string just for on the air
+                $GPSSpeakString3 = ">$RealAPRSCallsign $GPSCompDist mi $GPSCompLstBr of $GPSCompPlace.";
+
+###             # Added in 4.9
+                if ($GPSDistance <= 0.2) {
+                    $GPSSpeakString2 = "Currently near $GPSCompPlace.";
+                    $GPSSpeakString3 = ">$RealAPRSCallsign near $GPSCompPlace.";
+                }
+                if ((substr($PacketPart, 0, 6) eq '$GPRMC') and
+                ($GPSDistance <= 0.1) and
+                ($GPSSpeed <= 1)) {
+                    $GPSSpeakString2 = "Currently parked at $GPSCompPlace.";
+                    $GPSSpeakString3 = ">$RealAPRSCallsign parked at $GPSCompPlace.";
+                }
+                if ((substr($PacketPart, 0, 6) eq '$GPGGA') and
+                ($GPSDistance <= 0.1)) {
+                    $GPSSpeakString2 = "Currently at $GPSCompPlace.";
+                    $GPSSpeakString3 = ">$RealAPRSCallsign at $GPSCompPlace.";
+                }
+##
+
+                set $tnc_output $GPSSpeakString3;
+            }
+
+            # If It's a $GPRMC or Mic-E String,
+
+            if ((substr($PacketPart, 0, 6) eq '$GPRMC') ||
+                (substr($PacketPart, 0, 1) eq '`')) {
+
+                # Only Calculate Course & Speed if it's a $GPRMC string,
+                if (substr($PacketPart, 0, 6) eq '$GPRMC') {
+
+                    # Truncate Course to max of 3 numbers for parsing below
+                    $GPSCourse = substr($GPSCourse, 0, 3);
+
+                    # Round the Speed to the nearest integer
+                    $GPSSpeed = round($GPSSpeed);
+                }
+
+                $GPSCourseVoice = "north" if ($GPSCourse >= 0 and $GPSCourse <= 11);
+                $GPSCourseVoice = "north-northeast" if ($GPSCourse >= 12 and $GPSCourse <= 33);
+                $GPSCourseVoice = "northeast" if ($GPSCourse >= 34 and $GPSCourse <= 55);
+                $GPSCourseVoice = "east-northeast" if ($GPSCourse >= 56 and $GPSCourse <= 77);
+                $GPSCourseVoice = "east" if ($GPSCourse >= 78 and $GPSCourse <= 99);
+                $GPSCourseVoice = "east-southeast" if ($GPSCourse >= 100 and $GPSCourse <= 121);
+                $GPSCourseVoice = "southeast" if ($GPSCourse >= 122 and $GPSCourse <= 143);
+                $GPSCourseVoice = "south-southeast" if ($GPSCourse >= 144 and $GPSCourse <= 165);
+                $GPSCourseVoice = "south" if ($GPSCourse >= 166 and $GPSCourse <= 187);
+                $GPSCourseVoice = "south-southwest" if ($GPSCourse >= 188 and $GPSCourse <= 209);
+                $GPSCourseVoice = "southwest" if ($GPSCourse >= 210 and $GPSCourse <= 231);
+                $GPSCourseVoice = "west-southwest" if ($GPSCourse >= 232 and $GPSCourse <= 253);
+                $GPSCourseVoice = "west" if ($GPSCourse >= 254 and $GPSCourse <= 275);
+                $GPSCourseVoice = "west-northwest" if ($GPSCourse >= 276 and $GPSCourse <= 297);
+                $GPSCourseVoice = "northwest" if ($GPSCourse >= 298 and $GPSCourse <= 319);
+                $GPSCourseVoice = "north-northwest" if ($GPSCourse >= 320 and $GPSCourse <= 341);
+                $GPSCourseVoice = "north" if ($GPSCourse >= 342 and $GPSCourse <= 360);
+
+                if ($config_parms{tracking_withname} == 1)
+                    {$GPSCallsign = $HamName};
+
+                # If It's not the same as the last report, say it.
+
+                if ((($GPSCallsign ne $LastGPSCallsign) || ($GPSDistance ne $LastGPSDistance)) and ($GPSSpeed ne '0')) {
+
+                    if ($config_parms{tracking_shortannounce} == 0)
+                        {$GPSSpeakString = "$GPSCallsign is $GPSDistance miles $GPSLstBr of us, heading $GPSCourseVoice at $GPSSpeed miles an hour.  $GPSSpeakString2"};
+
+                    if ($config_parms{tracking_shortannounce} == 1) {
+                        $GPSSpeakString = "$GPSCallsign is $GPSSpeakString2";
+                        if ($GPSSpeakString2 eq '') {$GPSSpeakString = "$GPSCallsign is $GPSDistance miles $GPSLstBr of us, heading $GPSCourseVoice at $GPSSpeed miles an hour."};
+                    }
+
+                    print_log "$GPSSpeakString";
+
+                    if (($config_parms{tracking_speakflag} == 1) ||
+                        ($config_parms{tracking_speakflag} == 3))
+                        {speak $GPSSpeakString};
+
+                    if ($config_parms{tracking_trackself} == 1 and
+                        $APRSCallsignNoSSID eq $HamCall)
+                        {speak $GPSSpeakString};
+                }
+
+                # If the GPS is Stationary, say the following.
+
+                if ((($GPSCallsign ne $LastGPSCallsign) || ($GPSDistance ne $LastGPSDistance)) and ($GPSSpeed eq '0')) {
+
+                    if ($config_parms{tracking_shortannounce} == 0)
+                        {$GPSSpeakString = "$GPSCallsign is parked $GPSDistance miles $GPSLstBr of us.  $GPSSpeakString2"};
+
+                    if ($config_parms{tracking_shortannounce} == 1) {
+                        $GPSSpeakString = "$GPSCallsign is $GPSSpeakString2";
+                        if ($GPSSpeakString2 eq '') {$GPSSpeakString = "$GPSCallsign is parked $GPSDistance miles $GPSLstBr of us."};
+                    }
+
+                    print_log "$GPSSpeakString";
+
+                    if (($config_parms{tracking_speakflag} == 1) ||
+                        ($config_parms{tracking_speakflag} == 3))
+                        {speak $GPSSpeakString};
+
+                    if ($config_parms{tracking_trackself} == 1 and
+                        $APRSCallsignNoSSID eq $HamCall)
+                        {speak $GPSSpeakString};
+                }
+            }
+
+            # If It's a $GPGGA String,
+
+            if (substr($PacketPart, 0, 6) eq '$GPGGA') {
+
+                if ($config_parms{tracking_withname} == 1)
+                    {$GPSCallsign = $HamName};
+
+                if (($GPSCallsign ne $LastGPSCallsign) || ($GPSDistance ne $LastGPSDistance)) {
+
+                    if ($config_parms{tracking_shortannounce} == 0)
+                        {$GPSSpeakString = "$GPSCallsign is $GPSDistance miles $GPSLstBr of us.  $GPSSpeakString2"};
+
+                    if ($config_parms{tracking_shortannounce} == 1) {
+                        $GPSSpeakString = "$GPSCallsign is $GPSSpeakString2";
+                        if ($GPSSpeakString2 eq '') {$GPSSpeakString = "$GPSCallsign is $GPSDistance miles $GPSLstBr of us."};
+                    }
+
+                    print_log "$GPSSpeakString";
+
+                    if (($config_parms{tracking_speakflag} == 1) ||
+                        ($config_parms{tracking_speakflag} == 3))
+                        {speak $GPSSpeakString};
+
+                    if ($config_parms{tracking_trackself} == 1 and
+                        $APRSCallsignNoSSID eq $HamCall)
+                        {speak $GPSSpeakString};
+                }
+            }
+
+            $LastGPSCallsign = $GPSCallsign;        # Save last GPS rpt
+            $LastGPSDistance = $GPSDistance;
+            $LastGPSLstBr = $GPSLstBr;
+
+            # NEW IN 4.8
+            # Prototype Log File Procedure for Tracking
+
+            $i = -$GPSLongitude;
+            $j = $GPSLatitude;
+
+            my $html  = qq[<FORM ACTION='/SET:last_response' target='speech';\n];
+            $html .= qq[<tr><td>$Date_Now $Time_Now</td><td>$GPSSpeakString</td>\n];
+            $html .= qq[<td><a href="http://www.mapblast.com/myblast/map.mb?];
+            $html .= qq|CT=$j\%3A$i\%3A10000">$GPSSpeakString2</a></td>\n|;
+            $html .= qq[<td><INPUT name=aprs_location_name type='text' SIZE=10 onChange=submit>\n];
+            $i = -$i;       # For logging form data in .pos
+            $html .= qq[<INPUT name=aprs_location_loc type='hidden' value='$j,$i'></td></tr></FORM>\n\n];
+
+            #$k = qq[<li>$Date_Now $Time_Now: <a href=\"http://www.mapblast.com/mblast/map.mb?];
+            #$k .= qq[&GC=X:$i|Y:$j|LT:$j|LN:$i|LS:16000|&IC=$j:$i:100:$GPSCallsign $GPSCourseVoice $GPSSpeed MPH&CMD=MAP\">];
+            #$k .= qq[\n$GPSSpeakString</a>\n\n];
+            logit "$config_parms{html_dir}/mh/tracking/today.html", $html, 0;
+            logit "$config_parms{html_dir}/mh/tracking/week1.html", $html, 0;
+
+            if ($New_Day) {
+                open(NEWDAY, ">$config_parms{html_dir}/mh/tracking/today.html");
+                close NEWDAY;
+		    my $html = qq[<link rel="STYLESHEET" href="/default.css" type="text/css">\n<table>\n];
+                $html .= qq[<tr><td><b>Date Time</b></td><td><b>Vehicle Heading and Speed</b></td><td><b>Location</b></td><td><b>New Location</b></td></tr>\n];
+                logit "$config_parms{html_dir}/mh/tracking/today.html", $html, 0, 1;
+                logit "$config_parms{html_dir}/mh/tracking/week1.html", "<hr>\n", 0, 1;
+            }
+
+            if ($New_Week) {
+                open(NEWWEEK, ">$config_parms{html_dir}/mh/tracking/week1.html");
+                close NEWWEEK;
+                #file_cat "$config_parms{html_dir}/mh/tracking/week2.html", "$config_parms{html_dir}/mh/tracking/old/${Year_Month_Now}.html";
+                #rename "$config_parms{html_dir}/mh/tracking/week1.html", "$config_parms{html_dir}/mh/tracking/week2.html"  or print_log "Error in aprs rename 2: $!";
+                my $html = qq[<link rel="STYLESHEET" href="/default.css" type="text/css">\n<table>\n];
+                $html .= qq[<tr><td><b>Date Time</b></td><td><b>Vehicle Heading and Speed</b></td><td><b>Location</b></td><td><b>New Location</b></td></tr>\n];
+                logit "$config_parms{html_dir}/mh/tracking/week1.html", $html, 1;
+            }
+
+            # Add an index entry for the new months entry in aprs/old
+
+            #if ($New_Month) {
+            #    my $html = qq[<li><a href=\"$Year_Month_Now.html\">$Year_Month_Now.html</a>\n];
+            #    logit "$config_parms{html_dir}/mh/tracking/old/index.html", $html, 1;
+            #}
+        }                                           #  **END** GPS Parse
+
+        # Send E-Mail from APRS messages with "EMAIL2"
+
+        if (substr($MsgLine, 0, 6) eq 'EMAIL2') {
+            $APRSFoundAPRS = 1;
+
+            ($MsgLine, $MessageAck) = (split('{', $MsgLine))[0, 1];
+            ($CallsignPart, $PacketPart) = (split(':', $MsgLine))[0, 1];
+            ($CallsignPart, $PacketPart) = (split(' ', $PacketPart))[0, 1];
+
+            # Let $i equals the number of spaces to put before :ack
+            $i = (9 - length($RealAPRSCallsign));
+            $k = ' ';
+            $k = ($k x $i);
+
+            print_log "Email gateway: Callsign=$RealAPRSCallsign, to=$CallsignPart data=$PacketPart\n";
+
+            # Send the mail!!
+            #if (&net_connect_check) {
+                $i = $RealAPRSCallsign . $k . ":ack" . $MessageAck;
+                set $tnc_output $i;
+                &net_mail_send(to => $CallsignPart, subject => "APRS Gateway",
+                             text => "From $HamCall APRS Gateway\n$PacketPart");
+                $i = ":" . $RealAPRSCallsign . $k . ":Your E-Mail Message has been sent.{7";
+                set $tnc_output $i;
+            #}
+            #else {
+            #    $i = $RealAPRSCallsign . $k . ":ack" . $MessageAck;
+            #    set $tnc_output $i;
+            #    $i = ":" . $RealAPRSCallsign . $k . ":Sorry, Gateway is currently closed.{8";
+            #    set $tnc_output $i;
+            #}
+        }
+
+        # Speak any incoming APRS Bulletins
+
+        if (substr($MsgLine, 0, 3) eq 'BLN') {
+            $APRSFoundAPRS = 1;
+
+#            ($CallsignPart, $PacketPart) = (split(':', $MsgLine))[0, 1];
+            ($CallsignPart, $CallsignPart, $PacketPart) = (split(':', $APRSString))[0, 1, 2];
+            print_log "Incoming Bulletin from $APRSCallsign: $PacketPart";
+            ## REMMED THIS NEXT STATEMENT OUT FOR SANITY
+            #speak "Incoming Bulletin from $APRSCallsign. $PacketPart";
+        }
+
+        # If It's an APRS Message, either say it or process the voice command:
+
+        if (substr($MsgLine, 0, length($HamCall)) eq $HamCall) {
+            $APRSFoundAPRS = 1;
+
+            ($MsgLine, $MessageAck) = (split('{', $MsgLine))[0, 1];
+            ($CallsignPart, $PacketPart) = (split(':', $MsgLine))[0, 1];
+
+            # Let $i equals the number of spaces to put before :ack
+            $i = (9 - length($RealAPRSCallsign));
+            $k = ' ';
+            $k = ($k x $i);
+
+            # Check to see if it is a voice command to process from our CALLSIGN:
+
+            if (substr($PacketPart, 0, 4) eq 'X10-' and
+                substr($RealAPRSCallsign, 0, length($HamCall)) eq $HamCall) {
+
+                # Split the line so $PacketPart is actually the message received to process.
+                ($CallsignPart, $PacketPart) = (split('-', $PacketPart))[0, 1];
+
+                run_voice_cmd $PacketPart;
+                print_log "X10 received from APRS: $PacketPart";
+                speak "X10 received from A P R S: $PacketPart";
+
+                $i = $RealAPRSCallsign . $k . ":ack" . $MessageAck;
+                set $tnc_output $i;
+                $i = ":" . $RealAPRSCallsign . $k . ":X-10 Message Received.{9";
+                set $tnc_output $i;
+                $MsgLine = "";
+            }
+
+            # NEW in 4.52 - Check to see if its an ack.  If so, don't speak it.
+
+            elsif (substr($PacketPart, 0, 3) eq 'ack') {
+                print_log "Acknowledgement received from $RealAPRSCallsign";
+            }
+
+            # NEW in 4.62 - Respond to ?WX? requests with the temperature.
+
+            elsif (substr($PacketPart, 0, 4) eq '?WX?') {
+                $i = $RealAPRSCallsign . $k . ":ack" . $MessageAck;
+                set $tnc_output $i;
+                $i = ":" . $RealAPRSCallsign . $k . ": Current Temperature: $CurrentTemp.{4";
+                set $tnc_output $i;
+                $MsgLine = "";
+            }
+
+            # NEW in 4.62 - Respond to ?PHONE? requests with last call.
+
+            elsif (substr($PacketPart, 0, 7) eq '?PHONE?') {
+                $i = $RealAPRSCallsign . $k . ":ack" . $MessageAck;
+                set $tnc_output $i;
+                $i = ":" . $RealAPRSCallsign . $k . ": Last Call: $PhoneName ($DisplayPhoneNumber){6";
+                set $tnc_output $i;
+                $MsgLine = "";
+            }
+
+            # If it's not a voice command, than assume it's a standard message:
+
+            else {
+                print_log "Incoming Message from $APRSCallsign: $PacketPart";
+                #speak "Incoming Message from $APRSCallsign. $PacketPart";
+                # THIS IS A STATUS PAGE EVENT
+                    #if (time_greater_than("22:00") and time_less_than("15:00")) {
+                    #$page_icq = "$PacketPart";
+                    #}
+
+                $i = $RealAPRSCallsign . $k . ":ack" . $MessageAck;
+                set $tnc_output $i;
+                set $tnc_output $i;
+                #$i = ":" . $RealAPRSCallsign . $k . ":Message Received.{2";
+                #set $tnc_output $i;
+
+                $MsgLine = "";
+            }
+        }
+
+        # If it's a U2k or UII Weather Station,
+        # AA0SM>APRSW,N0EST,WIDE*,WIDE:_02050122c168s005g010t011r000p000P000h91b10224wU2K
+
+        if ((substr($APRSString, ($APRSStringLength - 4), 2) eq 'dU')
+        || (substr($APRSString, ($APRSStringLength - 6), 6) eq 'dU2kFM')
+        || (substr($APRSString, ($APRSStringLength - 4), 2) eq 'wU')) {
+            $APRSFoundAPRS = 1;
+            $WXCallsign = $APRSCallsign;            # Reset Variables
+            $WXTime = "";
+            $WXLatitudeDegrees = "";
+            $WXLatitudeMinutes = "";
+            $WXLongitudeDegrees = "";
+            $WXLongitudeMinutes = "";
+            $WXLatitude = "";
+            $WXLongitude = "";
+            $WXDistance = "";
+            $WXTemp = "";
+            $WXWindDir = "";
+            $WXWindSpeed = "";
+            $WXWindChill = "";
+            $WXHrPrecip = "";
+            $WX24HrPrecip = "";
+            # Added in 4.7
+            $WXLstBr = "";
+            $WXLstBrLat = "";
+            $WXLstBrLon = "";
+            $WXCompPlace = "";
+            $WXCompLat = "";
+            $WXCompLong = "";
+            $WXCompDist = "9999";
+            $WXSpeakString2 = "";
+            $WXTempCompPlace = "";
+            $WXTempCompDist = "";
+
+            # If It's a DOS Weather String,
+
+            if ((substr($APRSString, ($APRSStringLength - 4), 2) eq 'dU')
+            || (substr($APRSString, ($APRSStringLength - 6), 6) eq 'dU2kFM')) {
+
+                $WXTime = (substr($PacketPart, 3, 4));  # Time of WX Report
+                $WXWindDir = (substr($PacketPart, 27, 3));  # Wind Direction
+                $WXWindSpeed = (substr($PacketPart, 31, 3));  # Wind Speed
+
+                # Get rid of those damn 0's in the Speed
+                if (substr($WXWindSpeed, 0, 2) eq '00') {$WXWindSpeed = (substr($WXWindSpeed, 2, 1))};
+                if ($WXWindSpeed ne '0') {       # Except if wind speed IS 0
+                    if (substr($WXWindSpeed, 0, 1) eq '0') {$WXWindSpeed = (substr($WXWindSpeed, 1, 2))};
+                }
+
+                $WXLatitudeDegrees = (substr($PacketPart, 8, 2));
+                $WXLatitudeMinutes = (substr($PacketPart, 10, 5));
+                $WXLatitude = ($WXLatitudeDegrees + ($WXLatitudeMinutes / 60));
+                $WXLongitudeDegrees = (substr($PacketPart, 17, 3));
+                $WXLongitudeMinutes = (substr($PacketPart, 20, 5));
+                $WXLongitude = ($WXLongitudeDegrees + ($WXLongitudeMinutes / 60));
+
+		    $WXDistance = &great_circle_distance($WXLatitude, $WXLongitude, $config_parms{latitude}, $config_parms{longitude});
+                #$WXDistance = (sin $WXLatitude) * (sin $config_parms{latitude}) + (cos $WXLatitude) * (cos $config_parms{latitude}) * (cos ($config_parms{longitude}-$WXLongitude));
+                #$WXDistance = 1.852 * 60 * atan2(sqrt(1 - $WXDistance * $WXDistance), $WXDistance);
+                #$WXDistance = $WXDistance / 1.6093440;
+                $WXDistance = round($WXDistance, 1);
+
+                # Calculate if station is north/west/east/south of ours
+                $WXLstBrLat = ($config_parms{latitude} - $WXLatitude);
+                $WXLstBrLon = ($config_parms{longitude} - $WXLongitude);
+                if ($WXLstBrLat < 0 and $WXLstBrLon < 0) {$WXLstBr = 'northwest'};
+                if ($WXLstBrLat > 0 and $WXLstBrLon < 0) {$WXLstBr = 'southwest'};
+                if ($WXLstBrLat < 0 and $WXLstBrLon > 0) {$WXLstBr = 'northeast'};
+                if ($WXLstBrLat > 0 and $WXLstBrLon > 0) {$WXLstBr = 'southeast'};
+                if ($WXLstBrLat <= 0 and (abs($WXLstBrLon) * 2) < abs($WXLstBrLat)) {$WXLstBr = 'north'};
+                if ($WXLstBrLat >= 0 and (abs($WXLstBrLon) * 2) < abs($WXLstBrLat)) {$WXLstBr = 'south'};
+                if ($WXLstBrLon <= 0 and (abs($WXLstBrLat) * 2) < abs($WXLstBrLon)) {$WXLstBr = 'west'};
+                if ($WXLstBrLon >= 0 and (abs($WXLstBrLat) * 2) < abs($WXLstBrLon)) {$WXLstBr = 'east'};
+            }
+
+            # For New Windows UII/U2000 String Only
+
+            if (substr($APRSString, ($APRSStringLength - 4), 2) eq 'wU') {
+                $WXTime = (substr($PacketPart, 5, 4));  # Time of WX Report
+                $WXWindDir = (substr($PacketPart, 10, 3));  # Wind Direction
+                $WXWindSpeed = (substr($PacketPart, 14, 3));  # Wind Speed
+
+                # Get rid of those damn 0's in the Speed
+                if (substr($WXWindSpeed, 0, 2) eq '00') {$WXWindSpeed = (substr($WXWindSpeed, 2, 1))};
+                if ($WXWindSpeed ne '0') {       # Except if wind speed IS 0
+                    if (substr($WXWindSpeed, 0, 1) eq '0') {$WXWindSpeed = (substr($WXWindSpeed, 1, 2))};
+                }
+            }
+
+            # All Weather Stations Process the Following
+
+            $WXWindDirVoice = "north" if ($WXWindDir >= 0 and $WXWindDir <= 11);
+            $WXWindDirVoice = "north-northeast" if ($WXWindDir >= 12 and $WXWindDir <= 33);
+            $WXWindDirVoice = "northeast" if ($WXWindDir >= 34 and $WXWindDir <= 55);
+            $WXWindDirVoice = "east-northeast" if ($WXWindDir >= 56 and $WXWindDir <= 77);
+            $WXWindDirVoice = "east" if ($WXWindDir >= 78 and $WXWindDir <= 99);
+            $WXWindDirVoice = "east-southeast" if ($WXWindDir >= 100 and $WXWindDir <= 121);
+            $WXWindDirVoice = "southeast" if ($WXWindDir >= 122 and $WXWindDir <= 143);
+            $WXWindDirVoice = "south-southeast" if ($WXWindDir >= 144 and $WXWindDir <= 165);
+            $WXWindDirVoice = "south" if ($WXWindDir >= 166 and $WXWindDir <= 187);
+            $WXWindDirVoice = "south-southwest" if ($WXWindDir >= 188 and $WXWindDir <= 209);
+            $WXWindDirVoice = "southwest" if ($WXWindDir >= 210 and $WXWindDir <= 231);
+            $WXWindDirVoice = "west-southwest" if ($WXWindDir >= 232 and $WXWindDir <= 253);
+            $WXWindDirVoice = "west" if ($WXWindDir >= 254 and $WXWindDir <= 275);
+            $WXWindDirVoice = "west-northwest" if ($WXWindDir >= 276 and $WXWindDir <= 297);
+            $WXWindDirVoice = "northwest" if ($WXWindDir >= 298 and $WXWindDir <= 319);
+            $WXWindDirVoice = "north-northwest" if ($WXWindDir >= 320 and $WXWindDir <= 341);
+            $WXWindDirVoice = "north" if ($WXWindDir >= 342 and $WXWindDir <= 360);
+
+#######
+# Added 4.7
+
+            # Calculate bearing from the Position file
+            foreach $WXTempCompLine (@gpscomplines) {
+                ($WXTempCompPlace, $WXTempCompLat, $WXTempCompLong) = (split(',', $WXTempCompLine))[0, 1, 2];
+
+                # Calculate distance station is away from pos file
+		    $WXTempCompDist = &great_circle_distance($WXLatitude, $WXLongitude, $WXTempCompLat, $WXTempCompLong);
+                #$WXTempCompDist = (sin $WXLatitude) * (sin $WXTempCompLat) + (cos $WXLatitude) * (cos $WXTempCompLat) * (cos ($WXTempCompLong-$WXLongitude));
+                #$WXTempCompDist = 1.852 * 60 * atan2(sqrt(1 - $WXTempCompDist * $WXTempCompDist), $WXTempCompDist);
+                #$WXTempCompDist = $WXTempCompDist / 1.6093440;
+                $WXTempCompDist = round($WXTempCompDist, 1);
+
+                if ($WXTempCompDist < 150 and $WXTempCompDist < $WXCompDist) {
+                    $WXCompPlace = $WXTempCompPlace;
+                    $WXCompDist = $WXTempCompDist;
+                    $WXCompLat = $WXTempCompLat;
+                    $WXCompLong = $WXTempCompLong;
+                }
+            }
+
+            # Calculate if station is north/west/east/south of POSFILE
+            $WXCompLstBrLat = ($WXCompLat - $WXLatitude);
+            $WXCompLstBrLon = ($WXCompLong - $WXLongitude);
+            if ($WXCompLstBrLat < 0 and $WXCompLstBrLon < 0) {$WXCompLstBr = 'northwest'};
+            if ($WXCompLstBrLat > 0 and $WXCompLstBrLon < 0) {$WXCompLstBr = 'southwest'};
+            if ($WXCompLstBrLat < 0 and $WXCompLstBrLon > 0) {$WXCompLstBr = 'northeast'};
+            if ($WXCompLstBrLat > 0 and $WXCompLstBrLon > 0) {$WXCompLstBr = 'southeast'};
+            if ($WXCompLstBrLat <= 0 and (abs($WXCompLstBrLon) * 2) < abs($WXCompLstBrLat)) {$WXCompLstBr = 'north'};
+            if ($WXCompLstBrLat >= 0 and (abs($WXCompLstBrLon) * 2) < abs($WXCompLstBrLat)) {$WXCompLstBr = 'south'};
+            if ($WXCompLstBrLon <= 0 and (abs($WXCompLstBrLat) * 2) < abs($WXCompLstBrLon)) {$WXCompLstBr = 'west'};
+            if ($WXCompLstBrLon >= 0 and (abs($WXCompLstBrLat) * 2) < abs($WXCompLstBrLon)) {$WXCompLstBr = 'east'};
+
+            # Add bearing from station in position file IF it's a new position report
+            if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance)) and ($GPSCompDist ne '9999')) {
+                $WXSpeakString2 = "Station is located $WXCompDist miles $WXCompLstBr of $WXCompPlace.";
+            }
+
+#######
+
+            if (substr($PacketPart, 35, 1) eq 'T') {  # If a traditional,
+                $WXTemp = (substr($PacketPart, 36, 3));
+                # Get rid of those damn 0's in the Temperature
+                if (substr($WXTemp, 0, 2) eq '00') {$WXTemp = (substr($WXTemp, 2, 1))};
+                if ($WXTemp ne '0') {        # Except if temp IS 0
+                    if (substr($WXTemp, 0, 1) eq '0') {$WXTemp = (substr($WXTemp, 1, 2))};
+                }
+
+                # Calculate Wind Chill if temp is less than 45 degrees
+                if ($WXTemp <= 45) {
+                    $WXWindChill = .0817 * (3.71 * sqrt($WXWindSpeed) + 5.81 - .25 * $WXWindSpeed) * ($WXTemp - 91.4) + 91.4;
+                    $WXWindChill = round($WXWindChill, 0);
+                    if ($WXWindSpeed <= 5) {$WXWindChill = $WXTemp};
+                }
+
+                # If Temperature is above freezing, make it equal.
+                if ($WXTemp >= 46) {
+                    $WXWindChill = $WXTemp;
+                }
+
+                # Add Readings for Last Hour Precip and Last 24 Hour Precip
+                $WXHrPrecip = (substr($PacketPart, 41, 3));
+                # Get rid of those damn 0's in the Precip
+                if (substr($WXHrPrecip, 0, 2) eq '00') {$WXHrPrecip = (substr($WXHrPrecip, 2, 1))};
+                if ($WXHrPrecip ne '0') {        # Except if precip IS 0
+                    if (substr($WXHrPrecip, 0, 1) eq '0') {$WXHrPrecip = (substr($WXHrPrecip, 1, 2))};
+                }
+                # Divide Precip by 10
+                $WXHrPrecip = $WXHrPrecip / 10;
+                $WX24HrPrecip = (substr($PacketPart, 45, 3));
+                # Get rid of those damn 0's in the 24 hr Precip
+                if (substr($WX24HrPrecip, 0, 2) eq '00') {$WX24HrPrecip = (substr($WX24HrPrecip, 2, 1))};
+                if ($WX24HrPrecip ne '0') {        # Except if precip IS 0
+                    if (substr($WX24HrPrecip, 0, 1) eq '0') {$WX24HrPrecip = (substr($WX24HrPrecip, 1, 2))};
+                }
+                # Divide Precip by 10
+                $WX24HrPrecip = $WX24HrPrecip / 10;
+
+                # If It's not the same as the last report, say it.
+
+                if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance) || ($WXTemp ne $LastWXTemp)) and ($WXWindSpeed ne '0')) {
+                    $WXSpeakString = "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is out of the $WXWindDirVoice at $WXWindSpeed miles an hour.";
+                    if ($WXTemp <= 45 and $WXTemp ne $WXWindChill) {$WXSpeakString = $WXSpeakString . "  The winnd chill is $WXWindChill."};
+                    if ($WXHrPrecip != 0) {$WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour."};
+                    # NEW in 4.7 - Add bearing from POSFILE
+                    $WXSpeakString = $WXSpeakString . "  $WXSpeakString2";
+
+                    print_log "$WXSpeakString";
+
+                    if (($config_parms{tracking_speakflag} == 2) ||
+                        ($config_parms{tracking_speakflag} == 3))
+                        {speak $WXSpeakString};
+                }
+
+                # If the wind is calm, say the following.
+
+                if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance) || ($WXTemp ne $LastWXTemp)) and ($WXWindSpeed eq '0')) {
+                    $WXSpeakString = "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is calm.";
+                    if ($WXHrPrecip != 0) {$WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour."};
+                    # NEW in 4.7 - Add bearing from POSFILE
+                    $WXSpeakString = $WXSpeakString . "  $WXSpeakString2";
+
+                    print_log "$WXSpeakString";
+
+                    if (($config_parms{tracking_speakflag} == 2) ||
+                        ($config_parms{tracking_speakflag} == 3))
+                        {speak $WXSpeakString};
+                }
+
+                $LastWXCallsign = $WXCallsign;          # Save last WX rpt information
+                $LastWXDistance = $WXDistance;
+                $LastWXTemp = $WXTemp;
+                $LastWXWindDir = $WXWindDir;
+                $LastWXWindSpeed = $WXWindSpeed;
+                $LastWXWindChill = $WXWindChill;
+                $LastWXHrPrecip = $WXHrPrecip;
+                $LastWX24HrPrecip = $WX24HrPrecip;
+
+            }
+
+            elsif (substr($PacketPart, 38, 1) eq 't') { # If a new format,
+                $WXTemp = (substr($PacketPart, 39, 3));
+                # Get rid of those damn 0's in the Temperature
+                if (substr($WXTemp, 0, 2) eq '00') {$WXTemp = (substr($WXTemp, 2, 1))};
+                if ($WXTemp ne '0') {        # Except if temp IS 0
+                    if (substr($WXTemp, 0, 1) eq '0') {$WXTemp = (substr($WXTemp, 1, 2))};
+                }
+
+                # Calculate Wind Chill if temp is less than 45 degrees
+                if ($WXTemp <= 45) {
+                    $WXWindChill = .0817 * (3.71 * sqrt($WXWindSpeed) + 5.81 - .25 * $WXWindSpeed) * ($WXTemp - 91.4) + 91.4;
+                    $WXWindChill = round($WXWindChill, 0);
+                    if ($WXWindSpeed <= 5) {$WXWindChill = $WXTemp};
+                }
+
+                # If Temperature is above freezing, make it equal.
+                if ($WXTemp >= 46) {
+                    $WXWindChill = $WXTemp;
+                }
+
+                # Add Readings for Last Hour Precip and Last 24 Hour Precip
+                $WXHrPrecip = (substr($PacketPart, 43, 3));
+                # Get rid of those damn 0's in the Precip
+                if (substr($WXHrPrecip, 0, 2) eq '00') {$WXHrPrecip = (substr($WXHrPrecip, 2, 1))};
+                if ($WXHrPrecip ne '0') {        # Except if precip IS 0
+                    if (substr($WXHrPrecip, 0, 1) eq '0') {$WXHrPrecip = (substr($WXHrPrecip, 1, 2))};
+                }
+                # Divide Precip by 10
+                $WXHrPrecip = $WXHrPrecip / 10;
+                $WX24HrPrecip = (substr($PacketPart, 47, 3));
+                # Get rid of those damn 0's in the 24 hr Precip
+                if (substr($WX24HrPrecip, 0, 2) eq '00') {$WX24HrPrecip = (substr($WX24HrPrecip, 2, 1))};
+                if ($WX24HrPrecip ne '0') {        # Except if precip IS 0
+                    if (substr($WX24HrPrecip, 0, 1) eq '0') {$WX24HrPrecip = (substr($WX24HrPrecip, 1, 2))};
+                }
+                # Divide Precip by 10
+                $WX24HrPrecip = $WX24HrPrecip / 10;
+
+                # If It's not the same as the last report, say it.
+
+                if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance) || ($WXTemp ne $LastWXTemp)) and ($WXWindSpeed ne '0')) {
+                    $WXSpeakString = "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is out of the $WXWindDirVoice at $WXWindSpeed miles an hour.";
+                    if ($WXTemp <= 45 and $WXTemp ne $WXWindChill) {$WXSpeakString = $WXSpeakString . "  The winnd chill is $WXWindChill."};
+                    if ($WXHrPrecip != 0) {$WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour."};
+                    # NEW in 4.7 - Add bearing from POSFILE
+                    $WXSpeakString = $WXSpeakString . "  $WXSpeakString2";
+
+                    print_log "$WXSpeakString";
+
+                    if (($config_parms{tracking_speakflag} == 2) ||
+                        ($config_parms{tracking_speakflag} == 3))
+                        {speak $WXSpeakString};
+                }
+
+                # If the wind is calm, say the following.
+
+                if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance) || ($WXTemp ne $LastWXTemp)) and ($WXWindSpeed eq '0')) {
+                    $WXSpeakString = "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is calm.";
+                    if ($WXHrPrecip != 0) {$WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour."};
+                    # NEW in 4.7 - Add bearing from POSFILE
+                    $WXSpeakString = $WXSpeakString . "  $WXSpeakString2";
+
+                    print_log "$WXSpeakString";
+
+                    if (($config_parms{tracking_speakflag} == 2) ||
+                        ($config_parms{tracking_speakflag} == 3))
+                        {speak $WXSpeakString};
+                }
+
+                $LastWXCallsign = $WXCallsign;          # Save last WX rpt information
+                $LastWXDistance = $WXDistance;
+                $LastWXTemp = $WXTemp;
+                $LastWXWindDir = $WXWindDir;
+                $LastWXWindSpeed = $WXWindSpeed;
+                $LastWXWindChill = $WXWindChill;
+                $LastWXHrPrecip = $WXHrPrecip;
+                $LastWX24HrPrecip = $WX24HrPrecip;
+
+            }
+
+            elsif (substr($PacketPart, 21, 1) eq 't') { # If WINDOWS format,
+                $WXDistance = 999.9;                    # Because we don't
+                                                        # have the position
+                $WXTemp = (substr($PacketPart, 22, 3));
+                # Get rid of those damn 0's in the Temperature
+                if (substr($WXTemp, 0, 2) eq '00') {$WXTemp = (substr($WXTemp, 2, 1))};
+                if ($WXTemp ne '0') {        # Except if temp IS 0
+                    if (substr($WXTemp, 0, 1) eq '0') {$WXTemp = (substr($WXTemp, 1, 2))};
+                }
+
+                # Calculate Wind Chill if temp is less than 45 degrees
+                if ($WXTemp <= 45) {
+                    $WXWindChill = .0817 * (3.71 * sqrt($WXWindSpeed) + 5.81 - .25 * $WXWindSpeed) * ($WXTemp - 91.4) + 91.4;
+                    $WXWindChill = round($WXWindChill, 0);
+                    if ($WXWindSpeed <= 5) {$WXWindChill = $WXTemp};
+                }
+
+                # If Temperature is above freezing, make it equal.
+                if ($WXTemp >= 45) {
+                    $WXWindChill = $WXTemp;
+                }
+
+                # Add Readings for Last Hour Precip and Last 24 Hour Precip
+                $WXHrPrecip = (substr($PacketPart, 26, 3));
+                # Get rid of those damn 0's in the Precip
+                if (substr($WXHrPrecip, 0, 2) eq '00') {$WXHrPrecip = (substr($WXHrPrecip, 2, 1))};
+                if ($WXHrPrecip ne '0') {        # Except if precip IS 0
+                    if (substr($WXHrPrecip, 0, 1) eq '0') {$WXHrPrecip = (substr($WXHrPrecip, 1, 2))};
+                }
+                # Divide Precip by 10
+                $WXHrPrecip = $WXHrPrecip / 10;
+                $WX24HrPrecip = (substr($PacketPart, 30, 3));
+                # Get rid of those damn 0's in the 24 hr Precip
+                if (substr($WX24HrPrecip, 0, 2) eq '00') {$WX24HrPrecip = (substr($WX24HrPrecip, 2, 1))};
+                if ($WX24HrPrecip ne '0') {        # Except if precip IS 0
+                    if (substr($WX24HrPrecip, 0, 1) eq '0') {$WX24HrPrecip = (substr($WX24HrPrecip, 1, 2))};
+                }
+                # Divide Precip by 10
+                $WX24HrPrecip = $WX24HrPrecip / 10;
+
+                # If It's not the same as the last report, say it.
+
+                if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance) || ($WXTemp ne $LastWXTemp)) and ($WXWindSpeed ne '0')) {
+                    $WXSpeakString = "$APRSCallsign reports temperature of $WXTemp degrees.  Winnd is out of the $WXWindDirVoice at $WXWindSpeed miles an hour.";
+                    if ($WXTemp <= 45 and $WXTemp ne $WXWindChill) {$WXSpeakString = $WXSpeakString . "  The winnd chill is $WXWindChill."};
+                    if ($WXHrPrecip != 0) {$WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour."};
+
+                    print_log "$WXSpeakString";
+
+                    if (($config_parms{tracking_speakflag} == 2) ||
+                        ($config_parms{tracking_speakflag} == 3))
+                        {speak $WXSpeakString};
+                }
+
+                # If the wind is calm, say the following.
+
+                if ((($WXCallsign ne $LastWXCallsign) || ($WXDistance ne $LastWXDistance) || ($WXTemp ne $LastWXTemp)) and ($WXWindSpeed eq '0')) {
+                    $WXSpeakString = "$APRSCallsign reports temperature of $WXTemp degrees.  Winnd is calm.";
+                    if ($WXHrPrecip != 0) {$WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour."};
+
+                    print_log "$WXSpeakString";
+
+                    if (($config_parms{tracking_speakflag} == 2) ||
+                        ($config_parms{tracking_speakflag} == 3))
+                        {speak $WXSpeakString};
+                }
+
+                $LastWXCallsign = $WXCallsign;          # Save last WX rpt information
+                $LastWXDistance = $WXDistance;
+                $LastWXTemp = $WXTemp;
+                $LastWXWindDir = $WXWindDir;
+                $LastWXWindSpeed = $WXWindSpeed;
+                $LastWXWindChill = $WXWindChill;
+                $LastWXHrPrecip = $WXHrPrecip;
+                $LastWX24HrPrecip = $WX24HrPrecip;
+            }
+
+            else
+            {
+                print_log "A funny weather station.";
+            }
+
+            if ($CurrentTempDist >= $WXDistance) {    # If a closer rpt,
+                $CurrentTempDist = $WXDistance;       # change the current
+                $CurrentTemp = $WXTemp;               # temp variable.
+                $CurrentChill = $WXWindChill;
+                $CurrentHrPrecip = $WXHrPrecip;
+                $Current24HrPrecip = $WX24HrPrecip;
+            }
+
+            if ($CurrentTempDist eq '') {             # If 1st report
+                $CurrentTempDist = $WXDistance;       # of the day, change
+                $CurrentTemp = $WXTemp;               # the temp variable.
+                $CurrentChill = $WXWindChill;
+                $CurrentHrPrecip = $WXHrPrecip;
+                $Current24HrPrecip = $WX24HrPrecip;
+            }
+        }
+
+    #elsif (substr($APRSString, $i, 1) eq '*') {     # Else if we find a "*",
+    #    $APRSPacketDigi = 1;                        # It got digipeated
+    #    print_log "Packet was Digipeated.";
+    #}
+    #else
+    #{
+    #}
+
+    }
+}
+
+sub great_circle_distance {
+    my ($lat1, $lon1, $lat2, $lon2) = map {&degrees_to_radians($_)} @_;
+#   my $radius = 6367; # km
+    my $radius = 3956; # miles
+    my $d = (sin(($lat2 - $lat1) / 2)) ** 2  + cos($lat1) * cos($lat2) *
+(sin(($lon2 - $lon1) / 2)) ** 2;
+    $d = $radius * 2 * atan2(sqrt($d), sqrt(1 - $d));
+#   print "db d=$d l=$lat1,$lon1,$lat2,$lon2\n";
+    return round($d, 1);
+}
+
+#EGIN { $::pi = 4 * atan2(1,1); }
+sub degrees_to_radians {
+    return $_[0] * 3.14159265 / 180.0;
+}
diff --git a/code/public/Brian/phonestuff.pl b/code/public/Brian/phonestuff.pl
index 1133f653e..6257c8f9c 100644
--- a/code/public/Brian/phonestuff.pl
+++ b/code/public/Brian/phonestuff.pl
@@ -1,34 +1,34 @@
-############################################################
-#  Klier Home Automation - Caller ID Module for Rockwell   #
-#  Version 2.2 Release                                     #
-#  By: Brian J. Klier, N0QVC                               #
-#  Thanks for the mucho help from: Bruce Winter            #
-#  E-Mail: klier@lakes.com                                 #
-#  Webpage: http://www.faribault.k12.mn.us/brian           #
-############################################################
-
-# Category=Phone
-
-# Declare Variables
-
-use vars qw($CompPhoneNumber $PhoneName $PhoneNumber $PhoneTime $PhoneDate $PhoneNumberSpoken);
-
-# Set Variables used by my custom code to match the callerid.pl
-
-$PhoneName = $cid_item->name();
-$PhoneNumber = $cid_item->number();
-$PhoneTime = localtime($cid_item->{set_time});
-
-# IF Phone Rings, play a wave file.
-
-if (state_now $cid_interface1 eq 'ring') {
-        play('file' => 'c:\mh\sounds\st-ring230.wav');
-        #set $TV 'mute';
-}
-
-# Page my phone if there's a new call
-
-if ($CompPhoneNumber ne $PhoneNumber) {
-        if (state $current_away_mode eq 'away') {$page_email = "Call from $PhoneName - $PhoneNumber - $PhoneTime"};
-        $CompPhoneNumber = $PhoneNumber;
-}
+############################################################
+#  Klier Home Automation - Caller ID Module for Rockwell   #
+#  Version 2.2 Release                                     #
+#  By: Brian J. Klier, N0QVC                               #
+#  Thanks for the mucho help from: Bruce Winter            #
+#  E-Mail: klier@lakes.com                                 #
+#  Webpage: http://www.faribault.k12.mn.us/brian           #
+############################################################
+
+# Category=Phone
+
+# Declare Variables
+
+use vars qw($CompPhoneNumber $PhoneName $PhoneNumber $PhoneTime $PhoneDate $PhoneNumberSpoken);
+
+# Set Variables used by my custom code to match the callerid.pl
+
+$PhoneName = $cid_item->name();
+$PhoneNumber = $cid_item->number();
+$PhoneTime = localtime($cid_item->{set_time});
+
+# IF Phone Rings, play a wave file.
+
+if (state_now $cid_interface1 eq 'ring') {
+        play('file' => 'c:\mh\sounds\st-ring230.wav');
+        #set $TV 'mute';
+}
+
+# Page my phone if there's a new call
+
+if ($CompPhoneNumber ne $PhoneNumber) {
+        if (state $current_away_mode eq 'away') {$page_email = "Call from $PhoneName - $PhoneNumber - $PhoneTime"};
+        $CompPhoneNumber = $PhoneNumber;
+}
diff --git a/code/public/Brian/radar-wx.pl b/code/public/Brian/radar-wx.pl
index 10b8fd23f..e789572be 100644
--- a/code/public/Brian/radar-wx.pl
+++ b/code/public/Brian/radar-wx.pl
@@ -1,193 +1,193 @@
-# This program retrieves current condition information from the Airport 10 minutes past each
-# hour, and then sends an APRS packet with this information every hour.
-
-# Category=Vehicles
-
-my ($DownloadedWindDirection, $DownloadedBarometer, $DownloadedWindSpeed, $DownloadedWindGust, $DownloadedTemp, $DownloadedHumidity, $tempwxsend);
-my ($DownloadedRainTotal, $DownloadedRainRate);
-my ($DownDay, $DownHour, $DownMinute);
-
-if (state $enable_transmit eq 'yes' and time_cron('6,15,21,36,45,51 * * * *')) {run_voice_cmd "Send Faribault Airport Weather"};
-
-$v_send_remotewx = new Voice_Cmd("Send Faribault Airport Weather");
-
-if ($state = said $v_send_remotewx) {
-    if (substr($Weather{Wind}, 0, 3) eq 'NNE') {
-        $DownloadedWindDirection = "023";
-    }
-    elsif (substr($Weather{Wind}, 0, 3) eq 'ENE') {
-        $DownloadedWindDirection = "067";
-    }
-    elsif (substr($Weather{Wind}, 0, 3) eq 'ESE') {
-        $DownloadedWindDirection = "112";
-    }
-    elsif (substr($Weather{Wind}, 0, 3) eq 'SSE') {
-        $DownloadedWindDirection = "157";
-    }
-    elsif (substr($Weather{Wind}, 0, 3) eq 'SSW') {
-        $DownloadedWindDirection = "202";
-    }
-    elsif (substr($Weather{Wind}, 0, 3) eq 'WSW') {
-        $DownloadedWindDirection = "257";
-    }
-    elsif (substr($Weather{Wind}, 0, 3) eq 'WNW') {
-        $DownloadedWindDirection = "292";
-    }
-    elsif (substr($Weather{Wind}, 0, 3) eq 'NNW') {
-        $DownloadedWindDirection = "337";
-    }
-    elsif (substr($Weather{Wind}, 0, 2) eq 'NE') {
-        $DownloadedWindDirection = "045";
-    }
-    elsif (substr($Weather{Wind}, 0, 2) eq 'SE') {
-        $DownloadedWindDirection = "135";
-    }
-    elsif (substr($Weather{Wind}, 0, 2) eq 'SW') {
-        $DownloadedWindDirection = "235";
-    }
-    elsif (substr($Weather{Wind}, 0, 2) eq 'NW') {
-        $DownloadedWindDirection = "315";
-    }
-    elsif (substr($Weather{Wind}, 0, 1) eq 'N') {
-        $DownloadedWindDirection = "360";
-    }
-    elsif (substr($Weather{Wind}, 0, 1) eq 'E') {
-        $DownloadedWindDirection = "090";
-    }
-    elsif (substr($Weather{Wind}, 0, 1) eq 'S') {
-        $DownloadedWindDirection = "180";
-    }
-    elsif (substr($Weather{Wind}, 0, 1) eq 'W') {
-        $DownloadedWindDirection = "270";
-    }
-    else {
-        $DownloadedWindDirection = "360";
-    }
-
-#    for ($i = 0; $i != (length($Weather{Wind})); ++$i) {
-#        if (substr($Weather{Wind}, $i, 3) eq 'mph') {
-#           $DownloadedWindSpeed = substr($Weather{Wind}, ($i-2), 2);
-#        }
-#    } 
-     
-    $DownloadedWindSpeed = $Weather{WindAvgSpeed};
-    $DownloadedWindSpeed = round($DownloadedWindSpeed);
-   
-    if (length(abs($DownloadedWindSpeed)) == 2) {
-        $DownloadedWindSpeed = "0" . $DownloadedWindSpeed;
-    }
-    elsif (length(abs($DownloadedWindSpeed)) == 1) {
-        $DownloadedWindSpeed = "00" . $DownloadedWindSpeed;
-    }
-    else {
-        $DownloadedWindSpeed = "000";
-    }
-
-    if ($DownloadedWindSpeed == 0) {$DownloadedWindSpeed = "000"};
-    $DownloadedWindSpeed = substr($DownloadedWindSpeed, 0, 3);
-
-#    for ($i = 0; $i != (length($Weather{Wind})); ++$i) {
-#        if (substr($Weather{Wind}, $i, 2) eq 'to') {
-#            $DownloadedWindGust = substr($Weather{Wind}, ($i+3), 2);
-#        }
-#    } 
-
-    $DownloadedWindGust = $Weather{WindGustSpeed};
-    $DownloadedWindGust = round($DownloadedWindGust);
-
-    if (length(abs($DownloadedWindGust)) == 2) {
-        $DownloadedWindGust = "0" . $DownloadedWindGust;
-    }
-    elsif (length(abs($DownloadedWindGust)) == 1) {
-        $DownloadedWindGust = "00" . $DownloadedWindGust;
-    }
-    else {
-        $DownloadedWindGust = "000";
-    }
-
-    if ($DownloadedWindGust == 0) {$DownloadedWindGust = "000"};
-    $DownloadedWindGust = substr($DownloadedWindGust, 0, 3);
-
-    $DownloadedTemp = $Weather{TempOutdoor};
-    $DownloadedTemp = round($DownloadedTemp);
-
-    if (length($DownloadedTemp) == 2) {
-        $DownloadedTemp = "0" . $DownloadedTemp;
-    }
-    elsif (length($DownloadedTemp) == 1) {
-        $DownloadedTemp = "00" . $DownloadedTemp;
-    }
-    else {
-        $DownloadedTemp = $DownloadedTemp;
-    }
-
-    if (length($Mday) == 1) {
-        $DownDay = "0" . $Mday;
-    }
-    else {
-        $DownDay = $Mday;
-    }
-
-    if (length($Hour) == 1) {
-        $DownHour = "0" . $Hour;
-    }
-    else {
-        $DownHour = $Hour;
-    }
-
-    if (length($Minute) == 1) {
-        $DownMinute = "0" . $Minute;
-    }
-    else {
-        $DownMinute = $Minute;
-    }
-    
-    print_log "Rain: $Weather{RainTotal}  ---  Rain Rate: $Weather{RainRate}";
-    $DownloadedBarometer = round(($Weather{BaromSea} / .03) * 10);
-    if (length($DownloadedBarometer) == 4) {$DownloadedBarometer = "0" . $DownloadedBarometer};
-
-    $DownloadedHumidity = $Weather{HumidOutdoor};
-    $DownloadedHumidity = round($DownloadedHumidity);
-    if ($DownloadedHumidity eq '100') {$DownloadedHumidity = "00"};
-
-    $DownloadedRainTotal = $Weather{RainTotal} * 100;
-    $DownloadedRainRate = $Weather{RainRate} * 100;
-
-    if (length(abs($DownloadedRainTotal)) == 2) {
-        $DownloadedRainTotal = "0" . $DownloadedRainTotal;
-    }
-    elsif (length(abs($DownloadedRainTotal)) == 1) {
-        $DownloadedRainTotal = "00" . $DownloadedRainTotal;
-    }
-    else {
-        $DownloadedRainTotal = "000";
-    }
-
-    if ($DownloadedRainTotal == 0) {$DownloadedRainTotal = "000"};
-
-    if (length(abs($DownloadedRainRate)) == 2) {
-        $DownloadedRainRate = "0" . $DownloadedRainRate;
-    }
-    elsif (length(abs($DownloadedRainRate)) == 1) {
-        $DownloadedRainRate = "00" . $DownloadedRainRate;
-    }
-    else {
-        $DownloadedRainRate = "000";
-    }
-
-    if ($DownloadedRainRate == 0) {$DownloadedRainRate = "000"};
-
-    if (($Minute eq '15') || ($Minute eq '45')) {
-
-        #$tempwxsend = "$HamCall>APRSMH,TCPIP*:;FRBLT    *" . $DownDay . $DownHour . $DownMinute . "/4416.83N/09317.13W_" . $DownloadedWindDirection . "/" . $DownloadedWindSpeed . "g" . $DownloadedWindGust . "t" . $DownloadedTemp . "r...p...P...h" . $DownloadedHumidity . "b" . $DownloadedBarometer . "dU2k";
-        $tempwxsend = "$HamCall>APRSMH,TCPIP*:;FRBLT    *" . $DownDay . $DownHour . $DownMinute . "/4416.83N/09317.13W_" . $DownloadedWindDirection . "/" . $DownloadedWindSpeed . "g" . $DownloadedWindGust . "t" . $DownloadedTemp . "r" . $DownloadedRainRate . "p" . $DownloadedRainTotal . "P...h" . $DownloadedHumidity . "b" . $DownloadedBarometer . "dU2k";
-    }
-    else {
-        $tempwxsend = "$HamCall>APRSMH,TCPIP*:;KFBL     *" . $DownDay . $DownHour . $DownMinute . "/4419.62N/09318.48W_" . $DownloadedWindDirection . "/" . $DownloadedWindSpeed . "g" . $DownloadedWindGust . "t" . $DownloadedTemp . "r...p...P...h" . $DownloadedHumidity . "b" . $DownloadedBarometer . "dU2k";
-    }
-
-    print_log $tempwxsend;
-
-    if (state $enable_transmit eq 'yes') {set $tnc_output $tempwxsend};
-    set $telnet $tempwxsend if active $telnet;
-}
+# This program retrieves current condition information from the Airport 10 minutes past each
+# hour, and then sends an APRS packet with this information every hour.
+
+# Category=Vehicles
+
+my ($DownloadedWindDirection, $DownloadedBarometer, $DownloadedWindSpeed, $DownloadedWindGust, $DownloadedTemp, $DownloadedHumidity, $tempwxsend);
+my ($DownloadedRainTotal, $DownloadedRainRate);
+my ($DownDay, $DownHour, $DownMinute);
+
+if (state $enable_transmit eq 'yes' and time_cron('6,15,21,36,45,51 * * * *')) {run_voice_cmd "Send Faribault Airport Weather"};
+
+$v_send_remotewx = new Voice_Cmd("Send Faribault Airport Weather");
+
+if ($state = said $v_send_remotewx) {
+    if (substr($Weather{Wind}, 0, 3) eq 'NNE') {
+        $DownloadedWindDirection = "023";
+    }
+    elsif (substr($Weather{Wind}, 0, 3) eq 'ENE') {
+        $DownloadedWindDirection = "067";
+    }
+    elsif (substr($Weather{Wind}, 0, 3) eq 'ESE') {
+        $DownloadedWindDirection = "112";
+    }
+    elsif (substr($Weather{Wind}, 0, 3) eq 'SSE') {
+        $DownloadedWindDirection = "157";
+    }
+    elsif (substr($Weather{Wind}, 0, 3) eq 'SSW') {
+        $DownloadedWindDirection = "202";
+    }
+    elsif (substr($Weather{Wind}, 0, 3) eq 'WSW') {
+        $DownloadedWindDirection = "257";
+    }
+    elsif (substr($Weather{Wind}, 0, 3) eq 'WNW') {
+        $DownloadedWindDirection = "292";
+    }
+    elsif (substr($Weather{Wind}, 0, 3) eq 'NNW') {
+        $DownloadedWindDirection = "337";
+    }
+    elsif (substr($Weather{Wind}, 0, 2) eq 'NE') {
+        $DownloadedWindDirection = "045";
+    }
+    elsif (substr($Weather{Wind}, 0, 2) eq 'SE') {
+        $DownloadedWindDirection = "135";
+    }
+    elsif (substr($Weather{Wind}, 0, 2) eq 'SW') {
+        $DownloadedWindDirection = "235";
+    }
+    elsif (substr($Weather{Wind}, 0, 2) eq 'NW') {
+        $DownloadedWindDirection = "315";
+    }
+    elsif (substr($Weather{Wind}, 0, 1) eq 'N') {
+        $DownloadedWindDirection = "360";
+    }
+    elsif (substr($Weather{Wind}, 0, 1) eq 'E') {
+        $DownloadedWindDirection = "090";
+    }
+    elsif (substr($Weather{Wind}, 0, 1) eq 'S') {
+        $DownloadedWindDirection = "180";
+    }
+    elsif (substr($Weather{Wind}, 0, 1) eq 'W') {
+        $DownloadedWindDirection = "270";
+    }
+    else {
+        $DownloadedWindDirection = "360";
+    }
+
+#    for ($i = 0; $i != (length($Weather{Wind})); ++$i) {
+#        if (substr($Weather{Wind}, $i, 3) eq 'mph') {
+#           $DownloadedWindSpeed = substr($Weather{Wind}, ($i-2), 2);
+#        }
+#    } 
+     
+    $DownloadedWindSpeed = $Weather{WindAvgSpeed};
+    $DownloadedWindSpeed = round($DownloadedWindSpeed);
+   
+    if (length(abs($DownloadedWindSpeed)) == 2) {
+        $DownloadedWindSpeed = "0" . $DownloadedWindSpeed;
+    }
+    elsif (length(abs($DownloadedWindSpeed)) == 1) {
+        $DownloadedWindSpeed = "00" . $DownloadedWindSpeed;
+    }
+    else {
+        $DownloadedWindSpeed = "000";
+    }
+
+    if ($DownloadedWindSpeed == 0) {$DownloadedWindSpeed = "000"};
+    $DownloadedWindSpeed = substr($DownloadedWindSpeed, 0, 3);
+
+#    for ($i = 0; $i != (length($Weather{Wind})); ++$i) {
+#        if (substr($Weather{Wind}, $i, 2) eq 'to') {
+#            $DownloadedWindGust = substr($Weather{Wind}, ($i+3), 2);
+#        }
+#    } 
+
+    $DownloadedWindGust = $Weather{WindGustSpeed};
+    $DownloadedWindGust = round($DownloadedWindGust);
+
+    if (length(abs($DownloadedWindGust)) == 2) {
+        $DownloadedWindGust = "0" . $DownloadedWindGust;
+    }
+    elsif (length(abs($DownloadedWindGust)) == 1) {
+        $DownloadedWindGust = "00" . $DownloadedWindGust;
+    }
+    else {
+        $DownloadedWindGust = "000";
+    }
+
+    if ($DownloadedWindGust == 0) {$DownloadedWindGust = "000"};
+    $DownloadedWindGust = substr($DownloadedWindGust, 0, 3);
+
+    $DownloadedTemp = $Weather{TempOutdoor};
+    $DownloadedTemp = round($DownloadedTemp);
+
+    if (length($DownloadedTemp) == 2) {
+        $DownloadedTemp = "0" . $DownloadedTemp;
+    }
+    elsif (length($DownloadedTemp) == 1) {
+        $DownloadedTemp = "00" . $DownloadedTemp;
+    }
+    else {
+        $DownloadedTemp = $DownloadedTemp;
+    }
+
+    if (length($Mday) == 1) {
+        $DownDay = "0" . $Mday;
+    }
+    else {
+        $DownDay = $Mday;
+    }
+
+    if (length($Hour) == 1) {
+        $DownHour = "0" . $Hour;
+    }
+    else {
+        $DownHour = $Hour;
+    }
+
+    if (length($Minute) == 1) {
+        $DownMinute = "0" . $Minute;
+    }
+    else {
+        $DownMinute = $Minute;
+    }
+    
+    print_log "Rain: $Weather{RainTotal}  ---  Rain Rate: $Weather{RainRate}";
+    $DownloadedBarometer = round(($Weather{BaromSea} / .03) * 10);
+    if (length($DownloadedBarometer) == 4) {$DownloadedBarometer = "0" . $DownloadedBarometer};
+
+    $DownloadedHumidity = $Weather{HumidOutdoor};
+    $DownloadedHumidity = round($DownloadedHumidity);
+    if ($DownloadedHumidity eq '100') {$DownloadedHumidity = "00"};
+
+    $DownloadedRainTotal = $Weather{RainTotal} * 100;
+    $DownloadedRainRate = $Weather{RainRate} * 100;
+
+    if (length(abs($DownloadedRainTotal)) == 2) {
+        $DownloadedRainTotal = "0" . $DownloadedRainTotal;
+    }
+    elsif (length(abs($DownloadedRainTotal)) == 1) {
+        $DownloadedRainTotal = "00" . $DownloadedRainTotal;
+    }
+    else {
+        $DownloadedRainTotal = "000";
+    }
+
+    if ($DownloadedRainTotal == 0) {$DownloadedRainTotal = "000"};
+
+    if (length(abs($DownloadedRainRate)) == 2) {
+        $DownloadedRainRate = "0" . $DownloadedRainRate;
+    }
+    elsif (length(abs($DownloadedRainRate)) == 1) {
+        $DownloadedRainRate = "00" . $DownloadedRainRate;
+    }
+    else {
+        $DownloadedRainRate = "000";
+    }
+
+    if ($DownloadedRainRate == 0) {$DownloadedRainRate = "000"};
+
+    if (($Minute eq '15') || ($Minute eq '45')) {
+
+        #$tempwxsend = "$HamCall>APRSMH,TCPIP*:;FRBLT    *" . $DownDay . $DownHour . $DownMinute . "/4416.83N/09317.13W_" . $DownloadedWindDirection . "/" . $DownloadedWindSpeed . "g" . $DownloadedWindGust . "t" . $DownloadedTemp . "r...p...P...h" . $DownloadedHumidity . "b" . $DownloadedBarometer . "dU2k";
+        $tempwxsend = "$HamCall>APRSMH,TCPIP*:;FRBLT    *" . $DownDay . $DownHour . $DownMinute . "/4416.83N/09317.13W_" . $DownloadedWindDirection . "/" . $DownloadedWindSpeed . "g" . $DownloadedWindGust . "t" . $DownloadedTemp . "r" . $DownloadedRainRate . "p" . $DownloadedRainTotal . "P...h" . $DownloadedHumidity . "b" . $DownloadedBarometer . "dU2k";
+    }
+    else {
+        $tempwxsend = "$HamCall>APRSMH,TCPIP*:;KFBL     *" . $DownDay . $DownHour . $DownMinute . "/4419.62N/09318.48W_" . $DownloadedWindDirection . "/" . $DownloadedWindSpeed . "g" . $DownloadedWindGust . "t" . $DownloadedTemp . "r...p...P...h" . $DownloadedHumidity . "b" . $DownloadedBarometer . "dU2k";
+    }
+
+    print_log $tempwxsend;
+
+    if (state $enable_transmit eq 'yes') {set $tnc_output $tempwxsend};
+    set $telnet $tempwxsend if active $telnet;
+}
diff --git a/code/public/Brian/stormwarning.pl b/code/public/Brian/stormwarning.pl
index afc4f04f7..634fbfc46 100644
--- a/code/public/Brian/stormwarning.pl
+++ b/code/public/Brian/stormwarning.pl
@@ -1,43 +1,43 @@
-# Category = Weather
-
-my $wx_warnings = "$config_parms{data_dir}/web/wx_warnings";
-$p_wx_warnings  = new Process_Item "get_url http://www.weather.gov/alerts/mn.cap $wx_warnings.xml";
-$v_wx_warnings  = new Voice_Cmd '[Get,Show,Display,Read,Parse] the latest NWS Announcements';
-
-$state = said $v_wx_warnings;
-if ($state eq 'Get' or time_cron('1,11,21,31,41,51 10,11,12,13,14,15,16,17,18,19,20 * * *')) {
-    print_log "Getting NWS Alerts";
-    start $p_wx_warnings;
-}
-display "$wx_warnings.txt" if $state eq 'Show' or $state eq 'Display';
-speak   "$wx_warnings.txt" if $state eq 'Read';
-
-if (done_now $p_wx_warnings or $state eq 'Parse') {
-    my ($finalsummarytx, $finalsummary, $summary, $tempcode, $localwarnflag, $i);
-    $localwarnflag = 0;
-    for (file_read "$wx_warnings.xml") {
-        $summary = "";
-        $summary .= "The national weather service has issued a $1" if /<cap:event>(.+)<\/cap:event>/;
-        $summary .= " .. "  if /<cap:expires>(.+)<\/cap:expires>/;
-        #$summary .= " until $1 for Rice County."  if /<cap:expires>(.+)<\/cap:expires>/;
-        $summary .= "$1." if /<cap:description>(.+)<\/cap:description>/;
-        $tempcode = "$1" if /<cap:geocode>(.+)<\/cap:geocode>/;
-        if ($tempcode eq '027131') {
-                $localwarnflag = 1;
-                $finalsummary .= $summary;
-        }
-    }
-    if ($localwarnflag == 1) {
-        speak $finalsummary;
-        play('file' => 'C:\MH\SOUNDS\MSG.WAV');
-        if ($finalsummary =~ m/WARNING/i) {play('file' => 'C:\MH\SOUNDS\STALLHRN2.WAV');}
-
-        $finalsummarytx = "$HamCall>APRSMH,TCPIP*:BLN9RICE :";
-        #$finalsummarytx = ":BLN9RICE :";
-        $finalsummarytx .= $finalsummary;
-        print_log $finalsummarytx;
-        if (state $enable_transmit eq 'yes') {set $tnc_output $finalsummarytx};
-    }
-    file_write "$wx_warnings.txt", $finalsummary;
-    display "$wx_warnings.txt";
-}
+# Category = Weather
+
+my $wx_warnings = "$config_parms{data_dir}/web/wx_warnings";
+$p_wx_warnings  = new Process_Item "get_url http://www.weather.gov/alerts/mn.cap $wx_warnings.xml";
+$v_wx_warnings  = new Voice_Cmd '[Get,Show,Display,Read,Parse] the latest NWS Announcements';
+
+$state = said $v_wx_warnings;
+if ($state eq 'Get' or time_cron('1,11,21,31,41,51 10,11,12,13,14,15,16,17,18,19,20 * * *')) {
+    print_log "Getting NWS Alerts";
+    start $p_wx_warnings;
+}
+display "$wx_warnings.txt" if $state eq 'Show' or $state eq 'Display';
+speak   "$wx_warnings.txt" if $state eq 'Read';
+
+if (done_now $p_wx_warnings or $state eq 'Parse') {
+    my ($finalsummarytx, $finalsummary, $summary, $tempcode, $localwarnflag, $i);
+    $localwarnflag = 0;
+    for (file_read "$wx_warnings.xml") {
+        $summary = "";
+        $summary .= "The national weather service has issued a $1" if /<cap:event>(.+)<\/cap:event>/;
+        $summary .= " .. "  if /<cap:expires>(.+)<\/cap:expires>/;
+        #$summary .= " until $1 for Rice County."  if /<cap:expires>(.+)<\/cap:expires>/;
+        $summary .= "$1." if /<cap:description>(.+)<\/cap:description>/;
+        $tempcode = "$1" if /<cap:geocode>(.+)<\/cap:geocode>/;
+        if ($tempcode eq '027131') {
+                $localwarnflag = 1;
+                $finalsummary .= $summary;
+        }
+    }
+    if ($localwarnflag == 1) {
+        speak $finalsummary;
+        play('file' => 'C:\MH\SOUNDS\MSG.WAV');
+        if ($finalsummary =~ m/WARNING/i) {play('file' => 'C:\MH\SOUNDS\STALLHRN2.WAV');}
+
+        $finalsummarytx = "$HamCall>APRSMH,TCPIP*:BLN9RICE :";
+        #$finalsummarytx = ":BLN9RICE :";
+        $finalsummarytx .= $finalsummary;
+        print_log $finalsummarytx;
+        if (state $enable_transmit eq 'yes') {set $tnc_output $finalsummarytx};
+    }
+    file_write "$wx_warnings.txt", $finalsummary;
+    display "$wx_warnings.txt";
+}
diff --git a/code/public/Brian/xpl.pl b/code/public/Brian/xpl.pl
index dbb16c3dd..8cc972792 100644
--- a/code/public/Brian/xpl.pl
+++ b/code/public/Brian/xpl.pl
@@ -1,56 +1,56 @@
-# Category = xPL
-
-my $xpllastcommand;
-my $xpljabberdevice;
-
-$xpl_balloon  = new xPL_Item('medusa-balloon.klierpc','log.basic' => {speech => '$state'});
-$xpl_jabber   = new xPL_Item('doghouse-blabber.archeserver20');
-$xpl_jabber_resp   = new xPL_Item('doghouse-blabber.archestar20','control.basic' => {device => 'brian.klier@gmail.com/BlackBerry4BF62086', current => '$state'});
-
-if ($state = state_now $xpl_jabber) {
-        my $xpljabberdevice=$xpl_jabber->{'sensor.basic'}{'device'};
-        #print_log "Jabberdevice: $xpljabberdevice";
-        my $xpljabbertype=$xpl_jabber->{'sensor.basic'}{'type'};
-        #print_log "Jabbertype: $xpljabbertype";
-        my $xpljabbercommand=$xpl_jabber->{'sensor.basic'}{'current'};
-        #print_log "Jabbercommand: $xpljabbercommand";
-        my $xpljabberdevicecon = substr($xpljabberdevice, 0, 11);
-        #print_log "Jabberdeviceconcat: $xpljabberdevicecon";
-
-        if (($xpljabberdevicecon eq 'brian.klier') and ($xpljabbertype eq 'message') and ($xpljabbercommand ne $xpllastcommand)) {
-                $xpllastcommand = $xpljabbercommand;
-                run_voice_cmd $xpljabbercommand;
-                #my $test123 = "testmessage";
-                #&xAP::send('xPL', 'doghouse-blabber.archestar20', 'control.basic' => $test123, 'message' => $test123);
-                #&xAP::send('xPL', 'doghouse-blabber.archestar20', 'sensor.basic'set $xpl_jabber
-                speak "Ran Jabber Command: $xpljabbercommand";
-		$page_email = "Ack: $xpljabbercommand";
-		set $xpl_jabber_resp 'Ack';
-        }
-}
-
-
-if (state_now $bed_heater eq 'off') {
-	set $xpl_balloon "The Bed Heater is now off";
-}
-
-if (state_now $cid_interface1 eq 'ring') {
-        set $xpl_balloon "RING RING RING";
-}
-
-#set $xpl_balloon "$Time_Now" if $New_Minute;
-
-#$xpl_cid = new xPL_Item('ag-asterisk.asterisk1local');
-#
-#if ($state = state_now $xpl_cid) {
-#       my $cidname=$xpl_cid->{'cid.asterisk'}{'cln'};
-#       my $cidnumber=$xpl_cid->{'cid.asterisk'}{'phone'};
-#       print_log "Incoming call from $cidname, number is $cidnumber";
-#}
-#
-#  
-#
-#>04/12/05 08:06:35 AM xpl data: cid.asterisk : cln = 7856336488 |
-#>cid.asterisk : calltype = inbound | cid.asterisk : ccs = ring | cid.asterisk
-#>: phone = 7856336488 | xpl-trig : source = ag-asterisk.asterisk1local |
-#>xpl-trig : target = * | xpl-trig : hop = 1 |
+# Category = xPL
+
+my $xpllastcommand;
+my $xpljabberdevice;
+
+$xpl_balloon  = new xPL_Item('medusa-balloon.klierpc','log.basic' => {speech => '$state'});
+$xpl_jabber   = new xPL_Item('doghouse-blabber.archeserver20');
+$xpl_jabber_resp   = new xPL_Item('doghouse-blabber.archestar20','control.basic' => {device => 'brian.klier@gmail.com/BlackBerry4BF62086', current => '$state'});
+
+if ($state = state_now $xpl_jabber) {
+        my $xpljabberdevice=$xpl_jabber->{'sensor.basic'}{'device'};
+        #print_log "Jabberdevice: $xpljabberdevice";
+        my $xpljabbertype=$xpl_jabber->{'sensor.basic'}{'type'};
+        #print_log "Jabbertype: $xpljabbertype";
+        my $xpljabbercommand=$xpl_jabber->{'sensor.basic'}{'current'};
+        #print_log "Jabbercommand: $xpljabbercommand";
+        my $xpljabberdevicecon = substr($xpljabberdevice, 0, 11);
+        #print_log "Jabberdeviceconcat: $xpljabberdevicecon";
+
+        if (($xpljabberdevicecon eq 'brian.klier') and ($xpljabbertype eq 'message') and ($xpljabbercommand ne $xpllastcommand)) {
+                $xpllastcommand = $xpljabbercommand;
+                run_voice_cmd $xpljabbercommand;
+                #my $test123 = "testmessage";
+                #&xAP::send('xPL', 'doghouse-blabber.archestar20', 'control.basic' => $test123, 'message' => $test123);
+                #&xAP::send('xPL', 'doghouse-blabber.archestar20', 'sensor.basic'set $xpl_jabber
+                speak "Ran Jabber Command: $xpljabbercommand";
+		$page_email = "Ack: $xpljabbercommand";
+		set $xpl_jabber_resp 'Ack';
+        }
+}
+
+
+if (state_now $bed_heater eq 'off') {
+	set $xpl_balloon "The Bed Heater is now off";
+}
+
+if (state_now $cid_interface1 eq 'ring') {
+        set $xpl_balloon "RING RING RING";
+}
+
+#set $xpl_balloon "$Time_Now" if $New_Minute;
+
+#$xpl_cid = new xPL_Item('ag-asterisk.asterisk1local');
+#
+#if ($state = state_now $xpl_cid) {
+#       my $cidname=$xpl_cid->{'cid.asterisk'}{'cln'};
+#       my $cidnumber=$xpl_cid->{'cid.asterisk'}{'phone'};
+#       print_log "Incoming call from $cidname, number is $cidnumber";
+#}
+#
+#  
+#
+#>04/12/05 08:06:35 AM xpl data: cid.asterisk : cln = 7856336488 |
+#>cid.asterisk : calltype = inbound | cid.asterisk : ccs = ring | cid.asterisk
+#>: phone = 7856336488 | xpl-trig : source = ag-asterisk.asterisk1local |
+#>xpl-trig : target = * | xpl-trig : hop = 1 |
diff --git a/code/public/Esensor_EM01.pl b/code/public/Esensor_EM01.pl
index 5e02d7c07..da0d6b53e 100644
--- a/code/public/Esensor_EM01.pl
+++ b/code/public/Esensor_EM01.pl
@@ -1,72 +1,72 @@
-
-=begin comment
-
-For sensor from:  http://www.eEsensors.com
-
-I have the data posting to:
-$TempSpare1, $HumidSpare1, $SunSensor, $E_sensor185 (Dry Contact)
-
-Let me know if you have any questions. I have 3 of them running in Misterhouse under "$xxxxSapre1, Spare2, and Spare3.
-
-Rick "TheBassman" Bassett
-Salt Lake City USA
-http://thebassman.is-a-geek.net
-
-=cut
-
-
-
-# Category = Weather
-
-# set $f_sensor184_url = IP address in mh.ini or mh.private.ini  http://www.eEsensors.com
-# Support added my Rick "TheBassman" Bassett	http://thebassman.is-a-geek.net	  thebassmanis@gmail.com
-
-$TempSpare1   = new Weather_Item 'TempSpare1';
-$HumidSpare1  = new Weather_Item 'HumidSpare1';
-#$SunSensor    = new Weather_Item 'sun_sensor';   #Could be used for the Lumination sensor. Uncomment throughout the file to use 
-#$Esensor184	= new Weather_Item 'Esensor184';  #Could be used for the contact feature.  Uncomment throughout the file to use 
-
-my $f_sensor184_text = "$config_parms{data_dir}/web/esensor184.txt";
-my $f_sensor184_html = "$config_parms{data_dir}/web/esensor184.html";
-my $f_sensor184_url=$config_parms{Esensor184_id};
-
-
-$p_check_sensor184 = new Process_Item qq[get_url "http://$f_sensor184_url/index.html" "$f_sensor184_html"];
-$v_check_sensor184 = new Voice_Cmd('[Get,Read,Check] sernsor184');
-
-if (($New_Minute and (($Minute % 5) == 2))) {
-        if (&net_connect_check) {
-            $v_check_sensor184->respond("Getting sensor184 data...");
-            start $p_check_sensor184;
-        }
-        else {
-            $v_check_sensor184->respond("Cannot retrieve data.");
-        }
-}
-
-if (done_now $p_check_sensor184) {
-
-    my $html = file_read $f_sensor184_html;
-
-    my $text = &html_to_text($html);
-
-    $text =~ /\D\D\d+TF\D+([\d.]+)\D*HU\D*([\d.]+)\D*IL\D*[\d.]+/;
-	file_write($f_sensor184_text, $text);
-
-    if ($v_check_sensor184->{state} eq 'Check') {
-	$v_check_sensor184->respond("connected=0 important=1 $text");
-    }
-    else {
-        $v_check_sensor184->respond("connected=0 data retrieved.");
-    }
-}
-    my $text2 = file_read $f_sensor184_text;
-
-    my ( $TempSpare1, $HumidSpare1) = $text2 =~ /\D\D\d+TF\D+([\d.]+)\D*HU\D*([\d.]+)\D*IL\D*[\d.]+/;
-#    my ($E_sensor185, $TempIndoor, $HumidIndoor, $SunSensor) = $text2 =~ /\D(\D)\d+TF\D+([\d.]+)\D*HU\D*([\d.]+)\D*IL\D*([\d.]+)/;
-
-$Weather{TempSpare1}  = $TempSpare1;
-$Weather{HumidSpare1} = $HumidSpare1;
-#$Weather{sun_sensor} = $SunSensor;
-#$Esensor184 = $E_sensor184; 
-
+
+=begin comment
+
+For sensor from:  http://www.eEsensors.com
+
+I have the data posting to:
+$TempSpare1, $HumidSpare1, $SunSensor, $E_sensor185 (Dry Contact)
+
+Let me know if you have any questions. I have 3 of them running in Misterhouse under "$xxxxSapre1, Spare2, and Spare3.
+
+Rick "TheBassman" Bassett
+Salt Lake City USA
+http://thebassman.is-a-geek.net
+
+=cut
+
+
+
+# Category = Weather
+
+# set $f_sensor184_url = IP address in mh.ini or mh.private.ini  http://www.eEsensors.com
+# Support added my Rick "TheBassman" Bassett	http://thebassman.is-a-geek.net	  thebassmanis@gmail.com
+
+$TempSpare1   = new Weather_Item 'TempSpare1';
+$HumidSpare1  = new Weather_Item 'HumidSpare1';
+#$SunSensor    = new Weather_Item 'sun_sensor';   #Could be used for the Lumination sensor. Uncomment throughout the file to use 
+#$Esensor184	= new Weather_Item 'Esensor184';  #Could be used for the contact feature.  Uncomment throughout the file to use 
+
+my $f_sensor184_text = "$config_parms{data_dir}/web/esensor184.txt";
+my $f_sensor184_html = "$config_parms{data_dir}/web/esensor184.html";
+my $f_sensor184_url=$config_parms{Esensor184_id};
+
+
+$p_check_sensor184 = new Process_Item qq[get_url "http://$f_sensor184_url/index.html" "$f_sensor184_html"];
+$v_check_sensor184 = new Voice_Cmd('[Get,Read,Check] sernsor184');
+
+if (($New_Minute and (($Minute % 5) == 2))) {
+        if (&net_connect_check) {
+            $v_check_sensor184->respond("Getting sensor184 data...");
+            start $p_check_sensor184;
+        }
+        else {
+            $v_check_sensor184->respond("Cannot retrieve data.");
+        }
+}
+
+if (done_now $p_check_sensor184) {
+
+    my $html = file_read $f_sensor184_html;
+
+    my $text = &html_to_text($html);
+
+    $text =~ /\D\D\d+TF\D+([\d.]+)\D*HU\D*([\d.]+)\D*IL\D*[\d.]+/;
+	file_write($f_sensor184_text, $text);
+
+    if ($v_check_sensor184->{state} eq 'Check') {
+	$v_check_sensor184->respond("connected=0 important=1 $text");
+    }
+    else {
+        $v_check_sensor184->respond("connected=0 data retrieved.");
+    }
+}
+    my $text2 = file_read $f_sensor184_text;
+
+    my ( $TempSpare1, $HumidSpare1) = $text2 =~ /\D\D\d+TF\D+([\d.]+)\D*HU\D*([\d.]+)\D*IL\D*[\d.]+/;
+#    my ($E_sensor185, $TempIndoor, $HumidIndoor, $SunSensor) = $text2 =~ /\D(\D)\d+TF\D+([\d.]+)\D*HU\D*([\d.]+)\D*IL\D*([\d.]+)/;
+
+$Weather{TempSpare1}  = $TempSpare1;
+$Weather{HumidSpare1} = $HumidSpare1;
+#$Weather{sun_sensor} = $SunSensor;
+#$Esensor184 = $E_sensor184; 
+
diff --git a/code/public/Ricardo/bin/get_tv_com b/code/public/Ricardo/bin/get_tv_com
index ddc11f167..ab825fa30 100644
--- a/code/public/Ricardo/bin/get_tv_com
+++ b/code/public/Ricardo/bin/get_tv_com
@@ -1,248 +1,248 @@
-#!/usr/bin/perl
-# -*- Perl -*-
-
-#---------------------------------------------------------------------------
-#  File:
-#      get_tv_com
-#  Description:
-#      A perl script that gets the 
-#  Author:
-#      Mario Bonja based extensively on get_weather_ca, written by
-#      Bruce Winter    bruce@misterhouse.net   http://misterhouse.net
-#    2006-04-20 Updated to the latest tv.com web page format.
-#
-#  Copyright 2002 Bruce Winter
-#
-#---------------------------------------------------------------------------
-#
-# $Id: get_tv_com,v 0.1 2006/01/14 Exp $
-
-use strict;
-
-my ($Pgm_Path, $Pgm_Name);
-BEGIN {
-    ($Pgm_Path, $Pgm_Name) = $0 =~ /(.*)[\\\/](.+)\.?/;
-    ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-}
-
-my ($Version) = q$Revision: 0.1 $ =~ /: (\S+)/; # Note: revision number is auto-updated by cvs
-
-#print "Command: $Pgm_Name @ARGV\n";
-#print "Version: $Version\n";
-
-use Getopt::Long;
-my %parms;
-if (!&GetOptions(\%parms, "reget", "h", "help", "v", "debug", "showId:s", "file=s", "no_log") or
-    @ARGV or
-    ($parms{h} or $parms{help})) {
-    print<<eof;
-
-$Pgm_Name gets TV schedule info
-
-Usage:
-
-  $Pgm_Name [options] 
-
-    -h         => This help text
-    -help      => This help text
-    -v         => verbose
-    -debug     => debug
-
-    -reget     => force HTML fetch
-    -showId    => show index
-
-    -no_log       => Unless this option is used, the results also get filed 
-                     into the data_dir/web directory
-
-  Example:
-    $Pgm_Name -showId 1 (1st show in TV_com_progs)
-
-eof
-    exit;
-  }
-
-my %config_parms;
-my $caller = caller;
-my $return_flag = ($caller and $caller ne 'main') ? 1 : 0;
-my $ProgramName;
-my $EpisodeName;
-my $EpisodeDate;
-my $EpisodeTime;
-my $EpisodeDescription;
-
-#use my_lib "$Pgm_Path/../lib/site"; # See note in lib/mh_perl2exe.pl for lib -> my_lib explaination
-BEGIN { eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'" } # Use BEGIN eval to keep perl2exe happy
-
-require 'handy_utilities.pl';       # For read_mh_opts funcion
-&main::read_mh_opts(\%config_parms, $Pgm_Path);
-
-use HTML::TableExtract;
-use Date::Parse;
-use Date::Format;
-
-$parms{showId}  = 0 unless $parms{showId};
-
-# Get the list of programs from the list file.
-my $programs_file = $config_parms{code_dir}."/".$config_parms{TV_com_progs_file};
-open(TV_PROGRAMS, $programs_file) or print "Warning, could not open $programs_file!\n", return 1; 
-my(@TV_com_progs) = <TV_PROGRAMS>;
-close TV_PROGRAMS;
-
-my $TvURL;
-my $showId;
-$showId = $parms{showId};
-$TvURL = $TV_com_progs[$showId];
-
-my $f_tv_html = "$config_parms{data_dir}/web/tv_com";
-$f_tv_html .= $showId . ".html";
-my $f_tv_data = "$config_parms{data_dir}/tv_data";
-
-my $debug = 1 if ($parms{debug});
-
-##########
-# get TV #
-##########
-
-my $tv_time = (stat($f_tv_html))[9];
-if ($parms{reget} or
-    (-s $f_tv_html < 10) )
-{
-    get_url_ua($TvURL, $f_tv_html);
-}
-
-############
-# parse TV #
-############
-
-print "parsing TV data from $f_tv_html\n" if $parms{v};
-&parse_tv_com($f_tv_html);
-
-###########
-# save TV #
-###########
-
-print "saving TV data to $f_tv_data\n" if $parms{v};
-&save_tv_com($f_tv_data);
-
-exit(0);
-
-###############
-# subroutines #
-###############
-
-# from get_url
-sub get_url_ua {
-    my $url = shift;
-    my $file = shift;
-
-    use LWP::UserAgent;
-
-    my $ua = new LWP::UserAgent;
-    $config_parms{proxy} = $ENV{HTTP_PROXY}           unless $config_parms{proxy};
-    $ua -> proxy(['http', 'ftp'] => $config_parms{proxy}) if $config_parms{proxy};
-
-    $ua->timeout([120]);         # Time out after 60 seconds 
-    $ua->env_proxy(); 
-
-    my $request = new HTTP::Request('GET', $url);
-    my $response;
-
-    print "Retrieving (with ua) $url into $file ...\n" unless $config_parms{quiet};
-    if ($file eq '/dev/null') {
-        $response = $ua->simple_request($request);
-    }
-    else {
-        $response = $ua->simple_request($request, $file);
-    }
-
-    if ($response->is_error()) {
-        printf "error: %s\n", $response->status_line;
-    }
-}
-
-
-# There is an HTML TV page on disk. Parse the TV data out of it and
-# save the results in a file so that the parent MH process can read them back
-# in.
-#
-sub parse_tv_com {
-    my $file = shift;
-    my $html = &file_read($file);
-    my $temp1;
-    my $temp2;
-
-    # find the start of the actual data
-#print STDERR $html if ($debug);
-
-    # Get the program name
-    $html =~ m/\<title\>\s*([^<]*) TV Show/i;
-    $ProgramName = $1;
-
-    $html =~ m/span class=\"f-C00\"\>\s*([\w]+)\s*([\w]+)\s*([\w]+),\s*([\w]+)/i;
-    $EpisodeDate = $1 . " " . $2 . " " . $3 . ", " . $4;
-
-    # Get the program time
-    $html =~ m/Airs Next: \<span class=\"f-333\"\>\s*([\w]+)\s+([\w]+)\s+([\w]+)\s+([\d:]+)\s+([\w]+)/i;
-    if ( $4 ne '' and $5 ne '' )
-    {
-        $EpisodeTime = $4 . " " . $5;
-    }
-    else
-    {
-        $EpisodeTime = "";
-    }
-
-    # Get the next episode details.
-    $html =~ m/Next Episode:\s*\<a\s*([^\n]*)\>\s*([^\n]*)\<\/a\>\<\/span\>\<br\s*\/\>\s*\n\s*([^\n]*)/i;
-    $EpisodeName = $2;
-    $EpisodeDescription = $3;
-    $EpisodeDescription =~ s/"//g;
-    $EpisodeDescription =~ s/\<br \/\>//g;
-    $EpisodeDescription =~ s/\n//g;
-    $EpisodeDescription =~ s/\r//g;
-
-    print "Program: $ProgramName\nDate: $EpisodeDate\nTime: $EpisodeTime\nTitle: $EpisodeName\nDescription: $EpisodeDescription\n" if $parms{v};
-}
-
-
-sub save_tv_com {
-    my $file = shift;
-    my $perl = '';
-    my ($year, $month, $day);
-
-    # input date format is "Thursday March 9, 2006"
-    $EpisodeDate =~ m/([\w]+) ([\w]+) ([\d]+), ([\d]+)/i;
-    $year = $4;
-    $month = monthStr_To_num($2);
-    $day = $3;
-
-    # old format
-#    $perl .= '$TVProgramName[' . $showId . '] = "' . $ProgramName . '"' . ";\n";
-#    $perl .= '$TVEpisodeName[' . $showId . '] = "' . $EpisodeName . '"' . ";\n";
-#    $perl .= '$TVEpisodeDate[' . $showId . '] = "' . $EpisodeDate . '"' . ";\n";
-#    $perl .= '$TVEpisodeDescription[' . $showId . '] = "' . $EpisodeDescription . '"' . ";\n";
-
-    # output format is "TV	date	no time	Prog name	Programmes TV	Episode name & Desc"
-    if ( $year ) {
-        $perl .= "TV$showId\t$year.$month.$day\t$EpisodeTime\t$ProgramName\tProgrammes TV\t$EpisodeName: $EpisodeDescription\n";
-        # append the data to the file
-        main::logit($file, $perl, 0, 0);
-    }
-}
-
-sub monthStr_To_num {
-    my $monthStr = shift;
-
-    return 1 if ( $monthStr =~ m/Jan/i );
-    return 2 if ( $monthStr =~ m/Feb/i );
-    return 3 if ( $monthStr =~ m/Mar/i );
-    return 4 if ( $monthStr =~ m/Apr/i );
-    return 5 if ( $monthStr =~ m/May/i );
-    return 6 if ( $monthStr =~ m/Jun/i );
-    return 7 if ( $monthStr =~ m/Jul/i );
-    return 8 if ( $monthStr =~ m/Aug/i );
-    return 9 if ( $monthStr =~ m/Sep/i );
-    return 10 if ( $monthStr =~ m/Oct/i );
-    return 11 if ( $monthStr =~ m/Nov/i );
-    return 12 if ( $monthStr =~ m/Dec/i );
+#!/usr/bin/perl
+# -*- Perl -*-
+
+#---------------------------------------------------------------------------
+#  File:
+#      get_tv_com
+#  Description:
+#      A perl script that gets the 
+#  Author:
+#      Mario Bonja based extensively on get_weather_ca, written by
+#      Bruce Winter    bruce@misterhouse.net   http://misterhouse.net
+#    2006-04-20 Updated to the latest tv.com web page format.
+#
+#  Copyright 2002 Bruce Winter
+#
+#---------------------------------------------------------------------------
+#
+# $Id: get_tv_com,v 0.1 2006/01/14 Exp $
+
+use strict;
+
+my ($Pgm_Path, $Pgm_Name);
+BEGIN {
+    ($Pgm_Path, $Pgm_Name) = $0 =~ /(.*)[\\\/](.+)\.?/;
+    ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
+}
+
+my ($Version) = q$Revision: 0.1 $ =~ /: (\S+)/; # Note: revision number is auto-updated by cvs
+
+#print "Command: $Pgm_Name @ARGV\n";
+#print "Version: $Version\n";
+
+use Getopt::Long;
+my %parms;
+if (!&GetOptions(\%parms, "reget", "h", "help", "v", "debug", "showId:s", "file=s", "no_log") or
+    @ARGV or
+    ($parms{h} or $parms{help})) {
+    print<<eof;
+
+$Pgm_Name gets TV schedule info
+
+Usage:
+
+  $Pgm_Name [options] 
+
+    -h         => This help text
+    -help      => This help text
+    -v         => verbose
+    -debug     => debug
+
+    -reget     => force HTML fetch
+    -showId    => show index
+
+    -no_log       => Unless this option is used, the results also get filed 
+                     into the data_dir/web directory
+
+  Example:
+    $Pgm_Name -showId 1 (1st show in TV_com_progs)
+
+eof
+    exit;
+  }
+
+my %config_parms;
+my $caller = caller;
+my $return_flag = ($caller and $caller ne 'main') ? 1 : 0;
+my $ProgramName;
+my $EpisodeName;
+my $EpisodeDate;
+my $EpisodeTime;
+my $EpisodeDescription;
+
+#use my_lib "$Pgm_Path/../lib/site"; # See note in lib/mh_perl2exe.pl for lib -> my_lib explaination
+BEGIN { eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'" } # Use BEGIN eval to keep perl2exe happy
+
+require 'handy_utilities.pl';       # For read_mh_opts funcion
+&main::read_mh_opts(\%config_parms, $Pgm_Path);
+
+use HTML::TableExtract;
+use Date::Parse;
+use Date::Format;
+
+$parms{showId}  = 0 unless $parms{showId};
+
+# Get the list of programs from the list file.
+my $programs_file = $config_parms{code_dir}."/".$config_parms{TV_com_progs_file};
+open(TV_PROGRAMS, $programs_file) or print "Warning, could not open $programs_file!\n", return 1; 
+my(@TV_com_progs) = <TV_PROGRAMS>;
+close TV_PROGRAMS;
+
+my $TvURL;
+my $showId;
+$showId = $parms{showId};
+$TvURL = $TV_com_progs[$showId];
+
+my $f_tv_html = "$config_parms{data_dir}/web/tv_com";
+$f_tv_html .= $showId . ".html";
+my $f_tv_data = "$config_parms{data_dir}/tv_data";
+
+my $debug = 1 if ($parms{debug});
+
+##########
+# get TV #
+##########
+
+my $tv_time = (stat($f_tv_html))[9];
+if ($parms{reget} or
+    (-s $f_tv_html < 10) )
+{
+    get_url_ua($TvURL, $f_tv_html);
+}
+
+############
+# parse TV #
+############
+
+print "parsing TV data from $f_tv_html\n" if $parms{v};
+&parse_tv_com($f_tv_html);
+
+###########
+# save TV #
+###########
+
+print "saving TV data to $f_tv_data\n" if $parms{v};
+&save_tv_com($f_tv_data);
+
+exit(0);
+
+###############
+# subroutines #
+###############
+
+# from get_url
+sub get_url_ua {
+    my $url = shift;
+    my $file = shift;
+
+    use LWP::UserAgent;
+
+    my $ua = new LWP::UserAgent;
+    $config_parms{proxy} = $ENV{HTTP_PROXY}           unless $config_parms{proxy};
+    $ua -> proxy(['http', 'ftp'] => $config_parms{proxy}) if $config_parms{proxy};
+
+    $ua->timeout([120]);         # Time out after 60 seconds 
+    $ua->env_proxy(); 
+
+    my $request = new HTTP::Request('GET', $url);
+    my $response;
+
+    print "Retrieving (with ua) $url into $file ...\n" unless $config_parms{quiet};
+    if ($file eq '/dev/null') {
+        $response = $ua->simple_request($request);
+    }
+    else {
+        $response = $ua->simple_request($request, $file);
+    }
+
+    if ($response->is_error()) {
+        printf "error: %s\n", $response->status_line;
+    }
+}
+
+
+# There is an HTML TV page on disk. Parse the TV data out of it and
+# save the results in a file so that the parent MH process can read them back
+# in.
+#
+sub parse_tv_com {
+    my $file = shift;
+    my $html = &file_read($file);
+    my $temp1;
+    my $temp2;
+
+    # find the start of the actual data
+#print STDERR $html if ($debug);
+
+    # Get the program name
+    $html =~ m/\<title\>\s*([^<]*) TV Show/i;
+    $ProgramName = $1;
+
+    $html =~ m/span class=\"f-C00\"\>\s*([\w]+)\s*([\w]+)\s*([\w]+),\s*([\w]+)/i;
+    $EpisodeDate = $1 . " " . $2 . " " . $3 . ", " . $4;
+
+    # Get the program time
+    $html =~ m/Airs Next: \<span class=\"f-333\"\>\s*([\w]+)\s+([\w]+)\s+([\w]+)\s+([\d:]+)\s+([\w]+)/i;
+    if ( $4 ne '' and $5 ne '' )
+    {
+        $EpisodeTime = $4 . " " . $5;
+    }
+    else
+    {
+        $EpisodeTime = "";
+    }
+
+    # Get the next episode details.
+    $html =~ m/Next Episode:\s*\<a\s*([^\n]*)\>\s*([^\n]*)\<\/a\>\<\/span\>\<br\s*\/\>\s*\n\s*([^\n]*)/i;
+    $EpisodeName = $2;
+    $EpisodeDescription = $3;
+    $EpisodeDescription =~ s/"//g;
+    $EpisodeDescription =~ s/\<br \/\>//g;
+    $EpisodeDescription =~ s/\n//g;
+    $EpisodeDescription =~ s/\r//g;
+
+    print "Program: $ProgramName\nDate: $EpisodeDate\nTime: $EpisodeTime\nTitle: $EpisodeName\nDescription: $EpisodeDescription\n" if $parms{v};
+}
+
+
+sub save_tv_com {
+    my $file = shift;
+    my $perl = '';
+    my ($year, $month, $day);
+
+    # input date format is "Thursday March 9, 2006"
+    $EpisodeDate =~ m/([\w]+) ([\w]+) ([\d]+), ([\d]+)/i;
+    $year = $4;
+    $month = monthStr_To_num($2);
+    $day = $3;
+
+    # old format
+#    $perl .= '$TVProgramName[' . $showId . '] = "' . $ProgramName . '"' . ";\n";
+#    $perl .= '$TVEpisodeName[' . $showId . '] = "' . $EpisodeName . '"' . ";\n";
+#    $perl .= '$TVEpisodeDate[' . $showId . '] = "' . $EpisodeDate . '"' . ";\n";
+#    $perl .= '$TVEpisodeDescription[' . $showId . '] = "' . $EpisodeDescription . '"' . ";\n";
+
+    # output format is "TV	date	no time	Prog name	Programmes TV	Episode name & Desc"
+    if ( $year ) {
+        $perl .= "TV$showId\t$year.$month.$day\t$EpisodeTime\t$ProgramName\tProgrammes TV\t$EpisodeName: $EpisodeDescription\n";
+        # append the data to the file
+        main::logit($file, $perl, 0, 0);
+    }
+}
+
+sub monthStr_To_num {
+    my $monthStr = shift;
+
+    return 1 if ( $monthStr =~ m/Jan/i );
+    return 2 if ( $monthStr =~ m/Feb/i );
+    return 3 if ( $monthStr =~ m/Mar/i );
+    return 4 if ( $monthStr =~ m/Apr/i );
+    return 5 if ( $monthStr =~ m/May/i );
+    return 6 if ( $monthStr =~ m/Jun/i );
+    return 7 if ( $monthStr =~ m/Jul/i );
+    return 8 if ( $monthStr =~ m/Aug/i );
+    return 9 if ( $monthStr =~ m/Sep/i );
+    return 10 if ( $monthStr =~ m/Oct/i );
+    return 11 if ( $monthStr =~ m/Nov/i );
+    return 12 if ( $monthStr =~ m/Dec/i );
 }
\ No newline at end of file
diff --git a/code/public/Ricardo/bin/get_tv_com.bat b/code/public/Ricardo/bin/get_tv_com.bat
index e02ec090e..92f244391 100644
--- a/code/public/Ricardo/bin/get_tv_com.bat
+++ b/code/public/Ricardo/bin/get_tv_com.bat
@@ -1 +1 @@
-@mh -run get_tv_com %1 %2 %3 %4 %5 %6 %7 %8 %9
+@mh -run get_tv_com %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/code/public/Ricardo/bin/get_weather_ca b/code/public/Ricardo/bin/get_weather_ca
index 46040f7af..d91fb68db 100644
--- a/code/public/Ricardo/bin/get_weather_ca
+++ b/code/public/Ricardo/bin/get_weather_ca
@@ -1,358 +1,358 @@
-#!/usr/bin/perl
-# -*- Perl -*-
-
-#---------------------------------------------------------------------------
-#  File:
-#      get_weather_ca
-#  Description:
-#      A perl script that gets the weather forecast for Canada
-#  Author:
-#      Harald Koch     chk@pobox.com
-#    based extensively on get_weather, written by
-#      Bruce Winter    bruce@misterhouse.net   http://misterhouse.net
-#  Latest version:
-#      http://misterhouse.net/mh/bin
-#
-#  Copyright 2002 Bruce Winter
-#
-#---------------------------------------------------------------------------
-#
-# $Id: get_weather_ca,v 1.4 2005/03/20 19:01:52 winter Exp $
-
-use strict;
-
-my ($Pgm_Path, $Pgm_Name);
-BEGIN {
-    ($Pgm_Path, $Pgm_Name) = $0 =~ /(.*)[\\\/](.+)\.?/;
-    ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-}
-
-my ($Version) = q$Revision: 1.4 $ =~ /: (\S+)/; # Note: revision number is auto-updated by cvs
-
-#print "Command: $Pgm_Name @ARGV\n";
-#print "Version: $Version\n";
-
-use Getopt::Long;
-my %parms;
-if (!&GetOptions(\%parms, "reget", "h", "help", "v", "debug", "city:s", "file=s", "no_log") or
-    @ARGV or
-    ($parms{h} or $parms{help})) {
-    print<<eof;
-
-$Pgm_Name gets weather info
-
-Usage:
-
-  $Pgm_Name [options] 
-
-    -h         => This help text
-    -help      => This help text
-    -v         => verbose
-    -debug     => debug
-
-    -reget     => force HTML fetch
-
-    -city     xxx => xxx is the code for the city you want.
-    -file     xxx => xxx is the output filename
-
-    -no_log       => Unless this option is used, the results also get filed 
-                     into the data_dir/web directory
-
-  Example:
-    $Pgm_Name -city YYZ
-
-eof
-    exit;
-  }
-
-my ($conditions, $forecast, %data);
-my %config_parms;
-
-
-use vars qw(%Weather @Weather_Forecast);
-
-my $caller = caller;
-my $return_flag = ($caller and $caller ne 'main') ? 1 : 0;
-
-#use my_lib "$Pgm_Path/../lib/site"; # See note in lib/mh_perl2exe.pl for lib -> my_lib explaination
-BEGIN { eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'" } # Use BEGIN eval to keep perl2exe happy
-
-require 'handy_utilities.pl';       # For read_mh_opts funcion
-&main::read_mh_opts(\%config_parms, $Pgm_Path);
-
-use HTML::TableExtract;
-use Date::Parse;
-use Date::Format;
-
-$parms{city}  = $config_parms{weather_city} unless $parms{city};
-#$parms{city}  = 'yyz'                       unless $parms{city};
-$parms{city}  = 'on-117'                       unless $parms{city};
-
-my $WeatherURL;
-$WeatherURL = sprintf 'http://text.weatheroffice.ec.gc.ca/forecast/city_e.html?%s&b_templatePrint=true', $parms{city};
-
-my $f_weather_html = "$config_parms{data_dir}/web/weather_ca.html";
-my $f_weather_data = "$config_parms{data_dir}/weather_data";
-
-my $debug = 1 if ($parms{debug});
-
-###############
-# get weather #
-###############
-
-my $weather_time = (stat($f_weather_html))[9];
-if ($parms{reget} or
-    (-s $f_weather_html < 10) or
-    ((time - $weather_time) > 59*60)
-) {
-    get_url_ua($WeatherURL, $f_weather_html);
-}
-
-#################
-# parse weather #
-#################
-
-print "parsing weather data from $f_weather_html\n" if $parms{v};
-&parse_weather_ca($f_weather_html);
-
-################
-# save weather #
-################
-
-print "saving weather data to $f_weather_data\n" if $parms{v};
-&save_weather_ca($f_weather_data);
-
-exit(0);
-
-###############
-# subroutines #
-###############
-
-# from get_url
-sub get_url_ua {
-    my $url = shift;
-    my $file = shift;
-
-    use LWP::UserAgent;
-
-    my $ua = new LWP::UserAgent;
-    $config_parms{proxy} = $ENV{HTTP_PROXY}           unless $config_parms{proxy};
-    $ua -> proxy(['http', 'ftp'] => $config_parms{proxy}) if $config_parms{proxy};
-
-    $ua->timeout([120]);         # Time out after 60 seconds 
-    $ua->env_proxy(); 
-
-    my $request = new HTTP::Request('GET', $url);
-    my $response;
-
-    print "Retrieving (with ua) $url into $file ...\n" unless $config_parms{quiet};
-    if ($file eq '/dev/null') {
-        $response = $ua->simple_request($request);
-    }
-    else {
-        $response = $ua->simple_request($request, $file);
-    }
-
-    if ($response->is_error()) {
-        printf "error: %s\n", $response->status_line;
-    }
-}
-
-
-# There is an HTML weather page on disk. Parse the weather data out of it and
-# save the results in a file so that the parent MH process can read them back
-# in.
-#
-sub parse_weather_ca {
-    my $file = shift;
-    my $html = &file_read($file);
-
-    %Weather = ();
-    @Weather_Forecast = ();
-
-    # find the start of the actual data
-    $html =~ s/.*Currently\s*://m;
-
-    $html =~ s/<strong>//gs;
-    $html =~ s/<\/strong>//gs;
-    $html =~ s/\&nbsp;/ /gs;
-
-print STDERR $html if ($debug);
-
-    $html =~ m/Observed at:*\s+([^<]*)/i;
-    # convert the strangely formatted UTC timestamp to local time.
-    my $tmp = $1;
-
-    ($tmp =~ m/\s*([0-9]+)\s*([0-9|A-Z|a-z|:]+)\s*\s*([0-9|A-Z|a-z|:]+)\s*([0-9|A-Z|a-z|:]+)\s*([0-9|A-Z|a-z|:]+)/i) && 
-#	($tmp = $2 . " " . $1 . " " . $3 . " " . $4 . " " . $5);
-	($tmp = $4 . " " . $5);
-
-    $Weather{TimeObserved} = str2time($tmp);
-
-    ($html =~ m/Condition\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i) &&
-	($Weather{Conditions} = $1);
-
-    ($html =~ m/Temperature\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i) &&
-	($Weather{TempOutdoor} = $1);
-
-    ($html =~ m/Pressure\s*\/\s*Tendency\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)\s*\//i) &&
-	($Weather{Barom} = $1);
-
-    ($html =~ m/Visibility\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i) &&
-	($Weather{Visibility} = $1);
-
-    ($html =~ m/Humidity\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i) &&
-	($Weather{HumidOutdoor} = $1);
-
-    ($html =~ m/Dew Point\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i) &&
-	($Weather{DewpointOutdoor} = $1);
-
-    if ($html =~ m/Wind Speed\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i) {
-	my $wind = $1;
-	$wind =~ s/\s*$//;
-
-	$Weather{Wind} = $wind;
-	$wind =~ /^\s*([A-Z]*)\s*(\d+)(<br>)*\s*km\/h/;
-	$Weather{WindAvg} = $2;
-	$Weather{WindAvgDir} = convert_to_degrees($1);
-
-	if ($wind =~ /gusting to (\d+)/) {
-	    $Weather{WindGust} = $1;
-	    $Weather{WindGustDir} = $Weather{WindAvgDir};
-	}
-	else {
-	    $Weather{WindGust} = 0;
-	    $Weather{WindGustDir} = 0;
-	}
-    }
-
-
-    my $yesterday = '';
-    if ($html =~ m/yesterday :(.*?)<\/ul>/si) {
-	$yesterday = $1;
-    }
-    # new format 20030310
-    elsif ($html =~ m;Yesterday</h3>\s*(<dl.*?)</dl>;si) {
-	$yesterday = $1;
-    }
-    print STDERR "Yesterday |$yesterday|\n" if ($debug);
-   
-    ($yesterday =~ m/max temp\.*\s*:\s*([^<]+)/i) &&
-	($Weather{TempMaxOutdoor} = $1);
-    ($yesterday =~ m/min temp\.*\s*:\s*([^<]+)/i) &&
-	($Weather{TempMinOutdoor} = $1);
-    ($yesterday =~ m/precip\. total\s*:\s*([^<]+)/i) &&
-	($Weather{RainTotal} = $1);
-
-    my $normal = '';
-    if ($html =~ m/normal :(.*?)<\/ul>/si) {
-	$normal = $1;
-    }
-    # new format 20030310
-    elsif ($html =~ m;normal</h3>\s*(<dl.*?)</dl>;si) {
-	$normal = $1;
-    }
-    print STDERR "Normal |$normal|\n" if ($debug);
-
-    ($normal =~ m/max temp\.*\s*:\s*([^<]+)/i) &&
-	($Weather{TempMaxNormal} = $1);
-    ($normal =~ m/min temp\.*\s*:\s*([^<]+)/i) &&
-	($Weather{TempMinNormal} = $1);
-    ($normal =~ m/mean temp\s*:\s*([^<]+)/i) &&
-	($Weather{TempMeanNormal} = $1);
-
-    my $today = '';
-    if ($html =~ m/today :<\/h3>(.*?)<\/ul>/si) {
-	$today = $1;
-    }
-    # new format 20030310
-    elsif ($html =~ m;today</h3>\s*(<dl.*?)</dl>;si) {
-	$today = $1;
-    }
-    print STDERR "Today |$today|\n" if ($debug);
-
-    ($today =~  m/moon\s*rise\s*:\s*([^<]+)/i) &&
-	($Weather{Moonrise} = $1);
-    ($today =~  m/moon\s*set\s*:\s*([^<]+)/i) &&
-	($Weather{Moonset} = $1);
-
-### GET FORECAST
-#    $html =~ m/<dl[^>]*>(.*?issued.*?)<\/dl>/si;
-    
-    my $forecast = '';
-    # new format 20030310
-    if ($html =~ m;forecast</h3>\s*<dl[^>]*>(.*issued.*?)</dl>;si) {
-        $forecast = $1;
-    }
-    print STDERR "Forecast: |$forecast|\n" if ($debug);
-
-    $forecast =~ s/\s*<dd>\s*\n//gs;
-    $forecast =~ s/\s*<\/dd>\s*/\n/gs;
-    $forecast =~ s/\s*<dt>\s*//sg;
-    $forecast =~ s/\s*<\/dt>\s*/\n/gs;
-
-    my @forecast = split(/\n/, $forecast);
-
-    @Weather_Forecast = @forecast;
-}
-
-
-sub save_weather_ca {
-    my $file = shift;
-
-    # save the data for import by parent
-    my ($key, $perl, $line);
-    
-    $perl = '%Weather=(' . "\n";
-    foreach $key (keys(%Weather)) {
-	# cleanup the text
-	my $data = $Weather{$key};
-	$data =~ s/\s*(\xb0|&deg;)\s*[C]*//g;
-
-	$data =~ s/\s*%\s*//g;
-#	$data =~ s;\s*km/h\s*;;g;
-	$data =~ s/\s*kPa\s*//g;
-
-	$perl .= '    ' . $key . ' => ' . "'" . $data . "',\n";
-    }
-    $perl .= ');' . "\n";
-
-    $perl .= '@Weather_Forecast=(';
-    foreach $line (@Weather_Forecast) {
-	$perl .= "\n    '" . $line . "',";
-    }
-    $perl =~ s/,$//; # remove trailing comma
-    $perl .= "\n" . ');' . "\n";
-
-    main::file_write($file, $perl);
-}
-
-# convert text wind direction to degrees.
-sub convert_to_degrees {
-    my $text = shift;
-    my $dir;
-
-    ($text eq 'N')   && ($dir = 0);
-    ($text eq 'NNE') && ($dir = 22);
-    ($text eq 'NE')  && ($dir = 45);
-    ($text eq 'ENE') && ($dir = 67);
-
-    ($text eq 'E')   && ($dir = 90);
-    ($text eq 'ESE') && ($dir = 112);
-    ($text eq 'SE')  && ($dir = 135);
-    ($text eq 'SSE') && ($dir = 157);
-
-    ($text eq 'S')   && ($dir = 180);
-    ($text eq 'SSW') && ($dir = 202);
-    ($text eq 'SW')  && ($dir = 225);
-    ($text eq 'WSW') && ($dir = 247);
-
-    ($text eq 'W')   && ($dir = 270);
-    ($text eq 'WNW') && ($dir = 292);
-    ($text eq 'NW')  && ($dir = 315);
-    ($text eq 'NNW') && ($dir = 337);
-
-    return $dir;
-}
-
-
+#!/usr/bin/perl
+# -*- Perl -*-
+
+#---------------------------------------------------------------------------
+#  File:
+#      get_weather_ca
+#  Description:
+#      A perl script that gets the weather forecast for Canada
+#  Author:
+#      Harald Koch     chk@pobox.com
+#    based extensively on get_weather, written by
+#      Bruce Winter    bruce@misterhouse.net   http://misterhouse.net
+#  Latest version:
+#      http://misterhouse.net/mh/bin
+#
+#  Copyright 2002 Bruce Winter
+#
+#---------------------------------------------------------------------------
+#
+# $Id: get_weather_ca,v 1.4 2005/03/20 19:01:52 winter Exp $
+
+use strict;
+
+my ($Pgm_Path, $Pgm_Name);
+BEGIN {
+    ($Pgm_Path, $Pgm_Name) = $0 =~ /(.*)[\\\/](.+)\.?/;
+    ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
+}
+
+my ($Version) = q$Revision: 1.4 $ =~ /: (\S+)/; # Note: revision number is auto-updated by cvs
+
+#print "Command: $Pgm_Name @ARGV\n";
+#print "Version: $Version\n";
+
+use Getopt::Long;
+my %parms;
+if (!&GetOptions(\%parms, "reget", "h", "help", "v", "debug", "city:s", "file=s", "no_log") or
+    @ARGV or
+    ($parms{h} or $parms{help})) {
+    print<<eof;
+
+$Pgm_Name gets weather info
+
+Usage:
+
+  $Pgm_Name [options] 
+
+    -h         => This help text
+    -help      => This help text
+    -v         => verbose
+    -debug     => debug
+
+    -reget     => force HTML fetch
+
+    -city     xxx => xxx is the code for the city you want.
+    -file     xxx => xxx is the output filename
+
+    -no_log       => Unless this option is used, the results also get filed 
+                     into the data_dir/web directory
+
+  Example:
+    $Pgm_Name -city YYZ
+
+eof
+    exit;
+  }
+
+my ($conditions, $forecast, %data);
+my %config_parms;
+
+
+use vars qw(%Weather @Weather_Forecast);
+
+my $caller = caller;
+my $return_flag = ($caller and $caller ne 'main') ? 1 : 0;
+
+#use my_lib "$Pgm_Path/../lib/site"; # See note in lib/mh_perl2exe.pl for lib -> my_lib explaination
+BEGIN { eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'" } # Use BEGIN eval to keep perl2exe happy
+
+require 'handy_utilities.pl';       # For read_mh_opts funcion
+&main::read_mh_opts(\%config_parms, $Pgm_Path);
+
+use HTML::TableExtract;
+use Date::Parse;
+use Date::Format;
+
+$parms{city}  = $config_parms{weather_city} unless $parms{city};
+#$parms{city}  = 'yyz'                       unless $parms{city};
+$parms{city}  = 'on-117'                       unless $parms{city};
+
+my $WeatherURL;
+$WeatherURL = sprintf 'http://text.weatheroffice.ec.gc.ca/forecast/city_e.html?%s&b_templatePrint=true', $parms{city};
+
+my $f_weather_html = "$config_parms{data_dir}/web/weather_ca.html";
+my $f_weather_data = "$config_parms{data_dir}/weather_data";
+
+my $debug = 1 if ($parms{debug});
+
+###############
+# get weather #
+###############
+
+my $weather_time = (stat($f_weather_html))[9];
+if ($parms{reget} or
+    (-s $f_weather_html < 10) or
+    ((time - $weather_time) > 59*60)
+) {
+    get_url_ua($WeatherURL, $f_weather_html);
+}
+
+#################
+# parse weather #
+#################
+
+print "parsing weather data from $f_weather_html\n" if $parms{v};
+&parse_weather_ca($f_weather_html);
+
+################
+# save weather #
+################
+
+print "saving weather data to $f_weather_data\n" if $parms{v};
+&save_weather_ca($f_weather_data);
+
+exit(0);
+
+###############
+# subroutines #
+###############
+
+# from get_url
+sub get_url_ua {
+    my $url = shift;
+    my $file = shift;
+
+    use LWP::UserAgent;
+
+    my $ua = new LWP::UserAgent;
+    $config_parms{proxy} = $ENV{HTTP_PROXY}           unless $config_parms{proxy};
+    $ua -> proxy(['http', 'ftp'] => $config_parms{proxy}) if $config_parms{proxy};
+
+    $ua->timeout([120]);         # Time out after 60 seconds 
+    $ua->env_proxy(); 
+
+    my $request = new HTTP::Request('GET', $url);
+    my $response;
+
+    print "Retrieving (with ua) $url into $file ...\n" unless $config_parms{quiet};
+    if ($file eq '/dev/null') {
+        $response = $ua->simple_request($request);
+    }
+    else {
+        $response = $ua->simple_request($request, $file);
+    }
+
+    if ($response->is_error()) {
+        printf "error: %s\n", $response->status_line;
+    }
+}
+
+
+# There is an HTML weather page on disk. Parse the weather data out of it and
+# save the results in a file so that the parent MH process can read them back
+# in.
+#
+sub parse_weather_ca {
+    my $file = shift;
+    my $html = &file_read($file);
+
+    %Weather = ();
+    @Weather_Forecast = ();
+
+    # find the start of the actual data
+    $html =~ s/.*Currently\s*://m;
+
+    $html =~ s/<strong>//gs;
+    $html =~ s/<\/strong>//gs;
+    $html =~ s/\&nbsp;/ /gs;
+
+print STDERR $html if ($debug);
+
+    $html =~ m/Observed at:*\s+([^<]*)/i;
+    # convert the strangely formatted UTC timestamp to local time.
+    my $tmp = $1;
+
+    ($tmp =~ m/\s*([0-9]+)\s*([0-9|A-Z|a-z|:]+)\s*\s*([0-9|A-Z|a-z|:]+)\s*([0-9|A-Z|a-z|:]+)\s*([0-9|A-Z|a-z|:]+)/i) && 
+#	($tmp = $2 . " " . $1 . " " . $3 . " " . $4 . " " . $5);
+	($tmp = $4 . " " . $5);
+
+    $Weather{TimeObserved} = str2time($tmp);
+
+    ($html =~ m/Condition\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i) &&
+	($Weather{Conditions} = $1);
+
+    ($html =~ m/Temperature\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i) &&
+	($Weather{TempOutdoor} = $1);
+
+    ($html =~ m/Pressure\s*\/\s*Tendency\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)\s*\//i) &&
+	($Weather{Barom} = $1);
+
+    ($html =~ m/Visibility\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i) &&
+	($Weather{Visibility} = $1);
+
+    ($html =~ m/Humidity\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i) &&
+	($Weather{HumidOutdoor} = $1);
+
+    ($html =~ m/Dew Point\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i) &&
+	($Weather{DewpointOutdoor} = $1);
+
+    if ($html =~ m/Wind Speed\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i) {
+	my $wind = $1;
+	$wind =~ s/\s*$//;
+
+	$Weather{Wind} = $wind;
+	$wind =~ /^\s*([A-Z]*)\s*(\d+)(<br>)*\s*km\/h/;
+	$Weather{WindAvg} = $2;
+	$Weather{WindAvgDir} = convert_to_degrees($1);
+
+	if ($wind =~ /gusting to (\d+)/) {
+	    $Weather{WindGust} = $1;
+	    $Weather{WindGustDir} = $Weather{WindAvgDir};
+	}
+	else {
+	    $Weather{WindGust} = 0;
+	    $Weather{WindGustDir} = 0;
+	}
+    }
+
+
+    my $yesterday = '';
+    if ($html =~ m/yesterday :(.*?)<\/ul>/si) {
+	$yesterday = $1;
+    }
+    # new format 20030310
+    elsif ($html =~ m;Yesterday</h3>\s*(<dl.*?)</dl>;si) {
+	$yesterday = $1;
+    }
+    print STDERR "Yesterday |$yesterday|\n" if ($debug);
+   
+    ($yesterday =~ m/max temp\.*\s*:\s*([^<]+)/i) &&
+	($Weather{TempMaxOutdoor} = $1);
+    ($yesterday =~ m/min temp\.*\s*:\s*([^<]+)/i) &&
+	($Weather{TempMinOutdoor} = $1);
+    ($yesterday =~ m/precip\. total\s*:\s*([^<]+)/i) &&
+	($Weather{RainTotal} = $1);
+
+    my $normal = '';
+    if ($html =~ m/normal :(.*?)<\/ul>/si) {
+	$normal = $1;
+    }
+    # new format 20030310
+    elsif ($html =~ m;normal</h3>\s*(<dl.*?)</dl>;si) {
+	$normal = $1;
+    }
+    print STDERR "Normal |$normal|\n" if ($debug);
+
+    ($normal =~ m/max temp\.*\s*:\s*([^<]+)/i) &&
+	($Weather{TempMaxNormal} = $1);
+    ($normal =~ m/min temp\.*\s*:\s*([^<]+)/i) &&
+	($Weather{TempMinNormal} = $1);
+    ($normal =~ m/mean temp\s*:\s*([^<]+)/i) &&
+	($Weather{TempMeanNormal} = $1);
+
+    my $today = '';
+    if ($html =~ m/today :<\/h3>(.*?)<\/ul>/si) {
+	$today = $1;
+    }
+    # new format 20030310
+    elsif ($html =~ m;today</h3>\s*(<dl.*?)</dl>;si) {
+	$today = $1;
+    }
+    print STDERR "Today |$today|\n" if ($debug);
+
+    ($today =~  m/moon\s*rise\s*:\s*([^<]+)/i) &&
+	($Weather{Moonrise} = $1);
+    ($today =~  m/moon\s*set\s*:\s*([^<]+)/i) &&
+	($Weather{Moonset} = $1);
+
+### GET FORECAST
+#    $html =~ m/<dl[^>]*>(.*?issued.*?)<\/dl>/si;
+    
+    my $forecast = '';
+    # new format 20030310
+    if ($html =~ m;forecast</h3>\s*<dl[^>]*>(.*issued.*?)</dl>;si) {
+        $forecast = $1;
+    }
+    print STDERR "Forecast: |$forecast|\n" if ($debug);
+
+    $forecast =~ s/\s*<dd>\s*\n//gs;
+    $forecast =~ s/\s*<\/dd>\s*/\n/gs;
+    $forecast =~ s/\s*<dt>\s*//sg;
+    $forecast =~ s/\s*<\/dt>\s*/\n/gs;
+
+    my @forecast = split(/\n/, $forecast);
+
+    @Weather_Forecast = @forecast;
+}
+
+
+sub save_weather_ca {
+    my $file = shift;
+
+    # save the data for import by parent
+    my ($key, $perl, $line);
+    
+    $perl = '%Weather=(' . "\n";
+    foreach $key (keys(%Weather)) {
+	# cleanup the text
+	my $data = $Weather{$key};
+	$data =~ s/\s*(\xb0|&deg;)\s*[C]*//g;
+
+	$data =~ s/\s*%\s*//g;
+#	$data =~ s;\s*km/h\s*;;g;
+	$data =~ s/\s*kPa\s*//g;
+
+	$perl .= '    ' . $key . ' => ' . "'" . $data . "',\n";
+    }
+    $perl .= ');' . "\n";
+
+    $perl .= '@Weather_Forecast=(';
+    foreach $line (@Weather_Forecast) {
+	$perl .= "\n    '" . $line . "',";
+    }
+    $perl =~ s/,$//; # remove trailing comma
+    $perl .= "\n" . ');' . "\n";
+
+    main::file_write($file, $perl);
+}
+
+# convert text wind direction to degrees.
+sub convert_to_degrees {
+    my $text = shift;
+    my $dir;
+
+    ($text eq 'N')   && ($dir = 0);
+    ($text eq 'NNE') && ($dir = 22);
+    ($text eq 'NE')  && ($dir = 45);
+    ($text eq 'ENE') && ($dir = 67);
+
+    ($text eq 'E')   && ($dir = 90);
+    ($text eq 'ESE') && ($dir = 112);
+    ($text eq 'SE')  && ($dir = 135);
+    ($text eq 'SSE') && ($dir = 157);
+
+    ($text eq 'S')   && ($dir = 180);
+    ($text eq 'SSW') && ($dir = 202);
+    ($text eq 'SW')  && ($dir = 225);
+    ($text eq 'WSW') && ($dir = 247);
+
+    ($text eq 'W')   && ($dir = 270);
+    ($text eq 'WNW') && ($dir = 292);
+    ($text eq 'NW')  && ($dir = 315);
+    ($text eq 'NNW') && ($dir = 337);
+
+    return $dir;
+}
+
+
diff --git a/code/public/Ricardo/code/tv_com.pl b/code/public/Ricardo/code/tv_com.pl
index 5fd730bb5..0c48b5524 100644
--- a/code/public/Ricardo/code/tv_com.pl
+++ b/code/public/Ricardo/code/tv_com.pl
@@ -1,124 +1,124 @@
-# Category=TV
-
-my $f_tv_data = "$config_parms{data_dir}/tv_data";
-$f_tv_file = new File_Item($f_tv_data);
-my $calendar_data = "$config_parms{data_dir}/organizer/calendar.tab";
-
-# The obligatory voice command.
-$v_tv_page = new  Voice_Cmd('[Reget,Get,Show] internet tv');
-$v_tv_page-> set_info("TV schedule");
-$v_tv_page-> set_authority('anyone');
-
-respond &format_tv_com  if said $v_tv_page eq 'Show';
-
-# Here is the guts of the asynchronous processing. get_tv_com starts the
-# fetch subprocess. When it is done, fetch_tv_com reads the resulting data
-# back into the main misterhouse process.
-
-# Fetch the latest TV programs at 3:00 AM every day
-&get_tv_com(0)  if (said $v_tv_page eq 'Get');
-&get_tv_com(1)  if ((said $v_tv_page eq 'Reget') or
-			time_cron("0 3 * * *"));
-
-&fetch_tv_com   if (changed $f_tv_file);
-&fetch_tv_com   if ($Startup);
-
-# Other code modules (eg. internet_jabber.pl) can call these without having to
-# worry about implementation changes.
-sub read_tv_com {
-    respond &format_tv_com;
-}
-sub display_tv_com {
-    display &format_tv_com;
-}
-
-# This subroutine formats the summary of the current TV programs and content.
-sub format_tv_com {
-    my $data;
-
-#    # simple summary for now.
-#    $temp = $TV_schedule{TempOutdoor};
-#    $temp =~ s/C/degrees celsius/;
-#    $temp =~ s/F/degrees farenheit/;
-#
-#    $data = "The weather is " . $Weather{Conditions} . ". ";
-#    $data .= "It is " . $temp . " degrees outside";
-#    $data .= ", with a windchill of " . $Weather{WindChill} . " degrees" if ($Weather{WindChill});
-#    $data .= ". ";
-#
-#    if ($Weather{TempOutdoor} > 15) {
-#	$data .= "The humidity is " . $Weather{HumidOutdoor} .
-#		"%, with a humidex of " . $Weather{Humidex} .
-#		" and a dewpoint of " . $Weather{DewpointOutdoor} . ". ";
-#    }
-#
-#    if ($Weather{WindAvg}) {
-#	$data .= "The wind is from the " . convert_direction($Weather{WindAvgDir}) . " at " . $Weather{WindAvg} . " kilometers per hour";
-#	$data .= ", gusting to " . $Weather{WindGust} . " kilometers per hour" if ($Weather{WindGust});
-#	$data .= ". ";
-#    }
-#    else {
-#	$data .= "There is no wind. ";
-#    }
-#
-#    $data =~ s%km/h%kilometers per hour%;
-
-    return $data;
-}
-
-
-# Fetch the raw HTML TV page from the tv.com webserver, and update the parsed data file.
-sub get_tv_com {
-    my $programs_file = $config_parms{code_dir}."/".$config_parms{TV_com_progs_file};
-    open(TV_PROGRAMS, $programs_file) or print_log "Warning, could not open $programs_file!\n"; 
-    my @AllPrograms = <TV_PROGRAMS>;
-    close TV_PROGRAMS;
-    my $force = shift;
-    my $line;
-    my $lineNo = 0;
-    my $pgm;
-
-    # erase output file content
-    main::file_write($f_tv_data, '');
-
-    print_log "running $pgm multiple times";
-    foreach $line (@AllPrograms) {
-        chomp $line;
-        $lineNo++;
-        $pgm = "get_tv_com";
-        $pgm .= " -reget" if $force;
-        $pgm .= " -showId " . ($lineNo-1);
-        print_log "Getting TV $line $pgm";
-        run 'inline', $pgm;
-    }
-
-    set_watch $f_tv_file;
-    fetch_tv_com();
-}
-
-# this routine fetches the TV data already formatted for the organizer.
-sub fetch_tv_com {
-    my $tempCalBuffer = "";
-
-    # need to strip all entries beginning with "TV"
-    open CALENDAR, $calendar_data;
-    while (<CALENDAR>) {
-        if ( $_ =~ m/^TV/ ) {
-#            print "Stripped  $_";
-        }
-        else
-        {
-            $tempCalBuffer .= $_;
-        }
-    }
-    close CALENDAR;
-
-    open TV_DATA, $f_tv_data;
-    while (<TV_DATA>) {
-        $tempCalBuffer .= $_;
-    }
-    close TV_DATA;
-
-    file_write($calendar_data, $tempCalBuffer);
-}
-
+# Category=TV
+
+my $f_tv_data = "$config_parms{data_dir}/tv_data";
+$f_tv_file = new File_Item($f_tv_data);
+my $calendar_data = "$config_parms{data_dir}/organizer/calendar.tab";
+
+# The obligatory voice command.
+$v_tv_page = new  Voice_Cmd('[Reget,Get,Show] internet tv');
+$v_tv_page-> set_info("TV schedule");
+$v_tv_page-> set_authority('anyone');
+
+respond &format_tv_com  if said $v_tv_page eq 'Show';
+
+# Here is the guts of the asynchronous processing. get_tv_com starts the
+# fetch subprocess. When it is done, fetch_tv_com reads the resulting data
+# back into the main misterhouse process.
+
+# Fetch the latest TV programs at 3:00 AM every day
+&get_tv_com(0)  if (said $v_tv_page eq 'Get');
+&get_tv_com(1)  if ((said $v_tv_page eq 'Reget') or
+			time_cron("0 3 * * *"));
+
+&fetch_tv_com   if (changed $f_tv_file);
+&fetch_tv_com   if ($Startup);
+
+# Other code modules (eg. internet_jabber.pl) can call these without having to
+# worry about implementation changes.
+sub read_tv_com {
+    respond &format_tv_com;
+}
+sub display_tv_com {
+    display &format_tv_com;
+}
+
+# This subroutine formats the summary of the current TV programs and content.
+sub format_tv_com {
+    my $data;
+
+#    # simple summary for now.
+#    $temp = $TV_schedule{TempOutdoor};
+#    $temp =~ s/C/degrees celsius/;
+#    $temp =~ s/F/degrees farenheit/;
+#
+#    $data = "The weather is " . $Weather{Conditions} . ". ";
+#    $data .= "It is " . $temp . " degrees outside";
+#    $data .= ", with a windchill of " . $Weather{WindChill} . " degrees" if ($Weather{WindChill});
+#    $data .= ". ";
+#
+#    if ($Weather{TempOutdoor} > 15) {
+#	$data .= "The humidity is " . $Weather{HumidOutdoor} .
+#		"%, with a humidex of " . $Weather{Humidex} .
+#		" and a dewpoint of " . $Weather{DewpointOutdoor} . ". ";
+#    }
+#
+#    if ($Weather{WindAvg}) {
+#	$data .= "The wind is from the " . convert_direction($Weather{WindAvgDir}) . " at " . $Weather{WindAvg} . " kilometers per hour";
+#	$data .= ", gusting to " . $Weather{WindGust} . " kilometers per hour" if ($Weather{WindGust});
+#	$data .= ". ";
+#    }
+#    else {
+#	$data .= "There is no wind. ";
+#    }
+#
+#    $data =~ s%km/h%kilometers per hour%;
+
+    return $data;
+}
+
+
+# Fetch the raw HTML TV page from the tv.com webserver, and update the parsed data file.
+sub get_tv_com {
+    my $programs_file = $config_parms{code_dir}."/".$config_parms{TV_com_progs_file};
+    open(TV_PROGRAMS, $programs_file) or print_log "Warning, could not open $programs_file!\n"; 
+    my @AllPrograms = <TV_PROGRAMS>;
+    close TV_PROGRAMS;
+    my $force = shift;
+    my $line;
+    my $lineNo = 0;
+    my $pgm;
+
+    # erase output file content
+    main::file_write($f_tv_data, '');
+
+    print_log "running $pgm multiple times";
+    foreach $line (@AllPrograms) {
+        chomp $line;
+        $lineNo++;
+        $pgm = "get_tv_com";
+        $pgm .= " -reget" if $force;
+        $pgm .= " -showId " . ($lineNo-1);
+        print_log "Getting TV $line $pgm";
+        run 'inline', $pgm;
+    }
+
+    set_watch $f_tv_file;
+    fetch_tv_com();
+}
+
+# this routine fetches the TV data already formatted for the organizer.
+sub fetch_tv_com {
+    my $tempCalBuffer = "";
+
+    # need to strip all entries beginning with "TV"
+    open CALENDAR, $calendar_data;
+    while (<CALENDAR>) {
+        if ( $_ =~ m/^TV/ ) {
+#            print "Stripped  $_";
+        }
+        else
+        {
+            $tempCalBuffer .= $_;
+        }
+    }
+    close CALENDAR;
+
+    open TV_DATA, $f_tv_data;
+    while (<TV_DATA>) {
+        $tempCalBuffer .= $_;
+    }
+    close TV_DATA;
+
+    file_write($calendar_data, $tempCalBuffer);
+}
+
diff --git a/code/public/hvac_upb_thermostat.pl b/code/public/hvac_upb_thermostat.pl
index 56769f68a..98ddef767 100644
--- a/code/public/hvac_upb_thermostat.pl
+++ b/code/public/hvac_upb_thermostat.pl
@@ -1,53 +1,53 @@
-# category = HVAC
-
-if (my $current = $Livingroom_Thermostat->state_now)
-{
-  if ($current =~ /inside_temp: (\d+)/)
-  {
-    print "inside thermostat temp is: $1\n"
-  }
-  if ($current =~ /outside_temp: (\d+)/)
-  {
-    print "outside thermostat temp is: $1\n"
-  }
-  if ($current =~ /heat_sp_temp: (\d+)/)
-  {
-    print "heat setpoint temp is: $1\n"
-  }
-  if ($current =~ /cool_sp_temp: (\d+)/)
-  {
-    print "cool setpoint temp is: $1\n"
-  }
-  if ($current =~ /mode: (.*)/)
-  {
-    print "HVAC mode is: $1\n"
-  }
-  if ($current =~ /fan: (.*)/)
-  {
-    print "fan is: $1\n"
-  }
-  if ($current =~ /setback: (.*)/)
-  {
-    print "inside thermostat temp is: $1\n"
-  }
-  if ($current =~ /display_lockout: (.*)/)
-  {
-    print "display lockout status is: $1\n"
-  }
-  if ($current =~ /thermostat_status/)
-  {
-    # with this, you can call the different methods to get the current values
-  }
-  if ($current =~ /operating_mode_status: (.*)/)
-  {
-    print "thermostat operating mode is: $1\n"
-  }
-}
-
-$v_Livingroom_Thermostat_mode = new Voice_Cmd("Set the Livingroom Thermostat mode to [off, heat, cool, auto]");
-$Livingroom_Thermostat->mode($v_Livingroom_Thermostat_mode->{state}) if (said $v_Livingroom_Thermostat_mode);
-
-
-#$v_Master_Bedroom_Thermostat_mode = new Voice_Cmd("Set the Master Bedroom Thermostat mode to [off, heat, cool, auto]");
-#$Master_Bedroom_Thermostat->mode($v_Master_Bedroom_Thermostat_mode->{state}) if (said $v_Master_Bedroom_Thermostat_mode);
-
+# category = HVAC
+
+if (my $current = $Livingroom_Thermostat->state_now)
+{
+  if ($current =~ /inside_temp: (\d+)/)
+  {
+    print "inside thermostat temp is: $1\n"
+  }
+  if ($current =~ /outside_temp: (\d+)/)
+  {
+    print "outside thermostat temp is: $1\n"
+  }
+  if ($current =~ /heat_sp_temp: (\d+)/)
+  {
+    print "heat setpoint temp is: $1\n"
+  }
+  if ($current =~ /cool_sp_temp: (\d+)/)
+  {
+    print "cool setpoint temp is: $1\n"
+  }
+  if ($current =~ /mode: (.*)/)
+  {
+    print "HVAC mode is: $1\n"
+  }
+  if ($current =~ /fan: (.*)/)
+  {
+    print "fan is: $1\n"
+  }
+  if ($current =~ /setback: (.*)/)
+  {
+    print "inside thermostat temp is: $1\n"
+  }
+  if ($current =~ /display_lockout: (.*)/)
+  {
+    print "display lockout status is: $1\n"
+  }
+  if ($current =~ /thermostat_status/)
+  {
+    # with this, you can call the different methods to get the current values
+  }
+  if ($current =~ /operating_mode_status: (.*)/)
+  {
+    print "thermostat operating mode is: $1\n"
+  }
+}
+
+$v_Livingroom_Thermostat_mode = new Voice_Cmd("Set the Livingroom Thermostat mode to [off, heat, cool, auto]");
+$Livingroom_Thermostat->mode($v_Livingroom_Thermostat_mode->{state}) if (said $v_Livingroom_Thermostat_mode);
+
+
+#$v_Master_Bedroom_Thermostat_mode = new Voice_Cmd("Set the Master Bedroom Thermostat mode to [off, heat, cool, auto]");
+#$Master_Bedroom_Thermostat->mode($v_Master_Bedroom_Thermostat_mode->{state}) if (said $v_Master_Bedroom_Thermostat_mode);
+
diff --git a/data/event_sounds.txt b/data/event_sounds.txt
index ffc202288..d674593af 100644
--- a/data/event_sounds.txt
+++ b/data/event_sounds.txt
@@ -1,33 +1,33 @@
-#event sounds
-#one per line
-# $Date$
-# $Revision$
-
-alarm=>'sound_nature/gonge.wav',    volume => 100, mode=>'unmuted', nolog=>1
-movement1    => 'sound_nature/02.wav',       volume => 10
-movement2    => 'sound_nature/02.wav',       volume => 100
-unauthorized => 'sound_nature/loon.wav',       volume => 100
-3            => 'sound_nature/65.wav',       volume => 20
-4            => 'sound_nature/aviary.wav',   volume => 20
-barcode_scan => 'sound_beep1.wav',     volume => 70
-mh_problem   => 'sound_nature/bird1.wav',    volume => 20
-mh_pause     => 'none',                      volume => 20
-7            => 'sound_nature/bird2.wav',    volume => 20
-wap          => 'sound_nature/bird3.wav',    volume => 100
-tell_me      => 'sound_nature/birds.wav',    volume => 20
-10           => 'sound_nature/chirp.wav',    volume => 20
-router_hit   => 'sound_nature/frog.wav',     volume =>  2
-12           => 'sound_nature/frog3.wav',    volume => 20
-13           => 'sound_nature/h4560sh.wav',  volume => 20
-14           => 'sound_nature/kirtland.wav', volume => 20
-router_new   => 'sound_nature/loon.wav',     volume => 20
-16           => 'sound_nature/octap95.wav',  volume => 20
-17           => 'sound_nature/parakeet.wav', volume => 20
-18           => 'sound_nature/ribbit.wav',   volume => 10
-19           => 'sound_nature/wren.wav',     volume => 20
-timer        => 'sound_nature/gonge.wav',    volume => 100, rooms => 'all', time => 3 
-announcement => 'announcement.wav',   volume => 100, nolog=>1
-chat      => 'sound_nature/loon.wav', volume => 100, nolog => 1
-frog => 'sound_nature/frog.wav', nolog => 1
-cash_register => 'cash_register.wav', nolog => 1
+#event sounds
+#one per line
+# $Date$
+# $Revision$
+
+alarm=>'sound_nature/gonge.wav',    volume => 100, mode=>'unmuted', nolog=>1
+movement1    => 'sound_nature/02.wav',       volume => 10
+movement2    => 'sound_nature/02.wav',       volume => 100
+unauthorized => 'sound_nature/loon.wav',       volume => 100
+3            => 'sound_nature/65.wav',       volume => 20
+4            => 'sound_nature/aviary.wav',   volume => 20
+barcode_scan => 'sound_beep1.wav',     volume => 70
+mh_problem   => 'sound_nature/bird1.wav',    volume => 20
+mh_pause     => 'none',                      volume => 20
+7            => 'sound_nature/bird2.wav',    volume => 20
+wap          => 'sound_nature/bird3.wav',    volume => 100
+tell_me      => 'sound_nature/birds.wav',    volume => 20
+10           => 'sound_nature/chirp.wav',    volume => 20
+router_hit   => 'sound_nature/frog.wav',     volume =>  2
+12           => 'sound_nature/frog3.wav',    volume => 20
+13           => 'sound_nature/h4560sh.wav',  volume => 20
+14           => 'sound_nature/kirtland.wav', volume => 20
+router_new   => 'sound_nature/loon.wav',     volume => 20
+16           => 'sound_nature/octap95.wav',  volume => 20
+17           => 'sound_nature/parakeet.wav', volume => 20
+18           => 'sound_nature/ribbit.wav',   volume => 10
+19           => 'sound_nature/wren.wav',     volume => 20
+timer        => 'sound_nature/gonge.wav',    volume => 100, rooms => 'all', time => 3 
+announcement => 'announcement.wav',   volume => 100, nolog=>1
+chat      => 'sound_nature/loon.wav', volume => 100, nolog => 1
+frog => 'sound_nature/frog.wav', nolog => 1
+cash_register => 'cash_register.wav', nolog => 1
 about => 'sound_nature/loon.wav', nolog => 1
\ No newline at end of file
diff --git a/data/infrared/devicelib/Apple MAC.dvc b/data/infrared/devicelib/Apple MAC.dvc
index 1cb6225cf..f36b75de3 100755
--- a/data/infrared/devicelib/Apple MAC.dvc	
+++ b/data/infrared/devicelib/Apple MAC.dvc	
@@ -1,16 +1,16 @@
-Manufacturer=Apple
-Model=MAC
-
-[Key Codes]
-
-DOWN = 0000 006D 0022 0002 0157 00AC 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 0157 0056 0015 0E94 
-
-LEFT = 0000 006D 0022 0002 0157 00AC 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 0157 0056 0015 0E94 
-
-MENU = 0000 006D 0022 0002 0157 00AC 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 0157 0056 0015 0E94 
-
-RIGHT = 0000 006D 0022 0002 0157 00AC 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 0157 0056 0015 0E94 
-
-SELECT = 0000 006D 0022 0002 0157 00AC 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 0157 0056 0015 0E94 
-
-UP = 0000 006D 0022 0002 0157 00AC 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 0157 0056 0015 0E94 
+Manufacturer=Apple
+Model=MAC
+
+[Key Codes]
+
+DOWN = 0000 006D 0022 0002 0157 00AC 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 0157 0056 0015 0E94 
+
+LEFT = 0000 006D 0022 0002 0157 00AC 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 0157 0056 0015 0E94 
+
+MENU = 0000 006D 0022 0002 0157 00AC 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 0157 0056 0015 0E94 
+
+RIGHT = 0000 006D 0022 0002 0157 00AC 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 0157 0056 0015 0E94 
+
+SELECT = 0000 006D 0022 0002 0157 00AC 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 0157 0056 0015 0E94 
+
+UP = 0000 006D 0022 0002 0157 00AC 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 0157 0056 0015 0E94 
diff --git a/data/infrared/devicelib/Motorola qip6200.dvc b/data/infrared/devicelib/Motorola qip6200.dvc
index b017f0f33..269120633 100755
--- a/data/infrared/devicelib/Motorola qip6200.dvc	
+++ b/data/infrared/devicelib/Motorola qip6200.dvc	
@@ -1,71 +1,71 @@
-Manufacturer=Motorola
-Model=QIP6200
-
-[Key Codes]
-
-A = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 048A 0154 0055 0013 0D07 
-
-On Demand = 0000 006D 002E 0001 0154 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0633 0154 0054 0013 0D07 0154 0055 0013 01D2 0154 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0633 0154 0055 0013 0D06 0154 0055 0013 01D5 0154 00AA 0013 00AA 0013 0055 
-
-P- = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0435 0154 0055 0013 0D06 
-
-P+ = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0435 0154 0054 0013 0D07 
-
-Up Arrow = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 048A 0154 0054 0013 0D07 
-
-Down Arrow = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 048A 0154 0055 0013 0D07 
-
-Left Arrow = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 0055 0013 03E0 0154 0055 0013 0D07 
-
-Right Arrow = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 03E0 0154 0055 0013 0D07 
-
-Info = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 0435 0154 0055 0013 0D07 
-
-Guide = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 048A 0154 0055 0013 0D07 
-
-OK = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 048A 0154 0055 0013 0D07 
-
-Power Toggle = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 04DF 0154 0055 0013 0D07 
-
-Setup = 0000 0070 0000 0032 0080 0040 0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0030 0010 0030 0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 0010 0010 0010 0030 0010 0030 0010 0010 0010 0010 0010 0AC4 
-
-C = 0000 006D 0035 0000 0154 00AA 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0589 0154 0055 0013 0D06 0154 0054 0013 01DB 0154 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 048A 0154 0055 0013 0D07 0154 0055 0013 01D8 0154 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 
-
-Menu = 0000 006D 0018 0000 0154 00AA 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 048A 0154 0055 0013 0D07 0154 0055 0013 0D07 0154 0055 0013 00AA 
-
-Exit = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 048A 0154 0055 0013 0D08 
-
-Help = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 0435 0154 0054 0013 0D07 
-
-Last = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 048A 0154 0055 0013 0D07 
-
-Fav = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 048A 0154 0054 0013 0D07 
-
-Enter = 0000 006D 0018 0000 0154 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 00AA 0013 048A 0154 0054 0013 0D07 0154 0055 0013 0D06 0154 0054 0013 00AA 
-
-Input = 0000 006D 0016 0000 0154 00AA 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 048A 0154 0054 0013 0D07 0154 0055 0013 00AA 
-
-1 = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 00AA 0013 048A 0154 0055 0013 0D07 
-
-5 = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 048A 0154 0055 0013 0D07 
-
-8 = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0589 0154 0055 0013 0D06 
-
-7 = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 048A 0154 0055 0013 0D07 
-
-6 = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 04DF 0154 0055 0013 0D07 
-
-4 = 0000 006D 0018 0000 0154 00AA 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0534 0154 0054 0013 0D07 0154 0055 0013 0D08 0154 0054 0013 00AA 
-
-3 = 0000 006D 0018 0000 0154 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 048A 0154 0054 0013 0D07 0154 0054 0013 0D07 0154 0055 0013 00AA 
-
-2 = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 04E0 0154 0055 0013 0D07 
-
-9 = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 0055 0013 048A 0154 0054 0013 0D07 
-
-0 = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0633 0154 0055 0013 0D07 
-
-CH- = 0000 006D 0014 0000 0154 00AA 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 048B 0154 0055 0013 00AA 
-
-CH+ = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0534 0154 0055 0013 0D07 
-
+Manufacturer=Motorola
+Model=QIP6200
+
+[Key Codes]
+
+A = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 048A 0154 0055 0013 0D07 
+
+On Demand = 0000 006D 002E 0001 0154 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0633 0154 0054 0013 0D07 0154 0055 0013 01D2 0154 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0633 0154 0055 0013 0D06 0154 0055 0013 01D5 0154 00AA 0013 00AA 0013 0055 
+
+P- = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0435 0154 0055 0013 0D06 
+
+P+ = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0435 0154 0054 0013 0D07 
+
+Up Arrow = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 048A 0154 0054 0013 0D07 
+
+Down Arrow = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 048A 0154 0055 0013 0D07 
+
+Left Arrow = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 0055 0013 03E0 0154 0055 0013 0D07 
+
+Right Arrow = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 03E0 0154 0055 0013 0D07 
+
+Info = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 0435 0154 0055 0013 0D07 
+
+Guide = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 048A 0154 0055 0013 0D07 
+
+OK = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 048A 0154 0055 0013 0D07 
+
+Power Toggle = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 04DF 0154 0055 0013 0D07 
+
+Setup = 0000 0070 0000 0032 0080 0040 0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0030 0010 0030 0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 0010 0010 0010 0030 0010 0030 0010 0010 0010 0010 0010 0AC4 
+
+C = 0000 006D 0035 0000 0154 00AA 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0589 0154 0055 0013 0D06 0154 0054 0013 01DB 0154 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 048A 0154 0055 0013 0D07 0154 0055 0013 01D8 0154 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 
+
+Menu = 0000 006D 0018 0000 0154 00AA 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 048A 0154 0055 0013 0D07 0154 0055 0013 0D07 0154 0055 0013 00AA 
+
+Exit = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 048A 0154 0055 0013 0D08 
+
+Help = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 0435 0154 0054 0013 0D07 
+
+Last = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 048A 0154 0055 0013 0D07 
+
+Fav = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 048A 0154 0054 0013 0D07 
+
+Enter = 0000 006D 0018 0000 0154 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 00AA 0013 048A 0154 0054 0013 0D07 0154 0055 0013 0D06 0154 0054 0013 00AA 
+
+Input = 0000 006D 0016 0000 0154 00AA 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 048A 0154 0054 0013 0D07 0154 0055 0013 00AA 
+
+1 = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 00AA 0013 048A 0154 0055 0013 0D07 
+
+5 = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 048A 0154 0055 0013 0D07 
+
+8 = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0589 0154 0055 0013 0D06 
+
+7 = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 048A 0154 0055 0013 0D07 
+
+6 = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 04DF 0154 0055 0013 0D07 
+
+4 = 0000 006D 0018 0000 0154 00AA 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0534 0154 0054 0013 0D07 0154 0055 0013 0D08 0154 0054 0013 00AA 
+
+3 = 0000 006D 0018 0000 0154 00AA 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 00AA 0013 048A 0154 0054 0013 0D07 0154 0054 0013 0D07 0154 0055 0013 00AA 
+
+2 = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 04E0 0154 0055 0013 0D07 
+
+9 = 0000 006D 0012 0002 0154 00AA 0013 00AA 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 00AA 0013 0055 0013 048A 0154 0054 0013 0D07 
+
+0 = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0633 0154 0055 0013 0D07 
+
+CH- = 0000 006D 0014 0000 0154 00AA 0013 00AA 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 00AA 0013 0055 0013 048B 0154 0055 0013 00AA 
+
+CH+ = 0000 006D 0012 0002 0154 00AA 0013 0055 0013 0055 0013 00AA 0013 00AA 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 0055 0013 00AA 0013 0055 0013 0534 0154 0055 0013 0D07 
+
diff --git a/data/infrared/devicelib/Samsung HLT Series TV.dvc b/data/infrared/devicelib/Samsung HLT Series TV.dvc
index cf60c3ea1..a3bdc4088 100755
--- a/data/infrared/devicelib/Samsung HLT Series TV.dvc	
+++ b/data/infrared/devicelib/Samsung HLT Series TV.dvc	
@@ -1,134 +1,134 @@
-Manufacturer=Samsung
-Model=HLT Series
-Device=TV
-
-[Key Codes]
-
-ANT = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
-
-Vid1 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0689 
-
-S-Vid2 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 
-
-DVI = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0689 
-
-Vid2 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 
-
-Comp1 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0689 
-
-HDMI = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0689 
-
-HDMI2 = 0000 006C 0022 0000 00AD 00AD 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0015 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0015 0015 0728
-
-HDMI3 = 0000 006C 0022 0000 00AD 00AD 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0015 0015 0041 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0728
-
-USB = 0000 006C 0022 0000 00AD 00AD 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0015 0015 0728
-
-S-Vid1 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0689 
-
-Comp2 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0689 
-
-TV/Video = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-PC = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
-
-Chan Up = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
-
-Prev-Ch = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
-
-Fav Ch = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0689 
-
-Chan Down = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
-
-Add/Del = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
-
-Fav Ch2 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0689 
-
-Menu = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
-
-Exit = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
-
-Down = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
-
-Left = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
-
-Info = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
-
-Up = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
-
-Right = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
-
-Enter = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
-
-MTS = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-Vol- = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-Sound Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
-
-SRS = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
-
-Vol+ = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-Mute = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-MTS2 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
-
-PIP = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
-
-PIP Ch DN = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0689 
-
-Swap = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
-
-PIP Size = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
-
-PIP Ch UP = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0689 
-
-1 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-4 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-7 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-2 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-5 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-8 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-3 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-6 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-9 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-0 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
-
-100+ = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
-
-VCR Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0689 
-
-STB Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0689 
-
-Cable Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0689 
-
-TV Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0689 
-
-DVD Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0689 
-
-Pic Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
-
-Pic Size = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0689 
-
-Still = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0689 
-
-DNIe = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
-
-Power Toggle = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
-Power On = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0689 
-
-Power Off = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0689 
-
-Sleep = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
-
+Manufacturer=Samsung
+Model=HLT Series
+Device=TV
+
+[Key Codes]
+
+ANT = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
+
+Vid1 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0689 
+
+S-Vid2 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 
+
+DVI = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0689 
+
+Vid2 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0689 
+
+Comp1 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0689 
+
+HDMI = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0689 
+
+HDMI2 = 0000 006C 0022 0000 00AD 00AD 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0015 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0015 0015 0728
+
+HDMI3 = 0000 006C 0022 0000 00AD 00AD 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0015 0015 0041 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0728
+
+USB = 0000 006C 0022 0000 00AD 00AD 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0015 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0015 0015 0015 0015 0041 0015 0041 0015 0041 0015 0015 0015 0728
+
+S-Vid1 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0689 
+
+Comp2 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0689 
+
+TV/Video = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+PC = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
+
+Chan Up = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
+
+Prev-Ch = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
+
+Fav Ch = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0689 
+
+Chan Down = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
+
+Add/Del = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
+
+Fav Ch2 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0689 
+
+Menu = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
+
+Exit = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
+
+Down = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
+
+Left = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
+
+Info = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
+
+Up = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
+
+Right = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
+
+Enter = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
+
+MTS = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+Vol- = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+Sound Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
+
+SRS = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
+
+Vol+ = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+Mute = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+MTS2 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
+
+PIP = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
+
+PIP Ch DN = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0689 
+
+Swap = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
+
+PIP Size = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
+
+PIP Ch UP = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0689 
+
+1 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+4 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+7 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+2 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+5 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+8 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+3 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+6 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+9 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+0 = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0689 
+
+100+ = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
+
+VCR Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0689 
+
+STB Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0689 
+
+Cable Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0689 
+
+TV Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0689 
+
+DVD Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0689 
+
+Pic Mode = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0689 
+
+Pic Size = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0689 
+
+Still = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0041 0015 0689 
+
+DNIe = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0689 
+
+Power Toggle = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
+Power On = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0689 
+
+Power Off = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0689 
+
+Sleep = 0000 006D 0000 0022 00AC 00AB 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0016 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0041 0015 0689 
+
diff --git a/docs/faq.pod b/docs/faq.pod
index b7292385b..344bc036e 100644
--- a/docs/faq.pod
+++ b/docs/faq.pod
@@ -1,1789 +1,1789 @@
-=pod
-
-=head1 1: MisterHouse operational questions
-
-=head2 1.1: What OSes can it run on?
-
-It has been tested on Windows 95, 98, NT 4.0, 2K, XP, Vista (!) and 7.  
-On Unix, it has been run on Linux (Ubuntu, Debian, Fedora and others), AIX, and Sun.
-
-In theory, any OS that runs perl should be able to run mh.  In practice, some platforms will likely have strange Serial Interfaces, so the Serial I/O related function would take some work.
-
-=head2 1.2: How can I make it run faster and use less memory?
-
-On my Celron 400 Mhz computer running Windows 98, using 60 code files with 6000 lines of code, mh takes 10% the cpu, running at 9 passes per second and using about 30 MB of memory.
-
-If you are happy with the Web interface and don't need the Tk interface, turn it off by editing the Tk mh.ini parm or run:
-
-   mh -tk 0
-
-If you want the tk window, but don't use the Command/Items/Group pull down menus, try:
-
-   mh -tk_comands 0 -tk_items 0 -tk_groups 0
-
-You can turn off the tk 'eye' that bounces back and forth by deleting the tk_eye.pl code file.
-
-You can speed up / slow down mh, using more/less cpu, by mh.ini sleep_time parm.
-
-Here are some memory stats:
-
-  Linux
-    10 Meg   <- mh -tk 0 mh_control.pl (run just one code file)
-    12 Meg   <- mh -tk 0               (run all the default code)
-    17 Meg   <- mh                     (run all the default code with tk gui on)
-
-  Windows
-    18 Meg   <- mh -tk 0 mh_control.pl (run just one code file)
-    20 Meg   <- mh -tk 0               (run all the default code)
-    27 Meg   <- mh                     (run all the default code with tk gui on)
-
-
-
-=head2 1.3: How can I easily upgrade to the latest version of mh?
-
-Point your mh.ini code_dir, data_dir, and html_dir parms to somplace other than your mh path.
-Then you should be able to rename your old mh directory and unzip the new one in its place without loosing
-anything.  Also keep your mh.private.ini somewhere else (see next question).
-
-=head2 1.4: How does mh.ini work?
-
-All the entries in mh.ini are read on mh Startup and on a Reload.  They are stored
-in the %config_parms array.  So, for example, if you added:
-
-  myparm1=a b c
-
-Then, mh would set $config_parms{myparm1} = 'a b c';
-
-These parms also defined what are legal startup values, so if you want to try
-a different value, instead of editing your mh.ini, you can run:
-
-  mh -myparm1 'd e f'
-
-Rather then edit the default mh.ini file, the best approach is to copy just the parms you want to change to your own .ini file (e.g. mh.private.ini), then set the environmental variable mh_parms to point where you keep that file (see the header of mh/bin/mh.ini for more detail).
-
-While the %config_parms array IS refreshed on a mh Reload, some parms are only used on mh startup (e.g. http_port), so will only be reloaded when you re-start mh.
-
-=head2 1.5: Can I run run mh in a 'fast debug mode'?
-
-Funny you should ask :)  Check out the time_start, time_stop, and time_increment parms
-in the mh.ini file.  Here are some examples:
-
-   mh -time_start 0 -time_stop 24 -tk 0 -voice_text 0
-   mh -time_start "6 AM" -time_stop "11 PM"  -time_increment 1
-   mh -time_start "5/14 7:10" -time_stop "5/15 10 PM" -time_increment 300
-
-
-=head2 1.6: How are the X10 and Serial Items implemented, indpendent of the platform?
-
-The user works with an X10_Item which reflects physical hardware and the state of that hardware. The user "loop" code deals with the state and
-conditions which alter it. This code is independent of OS and specific to mh.
-
-X10_Items talk to Serial_Items which implement a software protocol required by the model and type of the actual hardware. The Serial_Items
-can use protocol translator modules such as CM11.pm, HomeBase.pm, and CM17.pm. But the output is platform-independent serial commands
-to the next layer. The protocol translator modules are publicly available outside mh and may be used by code other than Serial_Items. These modules will eventually be on CPAN. The code is still independent of OS. Other Serial_Item types, including "generic" read/write ports, also exist.
-
-Win32::SerialPort.pm and Device::SerialPort.pm are CPAN modules which actually implement the serial command interface. Device::SerialPort is a
-clone of its Win32 cousin. These modules handle high-level OS issues including device names, configuration files, and validation of port
-settings.
-
-Each also calls a CPAN module to handle low-level interfacing to the OS and the serial driver: Win32API::CommPort.pm or POSIX.pm (you guessed
-correctly ;-)
-
-
-=head2 1.7: mh seems way too complicated.  How can I run something simple?
-
-Copy mh\code\test\test_x10.pl into your own code dir (e.g. c:\mh_code).  Then run:
-
-  mh -code_dir c:\mh_code
-
-You can then use http://localhost:8080 for control.  This will also run all the
-code in mh/code/common.  To run JUST a specific code member(s), specify
-it on the command line.  For example:
-
-  mh test_x10.pl
-
-
-=head2 1.8: Is there a way I can have direct X10 control with a simple perl script?
-
-If all you want to do is control X10 devices with a cron job or from your own cgi scripts,
-running mh is probably overkill.  You can send X10 commands using either the ActiveHome
-interface (CM11, available from http://www.x10.com/automation/x10_ck11a_d.htm )
-or the cheaper Firecracker interface (CM17, available from http://www.x10.com/automation/firecracker_d.htm )
-using the modules and documentation found in mh/lib/site/ControlX10 or download them from CPAN.
-Examples can be found in mh/lib/site/test_cm11.pl and test_cm17.pl.
-
-
-
-=head2 1.9: Can I send mh commands from other programs?
-
-You can send mh commands (Voice_Cmd text strings) from other programs in many ways:
-
-- Write commands to the file specified in the mh.ini xcmd_file parm.  By default this
-is mh/house_cmd.txt. See mh/bin/house and mh/bin/house.bat for examples.
-
-- Use mh/bin/mhsend to send commands via sockets (can be over the internet).  If you have
-run mh/bin/set_password, the mhsend -password parm is required.   Some examples:
-
-  mh/bin/mhsend -host ip.A -run "All Lights On"
-  mhsend -p password -run "turn living room light on"
-
-Where ip.A is computer A's ip address (or name if you have a HOST file setup
-to alias a name to an ip address).  mhsend is a stand alone perl script,
-so you do not need mh running there (although it will not hurt).
-The code that allows this is in mh/code/common/mhsend_server.pl.
-An example of mh code to act as a client to different mh box is in mh/code/examples/test_server2.pl
-
-- You can also control mh remotely via email (see faq question 'Can do I send mh comands via email?'),
-telnet sessions (if running mh/code/common/telent.pl), and via the built in web server.  An example url
-for the web server is:
-
-  http://192.168.1.10:8080/RUN;last_response?turn_living_room_light_on
-
-- If you are runing IM client (if running code file internet_im.pl)
-like AOL AIM, MSN, or Jabber, you can any voice command to
-MisterHouse if you give Misterhouse its own account to logon with.
-
-
-
-=head2 1.11: How can I debug a problem?
-
-Lots of debug errata can be controled with the mh -debug switch.  Most of this code is probably
-meaningful only if you dig into the source code, so most people probably will not use
-it unless you are generating debug to send to the author.  To create a log file with debug in it,
-run:
-
-  mh -log debug.log -debug xyz
-
-Where xyz can be any of the following:
-
-  x10
-  serial
-  socket
-  startup
-  homebase
-  misc
-  http
-  port_name of socket port
-
-You can also stack debug flags, using ; as a separator.  fro example:
-
-  mh -debug "serial;x10"
-
-
-=head2 1.12: How can I debug timed event problem?
-
-One way is to create a code member that contains just the event you are trying to debug, then run mh on just that one member.  For example, create a member called \temp\test_time.pl with this code:
-
-  print "min=$Minute\n" if $New_Minute;
-  print "hour=$Hour\n"  if $New_Hour;
-  print "debug1 it is now $Time_Now\n" if time_now "11:59 PM";
-  print "debug2 it is now $Time_Now\n" if time_now "23:59";
-  print "debug3 it is now $Time_Now\n" if time_now "12:00 AM";
-  print "debug4 it is now $Time_Now\n" if time_now "00:00";
-
-Then run mh using these parameters:
-
-  mh -code_dir \temp -tk 0 -time_start '12/15 11:58 pm' -time_start '12/16 12:01 am'
-
-Note, you can run this test mh quickly without stopping your normal mh.
-
-=head2 1.13: What are the advantages/disadvantages to running the compiled versions of mh?
-
-Advantages:
-
-=over
-
-=item *
-
-You don't need the latest version of perl installed
-
-=item *
-
-You don't have to install additional perl modules
-
-=back
-
-Disadvantages:
-
-=over
-
-=item *
-
-For some reason, starting mh with the compiled versions is slower.  On my windows box, it is 10 seconds -vs- 20 seconds.
-
-=item *
-
-You can apply quick patches to mh, -vs- downloading a larger, less frequently updated mh.exe file.
-
-=back
-
-The memory and cpu used, once mh is started, is the same.
-
-
-=head2 1.14: How does mh read and use the user code in code_dir
-
-Each time mh is started or a Reload is done, mh will re-read all the .pl code members
-in the code_dir directory (this is a mh.ini parm)
-and the file data_dir/mh_temp.user_code is created.
-All of the objects and global variables (see FAQ question 2.4), are put at top
-of this file, and everything else is put in seperate subroutines, one for each file read.
-A &loop_code subroutine is also created (at the very bottom of mh_temp.user_code), that
-calls each member subroutine.
-
-After creating this file, mh runs the perl eval function on its contents.  This re-creates all the objects,
-global variables, and code_dir member subroutines.  Then mh goes back into its normal loop where
-it queries various input data (e.g. serial, tcp/ip, voice, time), updates objects and variables,
-evals the &loop_code code (it does an eval, rather then execute it directly, so we can trap errors and
-not kill mh), sleeps for a bit, then repeats.
-
-
-=head2 1.15 How can I control mh from a non-mh web server like Apache?
-
-You can think of the built in mh web server as 2 parts:
-
- - The part that auto-generates web pages that reflect your items and commands.
-
- - The part that responds to commands you give it via URLs.
-
-You don't really have to use the first part.
-Some mh users custom generate their own mh pages, to be served by the mh server or
-by a different server.  This allows for full control of
-what is on the web control page and how it looks.
-
-There is more (probably not so easy to read) documentation on how to do this
-under 'Customizing the Web Interface' in mh/docs/mh.html
-
-You can also use something like mh/code/common/mhsend_server.pl
-and then read/write to sockets directly from non-mh web server cgi scripts.
-Or have the web server script simply call mh/bin/mhsend to run mh commands.
-
-=head2 1.16 Is there a front-end tool for defining/editing mh items/events?
-
-Not yet, but you can now define items/events in a table-like format.
-This should allow us to enable a gui or web based front end tools for editing.
-
-Currently we have defined just one format defined, creativly named A,
-but other formats (e.g. XML) should be easy to implement.
-
-To use, create one or more *.mht (mh table) files in your code directory, specifying the table format with Format=A
-at the top of the table.  Then mh will process (on starup and reload) each record with mh/lib/read_table_A.pl, to create
-*.mhp (mh processed) files, which are then processed with all your other mh *.pl code files.
-
-Examples are in mh/code/bruce/*.mht and mh/code/test/*.mht.
-If you want to create another table format, all you need to do is create a mh/lib/read_table_xyz.pl member, then set Format=xyz.
-
-=head2 1.17: How can I use Family Radios with MisterHouse?
-
-=begin html
-There is seperate FAQ on the FRS topic in
-<a href="faq_frs.html">mh/docs/faq_frs.html</a>
-
-=end html
-
-
-=head2 1.18: Is there a way to tell if MH is shutdown correctly or not?
-
-On windows, mh/bin/mh.bat checks errorlevel and on linux, mh/bin/mhl finds the return code via $?.
-Both of these shells will restart mh unless they detect a normal exit (rc=1).
-
-This code in mh/code/common/mh_control.pl will detect an abnormal restart:
-
- if ($Startup and $Save{mh_exit} ne 'normal') {
-    display "MisterHouse auto restarted: $Save{mh_exit}", 0;
- }
-
-If you want to detect a power outage and you have a CM11,
-code in mh/code/common/mh_control.pl will set $Power_Supply, so you can do something like this:
-
- if (state_now $Power_Supply eq 'Restored') {
-    speak 'You should have bought a ups';
- }
-
-
-=head2 1.19: How can I use an Internet Appliance with MisterHouse?
-
-=begin html
-There is seperate FAQ on varous Internet Appliances in
-<a href="faq_ia.html">mh/docs/faq_ia.html</a>
-
-=end html
-
-
-=head2 1.20: Where is perl program code located?
-
-From Harald Koch on 2/2002.
-
-There are (at least) three different locations for scripts:
-
-/mh/bin - standalone programs (such as get_weather, get_tv_grid); they are called from the main MH process via "run" or a Process_Item;
-    they do not get any environment or variables from the main MH program, and typically return results to MH by writing output files
-    which MH later reads.
-
-    MH typically looks for external programs here, and also programs
-    here typically assume they're being run from this directory; they
-    try to find files in ../lib, for example.
-
-$config_parms{code_dir} - scripts in this directory are (after some parsing) loaded into the middle of the MH event loop, and the
-    commands in them run constantly. They run within the MH environment,
-    and can use all the variables available there.
-
-$config_parms{html_dir} - scripts in this directory are run by the HTTP
-    server, and are expected to return blobs of HTML. They too run
-    inside the MH process, and can access all variables, subroutines,
-    etc.
-
-Each script directory has a different purpose, and programs in one are
-generally not terribly useful in another. My weather processing, for
-example, has scripts in all three places; mh/bin/get_weather_ca is the
-standalone that fetches/parses HTML, code/weather_ec.pl is the script
-that creates and processes voice commands and timer events, and then I
-have scripts in /web/weather/ that format the HTML for display.
-
-
-
-
-=head1 2: MisterHouse coding questions
-
-=head2 2.1: How do I debug syntax errors in my code?
-
-If there are syntax errors in your code, most of them will be caught on startup or reload.
-The error, and (hopefully) relevant code member and/or line number, will show up in
-your console, and if running Tk, in a Tk window on reload.
-
-When you go to write new code, first start mh with old code that works, then edit or copy in
-your new code and do a mh Reload.  Fixing errors with code Reloads is much
-quicker than trying to fix them on mh startup.  You can add/delete the .pl suffix
-on code members between reloads to enable/disable them.
-
-Some errors (e.g. too few/many {} around code) will point to a misleading line number.
-In these cases, if you can not find the file with the error,
-you can try a new option: mh -error_by_file 1 .
-This will try loading one file at a time untill the error is found, but
-it runs pretty slow and may not work with members that have # noloop directives.
-
-Some errors will only show up after mh triggers events.  The first time this happens, a console/tk message
-will be displayed, and a message spoken.  Since these errors might happen on sequential passes of mh, subsequent errors
-are only listed in the console window.  If more than 10 occur, another window is displayed,
-and the code member there error was in is disabled.
-
-All of these on-the-fly errors are logged in the file mh_temp.error_log in your code directory.
-This is useful if you are not running tk and the error has scrolled out of your console window.
-
-You can enable the perl diagnostics module (same as perl -w) to get additional warnings on potential
-coding errors.  Either use mh -diagnostics 1 or set diagnostics=1 in your mh.ini.  This takes
-about 1 meg more of memory and causes mh to run about 10% slower, but the messages it displays
-often point to valid problems.
-To simplify coding, the 'uninitialized value' warnings disabled in the user code processing.
-
-=head2 2.2: How should I code events that should occur only at infrequently, or
-only at Startup?
-
-You can use the $Startup or $Reload variables for events that should only
-occur when mh is Started, or when code is Reloaded.  Note that $Reload
-is also true when $Startup is true.
-
-To run events infrequently, you can use the modulus operator (%),
-$New_Second/Hour/Day/Month/Year variables,
-or the Time_Now/Time_Cron functions to control events.
-
-The $New_xxx variables are 1 (true) for each pass that the xxx variable gets incremented,
-and 0 for all other passes.  For example, $New_Hour is true for one pass
-when $Hour changes from one hour to another.
-
-Here are some examples:
-
-  print_log "Only at startup" if $Startup;
-
-  print_log "Every 5 minutes" if $New_Minute and !($Minute % 5);
-
-  print_log "At 10:05 pm" if time_now '10:05 PM';
-
-  print_log "Every weekday at 2:15 am" time_cron '2 15 * * 1-5';
-
-
-=head2 2.3: How should I structure my Perl code?
-
-Pretty much anyway you want!  You may want to put object definitions all in one
-member (e.g. mh/code/Bruce/items.pl) so you can easily change device codes,
-or you may want to define the objects in the file members you use them in.
-
-If the same object is defined in multiple members, it will still work ok, although
-some object types (e.g. Voice_Item) will warn about duplicate names.
-
-
-=head2 2.4: Can I create global variables that can be shared between code members?
-
-Yep.  All objects definitions (e.g. $light = new X10_Item('C5')) are always shared.  They are pulled out of the member loop by mh.
-
-All other variable declarations must be made using with 'my' or 'use vars':
-
-   my ($my_var1, $my_var2);
-   use vars '$my_var1', '$my_var2';
-   use vars qw($my_var1 $my_var2);
-
-The last example uses the qw function (Quote Words) to save you from the ' and , punctuation.
-
-If you code a 'my' or 'use var' record that starts in column 1,
-mh will pull these records out of the member loop code (as it did with object definitions),
-so that the variable can now be shared with other code members.
-
-If the 'my' or 'use var' record does not start in column 1, the variable declaration
-is left in with the rest of the member code and is local to that member.
-
-If you want to use the variable with any mh/web/*.pl script when creating
-mh web pages, you must use 'use vars', as 'my' variables can not be shared with the server.
-
-
-=head2 2.5: How can I move code out of the loop code?
-
-Sometimes you may need to have mh run code out of the loop code.  For example, if you
-want to create a Voice_Cmd object that has states that are read from a file.  Since
-objects are moved out of the loop code by mh, we need to also move any other code used
-to define that object.
-
-You can tell mh to do this using '# noloop=start/stop' comments.  For example:
-
-   # noloop=start
-   my $mp3names;
-   while ( my $mp3name = <d:/songs/*.mp3> ) {
-      $mp3name =~ s#^.*/##;  # remove path
-      $mp3name =~ s#\..*$##; # remove extension
-      $mp3names .= "," if $mp3names;
-      $mp3names .= $mp3name;
-   }
-  # noloop=stop
-
-  $v_play_music = new Voice_Cmd("Play [$mp3names]");
-  if ($state = said $v_play_music) {
-     speak "Playing song $state";
-     run("winamp d:/songs/$state.mp3")
-  }
-
-
-=head2 2.6: How can I add my own subroutines?
-
-You can add your own subroutines anywhere in any of your code files.  These can then be
-called by that member or any other member.  Here is a couple of examples:
-
-   print_log &mysub1(9990, 9);
-
-   sub mysub1 {
-      my ($a, $b) = @_;
-      my $c = $a + $b;
-      return "The answer is: $a + $b = $c";
-   }
-
-
-   $v_bedroom_curtain  = new  Voice_Cmd('[open,close] the bedroom curtains');
-   &curtain_on('bedroom', $state) if $state = said $v_bedroom_curtain;
-
-   sub curtain_on {
-       my($room, $action) = @_;
-       set $curtain_updown  $action;
-       eval "set \$curtain_$room ON;";
-   }
-
-=head2 2.7: What other special global variables are there?
-
-Here are a few:
-
-  $Pgm_Path is the directory that that mh/bin/mh is found in.
-  $Pgm_Root is one directory above $Pgm_Path
-  $OS_win is true on windows, false otherwise.  $^O will reflect the OS name.
-
-=head2 2.8: Can I use mh to control other windows
-
-On Windows (95,98, NT), you can use the SendKeys to send keystrokes to other windows.  See mh.html for details.
-
-If anyone knows of an equivalent function for linux, let me know.  Linux is usually clever enough to have
-command line options, so there is less of a need here.
-
-
-
-=head2 2.9: What data is saved when mh is exited and restarted?
-
-The state of all objects (Timer Serial_Item X10_Item X10_Appliance File_Item Generic_Item) and all the $Save variables.
-
-Every 5 minutes while mh is running, and whenever mh is exited, the state of these variables are saved to your code directory in a member called mh_temp.saved_states.  When you start mh, this member is run to restore the states.
-
-You can make up any members to the $Save array.  For example, you can use $Save{sleeping_cat} to track whenever your cat is asleep.
-
-
-=head2 2.10: How can I turn a bunch of lights on/off all at once?
-
-You can turn all the lights on a single house code on/off by specifying just the house code letter.  For example:
-
-   $v_bedroom_lights = new Voice_Cmd('Bedroom lights [on,off]');
-   $bedroom_lights   = new X10_Item('P');
-   set $bedroom_lights $state if $state = said $v_bedroom_lights;
-
-You can also create a group of X10 items.  Here is an example that would turn all lights on/off in several rooms.
-
-  $all_lights_bed    = new X10_Item('P');
-  $all_lights_living = new X10_Item('O');
-  $all_lights  = new Group($all_lights_bed, $all_lights_living);
-
-  $v_lights_all = new  Voice_Cmd('All lights [on,off]');
-  set $all_lights $state if $state = said $v_lights_all;
-
-
-=head2 2.11: How do I get mh to stop telling the time each minute?
-
-Out of the box, mh defaults to running most of the code in the mh/code/common directory and all the code in mh/code/test.
-Members test_tagline.pl and the hello_speak.pl members are the main sources of the periodic test speech.
-Once you have played around with the example code, you will want to use
-http://localhost:8080/bin/code_select.pl  menu (avaliable on the web ia5 MrHouse menu 'Select Code' button)
-and select only the code files you find useful.
-
-See the FAQ question 'How does mh.ini work' on how to modify the code_dir parm to point to your new code directory.
-
-
-=head2 2.12: Can do I send mh comands via email?
-
-Set the mh.ini net_mail_command_code parm to a secret code, and copy mh/code/common/internet_mail.pl
-into your code directory.   Now you can send email with the following string either
-in the subject or the body of your email:
-
-  command:your command    code:your_code
-
-The internet_mail.pl code periodicaly runs the get_email process and then scans for the above string.
-If found, it will send a confirmation email saying either "command run", "command not found",
-or "command not authorized".
-
-
-=head2 2.13: How can I control Command Categories
-
-All Voice_Cmd objects are listed in the Tk Command pull down and Web Category list.
-These lists are organize by Category, which is specified with a Category=value comment in the user code.
-For example:
-
-  # Category=Timers
-
-This can be specified multiple times in the same file, with the most recent specification appling
-to all subsequent Voice_Cmd entries.
-
-If a file does not have a # Category record, the file name will be used.
-
-
-=head2 2.14: How can I measure time between two nearly spaced events?
-
-If you are on Windows, or on Unix with the Time::HiRes module installed,
-a call to get_tickcount will give sub-second resolution (returns milliseconds).
-For example, to 'debounce' a doorbell button, (i.e. don't trigger it twice within a 250 millisecond time):
-
-  my $doorbell_time;
-  if (state_now $doorbell) {
-    play 'doorbell' if get_tickcount - $doorbell_time > 250;
-    $doorbell_time = get_tickcount;
-  }
-
-If you are on unix without Time::HiRes, you can use $LoopCount and count number of passes through the loop code.
-
-
-=head2 2.15: What is the format of MisterHouse X10 codes?
-
-At a low level MH sends and receives X10 data in character strings (called
-Serial Items) that start with the letter X. It is usually easier to create an
-X10 Item (or similar) for each X10 device you have and manipulate those
-instead of using X10 strings. Most of the functionality descibed here is
-available in various items in easy to use states.
-
-Here is format of Misterhouse X10 strings: X10 strings always begin with an
-uppercase X (all letters in X10 strings must be uppercase.) The X is followed
-by one or more token pairs that are either a housecode and unitcode, or a
-housecode and command.
-
-A housecode is a letter in the range A through P.
-
-A unitcode is a number in the range 1 through 16. Unitcodes above 9 can be
-specified as two digit numbers or their hex equivalent A through G. Okay,
-there is no such thing as hex G, but X10 unitcodes start at 1, not 0. A note
-to X10 interface module developers: the Serial_Item module converts unitcodes
-above 9 to their hex equivalent before passing them to the interface module.
-
-The following four basic X10 commands are the most common and are supported by
-all the interface modules. Each command is listed here followed by the
-corresponding X10 command that is sent or received, plus any notes about its
-use:
-
-    J    - ON
-    K    - OFF
-    L    - Brighten
-    M    - Dim
-
-
-These commands are less common and are not supported by all the interface modules:
-
-    O                - All Lights ON
-    P                - All Units OFF
-    STATUS           - accepted by some 2-way X10 devices to request status
-    PRESET_DIM1      - these are the original direct dim commands specified but never used by X10
-    PRESET_DIM2      - still used by some X10 venders, including PCS, SwitchLinc and RCS
-    +#               - increase brightness by # percent, not used for receive
-    -#               - decrease brightness by # percent, not used for receive
-                       Serial_Item rounds # to a multiple of 5 before it's passed to the interface module,
-                       the interface module calculates the number of Bright/Dim commands to send
-                       by multiplying # by 22/100, since there are 22 standard dim levels
-    &P#              - send an extended direct dim command accepted by some X10 devices,
-                       # is the brightness level in the range 0 through 63
-    #%               - same as &P command, but # is a percentage in the range 0 through 100,
-                       Serial_Item converts this to a &P command before it's passed to the interface module,
-                       neither &P nor % are currently used for receive
-    Z##              - intended for sending and receiving EXTENDED_CODE commands with arbitrary extended
-                       hex ## bytes appended, but appears only receive is implemented by the CM11 module,
-                       no other tokens may follow this command
-
-
-These commands are rarely used and only supported for completeness by a few interface modules:
-
-    ALL_LIGHTS_OFF   - reported as P on receive
-    HAIL_REQUEST
-    HAIL_ACK
-    EXTENDED_CODE    - see Z above     EXTENDED_DATA
-    STATUS_ON
-    STATUS_OFF
-
-
-Here are examples of valid X10 strings and what they do:
-
-    XM1MK            - turn off M1
-    XC1C2C3CJ        - turn on C1, C2, and C3 simultaneously
-    XI6IJIKIJIK      - flash I6 twice
-
-
-For more examples, take a look at mh/lib/X10_Items.pm.
-
-Many of the X10 interface modules expect only a housecode/unitcode pair and a
-housecode/command pair, like the first example above.  This makes it
-impossible to send more complicated strings like the other examples, and is
-therefore discouraged. This can't be avoided with interfaces like the CM17 and
-BX24 that transmit using the X10 wireless protocol, since it combines
-housecode, unitcode, and command in one transmission.
-
-
-=head2 2.16: How are states set for each pass though the user code loop?
-
-Misterhouse works on a multipass system where a state becomes 'new' for
-one (and only) one pass thru the system.  The actually timing of the
-passes varies (based on the machine, the load, the code, etc) but you
-generally can presume multiple passes will occur per second (I'm getting
-about 19 per second with fairly light load on a 400mhz laptop).  I ran
-into an early problem where MH didn't handle multiple states being set
-during one pass (each subsequent state would 'overwrite' the previous
-one).  As an example if my object read from a device and noticed that
-both the volume and treble setting on my mixer changed, it would
-generate a volume state and a treble state.  The treble state when
-overwrite the volume state.
-
-To fix this Bruce introduced a queue of states.  So, when a module sets
-a state, it gets set for the 'next' *available* pass thru the system.
-In the example above (presuming no other states are outstanding) the
-volume state would be 'new' during currentpass+1 and the treble state
-would be 'new' during currentpass+2.
-
-The reason the 'current' pass is never effected is that you don't always
-know where you are in the list of code looking at the time you make the
-change.  If your in the 'middle' and set a state, code that already ran
-during that pass wouldn't have a chance to 'see' it before the pass
-ended.  By making states always start at the beginning of the next pass,
-we can insure that all modules see a coherent state in the system.  When
-the states becomes valid, if effects the tied_items (that is when they
-fire) as well as calls to 'state_now'.
-
-
-=head2 2.17: Common Perl and mh coding errors
-
-=begin html
-Clive Freedman sent in some useful tips on common coding errors in
-<a href="faq_damnblast.html">mh/docs/faq_damnblast.html</a>
-
-=end html
-
-=head2 2.18: What's the difference between 'on', 'ON' and ON?
-
-In MisterHouse, the state of many objects comes down to a question of whether
-they are on or off.  As this is a common situation, it is important to know
-exactly how to ask whether something is on or off.
-
-First, it is important to know that case matters.  PERL is a case sensitive
-language, so 'On' does not equal 'on'.  Second, by default, everytime that
-the state of an item is set, mh converts that state to its lowercase
-equivalent.  Hence, setting a light 'ON' actually sets it 'on'.  Third, the
-correct operator to check for string equality is eq, not == or =.
-
-Now, MisterHouse adds a little twist to the situation.  As 'on' and 'off' are
-common states, MisterHouse defines the PERL constants ON and OFF.  N.B. that
-there are no dollar signs ($) at the beginning of the constants.  Whenever
-MisterHouse code encounters ON and OFF as bare words (not within strings), they
-are replaced with 'on' and 'off' (both are lowercase).  This means:
-
-if (($state=$myLight->state_now) eq 'ON') # always fails as 'ON' is uppercase
-
-if (($state=$myLight->state_now) eq 'on') # could be true if light just turned on
-
-if (($state=$myLight->state_now) eq ON) # could be true as ON is the same as 'on'
-
-=head1 3: Linux specific questions
-
-=head2 3.1: Problem: When I run Viavoice and festival at the same time I get "Can't open output file '/dev/dsp'"
-
-The problem is, festival or another sound program, is locking your dsp device.
-The sound drivers that come stock in the Linux kernel do not allow more than one program to access the /dev/dsp at one time.
-If you are using RedHat, you can use ESD to multiplex the soundcard usage.
-The problem is, not all sound programs are esd aware. Festival and Viavoice do not directly support esd.
-ESD does have a workaround that _sometimes_ works with non-esd aware programs.
-Try starting your sound programs, festival and viavoice under esddsp.
-For example: "esddsp festival --server &".
-I had some success with this route but it doesn't always work because of sampling rates and such.
-
-The best fix would be to replace OSS with ALSA. http://www.alsa-project.org.
-The ALSA drivers directly support multiplexing the dsp devices.
-The only problem is they currently support fewer cards than the OSS drivers that come with the Linux kernel.
-Check out the web page and see if your card is supported. If it is, the best avenue would be replacing OSS with ALSA.
-
-
-=head2 3.1.1: Problem: The speech stutters and then stops half way through, and I end up with 'hung' vv_tts.pl processes that do not complete.
-
-Solution: You need to use ViaVoice_Outloud 5.0 with "any" ALSA driver.
-ViaVoice Outloud 5.1 does not work with ALSA, but it seems that downgrading to 5.0 fixes it.
-You can get the it here:
-http://dittos.yi.org/automation/ViaVoice_Outloud_rtk-5.0-1.0.i386.rpm
-
-The older version ViaVoiceTTS that supports the older ViaVoice Outloud can be foudn at  Brad's website:
-http://www.reednet.org/ViaVoiceTTS/ViaVoiceTTS-0.02.tar.gz
-
-
-=head2 3.2 How can I set the default volume level for Festival?
-
-This might work... it has not been tested.
-
-You can globally increase the volume of all waveforms generated by
-festival by adding the following to your siteinit.scm.  Put that in
-the festival/lib directory, (where all the other .scm files are)
-probably /usr/lib/festival/lib if you used the standard rpms.  Add the
-following
-
-    (set! default_after_synth_hooks
-          (list
-            (lambda (utt)
-              (utt.wave.rescale utt 1.0 t))))
-
-This will maximises the volume within a wavefrom, this wont necessary
-make all voices the same loudness (though it will be close).
-
-Alternatively
-
-    (set! default_after_synth_hooks
-          (list
-            (lambda (utt)
-               (utt.wave.rescale utt 4.0))))
-
-will mutiply the waveform by 4 but this has the problem that it may overflow.
-
-If you want X% of the maximum without overflow use the first example
-and lower the 1.0 until you get an acceptable volume
-
-=head2 3.3 How do I add a multi-port serial card in linux?
-
-From Dave Lounsberry on 1/1/2002
-
-First make sure you have the device nodes for the extra serial ports.
-You should have /dev/ttyS[16..23]. If not:
-
-  # cd /dev
-  # ./MAKEDEV ttyS16  (repeat for each device)
-
-Next you need to run setserial to setup the board. The kernel defaults
-to only two serial ports. Put the following in a file called
-/etc/rc.serial and make sure it runs each boot.
-
-  ---- clip here -----------------------------------------------
-  #!/bin/sh
-  setserial /dev/ttyS16 port 0x180 irq 4 uart 16550A ^fourport
-  setserial /dev/ttyS17 port 0x188 irq 4 uart 16550A ^fourport
-  setserial /dev/ttyS18 port 0x190 irq 4 uart 16550A ^fourport
-  setserial /dev/ttyS19 port 0x198 irq 4 uart 16550A ^fourport
-  setserial /dev/ttyS20 port 0x1a0 irq 4 uart 16550A ^fourport
-  setserial /dev/ttyS21 port 0x1a8 irq 4 uart 16550A ^fourport
-  setserial /dev/ttyS22 port 0x1b0 irq 4 uart 16550A ^fourport
-  setserial /dev/ttyS23 port 0x1b8 irq 4 uart 16550A ^fourport
-  setserial /dev/ttyS16 set_multiport port1 0x1c0 mask1 0xff match1 0xff
-
-  # chown to dbl (runs misterhouse)
-  for a in 16 17 18 19 20 21 22 23
-  do
-        chown dbl.wheel /dev/ttyS${a}
-  done
-  ----- clip here ----------------------------------------------
-
-
-Note that I am using irq 4 for my byterunner. Be careful that you don't have one of the built in serial ports on the same IRQ.
-
-You can probably take out the for loop in the bottom if you are running MH as root.
-
-Here is a link explaining the settings and jumpers (in more depth). 
-http://www.mail-archive.com/linux-hardware%40senator-bedfellow.mit.edu/msg01897.html
-
-Another good resource is always the Linux HOWTOs. The serial HOWTO can be found at http://www.ibiblio.org/mdw/HOWTO/Serial-HOWTO.html#toc5
-
-
-Here is a followup from Nigel Titley:
-
-I have found that the linux serial card driver doesn't like the serial card to be on a shared interrupt (I assume your Byterunner is a PCI card and not ISA). I had exactly this problem and worked around it by using the BIOS to move interrupts around until the serial card set itself up on an unshared IRQ. Everything then worked. This does seem to be a Linux issue, and I haven't taken the plunge yet and tried to find out where in the serial port driver the bug exists (I guess I am hoping that someone else will do it).
-
-
-Here is some useful serial info from Bob Hughes:
-
-Here is another way to look at the current serial port settings
-
-  setserial -a /dev/ttySX  where "X" is the port
-
-To set the serial port baud rate 9600
-
-  setserial /dev/ttyS0 baud_base 9600
-
-You can use setserial -G to get a list of current setting and have them
-in a format that can be fed back into setserial...
-
-  setserial -G /dev/ttyS0
-
-You can put setserial setting in /etc/rc.local so the port is ready for
-your interface program once boot up is complete
-
-
-
-=head2 3.4: How do I get Mister House to start up automatically when my linux box boots
-
-Check out various .rc startup scripts in mh/bin/*.rc
-
-Here is a good tutorial note from Mike Bruno  on 4/2002
-
-OK, here's the quick and dirty on startup scripts.
-
-(You also may wish to check out http://www.linux-mandrake.com/en/doc/82/en/ref.html/sysv.html which is where I pulled some of the stuff you'll find below)
-
-Just for reference, there's two methodologies that are used for bringing up Unix systems: BSD and SysV. Mandrake uses SysV.  BSD is initially simpler, but the SysV method is more flexible.  The names of the methods and their merits should not really concern you at the moment, its just background in case someone jumps out of the woods and asks you.
-
-I should also mention that there may be some sort of fancy graphical interface into all this.  But its much more satisfying to get your hands dirty and roll your own solution.
-
-
-The boot scripts are located in /etc/rc.d.  If you look in there, you'll find several subdirectories named init.d and rc0.d -> rc6.d.  The rc?.d directories correspond directly to the various runlevels that Unix supports.  Runlevel is a set of predefined modes that define what the system does. Mandrake has the runlevels defined as
-
- 0: complete machine stop;
-
- 1: single-user mode; to be used in the event of major
-    problems or system recovery;
-
- 2: multi-user mode, without networking;
-
- 3: Multi-user mode, but this time with networking;
-
- 4: unused;
-
- 5: like 3, but also launches the graphical login interface;
-
- 6: restart.
-
-If your machine comes up and immediately goes into an X-Window interface, then its default runlevel is 5.
-
-When you say 'reboot' or 'shutdown -r now', what you are really doing is putting the system into runlevel 6.
-
-When things have gone completely to shreds (typically after hardware failure or severe operator error ;), you want to get the machine into runlevel 1 - there are minimal services running and only one person can be logged in
-at a time.
-
-Now, on to the nitty-gritty.
-
-The init.d subdirectory is where all the startup/shutdown scripts are kept.  They are all text files, and you can
-get a good idea of their format by cracking one open (I'd recommend a short one) and looking at it.  You don't
-need to be an expert in shell programming to get the gist of it.
-
-These scripts are called with one arguement (more on how that arguement gets supplied later).  Virtually all scripts have the start and stop arguement, most have a restart, and then some have all sorts of custom ones.  Lets look at a quick example.
-
-This is an init script for starting up Apache. Most are more cluttered, but not really more complicated.
-
- -----------------
- #!/bin/sh
- #
- # Start the Apache web server
- #
-
- case "$1" in
-    'start')
-       /usr/sbin/apachectl start ;;
-    'stop')
-       /usr/sbin/apachectl stop ;;
-    'restart')
-       /usr/sbin/apachectl restart ;;
-    *)
-       echo "usage $0 start|stop|restart" ;;
- esac
- -----------------
-
-Anything after a # is a comment, except for the first line.
-If that is #!, then the shell starts up the command
-interpreter specified (in this case another /bin/sh) and
-sends all the following commands through that.
-(Don't know how far into Linux you are yet, but suffice
-it to say that shell scripts are like batch files on
-steroids).
-
-Moving down, we get to the first line of code.  This is just
-like a case statement in C, except for the syntax
-(case block ends with a esac, which, of course, is case backwards).
-$x are the positional parameters of the program
-($0 is the name of the program, $1 is the first arguement, etc.)
-
-The rest of the script is pretty self-explanatory.
-This particular one is easy as all the complicated parts
-are handled by apachectl.
-
-So that's all well and good, but how and when does it
-get called?  OK, lets go back to the rc0.d -> rc6.d directories.
-Looking in there, you can see a bunch of files that start
-with K or S and a number.  If you're using a color ls,
-then you'll notice that they are a different color and there
-might even be a @ after the name.  That's because these are
-all symlinks to the real files in the init.d directory.
-
-When the system enters a runlevel, it goes into the
-appropriate /etc/rc.d/rc?.d directory and begins
-executing the files in there.  If the file begins
-with a K, then the symlink gets called with a stop
-(kill) arguement; if it starts with an S the symlink
-is called with a start arguement.
-
-So if rc5.d has these links in it
-
- K15postgresql@  K60atd@      S15netfs@   S60lpd@        S90xfs@
- K20nfs@         K96pcmcia@   S20random@  S60nfs@        S99linuxconf@
- K20rstatd@      S05apmd@     S30syslog@  S66yppasswdd@  S99local@
- K20rusersd@     S10network@  S40crond@   S75keytable@
- K20rwhod@       S11portmap@  S50inet@    S85gpm@
- K30sendmail@    S12ypserv@   S55named@   S85httpd@
- K35smb@         S13ypbind@   S55routed@  S85sound@
-
-the system is going to kill off postgress, nfs, rstatd, etc first
-(in that order).  Then its going to start apmd, network, portmap, etc.
-(in that order).
-
-OK, so now you have a rough background in how the system starts.
-So how do you get mh working in it?
-
-The easiest way is to go into init.d, copy an existing file,
-and edit that. (Remember, you're root.  Type carefully)
-
- cp httpd mh
- vi mh
-
-and change the lines so that they look something
-like this
-
- -----------------
- #!/bin/sh
- #
- # Start mh
- #
-
- set mh_parms=/home/house/misterhouse/mh.private.ini
-
- case "$1" in
-    'start')
-       /home/house/misterhouse/mh/mh & ;;
-    'stop')
-       killall mh ;;
-    'restart')
-       killall mh
-       sleep 5
-       /home/house/misterhouse/mh/mh & ;;
-    *)
-       echo "usage $0 start|stop|restart" ;;
- esac
- -----------------
-
-This is very, very sloppy, but you get the idea.
-
-Before you go further, TEST IT!  Just call it by
-hand from the command line like
-
- /etc/rc.d/init.d/mh start
-
- /etc/rc.d/init.d/mh stop
-
-etc.
-
-(you'll need to include the full path as init.d is
-not in your PATH and neither is the currect directory for root)
-
-Once you've gotten all the bugs worked out and its working
-the way you like it, figure out which runlevels you want
-this to be running in.  I'd guess 3 and 5, but its up
-to you.
-
-Change into rc3.d.  Figure out when you want mh to start
-compared to all the other programs.  I'd guess you'd want
-to let everything else go first, then light up mh.
-So we'll give it a number of 99, effectively going last.
-Make the symlink like this
-
- ln -s /etc/rc.d/init.d/mh S99mh
-
-Do the same thing in rc5.d
-
-Now, you'll also want to have a good clean shutdown.
-So you'll have to take care of runlevels 0 and 6.
-Here, you'll want mh to get killed off early in
-the process, so give it a low number, say 01.
-
- ln -s /etc/rc.d/init.d/mh K01mh
-
-You'll also want to do the same in rc1.d
-
-
-Another option is to use a package called daemontools, available at
-
- http://cr.yp.to/daemontools.html
-
-His take on why you should use it is at
-
- http://cr.yp.to/daemontools/faq/create.html
-
-Its essentially inetd with the features it should have.
-
-When the system comes up, the daemontools program
-svscan starts and then starts up any programs
-you've asked it to.  Those programs are then
-monitored and get restarted if they die.  The
-good part here is that you can control any
-program from the command line without editing
-files
-
- svc -h /service/yourdaemon: sends HUP
- svc -t /service/yourdaemon: sends TERM, and
-        automatically restarts the daemon after it dies
- svc -d /service/yourdaemon: sends TERM, and leaves the service down
- svc -u /service/yourdaemon: brings the service back up
- svc -o /service/yourdaemon: runs the service once
-
-
--------------------------
-
-The following is from Harald Koch on 04/2002
-
-I'll offer an alternate method. Neither is really better or worse; it
-depends on your environment and requirements.
-
-I have a strong preference for running mission critical software
-directly from init, instead of from startup scripts; init will
-automatically restart software that crashes. I do this with misterhouse,
-SSH, and a database that I run.
-
-init is controlled from a file called (usually) /etc/inittab. Here's my
-MH entry from inittab:
-
- mh:2345:respawn:/home/mhouse/mhinit
-
-This tells init to run "/home/mhouse/mhinit" when the computer is in any
-multi-user mode (see Mike's message for a definition of runlevels), and
-to run it again when it exits.
-
-And here's my script:
-
- ----- /home/mhouse/mhinit -----
- #!/bin/sh
-
- mhhome=/home/mhouse
-
- cd ${mhhome}
-
- exec >> error_log 2>&1
-
- export PATH=${mhhome}/mh/bin:${mhhome}/bin:$PATH
- export mh_parms=${mhhome}/mh.ini
-
- # rotate logs
- /bin/mv log.3 log.4
- /bin/mv log.2 log.3
- /bin/mv log.1 log.2
- /bin/mv log.0 log.1
- /bin/mv log   log.0
-
- # start
- exec ${mhhome}/mh/bin/mh -log_file ${mhhome}/log
-
- ----- /home/mhouse/mhinit -----
-
-This method *does* make it harder to stop MH, because you have to edit
-/etc/inittab, change the "respawn" to "off", and then run "telinit q" to
-tell init to re-read the config file.
-
-On the other hand, it means that MH will restart itself automatically
-even if it exits due to bad code, which does happen to me occaisionally.
-
-
-=head2 3.4: How do get Linux to play more than one sound at the same time
-
-Posted by Richard Phillips and Sean Walker on 03/2003
-
-FYI This is a bit of a "head's up" for those people who may be
-trying/struggling to get misterhouse to - for example - play music and also
-at the same time be able to speak under linux. You may find, for example,
-that misterhouse is silent whilst playing music and only after stopping
-(say) xmms your misterhouse server starts speaking all the queued up
-messages.
-
-There are a number of different ways to enable your linux server to
-multiplex sound, and many different theories as to which way is better. Some
-people prefer to use ALSA because it's not proprietary as opposed to ARTS
-which is installed by default under many distributions such as Redhat. The
-trouble with alsa at the moment is it can be a bit fiddly to configure as it
-is not currently part of the linux kernel used in most distributions (it
-will be when 2.5 is released). Anyhow, even after successfully getting alsa
-installed, there can be some issues with getting multiple applications to
-use the sound card concurrently - this is because not all alsa sound card
-drivers support multiplexing.
-
-So.....
-
-If you want to use alsa, good for you. I won't get involved in which system
-is better, and of course there are some other commercial alternatives out
-there that a number of people also use and swear by. Anyhow, I'll just
-describe what can be done to get things working with arts IF you are using
-it AND are also having problems.
-
-1. Install your distribution as you would normally, and ensure that arts is
-also installed/configured. As previously noted, many distros such as Redhat
-use arts by default so you won't have to do anything special - everything
-should be automagically detected. If you open up a terminal session and type
-"ps -ef | grep artsd" you should see a line showing the details of the artsd
-daemon.
-2. Install flite - again depends on distro. With gentoo you can just do an
-"emerge flite". If you don't have a package available for your distro, you
-can get the source from http://www.speech.cs.cmu.edu/flite/ and try to build
-it yourself. There are other speech engines you can use of course, but this
-is probably the easiest to get running so it's what I'll use in this
-demonstration.
-3. From a command prompt type "flite -t hello -o play" - you should hear a
-very bad hello from your computer
-4. Fire up an application such as a music player that can use arts. If you
-use something like xmms, make sure that it is actually using arts (with
-xmms, go into options/preferences and check that the outplut plugin being
-used is the "aRts driver"). Now load up a playlist, put it on repeat, and
-start playing music.
-5. Now try step 3 again - you'll probably find that it appears to hang. Just
-kill it with a "ctrl c"
-6. Now try "artsdsp flite -t hello -o play" instead - you should hear music
-AND a bad "hello".
-
-Why is it so? Well, by default flite - and a number of other applications -
-when trying to create sound directly access the sound device (usually
-something like /dev/dsp). By using the wrapper "artsdsp" before running an
-application such as flite, any calls to the sound device by the program are
-trapped and redirected to the arts server - basically it forces the
-application to "play nice" and not grab exclusive use of the sound device.
-
-So how do I now use flite and misterhouse? Well, you just need to change the
-line in your ini file that tells misterhouse where flite is located. Go to a
-command prompt and type "which artsdsp". This will let you know exactly
-where the artsdsp program is located. Do the same for flite (eg "which
-flite"). Now change your mh.private.ini file as follows:
-
-voice_text = flite
-voice_text_flite = /usr/kde/3.1/bin/artsdsp /usr/bin/flite
-
-(Naturally, change the program locations depending on where your programs
-live).
-
-Now, restart misterhouse and keep xmms (or whatever) running and playing
-music. You should now be able to do something like go to the ia5 web
-interface, select misterhouse, then misterhouse home, then browse mr house,
-and then click on the "what is your up time" and be able to hear mister
-house talking whilst music is also a happening thing!
-
-Of course, as noted before you can use the same wrapper for other programs
-that may not directly support arts - for example if you install festival,
-you can test it by typing something like "echo 'Hello from Festival'|
-artsdsp festival --tts".
-
-The same also works for using esd as well as artsd. You can use JACK,
-I'm sure, but I haven't tried it yet. Also, you can configure festival
-to use any play program directly instead of using the artsdsp or esddsp
-hacks. Those are hacks and will not work with all programs, just for
-reference. To configure festival use something like this in your
-siteinit.scm file (located in the festival root directory):
-
-  (Parameter.set 'Audio_Required_Format 'snd)
-  (Parameter.set 'Audio_Command "esdplay -s localhost:5001 $FILE")
-  (Parameter.set 'Audio_Method 'Audio_Command)
-
-In the Audio_Command line, the only thing critical is the $FILE
-You can use any player that you want in place of esdplay in the above,
-but it must be compatible with the audio formats that festival can
-produce. These, coming from the docs, are as follows:
-The default is unheadered raw, but this may be any of the values
-supported by the speech tools (including nist, esps, snd, riff, aiff,
-audlab, raw and, if you really want it, ascii).
-
-More information can be found in the festival doc files festival_6.html
-and festival_23.html wherever your festival documentation is installed,
-including the handy:
-
-  (Parameter.set 'Audio_Required_Rate 16000)
-  (Parameter.set 'Audio_Device "/dev/dsp2")
-
-
-These parameters can be specified in alternative methods as well. We
-should be able to tell festival which sound card to use or modify other
-settings on the fly as well. I haven't looked into that yet.
-
-By default festival should be asynchronous and you should be able to
-start playing from the file even before the file if finished writing. At
-least that is what I gathered out of the doc files. Setting synchronous
-or asynchronous modes are as easy as (audio_mode sync) or (audio_mode async)
-
-
-
-=head1 4: Windows specific questions
-
-=head2 4.1: mh seems to cause some windows to hang
-
-If you are experiencing problems with windows not popping up when they should (e.g. control panel or install shield), you will want to install DCOM 1.3, available from here:
-
-  http://www.microsoft.com/com/dcom/dcom98/dcom1_3.asp
-
-Note, I had run all the 'Windows updates', including the Service Pack 2, but
-I still had the problem until I installed the above.
-
-For Windows 95, the update is at:
-
-  http://www.microsoft.com/com/dcom/dcom95/dcom1_3.asp
-
-
-=head2 4.2: How do I set setup networking between Windows boxes
-
-You need to have the TCP/IP protocol enabled for your Networking Interface Card (NIC).
-If you use a modem to reach the internet, you already have TCP/IP enable for the dial up adaptor,
-but you need to seperately enable it for your NIC card, using the control panel Network icon.
-
-You can find instuctions on how to do this at: http://win98central.acauth.com/inside98/networking.htm .
-
-IP addresses that start with 10. (e.g. 10.0.0.1) are reserved for internal lans, so you can use
-10.0.0.1, 10.0.0.2, etc.
-
-=head2 4.3 How do I run MH when not logged in to Win2K or XP?
-
-You can run any program as a service, using a program called srvany.exe,
-available in the Resource Kit, or from here:
-
- http://www.electrasoft.com/srvany/srvany.htm
-
-Here is an example of registry entries after configuring my to run with srvany:
-
- HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\MisterHouse\Parameters AppDirectory  REG_SZ    c:\mh\bin
- HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\MisterHouse\Parameters Application   REG_SZ    c:\perl\bin\perl.exe -S c:\mh\bin\mh
-
-
-Rather than call mh as a service, many people have Windows do an auto-login and just add mh to the startup.
-
-
-=head1 5: Perl questions
-
-=head2 5.1: Whats the best way to learn perl?
-
-Using MisterHouse ;-)  Much more fun that trying to code up that report generator at work!
-Some good books are referenced in mh.html.
-
-
-=head2 5.2 What are good editors to use with perl?
-
-Codeing perl is much easier and less error prone if you use an programing
-editor that automatically highlights and indents code.
-
-One very popular and powerful (and free) editor is Emacs: http://www.gnu.org/software/emacs/.
-A pre-compiled windows version can be found here: http://www.gnu.org/software/emacs/windows/ntemacs.html
-
-Alan Jackson liks vim: http://www.vim.org. "Does syntax highlighting quite nicely for perl"
-
-Kieran Ames likes UltraEdit32: http://www.ultraedit.com.
-"I swear by UltraEdit32 available at It works fully functional for 30 days and then expires.
-Registration goes for around $30. I'm coding Perl all day long and would die without it!
-Fairly thin and goes the distance with just about any language you'd want to use."
-
-Mark Yocom writes "I myself have grown fond of PrimalSCRIPT, which handles Perl, Java (and
-JScript & JavaScript), HTML, ASP, LotusScript, Livewire, Python, SQL, Tcl,
-REXX, VBScript, and good old fashioned .BAT/.CMD files.  In addition to the
-obligatory syntax coloring, it also has a number of other handy features.
-It's spendy, but a trial version is available at their website:
-http://www.sapien.com/PrimalSCRIPT.htm "
-
-=head2 5.3 When are you supposed to use '=>' as opposed to '->' ?
-
-You can use => for a synatically pretty way to seperate entries in a list.
-When creating a hash, you can pass it a set of key/value pairs via a list, so instead of this:
-
-  %hash = ('key1', 'value1', 'key2', 'value2');
-
-You can use => instead of a , to make it look pretty:
-
- %hash = ('key1' => 'value1', 'key2' => 'value2');
-
-Now to really confuse you, I'll try to explain how -> is used for dereferencing pointers.  All mh objects can be viewed as pointers, and the state of an object is stored in a hash key of {state}, so there are 4 ways to get the current object state:
-
- $state = state $light;    # Use the state method to get {state}
- $state = $light->state;   # Dereference with -> to get the state method
- $state = $light->{state}; # Dereference with -> to get the state hash
- $state = $$light{state};  # Dereference object with an extra
-
-
-=head1 6: Misc questions
-
-=head2 6.1: Misterhouse Timeline
-
-Here is a rough timeline of MisterHouse development:
-
- - 12/96 Coded a predecessor called House_Menu
- -  8/98 Re-wrote everything, called it MisterHouse
- -  9/98 Uploaded to the web
- - 10/98 Created compiled version.
- - 11/98 First known user.
- - 01/99 Started a mailing list at onelist.com
- - 02/99 Ported mh to Unix/Linux
- - 03/99 Article in Popular Home Automation
- - 04/99 Posted to comp.home.automation
- - 05/99 Registered misterhouse.net domain name.
- - 06/99 Added CM17 & HomeBase support
- - 06/99 Article in HomeToys: http://hometoys.com/htinews/jun99/articles/winter/winter.htm
- - 08/99 Mailing list reaches 100 members
- - 09/99 Added LCDproc and IRman support
- - 10/99 Article in Circuit Cellar Ink: http://www.circuitcellar.com/pastissues/articles/winter111/winter.pdf
- - 11/99 Linux VR using IBM's ViaVoice
- - 11/99 HomeVision support
- - 11/99 Mailing list reaches 200 members
- - 01/00 Moved the mailing list and CVS repostitory to sourceforge.net
- - 02/00 Re-worked the web interface
- - 03/00 Added support for iButtons
- - 04/00 Added support for X10's IR Commander transmiter
- - 05/00 Added voice modem, ISDN modem, and Compool support.
- - 05/00 Article in The Perl Journal #17
- - 06/00 Mailing list reaches 300 members
- - 06/00 Added support for table item/event input and tie_items/tie_events.
- - 08/00 Enable perl -w checks, .jpg and .gif, and Slinke support.
- - 08/00 Added rpm and tarballs, NetGear router support
- - 09/00 Added ViaVoiceTTS.pm, Jabber, and Applied Digital cpuxad support
- - 10/00 Added barcode scanner and MS Agent support
- - 11/00 Support for ical, rrd, html email access, WAP, and VXML for phone access via tellme.com
- - 12/00 wx200d and wunderground personal weather project support, new add_sound function.
- - 01/00 SMS and snnp messaging, improved iButton and benchmarking support.
- - 01/01 Mailing list reaches 400 members
- - 02/01 2 way AOL AIM messaging, earthquake and satellite tracking.
- - 03/01 Backup program and menu templates for WAP, VXML, and LCD displays.
- - 05/01 Audible menus, X10 Mr26 support, linux volume control.
- - 07/01 Browser dependent web pages, zap2it tv support, call waiting callerid.
- - 09/01 Audrey support, more MS TTS controls.
- - 10/01 Web mh.ini editing, remote browse TTS support, zap2it tv pages.
- - 11/01 New web interface, Audrey pictureframes, multiple sound cards.
- - 12/01 Wireless wmr968 and Ultimeter2000 weather stations, Lynx10 X10 support.
- - 01/02 Xmms, audrey callerid, Linksys rounter, TTS flite engine, standard CGIs.
- - 03/02 GD on-the-fly web buttons, support for comics, xmms, redrat.
- - 04/02 Added web calendar, contact, todo list, and tk photo slideshow
- - 05/02 Improved TTS support, TWiki web site, and support for DSS units, BX24 interface, and MSN,
- - 05/02 Rewrote web menu interface, added AudioTron support and improved im support.
- - 06/02 Registered misterhouse.com domain name.
- - 08/02 Caddx alarm, iButton humidity sensor, undo, light/dark hawkey sensor
- - 09/02 Proxy mh, improved %cpu used, Group member and idle_time methods, Linux NaturalVoice, Clipsal CBUS
- - 10/02 Enabled web based code selection, file based alarms, palm reader, and Mac OSX support.
- - 11/02 UIRT2 control, better im control, web interface for triggers and items
- - 12/02 Improved callerID, new respond and Text_Item functions, xAP support.
- - 01/03 Mailing list reaches 500 members.
- - 02/03 Addex xPL support, stacked and overloaded states, and multi-user logon.
- - 03/03 Linux NaturalVoiceWine, web based TV and photo setup, improved Lynx X10 support.
- - 04/03 Compiled mhe for linux, support for X10 W800, CallerID Identifier, USB-UIRT, and more iButton modules.
- - 07/03 Improved web floorplan, DBI interface, xAP news and weather interfaces.
- - 09/03 Cepstral TTS engine support, a new PA room object, improved proxy support.
- - 11/03 Support for Sphinx2 VR, myHTPC tv menus, Asterisk phone interface, SMTP authentication, and a xAP command server.
- - 12/03 Code for RCS TR40 theormostate, phone xAP.
- - 01/04 Code for rrd weather graphs, v4lctl.
- - 04/04 Code for ER1 robot, switched to the par compiler, improved mp3 Jukebox.
- - 06/04 Code for Musica whole house audio, rss feeds, xAP Slimserver
- - 07/04 Code for ICQ, vocp, tivo, Alpha LED displays, xAP IR for RedRat, RoboSapien.
- - 08/04 Mailing list reaches 600 members.
- - 09/04 Support for SVG floorplans, mp3 ripping, ebay monitoring, siteplayer, irc.
- - 11/04 Support for servo motors, the ESRA robot, cell phone minutes monitoring, motherboard monitoring.
- - 03/05 Support for serving multimedia files, cell phone minute monitors, shopping lists.
- - 05/05 Support for distributed xAP speech, bluetooth proximity detection.
- - 10/05 Support for xAP BCS, ssh, osd232, vocp, Wish x10, and EIB.
- - 01/06 New spam free Wiki, support for azureus, Insteon iplcs, ical, k8055, TI103.
- - 04/06 Moved from CVS to SVN, support for Xantrex power inverter, spanish web pages, french EDF power rates, DSC5401, xAP asterisk, 
-
-
-=head2 6.2: Who is that Bruce guy anyway?
-
-Bruce was the the original author of MisterHouse, but can no longer
-claim much authorship credit as it is now truly a group effort with many contributors.
-He has a day job with IBM in Rochester, Minnesota, designing integrated circuits.
-Lots of stuff of interest only to family and aliens at http://brucewinter.net
-
-=head2 6.3: Why open source?
-
-Because open source only has 3 syllables, and proprietary has 5.
-
-That and MisterHouse has developed much faster with the help of a wider user base
-and help from other coders than it would have if it were proprietary.
-
-Plus it feels good to give stuff back to the growing open source community.
-
-
-=head2 6.4: Misc Home Automation links
-
-Here are some useful/related Home Automation links:
-
-  Dan Hoehnens most excellent collection of HA links:
-    http://my.ohio.voyager.net/~dhoehnen/ha/list.html
-
-  Mark Henrichs has a great 'Home Wiring Guide' site here:
-    http://www.wildtracks.cihost.com/homewire/
-
-  Over 500 links on about everything with HA:
-    http://home-automation.org/
-
-  Lots of good tutorials and articles are here:
-    http://hometoys.com/
-
-  X10 has many of its products documented here:
-    http://www.x10.com/support/support_manuals.htm
-
-  Lots of good X10 data/ideas can be found here:
-    http://www.geocities.com/ido_bartana/toc.htm
-    http://www.x10ideas.com
-    http://www.x10.com/automation/homeautomation_e.htm
-
-  Dave Houston has some good X10 info (e.g. causes of CM11A lockups) here:
-     http://www.laser.com/dhouston/
-
-  Europeans can get X10 stuff distributers listed here:
-    http://www.x10.com/x10euro.htm
-  Some examples are:
-    http://www.intellihome.be
-    http://www.marmitek.com/
-
-  Neil Cherry has created a home for linux related Home Automation programs at
-    http://linuxha.sourceforge.net
-
-  Rene Mueller has a nice set of web pages with lots of info on HomeAppliances at
-    http://the-labs.com/HomeNetwork/
-
-  Jay Archer recommends this free Windows mail server and mult-platform web server:
-    http://www.argosoft.com
-    http://www.xitami.com
-
-  Nokia sponsered open source site for home entertainment devices.
-    http://www.ostdev.net/
-
-
-=head2 6.5: How do I contribute additions or updates to the mh code?
-
-The MisterHouse code is maintained via a GitHub repository.
-Instructions on how to commit changes can are here:
-https://github.com/hollie/misterhouse/wiki/Contributing
-
-If you have minor changes and don't want to bother with a sourceforge ID, feel free to mail them to the mailing list.
-
-
-=head2 6.6 What is X10?
-
-The people at http://www.x10.com sell affordable devices that communicate with each other over
-normal household power lines.  Manuals for many of there devices are listed
-at http://www.x10.com/support/support_manuals.htm  .
-They have their home automation product slited here: http://www.x10.com/automation/homeautomation_e.htm/#homeautomation
-
-The most common modules are the Lamp module and the Appliance module.  Both sell for around $10-$15.
-The lamp module has can turn up to 300 watt lamps on, off, and various levels of bright.
-The appliance module is an on/off relay.
-
-The 2 most popular X10 PC interfaces are
-the $50 ActiveHome/CM11 and the $6 Firecracker/CM17.
-
-The CM17 is a transmit only interface.  In addition to being almost free, another advantage is
-it is wireless. It is a small, 1 inch box that just dangles off of your serial port and transmits
-to a receiver that plugs into the wall.  The other advantage to the CM17 is gives
-instant ON/OFF control to the relay built into the wireless receiver.  All other X10 devices
-have about a 1/2 second delay to send and receive the protocol over the power lines.
-
-The CM11 is a 2 way interface, so you can program mh events to react to X10 motion sensor
-and button pushes from various X10 controlers (e.g. keychain and palmpads).
-Some of the newer, more expensive modules, like the $35 LM14A lamp module,
-allow you to query their status, so you can determine it status even if it were manually turned on or off.
-
-If decide you splurge for the CM11 activehome kit, you might as well also get the Firecracker kit.
-For the extra $6, you also get a few extra modules and mh can support both the CM11 and the CM17
-on the same port.
-
-There is lots of great X10 info at http://www.geocities.com/ido_bartana ,
-including information on using and buying X10 hardward outside of the US.
-
-Here is some more info, copied from a misterhouse-users post by Kevin Olalde.
-
-
-The firecracker hardware, CM17 which plugs into the PC, can only send radio
-frequency (RF) commands to devices.  With the kit you will also get a
-transceiver, TM751, that receives commands from the CM17 and relays
-commands for the house code it's set to via your power lines.  You also get
-a lamp module, LM465,  which can be control with via the transceiver.  With
-the PalmPad or the CM17 you send RF commands  to the TM751, those commands
-are then relayed to the lamp module (or other power line receiver modules,
-like light switches).  All of this is one way communications, the LM465
-lamp module and the TM751 transceiver are not capable of reporting status.
-The TM751 doubles as an appliance module hard coded to unit 1.  You can
-only control it though RF commands, it does not respond to power pline
-commands.
-
-The next step I took was to order the Active Home kit.  With it you get
-(among other stuff), another transceiver, RR501, and another computer
-interface, CM11A.  The RR501 works like the TM751, in that it receives RF
-commands, and relays then on to the power line.  A difference is that the
-RR501 can report it's status.  The computer interface, CM11A, can send
-power line commands (you use computer software to tell the interface what
-commands to send), 'sees' all commands being sent over the power line (and
-reports those commands to computer software), and can ask modules for their
-status.  The RR501 also doubles as an appliance module, it can be set to
-unit code 1 or 9, and can be controlled with both RF and power line
-commands.
-
-The majority of the devices, lamp modules, appliance modules, wall
-switches, ..... are one way devices, they can only receive.  I have no
-historical perspective, but it looks as though that was the way the
-original X10 spec went, one way only.
-
-There are devices that can report their current status to something like
-the CM11A, but I haven't used any of then (except for the RR501), since
-that are much more expense.
-
-  http://www.x10.com/products/x10_lm465.htm  one way lamp module from X10, $13
-  http://www.x10.com/products/x10_lm14a.htm  two way lamp module from X10, $33
-
-Bill Bass sent in these links to a bunch of links from
-Phil Kingery's great series of X10 articles at http://hometoys.com
-
-  Which One Should I Use?
-  http://www.hometoys.com/htinews/dec96/articles/kingery/kingery.htm
-
-  Controlling Motors and Transformers
-  http://www.hometoys.com/htinews/apr97/articles/kingery/kingery2.htm
-
-  120/240v Residential Coupling
-  http://www.hometoys.com/htinews/jun97/articles/kingery/kingery3.htm
-
-  Complex Residential Coupling with Considerations for Dim/Bright
-  http://www.hometoys.com/htinews/aug97/articles/kingery/kingery4.htm
-
-  Dim/Bright Commands and Coupler-Repeaters
-  http://www.hometoys.com/htinews/oct97/articles/kingery/kingery5.htm
-
-  Three-Way Switch Circuits
-  http://www.hometoys.com/htinews/dec97/articles/kingery/kingery6.htm
-
-  More Three-Way and Four-Way Switch Circuits
-  http://www.hometoys.com/htinews/feb98/articles/kingery/kingery7.htm
-
-  Troubleshooting Three-Way and Four-Way Switch Circuits
-  http://www.hometoys.com/htinews/apr98/articles/kingery/kingery8.htm
-
-  Noise and Filtering
-  http://www.hometoys.com/htinews/jun98/articles/kingery/kingery9.htm
-
-
-=head2 6.7 What do I need to use the iButtons?
-
-Ray Dzek created a how to get started with iButton guide at
-http://www.solarbugs.com/home/ibutton.htm
-
-Here is a post from Clay Jackson
-
-Right now, I've got 3 sensors (DS1822, in the three-lead package, inside an
-epoxy filled soda straw) at the end of 150' of Radio Shack "flat" cable,
-talking to a DS9097U (the U is CRITICAL) with no problems.  On the bench, I
-had another 2 sensors on the end of a 50' cable (for a total of 5 sensors).
-When I strung the 50' cable, I must have crimped a lead, because it now
-meters "closed" and when it was plugged into the "net", I got no readings.
-
-I also have an HA5 from Point-Six; that I'm gonna play with soon. The code
-Bruce did is for the 9097U, so that's why I started there (and, it's
-cheaper).  The 9097U has all the "passive" pull-up stuff the data sheets
-talk about (courtesy of a DS2048 inside the DB9); so I'm hoping it will do
-the trick.  Anyway, I'll keep the list posted as things progress.
-
-Bottom line - all I needed was Bruce's code, a 9097U from Dallas, the
-sensors and some Radio Shack "phone" cable.
-
-One more thing to watch - as best I can tell, Dallas has not standardized
-their thermal devices with respect to their outputs.  For example, the
-DS1820 and DS1920  both return a 9 bit value that's basically an integer.
-However, the DS1822 returns a VARIABLE length value (12 bits by default),
-with a binary point between the 3rd and 4th digits.  According to someone
-else on the list, the ThermoCRON iButton is different yet again.
-
-
-Here is another post from Jeff Pagel (06/2002).
-
-
-The Dallas '1-wire' bus for the ibutton family is actually 2 wires(there
-are only 2 connecting points on the devices).  1 for signal and power, the
-other for ground.  They talk about cat-5, which has 8 conductors, a lot
-because the signal charactoristics of it are very good for the '1-wire'
-bus, twisted pairs, size of the wire, etc..  Of the 8, you only need to use
-2.  Theoretically, the other 6 could be used for something else.
-
-So, back to the original problem, you would need to run a twisted pair,
-like cat5 or cat3, from your mh machine to the garage.  I have cat5 runs of
-over 500 feet that work fine without any special conditioning.
-
-The cool part about the 1-wire bus is that you just need to run 1(ok
-actually 2,but usually in 1 bundle) wire(s) around your house.  It's like a
-'multi-drop' system.  One connects to the other, to the other, etc., in
-parallel.
-
- In this case, you would run a line, from 1 spool of wire, to the bedroom
-to the living room to the kids room back to the computer.  If this is a
-pre-existing structure, you will face some wiring issues.  It's much easier
-for new construction.  For each ibutton, you would connect 'across' each
-line.  Just solder plus to plus, minus to minus and keep the wire going.
-Think of a railroad track as the 'wire' and the railroad ties as the
-ibutton devices.
-
-The 1-wire bus is fairly restrictive on how you wire it vs how long the
-runs are.  You should avoid 'star' type configurations.  They are ok, but
-only for short runs, the stars introduce reflections of the signal.
-
-Here will be a really bad ascii representation:
-
-
- Host +   -----------------------------------------------------
-                     |                  |                     |
-                  ibutton1           ibutton2             ibutton3
-                     |                  |                     |
- Host -   ----------------------------------------------------
-
-
-
-From Yannick Moussette (06/2002)
-
-The DS1820 Temp sensors come in 2 models: iButton and TO-220
-(transistor-type casing).
-
-The Ibutton has a total of 2 connections, ground and signal. It functions in
-"parasitic" mode to draw its power from the signal connections (kinda of
-like what X10 modules do to piggyback signals on powerlines...).
-
-Where things that may confuse you on Dallas's Website site, is the TO-220
-format of this same sensor which has 3 leads (connections). 1 for power, 1
-for ground and 1 for signal(data). The power lead may be omitted, in which
-case the sensor will work exactly like its iButton counterpart: Through
-parasitic powering.
-
-Here is a link with some detailed electronic info: http://www.maxim-ic.com/1st_pages/tb1.htm
-
-Kieran Ames has a nice writeup on how he used iButtons to log and plot his
-pond temperatures: http://ames.homeip.net:81/pages/My_iButtonVenture.htm
-
-
-=head1 7.0: Setup Questions
-
-=head2 7.1: Password Management
-
-To password protect Misterhouse, you can set passwords for different users via set_password.
-The 'admin' link from the main page is only for logging in once you have setup a password.
-
-To enable password protection, run mh/bin/set_password command like this:
-
-     set_password -user family -password xyz1
-     set_password -user admin  -password xyz2
-
-    Note: only the first 8 characters are used. The admin password is
-    required for controling the mh web setup menus (e.g. item and code
-    selection menus).(Unix or Windows)
-
-This will create a file pointed to with the mh.ini password_file parm (e.g. mh/data/.password).
-To further extend which user can do what see password_allow in mh/data/
-
-
-=head2 7.2: Customizing the TV guide
-
-To set the MisterHouse TV Today so it will display listings relevant to your area and provider
-Start by finding your tv_provider ID, run this command (located in mh/bin):
-
-  get_tv_grid -zip your_zipcode -get_provider
-
-Then edit your mh.ini and set the tv_provider_name parm.
-Listed below are two examples or related parms, one that uses sat_ and one that is tv_.
-You can copy these tv_* parms as another set of sat_* or cable_* or
-or whatever_*, then run get_tv_grid multiple times to support
-multiple sets of tv schedules.  For example:
-
-   get_tv_grid -db tv   (-db tv is the default)
-   get_tv_grid -db sat
-
-  sat_provider = 128772
-  sat_provider_name = DirectTV Washington
-  sat_name =SAT               @ Used to give a useful label on the web pages
-  sat_hours=all  				@ Which hours to get.  Use all for all hours
-  sat_label=SATELLITE         @ Which web link name.  Use none to disable,
-  sat_channels_keep=          @ Which channels to keep
-  sat_channels_skip=          @ Which channels to skip
-  sat_channel_min=0           @ Keep only channels above this number
-  sat_channel_max=99999
-
-  tv_provider_name = Charter Communications - Rochester
-  tv_name = TV                @ Used to give a useful label on the web pages
-  tv_hours=02,06,10,14,18,22  @ Which hours to get.  Use all for all hours
-  tv_label=VCR                @ Which web link name.  Use none to disable,
-  tv_channels_keep=           @ Which channels to keep
-  tv_channels_skip=           @ Which channels to skip
-  tv_channel_min=0            @ Keep only channels above this number
-  tv_channel_max=99999        @ Keep only channels below this number
-
-Use mh/common/tv_grid.pl to do daily call get_tv_grid to update your tv database and web pages.
-and mh/code/common/tv_info.pl to search and announce shows.
-If you change your tv_provider, you can use get_tv_grid -reget to refresh the tv/*.html files.
-
-When I first setup MH it took me three weeks to figure out that my providerID
-had changed since install (matter of a week) and thats why the tv listings came up broken.
-So if you have a problem, and you think the syntax in the mh.ini is correct, try re-checking your provider ID.
-
-
-=head2 7.3: How can I point MisterHouse to a custom web interface?
-
-From David Norwood on 10/2001
-
-Here's a way to configure Misterhouse so you can have your own custom web
-interface AND still have access to web pages that are introduced with new
-releases (like the Audrey pages).
-
-Let's assume your misterhouse distribution is in /misterhouse/mh and your
-custom html files are in /misterhouse/web/custom.   Set these private.ini
-parameters:
-
- html_dir=$Pgm_Root/web
- html_file=/custom/index.html
- html_alias_custom=/custom       /misterhouse/web/custom
-
-Now your custom web pages will come up by default, but you will still have
-access to the latest and greatest "mh4" and "ia*" interfaces.  Your pages
-will not be over-written by new releases.  If you need another directory
-for, say, your audrey interface, just add another html_alias_whatever
-parameter.
-
-You can now also override just specific pages from an existing web interface.
-For example, create your own web/ia5 and web/ia5/security
-directories, then add this mh.ini parm to point to it:
-
- html_alias2_ia5    = /misterhouse/web/ia5
-
-For example, you can change the ia5 Security menu to point to different webcams or floorplan
-images by creating your own web/ia5/security directory with just the files you want to
-modify.
-
-
-
-=cut
-
-
-
+=pod
+
+=head1 1: MisterHouse operational questions
+
+=head2 1.1: What OSes can it run on?
+
+It has been tested on Windows 95, 98, NT 4.0, 2K, XP, Vista (!) and 7.  
+On Unix, it has been run on Linux (Ubuntu, Debian, Fedora and others), AIX, and Sun.
+
+In theory, any OS that runs perl should be able to run mh.  In practice, some platforms will likely have strange Serial Interfaces, so the Serial I/O related function would take some work.
+
+=head2 1.2: How can I make it run faster and use less memory?
+
+On my Celron 400 Mhz computer running Windows 98, using 60 code files with 6000 lines of code, mh takes 10% the cpu, running at 9 passes per second and using about 30 MB of memory.
+
+If you are happy with the Web interface and don't need the Tk interface, turn it off by editing the Tk mh.ini parm or run:
+
+   mh -tk 0
+
+If you want the tk window, but don't use the Command/Items/Group pull down menus, try:
+
+   mh -tk_comands 0 -tk_items 0 -tk_groups 0
+
+You can turn off the tk 'eye' that bounces back and forth by deleting the tk_eye.pl code file.
+
+You can speed up / slow down mh, using more/less cpu, by mh.ini sleep_time parm.
+
+Here are some memory stats:
+
+  Linux
+    10 Meg   <- mh -tk 0 mh_control.pl (run just one code file)
+    12 Meg   <- mh -tk 0               (run all the default code)
+    17 Meg   <- mh                     (run all the default code with tk gui on)
+
+  Windows
+    18 Meg   <- mh -tk 0 mh_control.pl (run just one code file)
+    20 Meg   <- mh -tk 0               (run all the default code)
+    27 Meg   <- mh                     (run all the default code with tk gui on)
+
+
+
+=head2 1.3: How can I easily upgrade to the latest version of mh?
+
+Point your mh.ini code_dir, data_dir, and html_dir parms to somplace other than your mh path.
+Then you should be able to rename your old mh directory and unzip the new one in its place without loosing
+anything.  Also keep your mh.private.ini somewhere else (see next question).
+
+=head2 1.4: How does mh.ini work?
+
+All the entries in mh.ini are read on mh Startup and on a Reload.  They are stored
+in the %config_parms array.  So, for example, if you added:
+
+  myparm1=a b c
+
+Then, mh would set $config_parms{myparm1} = 'a b c';
+
+These parms also defined what are legal startup values, so if you want to try
+a different value, instead of editing your mh.ini, you can run:
+
+  mh -myparm1 'd e f'
+
+Rather then edit the default mh.ini file, the best approach is to copy just the parms you want to change to your own .ini file (e.g. mh.private.ini), then set the environmental variable mh_parms to point where you keep that file (see the header of mh/bin/mh.ini for more detail).
+
+While the %config_parms array IS refreshed on a mh Reload, some parms are only used on mh startup (e.g. http_port), so will only be reloaded when you re-start mh.
+
+=head2 1.5: Can I run run mh in a 'fast debug mode'?
+
+Funny you should ask :)  Check out the time_start, time_stop, and time_increment parms
+in the mh.ini file.  Here are some examples:
+
+   mh -time_start 0 -time_stop 24 -tk 0 -voice_text 0
+   mh -time_start "6 AM" -time_stop "11 PM"  -time_increment 1
+   mh -time_start "5/14 7:10" -time_stop "5/15 10 PM" -time_increment 300
+
+
+=head2 1.6: How are the X10 and Serial Items implemented, indpendent of the platform?
+
+The user works with an X10_Item which reflects physical hardware and the state of that hardware. The user "loop" code deals with the state and
+conditions which alter it. This code is independent of OS and specific to mh.
+
+X10_Items talk to Serial_Items which implement a software protocol required by the model and type of the actual hardware. The Serial_Items
+can use protocol translator modules such as CM11.pm, HomeBase.pm, and CM17.pm. But the output is platform-independent serial commands
+to the next layer. The protocol translator modules are publicly available outside mh and may be used by code other than Serial_Items. These modules will eventually be on CPAN. The code is still independent of OS. Other Serial_Item types, including "generic" read/write ports, also exist.
+
+Win32::SerialPort.pm and Device::SerialPort.pm are CPAN modules which actually implement the serial command interface. Device::SerialPort is a
+clone of its Win32 cousin. These modules handle high-level OS issues including device names, configuration files, and validation of port
+settings.
+
+Each also calls a CPAN module to handle low-level interfacing to the OS and the serial driver: Win32API::CommPort.pm or POSIX.pm (you guessed
+correctly ;-)
+
+
+=head2 1.7: mh seems way too complicated.  How can I run something simple?
+
+Copy mh\code\test\test_x10.pl into your own code dir (e.g. c:\mh_code).  Then run:
+
+  mh -code_dir c:\mh_code
+
+You can then use http://localhost:8080 for control.  This will also run all the
+code in mh/code/common.  To run JUST a specific code member(s), specify
+it on the command line.  For example:
+
+  mh test_x10.pl
+
+
+=head2 1.8: Is there a way I can have direct X10 control with a simple perl script?
+
+If all you want to do is control X10 devices with a cron job or from your own cgi scripts,
+running mh is probably overkill.  You can send X10 commands using either the ActiveHome
+interface (CM11, available from http://www.x10.com/automation/x10_ck11a_d.htm )
+or the cheaper Firecracker interface (CM17, available from http://www.x10.com/automation/firecracker_d.htm )
+using the modules and documentation found in mh/lib/site/ControlX10 or download them from CPAN.
+Examples can be found in mh/lib/site/test_cm11.pl and test_cm17.pl.
+
+
+
+=head2 1.9: Can I send mh commands from other programs?
+
+You can send mh commands (Voice_Cmd text strings) from other programs in many ways:
+
+- Write commands to the file specified in the mh.ini xcmd_file parm.  By default this
+is mh/house_cmd.txt. See mh/bin/house and mh/bin/house.bat for examples.
+
+- Use mh/bin/mhsend to send commands via sockets (can be over the internet).  If you have
+run mh/bin/set_password, the mhsend -password parm is required.   Some examples:
+
+  mh/bin/mhsend -host ip.A -run "All Lights On"
+  mhsend -p password -run "turn living room light on"
+
+Where ip.A is computer A's ip address (or name if you have a HOST file setup
+to alias a name to an ip address).  mhsend is a stand alone perl script,
+so you do not need mh running there (although it will not hurt).
+The code that allows this is in mh/code/common/mhsend_server.pl.
+An example of mh code to act as a client to different mh box is in mh/code/examples/test_server2.pl
+
+- You can also control mh remotely via email (see faq question 'Can do I send mh comands via email?'),
+telnet sessions (if running mh/code/common/telent.pl), and via the built in web server.  An example url
+for the web server is:
+
+  http://192.168.1.10:8080/RUN;last_response?turn_living_room_light_on
+
+- If you are runing IM client (if running code file internet_im.pl)
+like AOL AIM, MSN, or Jabber, you can any voice command to
+MisterHouse if you give Misterhouse its own account to logon with.
+
+
+
+=head2 1.11: How can I debug a problem?
+
+Lots of debug errata can be controled with the mh -debug switch.  Most of this code is probably
+meaningful only if you dig into the source code, so most people probably will not use
+it unless you are generating debug to send to the author.  To create a log file with debug in it,
+run:
+
+  mh -log debug.log -debug xyz
+
+Where xyz can be any of the following:
+
+  x10
+  serial
+  socket
+  startup
+  homebase
+  misc
+  http
+  port_name of socket port
+
+You can also stack debug flags, using ; as a separator.  fro example:
+
+  mh -debug "serial;x10"
+
+
+=head2 1.12: How can I debug timed event problem?
+
+One way is to create a code member that contains just the event you are trying to debug, then run mh on just that one member.  For example, create a member called \temp\test_time.pl with this code:
+
+  print "min=$Minute\n" if $New_Minute;
+  print "hour=$Hour\n"  if $New_Hour;
+  print "debug1 it is now $Time_Now\n" if time_now "11:59 PM";
+  print "debug2 it is now $Time_Now\n" if time_now "23:59";
+  print "debug3 it is now $Time_Now\n" if time_now "12:00 AM";
+  print "debug4 it is now $Time_Now\n" if time_now "00:00";
+
+Then run mh using these parameters:
+
+  mh -code_dir \temp -tk 0 -time_start '12/15 11:58 pm' -time_start '12/16 12:01 am'
+
+Note, you can run this test mh quickly without stopping your normal mh.
+
+=head2 1.13: What are the advantages/disadvantages to running the compiled versions of mh?
+
+Advantages:
+
+=over
+
+=item *
+
+You don't need the latest version of perl installed
+
+=item *
+
+You don't have to install additional perl modules
+
+=back
+
+Disadvantages:
+
+=over
+
+=item *
+
+For some reason, starting mh with the compiled versions is slower.  On my windows box, it is 10 seconds -vs- 20 seconds.
+
+=item *
+
+You can apply quick patches to mh, -vs- downloading a larger, less frequently updated mh.exe file.
+
+=back
+
+The memory and cpu used, once mh is started, is the same.
+
+
+=head2 1.14: How does mh read and use the user code in code_dir
+
+Each time mh is started or a Reload is done, mh will re-read all the .pl code members
+in the code_dir directory (this is a mh.ini parm)
+and the file data_dir/mh_temp.user_code is created.
+All of the objects and global variables (see FAQ question 2.4), are put at top
+of this file, and everything else is put in seperate subroutines, one for each file read.
+A &loop_code subroutine is also created (at the very bottom of mh_temp.user_code), that
+calls each member subroutine.
+
+After creating this file, mh runs the perl eval function on its contents.  This re-creates all the objects,
+global variables, and code_dir member subroutines.  Then mh goes back into its normal loop where
+it queries various input data (e.g. serial, tcp/ip, voice, time), updates objects and variables,
+evals the &loop_code code (it does an eval, rather then execute it directly, so we can trap errors and
+not kill mh), sleeps for a bit, then repeats.
+
+
+=head2 1.15 How can I control mh from a non-mh web server like Apache?
+
+You can think of the built in mh web server as 2 parts:
+
+ - The part that auto-generates web pages that reflect your items and commands.
+
+ - The part that responds to commands you give it via URLs.
+
+You don't really have to use the first part.
+Some mh users custom generate their own mh pages, to be served by the mh server or
+by a different server.  This allows for full control of
+what is on the web control page and how it looks.
+
+There is more (probably not so easy to read) documentation on how to do this
+under 'Customizing the Web Interface' in mh/docs/mh.html
+
+You can also use something like mh/code/common/mhsend_server.pl
+and then read/write to sockets directly from non-mh web server cgi scripts.
+Or have the web server script simply call mh/bin/mhsend to run mh commands.
+
+=head2 1.16 Is there a front-end tool for defining/editing mh items/events?
+
+Not yet, but you can now define items/events in a table-like format.
+This should allow us to enable a gui or web based front end tools for editing.
+
+Currently we have defined just one format defined, creativly named A,
+but other formats (e.g. XML) should be easy to implement.
+
+To use, create one or more *.mht (mh table) files in your code directory, specifying the table format with Format=A
+at the top of the table.  Then mh will process (on starup and reload) each record with mh/lib/read_table_A.pl, to create
+*.mhp (mh processed) files, which are then processed with all your other mh *.pl code files.
+
+Examples are in mh/code/bruce/*.mht and mh/code/test/*.mht.
+If you want to create another table format, all you need to do is create a mh/lib/read_table_xyz.pl member, then set Format=xyz.
+
+=head2 1.17: How can I use Family Radios with MisterHouse?
+
+=begin html
+There is seperate FAQ on the FRS topic in
+<a href="faq_frs.html">mh/docs/faq_frs.html</a>
+
+=end html
+
+
+=head2 1.18: Is there a way to tell if MH is shutdown correctly or not?
+
+On windows, mh/bin/mh.bat checks errorlevel and on linux, mh/bin/mhl finds the return code via $?.
+Both of these shells will restart mh unless they detect a normal exit (rc=1).
+
+This code in mh/code/common/mh_control.pl will detect an abnormal restart:
+
+ if ($Startup and $Save{mh_exit} ne 'normal') {
+    display "MisterHouse auto restarted: $Save{mh_exit}", 0;
+ }
+
+If you want to detect a power outage and you have a CM11,
+code in mh/code/common/mh_control.pl will set $Power_Supply, so you can do something like this:
+
+ if (state_now $Power_Supply eq 'Restored') {
+    speak 'You should have bought a ups';
+ }
+
+
+=head2 1.19: How can I use an Internet Appliance with MisterHouse?
+
+=begin html
+There is seperate FAQ on varous Internet Appliances in
+<a href="faq_ia.html">mh/docs/faq_ia.html</a>
+
+=end html
+
+
+=head2 1.20: Where is perl program code located?
+
+From Harald Koch on 2/2002.
+
+There are (at least) three different locations for scripts:
+
+/mh/bin - standalone programs (such as get_weather, get_tv_grid); they are called from the main MH process via "run" or a Process_Item;
+    they do not get any environment or variables from the main MH program, and typically return results to MH by writing output files
+    which MH later reads.
+
+    MH typically looks for external programs here, and also programs
+    here typically assume they're being run from this directory; they
+    try to find files in ../lib, for example.
+
+$config_parms{code_dir} - scripts in this directory are (after some parsing) loaded into the middle of the MH event loop, and the
+    commands in them run constantly. They run within the MH environment,
+    and can use all the variables available there.
+
+$config_parms{html_dir} - scripts in this directory are run by the HTTP
+    server, and are expected to return blobs of HTML. They too run
+    inside the MH process, and can access all variables, subroutines,
+    etc.
+
+Each script directory has a different purpose, and programs in one are
+generally not terribly useful in another. My weather processing, for
+example, has scripts in all three places; mh/bin/get_weather_ca is the
+standalone that fetches/parses HTML, code/weather_ec.pl is the script
+that creates and processes voice commands and timer events, and then I
+have scripts in /web/weather/ that format the HTML for display.
+
+
+
+
+=head1 2: MisterHouse coding questions
+
+=head2 2.1: How do I debug syntax errors in my code?
+
+If there are syntax errors in your code, most of them will be caught on startup or reload.
+The error, and (hopefully) relevant code member and/or line number, will show up in
+your console, and if running Tk, in a Tk window on reload.
+
+When you go to write new code, first start mh with old code that works, then edit or copy in
+your new code and do a mh Reload.  Fixing errors with code Reloads is much
+quicker than trying to fix them on mh startup.  You can add/delete the .pl suffix
+on code members between reloads to enable/disable them.
+
+Some errors (e.g. too few/many {} around code) will point to a misleading line number.
+In these cases, if you can not find the file with the error,
+you can try a new option: mh -error_by_file 1 .
+This will try loading one file at a time untill the error is found, but
+it runs pretty slow and may not work with members that have # noloop directives.
+
+Some errors will only show up after mh triggers events.  The first time this happens, a console/tk message
+will be displayed, and a message spoken.  Since these errors might happen on sequential passes of mh, subsequent errors
+are only listed in the console window.  If more than 10 occur, another window is displayed,
+and the code member there error was in is disabled.
+
+All of these on-the-fly errors are logged in the file mh_temp.error_log in your code directory.
+This is useful if you are not running tk and the error has scrolled out of your console window.
+
+You can enable the perl diagnostics module (same as perl -w) to get additional warnings on potential
+coding errors.  Either use mh -diagnostics 1 or set diagnostics=1 in your mh.ini.  This takes
+about 1 meg more of memory and causes mh to run about 10% slower, but the messages it displays
+often point to valid problems.
+To simplify coding, the 'uninitialized value' warnings disabled in the user code processing.
+
+=head2 2.2: How should I code events that should occur only at infrequently, or
+only at Startup?
+
+You can use the $Startup or $Reload variables for events that should only
+occur when mh is Started, or when code is Reloaded.  Note that $Reload
+is also true when $Startup is true.
+
+To run events infrequently, you can use the modulus operator (%),
+$New_Second/Hour/Day/Month/Year variables,
+or the Time_Now/Time_Cron functions to control events.
+
+The $New_xxx variables are 1 (true) for each pass that the xxx variable gets incremented,
+and 0 for all other passes.  For example, $New_Hour is true for one pass
+when $Hour changes from one hour to another.
+
+Here are some examples:
+
+  print_log "Only at startup" if $Startup;
+
+  print_log "Every 5 minutes" if $New_Minute and !($Minute % 5);
+
+  print_log "At 10:05 pm" if time_now '10:05 PM';
+
+  print_log "Every weekday at 2:15 am" time_cron '2 15 * * 1-5';
+
+
+=head2 2.3: How should I structure my Perl code?
+
+Pretty much anyway you want!  You may want to put object definitions all in one
+member (e.g. mh/code/Bruce/items.pl) so you can easily change device codes,
+or you may want to define the objects in the file members you use them in.
+
+If the same object is defined in multiple members, it will still work ok, although
+some object types (e.g. Voice_Item) will warn about duplicate names.
+
+
+=head2 2.4: Can I create global variables that can be shared between code members?
+
+Yep.  All objects definitions (e.g. $light = new X10_Item('C5')) are always shared.  They are pulled out of the member loop by mh.
+
+All other variable declarations must be made using with 'my' or 'use vars':
+
+   my ($my_var1, $my_var2);
+   use vars '$my_var1', '$my_var2';
+   use vars qw($my_var1 $my_var2);
+
+The last example uses the qw function (Quote Words) to save you from the ' and , punctuation.
+
+If you code a 'my' or 'use var' record that starts in column 1,
+mh will pull these records out of the member loop code (as it did with object definitions),
+so that the variable can now be shared with other code members.
+
+If the 'my' or 'use var' record does not start in column 1, the variable declaration
+is left in with the rest of the member code and is local to that member.
+
+If you want to use the variable with any mh/web/*.pl script when creating
+mh web pages, you must use 'use vars', as 'my' variables can not be shared with the server.
+
+
+=head2 2.5: How can I move code out of the loop code?
+
+Sometimes you may need to have mh run code out of the loop code.  For example, if you
+want to create a Voice_Cmd object that has states that are read from a file.  Since
+objects are moved out of the loop code by mh, we need to also move any other code used
+to define that object.
+
+You can tell mh to do this using '# noloop=start/stop' comments.  For example:
+
+   # noloop=start
+   my $mp3names;
+   while ( my $mp3name = <d:/songs/*.mp3> ) {
+      $mp3name =~ s#^.*/##;  # remove path
+      $mp3name =~ s#\..*$##; # remove extension
+      $mp3names .= "," if $mp3names;
+      $mp3names .= $mp3name;
+   }
+  # noloop=stop
+
+  $v_play_music = new Voice_Cmd("Play [$mp3names]");
+  if ($state = said $v_play_music) {
+     speak "Playing song $state";
+     run("winamp d:/songs/$state.mp3")
+  }
+
+
+=head2 2.6: How can I add my own subroutines?
+
+You can add your own subroutines anywhere in any of your code files.  These can then be
+called by that member or any other member.  Here is a couple of examples:
+
+   print_log &mysub1(9990, 9);
+
+   sub mysub1 {
+      my ($a, $b) = @_;
+      my $c = $a + $b;
+      return "The answer is: $a + $b = $c";
+   }
+
+
+   $v_bedroom_curtain  = new  Voice_Cmd('[open,close] the bedroom curtains');
+   &curtain_on('bedroom', $state) if $state = said $v_bedroom_curtain;
+
+   sub curtain_on {
+       my($room, $action) = @_;
+       set $curtain_updown  $action;
+       eval "set \$curtain_$room ON;";
+   }
+
+=head2 2.7: What other special global variables are there?
+
+Here are a few:
+
+  $Pgm_Path is the directory that that mh/bin/mh is found in.
+  $Pgm_Root is one directory above $Pgm_Path
+  $OS_win is true on windows, false otherwise.  $^O will reflect the OS name.
+
+=head2 2.8: Can I use mh to control other windows
+
+On Windows (95,98, NT), you can use the SendKeys to send keystrokes to other windows.  See mh.html for details.
+
+If anyone knows of an equivalent function for linux, let me know.  Linux is usually clever enough to have
+command line options, so there is less of a need here.
+
+
+
+=head2 2.9: What data is saved when mh is exited and restarted?
+
+The state of all objects (Timer Serial_Item X10_Item X10_Appliance File_Item Generic_Item) and all the $Save variables.
+
+Every 5 minutes while mh is running, and whenever mh is exited, the state of these variables are saved to your code directory in a member called mh_temp.saved_states.  When you start mh, this member is run to restore the states.
+
+You can make up any members to the $Save array.  For example, you can use $Save{sleeping_cat} to track whenever your cat is asleep.
+
+
+=head2 2.10: How can I turn a bunch of lights on/off all at once?
+
+You can turn all the lights on a single house code on/off by specifying just the house code letter.  For example:
+
+   $v_bedroom_lights = new Voice_Cmd('Bedroom lights [on,off]');
+   $bedroom_lights   = new X10_Item('P');
+   set $bedroom_lights $state if $state = said $v_bedroom_lights;
+
+You can also create a group of X10 items.  Here is an example that would turn all lights on/off in several rooms.
+
+  $all_lights_bed    = new X10_Item('P');
+  $all_lights_living = new X10_Item('O');
+  $all_lights  = new Group($all_lights_bed, $all_lights_living);
+
+  $v_lights_all = new  Voice_Cmd('All lights [on,off]');
+  set $all_lights $state if $state = said $v_lights_all;
+
+
+=head2 2.11: How do I get mh to stop telling the time each minute?
+
+Out of the box, mh defaults to running most of the code in the mh/code/common directory and all the code in mh/code/test.
+Members test_tagline.pl and the hello_speak.pl members are the main sources of the periodic test speech.
+Once you have played around with the example code, you will want to use
+http://localhost:8080/bin/code_select.pl  menu (avaliable on the web ia5 MrHouse menu 'Select Code' button)
+and select only the code files you find useful.
+
+See the FAQ question 'How does mh.ini work' on how to modify the code_dir parm to point to your new code directory.
+
+
+=head2 2.12: Can do I send mh comands via email?
+
+Set the mh.ini net_mail_command_code parm to a secret code, and copy mh/code/common/internet_mail.pl
+into your code directory.   Now you can send email with the following string either
+in the subject or the body of your email:
+
+  command:your command    code:your_code
+
+The internet_mail.pl code periodicaly runs the get_email process and then scans for the above string.
+If found, it will send a confirmation email saying either "command run", "command not found",
+or "command not authorized".
+
+
+=head2 2.13: How can I control Command Categories
+
+All Voice_Cmd objects are listed in the Tk Command pull down and Web Category list.
+These lists are organize by Category, which is specified with a Category=value comment in the user code.
+For example:
+
+  # Category=Timers
+
+This can be specified multiple times in the same file, with the most recent specification appling
+to all subsequent Voice_Cmd entries.
+
+If a file does not have a # Category record, the file name will be used.
+
+
+=head2 2.14: How can I measure time between two nearly spaced events?
+
+If you are on Windows, or on Unix with the Time::HiRes module installed,
+a call to get_tickcount will give sub-second resolution (returns milliseconds).
+For example, to 'debounce' a doorbell button, (i.e. don't trigger it twice within a 250 millisecond time):
+
+  my $doorbell_time;
+  if (state_now $doorbell) {
+    play 'doorbell' if get_tickcount - $doorbell_time > 250;
+    $doorbell_time = get_tickcount;
+  }
+
+If you are on unix without Time::HiRes, you can use $LoopCount and count number of passes through the loop code.
+
+
+=head2 2.15: What is the format of MisterHouse X10 codes?
+
+At a low level MH sends and receives X10 data in character strings (called
+Serial Items) that start with the letter X. It is usually easier to create an
+X10 Item (or similar) for each X10 device you have and manipulate those
+instead of using X10 strings. Most of the functionality descibed here is
+available in various items in easy to use states.
+
+Here is format of Misterhouse X10 strings: X10 strings always begin with an
+uppercase X (all letters in X10 strings must be uppercase.) The X is followed
+by one or more token pairs that are either a housecode and unitcode, or a
+housecode and command.
+
+A housecode is a letter in the range A through P.
+
+A unitcode is a number in the range 1 through 16. Unitcodes above 9 can be
+specified as two digit numbers or their hex equivalent A through G. Okay,
+there is no such thing as hex G, but X10 unitcodes start at 1, not 0. A note
+to X10 interface module developers: the Serial_Item module converts unitcodes
+above 9 to their hex equivalent before passing them to the interface module.
+
+The following four basic X10 commands are the most common and are supported by
+all the interface modules. Each command is listed here followed by the
+corresponding X10 command that is sent or received, plus any notes about its
+use:
+
+    J    - ON
+    K    - OFF
+    L    - Brighten
+    M    - Dim
+
+
+These commands are less common and are not supported by all the interface modules:
+
+    O                - All Lights ON
+    P                - All Units OFF
+    STATUS           - accepted by some 2-way X10 devices to request status
+    PRESET_DIM1      - these are the original direct dim commands specified but never used by X10
+    PRESET_DIM2      - still used by some X10 venders, including PCS, SwitchLinc and RCS
+    +#               - increase brightness by # percent, not used for receive
+    -#               - decrease brightness by # percent, not used for receive
+                       Serial_Item rounds # to a multiple of 5 before it's passed to the interface module,
+                       the interface module calculates the number of Bright/Dim commands to send
+                       by multiplying # by 22/100, since there are 22 standard dim levels
+    &P#              - send an extended direct dim command accepted by some X10 devices,
+                       # is the brightness level in the range 0 through 63
+    #%               - same as &P command, but # is a percentage in the range 0 through 100,
+                       Serial_Item converts this to a &P command before it's passed to the interface module,
+                       neither &P nor % are currently used for receive
+    Z##              - intended for sending and receiving EXTENDED_CODE commands with arbitrary extended
+                       hex ## bytes appended, but appears only receive is implemented by the CM11 module,
+                       no other tokens may follow this command
+
+
+These commands are rarely used and only supported for completeness by a few interface modules:
+
+    ALL_LIGHTS_OFF   - reported as P on receive
+    HAIL_REQUEST
+    HAIL_ACK
+    EXTENDED_CODE    - see Z above     EXTENDED_DATA
+    STATUS_ON
+    STATUS_OFF
+
+
+Here are examples of valid X10 strings and what they do:
+
+    XM1MK            - turn off M1
+    XC1C2C3CJ        - turn on C1, C2, and C3 simultaneously
+    XI6IJIKIJIK      - flash I6 twice
+
+
+For more examples, take a look at mh/lib/X10_Items.pm.
+
+Many of the X10 interface modules expect only a housecode/unitcode pair and a
+housecode/command pair, like the first example above.  This makes it
+impossible to send more complicated strings like the other examples, and is
+therefore discouraged. This can't be avoided with interfaces like the CM17 and
+BX24 that transmit using the X10 wireless protocol, since it combines
+housecode, unitcode, and command in one transmission.
+
+
+=head2 2.16: How are states set for each pass though the user code loop?
+
+Misterhouse works on a multipass system where a state becomes 'new' for
+one (and only) one pass thru the system.  The actually timing of the
+passes varies (based on the machine, the load, the code, etc) but you
+generally can presume multiple passes will occur per second (I'm getting
+about 19 per second with fairly light load on a 400mhz laptop).  I ran
+into an early problem where MH didn't handle multiple states being set
+during one pass (each subsequent state would 'overwrite' the previous
+one).  As an example if my object read from a device and noticed that
+both the volume and treble setting on my mixer changed, it would
+generate a volume state and a treble state.  The treble state when
+overwrite the volume state.
+
+To fix this Bruce introduced a queue of states.  So, when a module sets
+a state, it gets set for the 'next' *available* pass thru the system.
+In the example above (presuming no other states are outstanding) the
+volume state would be 'new' during currentpass+1 and the treble state
+would be 'new' during currentpass+2.
+
+The reason the 'current' pass is never effected is that you don't always
+know where you are in the list of code looking at the time you make the
+change.  If your in the 'middle' and set a state, code that already ran
+during that pass wouldn't have a chance to 'see' it before the pass
+ended.  By making states always start at the beginning of the next pass,
+we can insure that all modules see a coherent state in the system.  When
+the states becomes valid, if effects the tied_items (that is when they
+fire) as well as calls to 'state_now'.
+
+
+=head2 2.17: Common Perl and mh coding errors
+
+=begin html
+Clive Freedman sent in some useful tips on common coding errors in
+<a href="faq_damnblast.html">mh/docs/faq_damnblast.html</a>
+
+=end html
+
+=head2 2.18: What's the difference between 'on', 'ON' and ON?
+
+In MisterHouse, the state of many objects comes down to a question of whether
+they are on or off.  As this is a common situation, it is important to know
+exactly how to ask whether something is on or off.
+
+First, it is important to know that case matters.  PERL is a case sensitive
+language, so 'On' does not equal 'on'.  Second, by default, everytime that
+the state of an item is set, mh converts that state to its lowercase
+equivalent.  Hence, setting a light 'ON' actually sets it 'on'.  Third, the
+correct operator to check for string equality is eq, not == or =.
+
+Now, MisterHouse adds a little twist to the situation.  As 'on' and 'off' are
+common states, MisterHouse defines the PERL constants ON and OFF.  N.B. that
+there are no dollar signs ($) at the beginning of the constants.  Whenever
+MisterHouse code encounters ON and OFF as bare words (not within strings), they
+are replaced with 'on' and 'off' (both are lowercase).  This means:
+
+if (($state=$myLight->state_now) eq 'ON') # always fails as 'ON' is uppercase
+
+if (($state=$myLight->state_now) eq 'on') # could be true if light just turned on
+
+if (($state=$myLight->state_now) eq ON) # could be true as ON is the same as 'on'
+
+=head1 3: Linux specific questions
+
+=head2 3.1: Problem: When I run Viavoice and festival at the same time I get "Can't open output file '/dev/dsp'"
+
+The problem is, festival or another sound program, is locking your dsp device.
+The sound drivers that come stock in the Linux kernel do not allow more than one program to access the /dev/dsp at one time.
+If you are using RedHat, you can use ESD to multiplex the soundcard usage.
+The problem is, not all sound programs are esd aware. Festival and Viavoice do not directly support esd.
+ESD does have a workaround that _sometimes_ works with non-esd aware programs.
+Try starting your sound programs, festival and viavoice under esddsp.
+For example: "esddsp festival --server &".
+I had some success with this route but it doesn't always work because of sampling rates and such.
+
+The best fix would be to replace OSS with ALSA. http://www.alsa-project.org.
+The ALSA drivers directly support multiplexing the dsp devices.
+The only problem is they currently support fewer cards than the OSS drivers that come with the Linux kernel.
+Check out the web page and see if your card is supported. If it is, the best avenue would be replacing OSS with ALSA.
+
+
+=head2 3.1.1: Problem: The speech stutters and then stops half way through, and I end up with 'hung' vv_tts.pl processes that do not complete.
+
+Solution: You need to use ViaVoice_Outloud 5.0 with "any" ALSA driver.
+ViaVoice Outloud 5.1 does not work with ALSA, but it seems that downgrading to 5.0 fixes it.
+You can get the it here:
+http://dittos.yi.org/automation/ViaVoice_Outloud_rtk-5.0-1.0.i386.rpm
+
+The older version ViaVoiceTTS that supports the older ViaVoice Outloud can be foudn at  Brad's website:
+http://www.reednet.org/ViaVoiceTTS/ViaVoiceTTS-0.02.tar.gz
+
+
+=head2 3.2 How can I set the default volume level for Festival?
+
+This might work... it has not been tested.
+
+You can globally increase the volume of all waveforms generated by
+festival by adding the following to your siteinit.scm.  Put that in
+the festival/lib directory, (where all the other .scm files are)
+probably /usr/lib/festival/lib if you used the standard rpms.  Add the
+following
+
+    (set! default_after_synth_hooks
+          (list
+            (lambda (utt)
+              (utt.wave.rescale utt 1.0 t))))
+
+This will maximises the volume within a wavefrom, this wont necessary
+make all voices the same loudness (though it will be close).
+
+Alternatively
+
+    (set! default_after_synth_hooks
+          (list
+            (lambda (utt)
+               (utt.wave.rescale utt 4.0))))
+
+will mutiply the waveform by 4 but this has the problem that it may overflow.
+
+If you want X% of the maximum without overflow use the first example
+and lower the 1.0 until you get an acceptable volume
+
+=head2 3.3 How do I add a multi-port serial card in linux?
+
+From Dave Lounsberry on 1/1/2002
+
+First make sure you have the device nodes for the extra serial ports.
+You should have /dev/ttyS[16..23]. If not:
+
+  # cd /dev
+  # ./MAKEDEV ttyS16  (repeat for each device)
+
+Next you need to run setserial to setup the board. The kernel defaults
+to only two serial ports. Put the following in a file called
+/etc/rc.serial and make sure it runs each boot.
+
+  ---- clip here -----------------------------------------------
+  #!/bin/sh
+  setserial /dev/ttyS16 port 0x180 irq 4 uart 16550A ^fourport
+  setserial /dev/ttyS17 port 0x188 irq 4 uart 16550A ^fourport
+  setserial /dev/ttyS18 port 0x190 irq 4 uart 16550A ^fourport
+  setserial /dev/ttyS19 port 0x198 irq 4 uart 16550A ^fourport
+  setserial /dev/ttyS20 port 0x1a0 irq 4 uart 16550A ^fourport
+  setserial /dev/ttyS21 port 0x1a8 irq 4 uart 16550A ^fourport
+  setserial /dev/ttyS22 port 0x1b0 irq 4 uart 16550A ^fourport
+  setserial /dev/ttyS23 port 0x1b8 irq 4 uart 16550A ^fourport
+  setserial /dev/ttyS16 set_multiport port1 0x1c0 mask1 0xff match1 0xff
+
+  # chown to dbl (runs misterhouse)
+  for a in 16 17 18 19 20 21 22 23
+  do
+        chown dbl.wheel /dev/ttyS${a}
+  done
+  ----- clip here ----------------------------------------------
+
+
+Note that I am using irq 4 for my byterunner. Be careful that you don't have one of the built in serial ports on the same IRQ.
+
+You can probably take out the for loop in the bottom if you are running MH as root.
+
+Here is a link explaining the settings and jumpers (in more depth). 
+http://www.mail-archive.com/linux-hardware%40senator-bedfellow.mit.edu/msg01897.html
+
+Another good resource is always the Linux HOWTOs. The serial HOWTO can be found at http://www.ibiblio.org/mdw/HOWTO/Serial-HOWTO.html#toc5
+
+
+Here is a followup from Nigel Titley:
+
+I have found that the linux serial card driver doesn't like the serial card to be on a shared interrupt (I assume your Byterunner is a PCI card and not ISA). I had exactly this problem and worked around it by using the BIOS to move interrupts around until the serial card set itself up on an unshared IRQ. Everything then worked. This does seem to be a Linux issue, and I haven't taken the plunge yet and tried to find out where in the serial port driver the bug exists (I guess I am hoping that someone else will do it).
+
+
+Here is some useful serial info from Bob Hughes:
+
+Here is another way to look at the current serial port settings
+
+  setserial -a /dev/ttySX  where "X" is the port
+
+To set the serial port baud rate 9600
+
+  setserial /dev/ttyS0 baud_base 9600
+
+You can use setserial -G to get a list of current setting and have them
+in a format that can be fed back into setserial...
+
+  setserial -G /dev/ttyS0
+
+You can put setserial setting in /etc/rc.local so the port is ready for
+your interface program once boot up is complete
+
+
+
+=head2 3.4: How do I get Mister House to start up automatically when my linux box boots
+
+Check out various .rc startup scripts in mh/bin/*.rc
+
+Here is a good tutorial note from Mike Bruno  on 4/2002
+
+OK, here's the quick and dirty on startup scripts.
+
+(You also may wish to check out http://www.linux-mandrake.com/en/doc/82/en/ref.html/sysv.html which is where I pulled some of the stuff you'll find below)
+
+Just for reference, there's two methodologies that are used for bringing up Unix systems: BSD and SysV. Mandrake uses SysV.  BSD is initially simpler, but the SysV method is more flexible.  The names of the methods and their merits should not really concern you at the moment, its just background in case someone jumps out of the woods and asks you.
+
+I should also mention that there may be some sort of fancy graphical interface into all this.  But its much more satisfying to get your hands dirty and roll your own solution.
+
+
+The boot scripts are located in /etc/rc.d.  If you look in there, you'll find several subdirectories named init.d and rc0.d -> rc6.d.  The rc?.d directories correspond directly to the various runlevels that Unix supports.  Runlevel is a set of predefined modes that define what the system does. Mandrake has the runlevels defined as
+
+ 0: complete machine stop;
+
+ 1: single-user mode; to be used in the event of major
+    problems or system recovery;
+
+ 2: multi-user mode, without networking;
+
+ 3: Multi-user mode, but this time with networking;
+
+ 4: unused;
+
+ 5: like 3, but also launches the graphical login interface;
+
+ 6: restart.
+
+If your machine comes up and immediately goes into an X-Window interface, then its default runlevel is 5.
+
+When you say 'reboot' or 'shutdown -r now', what you are really doing is putting the system into runlevel 6.
+
+When things have gone completely to shreds (typically after hardware failure or severe operator error ;), you want to get the machine into runlevel 1 - there are minimal services running and only one person can be logged in
+at a time.
+
+Now, on to the nitty-gritty.
+
+The init.d subdirectory is where all the startup/shutdown scripts are kept.  They are all text files, and you can
+get a good idea of their format by cracking one open (I'd recommend a short one) and looking at it.  You don't
+need to be an expert in shell programming to get the gist of it.
+
+These scripts are called with one arguement (more on how that arguement gets supplied later).  Virtually all scripts have the start and stop arguement, most have a restart, and then some have all sorts of custom ones.  Lets look at a quick example.
+
+This is an init script for starting up Apache. Most are more cluttered, but not really more complicated.
+
+ -----------------
+ #!/bin/sh
+ #
+ # Start the Apache web server
+ #
+
+ case "$1" in
+    'start')
+       /usr/sbin/apachectl start ;;
+    'stop')
+       /usr/sbin/apachectl stop ;;
+    'restart')
+       /usr/sbin/apachectl restart ;;
+    *)
+       echo "usage $0 start|stop|restart" ;;
+ esac
+ -----------------
+
+Anything after a # is a comment, except for the first line.
+If that is #!, then the shell starts up the command
+interpreter specified (in this case another /bin/sh) and
+sends all the following commands through that.
+(Don't know how far into Linux you are yet, but suffice
+it to say that shell scripts are like batch files on
+steroids).
+
+Moving down, we get to the first line of code.  This is just
+like a case statement in C, except for the syntax
+(case block ends with a esac, which, of course, is case backwards).
+$x are the positional parameters of the program
+($0 is the name of the program, $1 is the first arguement, etc.)
+
+The rest of the script is pretty self-explanatory.
+This particular one is easy as all the complicated parts
+are handled by apachectl.
+
+So that's all well and good, but how and when does it
+get called?  OK, lets go back to the rc0.d -> rc6.d directories.
+Looking in there, you can see a bunch of files that start
+with K or S and a number.  If you're using a color ls,
+then you'll notice that they are a different color and there
+might even be a @ after the name.  That's because these are
+all symlinks to the real files in the init.d directory.
+
+When the system enters a runlevel, it goes into the
+appropriate /etc/rc.d/rc?.d directory and begins
+executing the files in there.  If the file begins
+with a K, then the symlink gets called with a stop
+(kill) arguement; if it starts with an S the symlink
+is called with a start arguement.
+
+So if rc5.d has these links in it
+
+ K15postgresql@  K60atd@      S15netfs@   S60lpd@        S90xfs@
+ K20nfs@         K96pcmcia@   S20random@  S60nfs@        S99linuxconf@
+ K20rstatd@      S05apmd@     S30syslog@  S66yppasswdd@  S99local@
+ K20rusersd@     S10network@  S40crond@   S75keytable@
+ K20rwhod@       S11portmap@  S50inet@    S85gpm@
+ K30sendmail@    S12ypserv@   S55named@   S85httpd@
+ K35smb@         S13ypbind@   S55routed@  S85sound@
+
+the system is going to kill off postgress, nfs, rstatd, etc first
+(in that order).  Then its going to start apmd, network, portmap, etc.
+(in that order).
+
+OK, so now you have a rough background in how the system starts.
+So how do you get mh working in it?
+
+The easiest way is to go into init.d, copy an existing file,
+and edit that. (Remember, you're root.  Type carefully)
+
+ cp httpd mh
+ vi mh
+
+and change the lines so that they look something
+like this
+
+ -----------------
+ #!/bin/sh
+ #
+ # Start mh
+ #
+
+ set mh_parms=/home/house/misterhouse/mh.private.ini
+
+ case "$1" in
+    'start')
+       /home/house/misterhouse/mh/mh & ;;
+    'stop')
+       killall mh ;;
+    'restart')
+       killall mh
+       sleep 5
+       /home/house/misterhouse/mh/mh & ;;
+    *)
+       echo "usage $0 start|stop|restart" ;;
+ esac
+ -----------------
+
+This is very, very sloppy, but you get the idea.
+
+Before you go further, TEST IT!  Just call it by
+hand from the command line like
+
+ /etc/rc.d/init.d/mh start
+
+ /etc/rc.d/init.d/mh stop
+
+etc.
+
+(you'll need to include the full path as init.d is
+not in your PATH and neither is the currect directory for root)
+
+Once you've gotten all the bugs worked out and its working
+the way you like it, figure out which runlevels you want
+this to be running in.  I'd guess 3 and 5, but its up
+to you.
+
+Change into rc3.d.  Figure out when you want mh to start
+compared to all the other programs.  I'd guess you'd want
+to let everything else go first, then light up mh.
+So we'll give it a number of 99, effectively going last.
+Make the symlink like this
+
+ ln -s /etc/rc.d/init.d/mh S99mh
+
+Do the same thing in rc5.d
+
+Now, you'll also want to have a good clean shutdown.
+So you'll have to take care of runlevels 0 and 6.
+Here, you'll want mh to get killed off early in
+the process, so give it a low number, say 01.
+
+ ln -s /etc/rc.d/init.d/mh K01mh
+
+You'll also want to do the same in rc1.d
+
+
+Another option is to use a package called daemontools, available at
+
+ http://cr.yp.to/daemontools.html
+
+His take on why you should use it is at
+
+ http://cr.yp.to/daemontools/faq/create.html
+
+Its essentially inetd with the features it should have.
+
+When the system comes up, the daemontools program
+svscan starts and then starts up any programs
+you've asked it to.  Those programs are then
+monitored and get restarted if they die.  The
+good part here is that you can control any
+program from the command line without editing
+files
+
+ svc -h /service/yourdaemon: sends HUP
+ svc -t /service/yourdaemon: sends TERM, and
+        automatically restarts the daemon after it dies
+ svc -d /service/yourdaemon: sends TERM, and leaves the service down
+ svc -u /service/yourdaemon: brings the service back up
+ svc -o /service/yourdaemon: runs the service once
+
+
+-------------------------
+
+The following is from Harald Koch on 04/2002
+
+I'll offer an alternate method. Neither is really better or worse; it
+depends on your environment and requirements.
+
+I have a strong preference for running mission critical software
+directly from init, instead of from startup scripts; init will
+automatically restart software that crashes. I do this with misterhouse,
+SSH, and a database that I run.
+
+init is controlled from a file called (usually) /etc/inittab. Here's my
+MH entry from inittab:
+
+ mh:2345:respawn:/home/mhouse/mhinit
+
+This tells init to run "/home/mhouse/mhinit" when the computer is in any
+multi-user mode (see Mike's message for a definition of runlevels), and
+to run it again when it exits.
+
+And here's my script:
+
+ ----- /home/mhouse/mhinit -----
+ #!/bin/sh
+
+ mhhome=/home/mhouse
+
+ cd ${mhhome}
+
+ exec >> error_log 2>&1
+
+ export PATH=${mhhome}/mh/bin:${mhhome}/bin:$PATH
+ export mh_parms=${mhhome}/mh.ini
+
+ # rotate logs
+ /bin/mv log.3 log.4
+ /bin/mv log.2 log.3
+ /bin/mv log.1 log.2
+ /bin/mv log.0 log.1
+ /bin/mv log   log.0
+
+ # start
+ exec ${mhhome}/mh/bin/mh -log_file ${mhhome}/log
+
+ ----- /home/mhouse/mhinit -----
+
+This method *does* make it harder to stop MH, because you have to edit
+/etc/inittab, change the "respawn" to "off", and then run "telinit q" to
+tell init to re-read the config file.
+
+On the other hand, it means that MH will restart itself automatically
+even if it exits due to bad code, which does happen to me occaisionally.
+
+
+=head2 3.4: How do get Linux to play more than one sound at the same time
+
+Posted by Richard Phillips and Sean Walker on 03/2003
+
+FYI This is a bit of a "head's up" for those people who may be
+trying/struggling to get misterhouse to - for example - play music and also
+at the same time be able to speak under linux. You may find, for example,
+that misterhouse is silent whilst playing music and only after stopping
+(say) xmms your misterhouse server starts speaking all the queued up
+messages.
+
+There are a number of different ways to enable your linux server to
+multiplex sound, and many different theories as to which way is better. Some
+people prefer to use ALSA because it's not proprietary as opposed to ARTS
+which is installed by default under many distributions such as Redhat. The
+trouble with alsa at the moment is it can be a bit fiddly to configure as it
+is not currently part of the linux kernel used in most distributions (it
+will be when 2.5 is released). Anyhow, even after successfully getting alsa
+installed, there can be some issues with getting multiple applications to
+use the sound card concurrently - this is because not all alsa sound card
+drivers support multiplexing.
+
+So.....
+
+If you want to use alsa, good for you. I won't get involved in which system
+is better, and of course there are some other commercial alternatives out
+there that a number of people also use and swear by. Anyhow, I'll just
+describe what can be done to get things working with arts IF you are using
+it AND are also having problems.
+
+1. Install your distribution as you would normally, and ensure that arts is
+also installed/configured. As previously noted, many distros such as Redhat
+use arts by default so you won't have to do anything special - everything
+should be automagically detected. If you open up a terminal session and type
+"ps -ef | grep artsd" you should see a line showing the details of the artsd
+daemon.
+2. Install flite - again depends on distro. With gentoo you can just do an
+"emerge flite". If you don't have a package available for your distro, you
+can get the source from http://www.speech.cs.cmu.edu/flite/ and try to build
+it yourself. There are other speech engines you can use of course, but this
+is probably the easiest to get running so it's what I'll use in this
+demonstration.
+3. From a command prompt type "flite -t hello -o play" - you should hear a
+very bad hello from your computer
+4. Fire up an application such as a music player that can use arts. If you
+use something like xmms, make sure that it is actually using arts (with
+xmms, go into options/preferences and check that the outplut plugin being
+used is the "aRts driver"). Now load up a playlist, put it on repeat, and
+start playing music.
+5. Now try step 3 again - you'll probably find that it appears to hang. Just
+kill it with a "ctrl c"
+6. Now try "artsdsp flite -t hello -o play" instead - you should hear music
+AND a bad "hello".
+
+Why is it so? Well, by default flite - and a number of other applications -
+when trying to create sound directly access the sound device (usually
+something like /dev/dsp). By using the wrapper "artsdsp" before running an
+application such as flite, any calls to the sound device by the program are
+trapped and redirected to the arts server - basically it forces the
+application to "play nice" and not grab exclusive use of the sound device.
+
+So how do I now use flite and misterhouse? Well, you just need to change the
+line in your ini file that tells misterhouse where flite is located. Go to a
+command prompt and type "which artsdsp". This will let you know exactly
+where the artsdsp program is located. Do the same for flite (eg "which
+flite"). Now change your mh.private.ini file as follows:
+
+voice_text = flite
+voice_text_flite = /usr/kde/3.1/bin/artsdsp /usr/bin/flite
+
+(Naturally, change the program locations depending on where your programs
+live).
+
+Now, restart misterhouse and keep xmms (or whatever) running and playing
+music. You should now be able to do something like go to the ia5 web
+interface, select misterhouse, then misterhouse home, then browse mr house,
+and then click on the "what is your up time" and be able to hear mister
+house talking whilst music is also a happening thing!
+
+Of course, as noted before you can use the same wrapper for other programs
+that may not directly support arts - for example if you install festival,
+you can test it by typing something like "echo 'Hello from Festival'|
+artsdsp festival --tts".
+
+The same also works for using esd as well as artsd. You can use JACK,
+I'm sure, but I haven't tried it yet. Also, you can configure festival
+to use any play program directly instead of using the artsdsp or esddsp
+hacks. Those are hacks and will not work with all programs, just for
+reference. To configure festival use something like this in your
+siteinit.scm file (located in the festival root directory):
+
+  (Parameter.set 'Audio_Required_Format 'snd)
+  (Parameter.set 'Audio_Command "esdplay -s localhost:5001 $FILE")
+  (Parameter.set 'Audio_Method 'Audio_Command)
+
+In the Audio_Command line, the only thing critical is the $FILE
+You can use any player that you want in place of esdplay in the above,
+but it must be compatible with the audio formats that festival can
+produce. These, coming from the docs, are as follows:
+The default is unheadered raw, but this may be any of the values
+supported by the speech tools (including nist, esps, snd, riff, aiff,
+audlab, raw and, if you really want it, ascii).
+
+More information can be found in the festival doc files festival_6.html
+and festival_23.html wherever your festival documentation is installed,
+including the handy:
+
+  (Parameter.set 'Audio_Required_Rate 16000)
+  (Parameter.set 'Audio_Device "/dev/dsp2")
+
+
+These parameters can be specified in alternative methods as well. We
+should be able to tell festival which sound card to use or modify other
+settings on the fly as well. I haven't looked into that yet.
+
+By default festival should be asynchronous and you should be able to
+start playing from the file even before the file if finished writing. At
+least that is what I gathered out of the doc files. Setting synchronous
+or asynchronous modes are as easy as (audio_mode sync) or (audio_mode async)
+
+
+
+=head1 4: Windows specific questions
+
+=head2 4.1: mh seems to cause some windows to hang
+
+If you are experiencing problems with windows not popping up when they should (e.g. control panel or install shield), you will want to install DCOM 1.3, available from here:
+
+  http://www.microsoft.com/com/dcom/dcom98/dcom1_3.asp
+
+Note, I had run all the 'Windows updates', including the Service Pack 2, but
+I still had the problem until I installed the above.
+
+For Windows 95, the update is at:
+
+  http://www.microsoft.com/com/dcom/dcom95/dcom1_3.asp
+
+
+=head2 4.2: How do I set setup networking between Windows boxes
+
+You need to have the TCP/IP protocol enabled for your Networking Interface Card (NIC).
+If you use a modem to reach the internet, you already have TCP/IP enable for the dial up adaptor,
+but you need to seperately enable it for your NIC card, using the control panel Network icon.
+
+You can find instuctions on how to do this at: http://win98central.acauth.com/inside98/networking.htm .
+
+IP addresses that start with 10. (e.g. 10.0.0.1) are reserved for internal lans, so you can use
+10.0.0.1, 10.0.0.2, etc.
+
+=head2 4.3 How do I run MH when not logged in to Win2K or XP?
+
+You can run any program as a service, using a program called srvany.exe,
+available in the Resource Kit, or from here:
+
+ http://www.electrasoft.com/srvany/srvany.htm
+
+Here is an example of registry entries after configuring my to run with srvany:
+
+ HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\MisterHouse\Parameters AppDirectory  REG_SZ    c:\mh\bin
+ HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\MisterHouse\Parameters Application   REG_SZ    c:\perl\bin\perl.exe -S c:\mh\bin\mh
+
+
+Rather than call mh as a service, many people have Windows do an auto-login and just add mh to the startup.
+
+
+=head1 5: Perl questions
+
+=head2 5.1: Whats the best way to learn perl?
+
+Using MisterHouse ;-)  Much more fun that trying to code up that report generator at work!
+Some good books are referenced in mh.html.
+
+
+=head2 5.2 What are good editors to use with perl?
+
+Codeing perl is much easier and less error prone if you use an programing
+editor that automatically highlights and indents code.
+
+One very popular and powerful (and free) editor is Emacs: http://www.gnu.org/software/emacs/.
+A pre-compiled windows version can be found here: http://www.gnu.org/software/emacs/windows/ntemacs.html
+
+Alan Jackson liks vim: http://www.vim.org. "Does syntax highlighting quite nicely for perl"
+
+Kieran Ames likes UltraEdit32: http://www.ultraedit.com.
+"I swear by UltraEdit32 available at It works fully functional for 30 days and then expires.
+Registration goes for around $30. I'm coding Perl all day long and would die without it!
+Fairly thin and goes the distance with just about any language you'd want to use."
+
+Mark Yocom writes "I myself have grown fond of PrimalSCRIPT, which handles Perl, Java (and
+JScript & JavaScript), HTML, ASP, LotusScript, Livewire, Python, SQL, Tcl,
+REXX, VBScript, and good old fashioned .BAT/.CMD files.  In addition to the
+obligatory syntax coloring, it also has a number of other handy features.
+It's spendy, but a trial version is available at their website:
+http://www.sapien.com/PrimalSCRIPT.htm "
+
+=head2 5.3 When are you supposed to use '=>' as opposed to '->' ?
+
+You can use => for a synatically pretty way to seperate entries in a list.
+When creating a hash, you can pass it a set of key/value pairs via a list, so instead of this:
+
+  %hash = ('key1', 'value1', 'key2', 'value2');
+
+You can use => instead of a , to make it look pretty:
+
+ %hash = ('key1' => 'value1', 'key2' => 'value2');
+
+Now to really confuse you, I'll try to explain how -> is used for dereferencing pointers.  All mh objects can be viewed as pointers, and the state of an object is stored in a hash key of {state}, so there are 4 ways to get the current object state:
+
+ $state = state $light;    # Use the state method to get {state}
+ $state = $light->state;   # Dereference with -> to get the state method
+ $state = $light->{state}; # Dereference with -> to get the state hash
+ $state = $$light{state};  # Dereference object with an extra
+
+
+=head1 6: Misc questions
+
+=head2 6.1: Misterhouse Timeline
+
+Here is a rough timeline of MisterHouse development:
+
+ - 12/96 Coded a predecessor called House_Menu
+ -  8/98 Re-wrote everything, called it MisterHouse
+ -  9/98 Uploaded to the web
+ - 10/98 Created compiled version.
+ - 11/98 First known user.
+ - 01/99 Started a mailing list at onelist.com
+ - 02/99 Ported mh to Unix/Linux
+ - 03/99 Article in Popular Home Automation
+ - 04/99 Posted to comp.home.automation
+ - 05/99 Registered misterhouse.net domain name.
+ - 06/99 Added CM17 & HomeBase support
+ - 06/99 Article in HomeToys: http://hometoys.com/htinews/jun99/articles/winter/winter.htm
+ - 08/99 Mailing list reaches 100 members
+ - 09/99 Added LCDproc and IRman support
+ - 10/99 Article in Circuit Cellar Ink: http://www.circuitcellar.com/pastissues/articles/winter111/winter.pdf
+ - 11/99 Linux VR using IBM's ViaVoice
+ - 11/99 HomeVision support
+ - 11/99 Mailing list reaches 200 members
+ - 01/00 Moved the mailing list and CVS repostitory to sourceforge.net
+ - 02/00 Re-worked the web interface
+ - 03/00 Added support for iButtons
+ - 04/00 Added support for X10's IR Commander transmiter
+ - 05/00 Added voice modem, ISDN modem, and Compool support.
+ - 05/00 Article in The Perl Journal #17
+ - 06/00 Mailing list reaches 300 members
+ - 06/00 Added support for table item/event input and tie_items/tie_events.
+ - 08/00 Enable perl -w checks, .jpg and .gif, and Slinke support.
+ - 08/00 Added rpm and tarballs, NetGear router support
+ - 09/00 Added ViaVoiceTTS.pm, Jabber, and Applied Digital cpuxad support
+ - 10/00 Added barcode scanner and MS Agent support
+ - 11/00 Support for ical, rrd, html email access, WAP, and VXML for phone access via tellme.com
+ - 12/00 wx200d and wunderground personal weather project support, new add_sound function.
+ - 01/00 SMS and snnp messaging, improved iButton and benchmarking support.
+ - 01/01 Mailing list reaches 400 members
+ - 02/01 2 way AOL AIM messaging, earthquake and satellite tracking.
+ - 03/01 Backup program and menu templates for WAP, VXML, and LCD displays.
+ - 05/01 Audible menus, X10 Mr26 support, linux volume control.
+ - 07/01 Browser dependent web pages, zap2it tv support, call waiting callerid.
+ - 09/01 Audrey support, more MS TTS controls.
+ - 10/01 Web mh.ini editing, remote browse TTS support, zap2it tv pages.
+ - 11/01 New web interface, Audrey pictureframes, multiple sound cards.
+ - 12/01 Wireless wmr968 and Ultimeter2000 weather stations, Lynx10 X10 support.
+ - 01/02 Xmms, audrey callerid, Linksys rounter, TTS flite engine, standard CGIs.
+ - 03/02 GD on-the-fly web buttons, support for comics, xmms, redrat.
+ - 04/02 Added web calendar, contact, todo list, and tk photo slideshow
+ - 05/02 Improved TTS support, TWiki web site, and support for DSS units, BX24 interface, and MSN,
+ - 05/02 Rewrote web menu interface, added AudioTron support and improved im support.
+ - 06/02 Registered misterhouse.com domain name.
+ - 08/02 Caddx alarm, iButton humidity sensor, undo, light/dark hawkey sensor
+ - 09/02 Proxy mh, improved %cpu used, Group member and idle_time methods, Linux NaturalVoice, Clipsal CBUS
+ - 10/02 Enabled web based code selection, file based alarms, palm reader, and Mac OSX support.
+ - 11/02 UIRT2 control, better im control, web interface for triggers and items
+ - 12/02 Improved callerID, new respond and Text_Item functions, xAP support.
+ - 01/03 Mailing list reaches 500 members.
+ - 02/03 Addex xPL support, stacked and overloaded states, and multi-user logon.
+ - 03/03 Linux NaturalVoiceWine, web based TV and photo setup, improved Lynx X10 support.
+ - 04/03 Compiled mhe for linux, support for X10 W800, CallerID Identifier, USB-UIRT, and more iButton modules.
+ - 07/03 Improved web floorplan, DBI interface, xAP news and weather interfaces.
+ - 09/03 Cepstral TTS engine support, a new PA room object, improved proxy support.
+ - 11/03 Support for Sphinx2 VR, myHTPC tv menus, Asterisk phone interface, SMTP authentication, and a xAP command server.
+ - 12/03 Code for RCS TR40 theormostate, phone xAP.
+ - 01/04 Code for rrd weather graphs, v4lctl.
+ - 04/04 Code for ER1 robot, switched to the par compiler, improved mp3 Jukebox.
+ - 06/04 Code for Musica whole house audio, rss feeds, xAP Slimserver
+ - 07/04 Code for ICQ, vocp, tivo, Alpha LED displays, xAP IR for RedRat, RoboSapien.
+ - 08/04 Mailing list reaches 600 members.
+ - 09/04 Support for SVG floorplans, mp3 ripping, ebay monitoring, siteplayer, irc.
+ - 11/04 Support for servo motors, the ESRA robot, cell phone minutes monitoring, motherboard monitoring.
+ - 03/05 Support for serving multimedia files, cell phone minute monitors, shopping lists.
+ - 05/05 Support for distributed xAP speech, bluetooth proximity detection.
+ - 10/05 Support for xAP BCS, ssh, osd232, vocp, Wish x10, and EIB.
+ - 01/06 New spam free Wiki, support for azureus, Insteon iplcs, ical, k8055, TI103.
+ - 04/06 Moved from CVS to SVN, support for Xantrex power inverter, spanish web pages, french EDF power rates, DSC5401, xAP asterisk, 
+
+
+=head2 6.2: Who is that Bruce guy anyway?
+
+Bruce was the the original author of MisterHouse, but can no longer
+claim much authorship credit as it is now truly a group effort with many contributors.
+He has a day job with IBM in Rochester, Minnesota, designing integrated circuits.
+Lots of stuff of interest only to family and aliens at http://brucewinter.net
+
+=head2 6.3: Why open source?
+
+Because open source only has 3 syllables, and proprietary has 5.
+
+That and MisterHouse has developed much faster with the help of a wider user base
+and help from other coders than it would have if it were proprietary.
+
+Plus it feels good to give stuff back to the growing open source community.
+
+
+=head2 6.4: Misc Home Automation links
+
+Here are some useful/related Home Automation links:
+
+  Dan Hoehnens most excellent collection of HA links:
+    http://my.ohio.voyager.net/~dhoehnen/ha/list.html
+
+  Mark Henrichs has a great 'Home Wiring Guide' site here:
+    http://www.wildtracks.cihost.com/homewire/
+
+  Over 500 links on about everything with HA:
+    http://home-automation.org/
+
+  Lots of good tutorials and articles are here:
+    http://hometoys.com/
+
+  X10 has many of its products documented here:
+    http://www.x10.com/support/support_manuals.htm
+
+  Lots of good X10 data/ideas can be found here:
+    http://www.geocities.com/ido_bartana/toc.htm
+    http://www.x10ideas.com
+    http://www.x10.com/automation/homeautomation_e.htm
+
+  Dave Houston has some good X10 info (e.g. causes of CM11A lockups) here:
+     http://www.laser.com/dhouston/
+
+  Europeans can get X10 stuff distributers listed here:
+    http://www.x10.com/x10euro.htm
+  Some examples are:
+    http://www.intellihome.be
+    http://www.marmitek.com/
+
+  Neil Cherry has created a home for linux related Home Automation programs at
+    http://linuxha.sourceforge.net
+
+  Rene Mueller has a nice set of web pages with lots of info on HomeAppliances at
+    http://the-labs.com/HomeNetwork/
+
+  Jay Archer recommends this free Windows mail server and mult-platform web server:
+    http://www.argosoft.com
+    http://www.xitami.com
+
+  Nokia sponsered open source site for home entertainment devices.
+    http://www.ostdev.net/
+
+
+=head2 6.5: How do I contribute additions or updates to the mh code?
+
+The MisterHouse code is maintained via a GitHub repository.
+Instructions on how to commit changes can are here:
+https://github.com/hollie/misterhouse/wiki/Contributing
+
+If you have minor changes and don't want to bother with a sourceforge ID, feel free to mail them to the mailing list.
+
+
+=head2 6.6 What is X10?
+
+The people at http://www.x10.com sell affordable devices that communicate with each other over
+normal household power lines.  Manuals for many of there devices are listed
+at http://www.x10.com/support/support_manuals.htm  .
+They have their home automation product slited here: http://www.x10.com/automation/homeautomation_e.htm/#homeautomation
+
+The most common modules are the Lamp module and the Appliance module.  Both sell for around $10-$15.
+The lamp module has can turn up to 300 watt lamps on, off, and various levels of bright.
+The appliance module is an on/off relay.
+
+The 2 most popular X10 PC interfaces are
+the $50 ActiveHome/CM11 and the $6 Firecracker/CM17.
+
+The CM17 is a transmit only interface.  In addition to being almost free, another advantage is
+it is wireless. It is a small, 1 inch box that just dangles off of your serial port and transmits
+to a receiver that plugs into the wall.  The other advantage to the CM17 is gives
+instant ON/OFF control to the relay built into the wireless receiver.  All other X10 devices
+have about a 1/2 second delay to send and receive the protocol over the power lines.
+
+The CM11 is a 2 way interface, so you can program mh events to react to X10 motion sensor
+and button pushes from various X10 controlers (e.g. keychain and palmpads).
+Some of the newer, more expensive modules, like the $35 LM14A lamp module,
+allow you to query their status, so you can determine it status even if it were manually turned on or off.
+
+If decide you splurge for the CM11 activehome kit, you might as well also get the Firecracker kit.
+For the extra $6, you also get a few extra modules and mh can support both the CM11 and the CM17
+on the same port.
+
+There is lots of great X10 info at http://www.geocities.com/ido_bartana ,
+including information on using and buying X10 hardward outside of the US.
+
+Here is some more info, copied from a misterhouse-users post by Kevin Olalde.
+
+
+The firecracker hardware, CM17 which plugs into the PC, can only send radio
+frequency (RF) commands to devices.  With the kit you will also get a
+transceiver, TM751, that receives commands from the CM17 and relays
+commands for the house code it's set to via your power lines.  You also get
+a lamp module, LM465,  which can be control with via the transceiver.  With
+the PalmPad or the CM17 you send RF commands  to the TM751, those commands
+are then relayed to the lamp module (or other power line receiver modules,
+like light switches).  All of this is one way communications, the LM465
+lamp module and the TM751 transceiver are not capable of reporting status.
+The TM751 doubles as an appliance module hard coded to unit 1.  You can
+only control it though RF commands, it does not respond to power pline
+commands.
+
+The next step I took was to order the Active Home kit.  With it you get
+(among other stuff), another transceiver, RR501, and another computer
+interface, CM11A.  The RR501 works like the TM751, in that it receives RF
+commands, and relays then on to the power line.  A difference is that the
+RR501 can report it's status.  The computer interface, CM11A, can send
+power line commands (you use computer software to tell the interface what
+commands to send), 'sees' all commands being sent over the power line (and
+reports those commands to computer software), and can ask modules for their
+status.  The RR501 also doubles as an appliance module, it can be set to
+unit code 1 or 9, and can be controlled with both RF and power line
+commands.
+
+The majority of the devices, lamp modules, appliance modules, wall
+switches, ..... are one way devices, they can only receive.  I have no
+historical perspective, but it looks as though that was the way the
+original X10 spec went, one way only.
+
+There are devices that can report their current status to something like
+the CM11A, but I haven't used any of then (except for the RR501), since
+that are much more expense.
+
+  http://www.x10.com/products/x10_lm465.htm  one way lamp module from X10, $13
+  http://www.x10.com/products/x10_lm14a.htm  two way lamp module from X10, $33
+
+Bill Bass sent in these links to a bunch of links from
+Phil Kingery's great series of X10 articles at http://hometoys.com
+
+  Which One Should I Use?
+  http://www.hometoys.com/htinews/dec96/articles/kingery/kingery.htm
+
+  Controlling Motors and Transformers
+  http://www.hometoys.com/htinews/apr97/articles/kingery/kingery2.htm
+
+  120/240v Residential Coupling
+  http://www.hometoys.com/htinews/jun97/articles/kingery/kingery3.htm
+
+  Complex Residential Coupling with Considerations for Dim/Bright
+  http://www.hometoys.com/htinews/aug97/articles/kingery/kingery4.htm
+
+  Dim/Bright Commands and Coupler-Repeaters
+  http://www.hometoys.com/htinews/oct97/articles/kingery/kingery5.htm
+
+  Three-Way Switch Circuits
+  http://www.hometoys.com/htinews/dec97/articles/kingery/kingery6.htm
+
+  More Three-Way and Four-Way Switch Circuits
+  http://www.hometoys.com/htinews/feb98/articles/kingery/kingery7.htm
+
+  Troubleshooting Three-Way and Four-Way Switch Circuits
+  http://www.hometoys.com/htinews/apr98/articles/kingery/kingery8.htm
+
+  Noise and Filtering
+  http://www.hometoys.com/htinews/jun98/articles/kingery/kingery9.htm
+
+
+=head2 6.7 What do I need to use the iButtons?
+
+Ray Dzek created a how to get started with iButton guide at
+http://www.solarbugs.com/home/ibutton.htm
+
+Here is a post from Clay Jackson
+
+Right now, I've got 3 sensors (DS1822, in the three-lead package, inside an
+epoxy filled soda straw) at the end of 150' of Radio Shack "flat" cable,
+talking to a DS9097U (the U is CRITICAL) with no problems.  On the bench, I
+had another 2 sensors on the end of a 50' cable (for a total of 5 sensors).
+When I strung the 50' cable, I must have crimped a lead, because it now
+meters "closed" and when it was plugged into the "net", I got no readings.
+
+I also have an HA5 from Point-Six; that I'm gonna play with soon. The code
+Bruce did is for the 9097U, so that's why I started there (and, it's
+cheaper).  The 9097U has all the "passive" pull-up stuff the data sheets
+talk about (courtesy of a DS2048 inside the DB9); so I'm hoping it will do
+the trick.  Anyway, I'll keep the list posted as things progress.
+
+Bottom line - all I needed was Bruce's code, a 9097U from Dallas, the
+sensors and some Radio Shack "phone" cable.
+
+One more thing to watch - as best I can tell, Dallas has not standardized
+their thermal devices with respect to their outputs.  For example, the
+DS1820 and DS1920  both return a 9 bit value that's basically an integer.
+However, the DS1822 returns a VARIABLE length value (12 bits by default),
+with a binary point between the 3rd and 4th digits.  According to someone
+else on the list, the ThermoCRON iButton is different yet again.
+
+
+Here is another post from Jeff Pagel (06/2002).
+
+
+The Dallas '1-wire' bus for the ibutton family is actually 2 wires(there
+are only 2 connecting points on the devices).  1 for signal and power, the
+other for ground.  They talk about cat-5, which has 8 conductors, a lot
+because the signal charactoristics of it are very good for the '1-wire'
+bus, twisted pairs, size of the wire, etc..  Of the 8, you only need to use
+2.  Theoretically, the other 6 could be used for something else.
+
+So, back to the original problem, you would need to run a twisted pair,
+like cat5 or cat3, from your mh machine to the garage.  I have cat5 runs of
+over 500 feet that work fine without any special conditioning.
+
+The cool part about the 1-wire bus is that you just need to run 1(ok
+actually 2,but usually in 1 bundle) wire(s) around your house.  It's like a
+'multi-drop' system.  One connects to the other, to the other, etc., in
+parallel.
+
+ In this case, you would run a line, from 1 spool of wire, to the bedroom
+to the living room to the kids room back to the computer.  If this is a
+pre-existing structure, you will face some wiring issues.  It's much easier
+for new construction.  For each ibutton, you would connect 'across' each
+line.  Just solder plus to plus, minus to minus and keep the wire going.
+Think of a railroad track as the 'wire' and the railroad ties as the
+ibutton devices.
+
+The 1-wire bus is fairly restrictive on how you wire it vs how long the
+runs are.  You should avoid 'star' type configurations.  They are ok, but
+only for short runs, the stars introduce reflections of the signal.
+
+Here will be a really bad ascii representation:
+
+
+ Host +   -----------------------------------------------------
+                     |                  |                     |
+                  ibutton1           ibutton2             ibutton3
+                     |                  |                     |
+ Host -   ----------------------------------------------------
+
+
+
+From Yannick Moussette (06/2002)
+
+The DS1820 Temp sensors come in 2 models: iButton and TO-220
+(transistor-type casing).
+
+The Ibutton has a total of 2 connections, ground and signal. It functions in
+"parasitic" mode to draw its power from the signal connections (kinda of
+like what X10 modules do to piggyback signals on powerlines...).
+
+Where things that may confuse you on Dallas's Website site, is the TO-220
+format of this same sensor which has 3 leads (connections). 1 for power, 1
+for ground and 1 for signal(data). The power lead may be omitted, in which
+case the sensor will work exactly like its iButton counterpart: Through
+parasitic powering.
+
+Here is a link with some detailed electronic info: http://www.maxim-ic.com/1st_pages/tb1.htm
+
+Kieran Ames has a nice writeup on how he used iButtons to log and plot his
+pond temperatures: http://ames.homeip.net:81/pages/My_iButtonVenture.htm
+
+
+=head1 7.0: Setup Questions
+
+=head2 7.1: Password Management
+
+To password protect Misterhouse, you can set passwords for different users via set_password.
+The 'admin' link from the main page is only for logging in once you have setup a password.
+
+To enable password protection, run mh/bin/set_password command like this:
+
+     set_password -user family -password xyz1
+     set_password -user admin  -password xyz2
+
+    Note: only the first 8 characters are used. The admin password is
+    required for controling the mh web setup menus (e.g. item and code
+    selection menus).(Unix or Windows)
+
+This will create a file pointed to with the mh.ini password_file parm (e.g. mh/data/.password).
+To further extend which user can do what see password_allow in mh/data/
+
+
+=head2 7.2: Customizing the TV guide
+
+To set the MisterHouse TV Today so it will display listings relevant to your area and provider
+Start by finding your tv_provider ID, run this command (located in mh/bin):
+
+  get_tv_grid -zip your_zipcode -get_provider
+
+Then edit your mh.ini and set the tv_provider_name parm.
+Listed below are two examples or related parms, one that uses sat_ and one that is tv_.
+You can copy these tv_* parms as another set of sat_* or cable_* or
+or whatever_*, then run get_tv_grid multiple times to support
+multiple sets of tv schedules.  For example:
+
+   get_tv_grid -db tv   (-db tv is the default)
+   get_tv_grid -db sat
+
+  sat_provider = 128772
+  sat_provider_name = DirectTV Washington
+  sat_name =SAT               @ Used to give a useful label on the web pages
+  sat_hours=all  				@ Which hours to get.  Use all for all hours
+  sat_label=SATELLITE         @ Which web link name.  Use none to disable,
+  sat_channels_keep=          @ Which channels to keep
+  sat_channels_skip=          @ Which channels to skip
+  sat_channel_min=0           @ Keep only channels above this number
+  sat_channel_max=99999
+
+  tv_provider_name = Charter Communications - Rochester
+  tv_name = TV                @ Used to give a useful label on the web pages
+  tv_hours=02,06,10,14,18,22  @ Which hours to get.  Use all for all hours
+  tv_label=VCR                @ Which web link name.  Use none to disable,
+  tv_channels_keep=           @ Which channels to keep
+  tv_channels_skip=           @ Which channels to skip
+  tv_channel_min=0            @ Keep only channels above this number
+  tv_channel_max=99999        @ Keep only channels below this number
+
+Use mh/common/tv_grid.pl to do daily call get_tv_grid to update your tv database and web pages.
+and mh/code/common/tv_info.pl to search and announce shows.
+If you change your tv_provider, you can use get_tv_grid -reget to refresh the tv/*.html files.
+
+When I first setup MH it took me three weeks to figure out that my providerID
+had changed since install (matter of a week) and thats why the tv listings came up broken.
+So if you have a problem, and you think the syntax in the mh.ini is correct, try re-checking your provider ID.
+
+
+=head2 7.3: How can I point MisterHouse to a custom web interface?
+
+From David Norwood on 10/2001
+
+Here's a way to configure Misterhouse so you can have your own custom web
+interface AND still have access to web pages that are introduced with new
+releases (like the Audrey pages).
+
+Let's assume your misterhouse distribution is in /misterhouse/mh and your
+custom html files are in /misterhouse/web/custom.   Set these private.ini
+parameters:
+
+ html_dir=$Pgm_Root/web
+ html_file=/custom/index.html
+ html_alias_custom=/custom       /misterhouse/web/custom
+
+Now your custom web pages will come up by default, but you will still have
+access to the latest and greatest "mh4" and "ia*" interfaces.  Your pages
+will not be over-written by new releases.  If you need another directory
+for, say, your audrey interface, just add another html_alias_whatever
+parameter.
+
+You can now also override just specific pages from an existing web interface.
+For example, create your own web/ia5 and web/ia5/security
+directories, then add this mh.ini parm to point to it:
+
+ html_alias2_ia5    = /misterhouse/web/ia5
+
+For example, you can change the ia5 Security menu to point to different webcams or floorplan
+images by creating your own web/ia5/security directory with just the files you want to
+modify.
+
+
+
+=cut
+
+
+
diff --git a/docs/usenet_post.txt b/docs/usenet_post.txt
index 75c6a5427..3a8f20394 100644
--- a/docs/usenet_post.txt
+++ b/docs/usenet_post.txt
@@ -1,103 +1,103 @@
-All messages from thread 
-Message 1 in thread 
-From: Bruce Winter (brucewinter@home.net)
-Subject: MisterHouse open source HA program 
- 
-  
-View this article only 
-Newsgroups: comp.home.automation
-Date: 1999/04/01 
- 
-
-Hi all,
-
-I am the author of a free, perl based HomeAutomation (HA) program called
-mysterious (mh).  I've been using/extending for about a year or so, but it
-has just recently become stable enough that I feel comfortable posting this
-announcement.
-
-Perl is a free, powerful, interpreted language that is available on many
-different operating systems.  By extending perl with various HA related
-objects and methods, mh can use the perl language for its event language.
-Since it is written in perl, it can in theory run on any OS that runs perl.
-I've run it on Windows 95, 98, NT, linux, and AIX.
-
-On the windows platform, mh can use free MS  TTS and VR engines.  On linux,
-it can use the Festival TTS engine.
-
-On the downside, it is a bit of a memory hog, using between 10 and 20 mb,
-depending on if you enable the Tk gui interface and how many events you
-have.  On my house computer, for example, I have about 3k lines of code in
-40 different event files.  This uses 20 mb and about 30% of a 100 mhz
-Pentium cpu, set at 10 passes per second.
-
-On the upside, since it is an extension of a powerful programming language,
-you can fairly easily program complex events.  Here are a few of the tasks I
-have running:
-
-- Control of south facing window curtains.  By monitoring sunlight and
-temperatures, mh can maximize passive solar heat gain.
-
-- Internet data retrieval and processing.  Monitors URLs, sends and monitors
-email, announcing who has what mail.  Other example data is weather info and
-TV programming.
-
-- Controls a relay enabled PA speaker system, so it can speak to one room or
-all rooms in the house.
-
-- For those with radio receivers, it can tracks HAM radio GPS enable cars,
-announcing speed and position.  Also gathers weather data from HAM/packet
-weather stations.
-
-You can control events with voice, a web interface, a Tk widget GUI
-interface, from a command line, via tcpip sockets, time of day, and/or
-serial port data.  It currently has code to interface with the CM11, various
-weeder PIC kits, wx200 weather station, and various other serial devices.
-
-Programming mh is not as easy to program as some of the other fine HA
-programs out there, and it requires a 32 Meg 100 mhz Pentium or bigger, so
-it is not for everyone.  But it is free and open sourced, so if it doesn't
-do what you want it to do, you can change it or ask for a change from any
-the other mh users.  Currently there are about 50 people on the mailing
-list.
-
- You can download it and or view the mailing list archives from any of the
-following:
-
-  http://members.home.net/winters/house/programs/index.html
-  http://www.geocities.com/ResearchTriangle/Lab/5514/index.html
-  http://misterhouse.webjump.com/index.html
-
-
-Bruce Winter
-Message 2 in thread 
-From: Bruce Winter (brucewinter@home.net)
-Subject: Re: MisterHouse open source HA program 
- 
-  
-View this article only 
-Newsgroups: comp.home.automation
-Date: 1999/04/02 
- 
-
-blush ... my spell checker went out of control.  I ment to say:
-
-    "program called MisterHouse"
-
-instead of:
-
-    "program called mysterious"
-
-One other note: you can take a peek at the web interface at
-
-http://winter.tzo.com:8080
-
-This is MisterHouse running on my house computer, connected to the net via a
-cable modem.
-
-Bruce
-
-> I am the author of a free, perl based HomeAutomation (HA) program called
-> mysterious (mh).  I've been using/extending for about a year or so, but it
-> has just recently become stable enough that I feel comfortable posting this
-> announcement.
+All messages from thread 
+Message 1 in thread 
+From: Bruce Winter (brucewinter@home.net)
+Subject: MisterHouse open source HA program 
+ 
+  
+View this article only 
+Newsgroups: comp.home.automation
+Date: 1999/04/01 
+ 
+
+Hi all,
+
+I am the author of a free, perl based HomeAutomation (HA) program called
+mysterious (mh).  I've been using/extending for about a year or so, but it
+has just recently become stable enough that I feel comfortable posting this
+announcement.
+
+Perl is a free, powerful, interpreted language that is available on many
+different operating systems.  By extending perl with various HA related
+objects and methods, mh can use the perl language for its event language.
+Since it is written in perl, it can in theory run on any OS that runs perl.
+I've run it on Windows 95, 98, NT, linux, and AIX.
+
+On the windows platform, mh can use free MS  TTS and VR engines.  On linux,
+it can use the Festival TTS engine.
+
+On the downside, it is a bit of a memory hog, using between 10 and 20 mb,
+depending on if you enable the Tk gui interface and how many events you
+have.  On my house computer, for example, I have about 3k lines of code in
+40 different event files.  This uses 20 mb and about 30% of a 100 mhz
+Pentium cpu, set at 10 passes per second.
+
+On the upside, since it is an extension of a powerful programming language,
+you can fairly easily program complex events.  Here are a few of the tasks I
+have running:
+
+- Control of south facing window curtains.  By monitoring sunlight and
+temperatures, mh can maximize passive solar heat gain.
+
+- Internet data retrieval and processing.  Monitors URLs, sends and monitors
+email, announcing who has what mail.  Other example data is weather info and
+TV programming.
+
+- Controls a relay enabled PA speaker system, so it can speak to one room or
+all rooms in the house.
+
+- For those with radio receivers, it can tracks HAM radio GPS enable cars,
+announcing speed and position.  Also gathers weather data from HAM/packet
+weather stations.
+
+You can control events with voice, a web interface, a Tk widget GUI
+interface, from a command line, via tcpip sockets, time of day, and/or
+serial port data.  It currently has code to interface with the CM11, various
+weeder PIC kits, wx200 weather station, and various other serial devices.
+
+Programming mh is not as easy to program as some of the other fine HA
+programs out there, and it requires a 32 Meg 100 mhz Pentium or bigger, so
+it is not for everyone.  But it is free and open sourced, so if it doesn't
+do what you want it to do, you can change it or ask for a change from any
+the other mh users.  Currently there are about 50 people on the mailing
+list.
+
+ You can download it and or view the mailing list archives from any of the
+following:
+
+  http://members.home.net/winters/house/programs/index.html
+  http://www.geocities.com/ResearchTriangle/Lab/5514/index.html
+  http://misterhouse.webjump.com/index.html
+
+
+Bruce Winter
+Message 2 in thread 
+From: Bruce Winter (brucewinter@home.net)
+Subject: Re: MisterHouse open source HA program 
+ 
+  
+View this article only 
+Newsgroups: comp.home.automation
+Date: 1999/04/02 
+ 
+
+blush ... my spell checker went out of control.  I ment to say:
+
+    "program called MisterHouse"
+
+instead of:
+
+    "program called mysterious"
+
+One other note: you can take a peek at the web interface at
+
+http://winter.tzo.com:8080
+
+This is MisterHouse running on my house computer, connected to the net via a
+cable modem.
+
+Bruce
+
+> I am the author of a free, perl based HomeAutomation (HA) program called
+> mysterious (mh).  I've been using/extending for about a year or so, but it
+> has just recently become stable enough that I feel comfortable posting this
+> announcement.
diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index 58afb690f..ba9c5a810 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -1,1370 +1,1370 @@
-package Insteon;
-
-use strict;
-
-# Category=Insteon
-
-#@ This module creates voice commands for all insteon related items.
-
-=head1 B<Insteon>
-
-=head2 DESCRIPTION
-
-Provides the basic infrastructure for the Insteon stack, contains many of the 
-startup routines.
-
-=head2 INHERITS
-
-None
-
-=head2 VOICE COMMANDS
-
-=head3 PLM
-
-=over
-
-=item C<Complete Linking as Responder>
-
-If a device is first placed into linking mode, calling this command will cause
-the PLM to complete the link, thus making the PLM the responder.  The 
-C<Link To Interface> device voice command is likely an easier way to do this, 
-but this may be need for hard to reach devices or deaf devices.
-
-=item C<Initiate Linking as Controller>
-
-Call this first, then press and hold the set button on a device that you wish
-to have the PLM control.  The C<Link To Interface> device voice command is 
-likely an easier way to do this, but this may be need for hard to reach devices 
-or deaf devices.  This is also needed for i2cs devices in which the first link
-must currently be manually created this way.
-
-=item C<Cancel Linking>
-
-Cancel either of the above two commands without completing a link.
-
-=item C<Delete Link with PLM>
-
-This does nothing and shoudl be removed.
-
-=item C<Scan Link Table>
-
-This will scan and output to the log only the PLM link table.
-
-=item C<Log Links>
-
-This will output only the PLM link table to log.
-
-=item C<Delete Orphan Links>
-
-Misterhouse will review the state of all of the links in your system, as it knows
-them without any additional scanning.  If any of these links are not defined in
-your mht file or the links are only half links (controller with no responder or
-vice versa) MisterHouse will delete these links.
-
-It is usually best to:
-
-1. Run C<Scan Changed Device Link Tables> first unless you know that the
-information in MisterHouse is up-to-date.
-
-2. Run C<AUDIT Sync All Links> and verify that what is being added is correct.
-
-3. Run C<Sync All Links> to add the links
-
-4. Run C<AUDIT Delete Orphan Links> first to see what will happen.
-
-5. If everything looks right, run C<Delete Orphan Links> to clean up the old links
-
-Deleting the orphan links will make your devices happier.  If you have unintended
-links on your devices, they can run slower and may unnecessarily increase the 
-number of messages sent on your network.
-
-=item C<AUDIT Delete Orphan Links>
-
-Does the same thing as C<Delete Orphan Links> but doesn't actually delete anything
-instead it just prints what it would have done to the log.
-
-=item C<Scan All Device Link Tables>
-
-Scans the link tables of the PLM and all devices on your network.  On a large
-network this can take sometime.  You can generally run C<Scan Changed Device Link Tables>
-which is much faster without any issue.
-
-=item C<Scan Changed Device Link Tables>
-
-Scans the link tables of the PLM and all devices whose link tables have changed
-on your network.
-
-=item C<Sync All Links>
-
-Similar to C<Delete Orphan Links> exccept this adds any links that are missing.
-This is helpful when adding a bunch of new devices, new scenes, or cleaning things
-up.
-
-See the workflow described in C<Delete Orphan Links>.
-
-=item C<AUDIT Sync All Links>
-
-Same as C<Sync All Links> but prints what it would do to the log, without doing
-anything else.
-
-=item C<print all message stats>
-
-Prints the message stats for all devices plus a summary of the entire network
-stats.  For full details on what is contained in this printout please see
-the description for the C<print message stats> voice command under the device
-heading below.
-
-=item C<reset all message stats>
-
-Resets all the message stats for all devices including the Unk_Error stat.
-
-=item C<stress test All devices>
-
-Performs a 5 count stress test on all devices on the network.  See the description
-of what a stress test is under the device voice commands.
-
-=item C<ping test All devices>
-
-Performs a 5 count ping test on all devices on the network.  See the description
-of what a ping test is under the device voice commands.
-
-=item C<Log All Device ALDB Status>
-
-Logs some details about each device to the log.  See C<log_all_ADLB_status()>
-
-=back
-
-=head3 Devices
-
-=over
-
-=item C<on>
-
-Turns the device on.
-
-=item C<off>
-
-Turns the device off.
-
-=item C<Sync Links>
-
-Similar to C<Sync All Links> above, but this will only add links that are related
-to this device.  Useful when adding a new device.
-
-=item C<Link to Interface>
-
-Will create the controller/responder links between the device and the PLM.
-
-=item C<Unlink with Interface>
-
-Will delete the controller/responder links between the device and the PLM.  
-Useful if you are removing a device from your network.
-
-=item C<Status>
-
-Requests the status of the device.
-
-=item C<Get Engine Version>
-
-Requests the engine version of the device.  Generally you would not need to call
-this, but every now and then it is needed when a new device is installed.
-
-=item C<Scan Link Table>
-
-This will scan and output to the log only the link table of this device.
-
-=item C<Log Links>
-
-Will output to the log only the link table of this device.
-
-=item C<Initiate Linking as Controller>
-
-Generally only available for PLM Scenes.  This places the PLM in linking mode
-and adds any device which the set button is pressed for 4 seconds as a responder
-to this scene.  Generally not needed.
-
-=item C<Cancel Linking>
-
-Cancels the above linking session without creating a link.
-
-=item C<Run Stress Test>
-
-Simulates a read of a 5 link addresses from the device.  This routine is meant to 
-be used as a diagnostic tool.
-
-This is also similar to the C<ping> test, however, rather than simply requesting
-an ACK, this requests a full set of data equivalent to a link entry.  Similar to
-C<ping> this should be used with C<print_message_log> to diagnose issues and try
-different settings.
-
-=item C<Run Ping Test>
-
-Sends 5 ping messages to the device.  A ping message is a basic 
-message that simply asks the device to respond with an ACKnowledgement.  For
-i1 devices this will send a standard length command, for i2 and i2cs devices
-this will send an extended ping command.  In both cases, the device responds
-back with a standard length ACKnowledgement only.
-
-Much like the ping command in IP networks, this command is useful for testing the
-connectivity of a device on your network.  You likely want to use this in 
-conjunction with the C<print_message_log> routine.  For example, you can use 
-this to compare the message stats for a device when changing settings in 
-MisterHouse.
-
-=item C<Print Message Stats>
-
-Prints message statistics for this device to the print log.  
-
-=back
-
-=over8
-
-=item * 
-
-In - The number of incoming messages received
-
-=item * 
-
-Corrupt - The number of incoming corrupt messages received
-
-=item * 
-
-%Corrpt - Of the incoming messages received, the percentage that were 
-corrupt
-
-=item *
-
-Dupe - The number of duplicate messages that have been received from this 
-device.
-
-=item *
-
-%Dupe - The percentage of duplilicate incoming messages received.
-
-=item *
-
-Hops_Left - The average hops left in the messages received from this device.
-
-=item *
-
-Max_Hops - The average maximum hops in the messages received from this device.
-
-=item *
-
-Act_Hops - Max_Hops - Hops_Left, this is the average number of hops that have
-been required for a message sent from the device to reach MisterHouse.
-
-=item * 
-
-Out - The number of unique outgoing messages, without retries, sent. 
-
-=item * 
-
-Fail - The number times that all retries were exhausted without a successful
-delivery of a message.
-
-=item * 
-
-%Fail - Of the outgoing messages sent, the percentage that failed.
-
-=item * 
-
-Retry - The number of retry attempts that have been made to deliver a message. 
-Ideally this is 0, but Sends/Msg is a better indication of this parameter.
-
-=item * 
-
-AvgSend - The average number of send attempts that must be made in order to 
-successfully deliver a message.  Ideally this would be 1.0.  
-
-NOTE: If the number of retries exceeds the value set in the configuration file 
-for Insteon_retry_count, MisterHouse will abandon sending the message.  As a 
-result, as this number approaches Insteon_retry_count it becomes a less accurate 
-representation of the number of retries needed to reach a device.
-
-=item *
-
-Avg_Hops - The average number of hops that have been used by MisterHouse when
-sending messages to this device.
-
-=item *
-
-Hop_Count - The current hop count being used by MH.  This count is dynamically
-controlled by MH and is not reset by calling C<reset_message_stats>
-
-=back
-
-=over
-
-=item C<Reset Message Stats>
-
-Resets the message stats back to 0 for this device.
-
-=back
-
-=head2 METHODS
-
-=over
-
-=cut
-
-
-my (@_insteon_plm,@_insteon_device,@_insteon_link,@_scannable_link,$_scan_cnt,$_sync_cnt,$_sync_failure_cnt);
-my $init_complete;
-my (@_scan_devices,@_scan_device_failures,$current_scan_device);
-my (@_sync_devices,@_sync_device_failures,$current_sync_device);
-my ($_stress_test_count, $_stress_test_one_pass, @_stress_test_devices);
-my ($_ping_count, @_ping_devices);
-
-=item C<stress_test_all(count, [is_one_pass])>
-
-Sequentially goes through every Insteon device and performs a stress_test on it.  
-See L<Insteon::BaseDevice::stress_test|Insteon::BaseInsteon::BaseDevice::stress_test> 
-for a more detailed description of stress_test.
-
-Parameters:
-	Count: defines the number of stress_tests to perform on each device.
-	is_one_pass: if true, all stress_tests will be performed on a device
-		before proceeding to the next device. if false, the routine 
-		loops through all devices performing one stress_test on each 
-		device before moving on to the next device.
-
-=cut
-
-sub stress_test_all
-{
-	my ($p_count, $is_one_pass) = @_;
-	if (defined $p_count){
-		$_stress_test_count = $p_count; 
-		$_stress_test_one_pass = $is_one_pass;
-		@_stress_test_devices = undef; 
-		push @_stress_test_devices, Insteon::find_members("Insteon::BaseDevice");
-		main::print_log("[Insteon::Stress Test All Devices] Stress Testing All Devices $p_count times");
-	};	
-	if (!@_stress_test_devices) {
-		#Iteration may be complete, start over from the beginning
-		$_stress_test_count = ($_stress_test_one_pass) ? 0 : $_stress_test_count--; 
-		push @_stress_test_devices, Insteon::find_members("Insteon::BaseDevice");
-	}
-	if ($_stress_test_count > 0){
-		my $current_stress_test_device;
-		my $complete_callback = '&Insteon::stress_test_all()';
-		while (@_stress_test_devices){
-			$current_stress_test_device = pop @_stress_test_devices;
-			next unless $current_stress_test_device->is_root();
-			next unless $current_stress_test_device->is_responder();
-			last;
-		}
-		my $run_count = ($_stress_test_one_pass) ? $_stress_test_count : 1;
-		if (ref $current_stress_test_device && $current_stress_test_device->can('stress_test')){
-			$current_stress_test_device->stress_test($run_count, $complete_callback);
-		}
-	} 
-	else {
-		$_stress_test_one_pass = 0;
-		main::print_log("[Insteon::Stress Test All Devices] Complete");
-	}
-}
-
-=item C<scan_all_linktables()>
-
-Walks through every Insteon device calling the device's scan links command.
-Does not output anything but will recreate the device's aldb from the actual
-entries in the device.
-
-=cut
-
-sub scan_all_linktables
-{
-	my $skip_unchanged = pop(@_);
-	$skip_unchanged = 0 if (ref $skip_unchanged || !defined($skip_unchanged));
-	if ($current_scan_device)
-        {
-        	&main::print_log("[Scan all linktables] WARN: link already underway. Ignoring request for new scan ...");
-                return;
-        }
-        my @candidate_devices = ();
-        # clear @_scan_devices
-        @_scan_devices = ();
-        @_scan_device_failures = ();
-        $current_scan_device = undef;
-        # alwayws include the active interface (e.g., plm)
-       	push @_scan_devices, &Insteon::active_interface;
-
-       	push @candidate_devices, &Insteon::find_members("Insteon::BaseDevice");
-
-        # don't try to scan devices that are not responders
-        if (@candidate_devices)
-        {
-        	foreach (@candidate_devices)
-        	{
-        		my $candidate_object = $_;
-        		if ($candidate_object->is_root and
-                		!($candidate_object->is_deaf
-                		or $candidate_object->isa('Insteon::InterfaceController')))
-                	{
-		       		push @_scan_devices, $candidate_object;
-                		&main::print_log("[Scan all linktables] INFO1: "
-                        		. $candidate_object->get_object_name
-                        		. " will be scanned.") if $candidate_object->debuglevel(1, 'insteon');
-        		}
-                	else
-                	{
-                		&main::print_log("[Scan all linktables] INFO: !!! "
-                        		. $candidate_object->get_object_name
-                        		. " is NOT a candidate for scanning.");
-                	}
-		}
-        }
-        else
-        {
-        	&main::print_log("[Scan all linktables] WARN: No insteon devices could be found");
-        }
-        $_scan_cnt = scalar @_scan_devices;
-
-        &_get_next_linkscan($skip_unchanged);
-}
-
-=item C<_get_next_linkscan_failure()>
-
-Called if a the scanning of a device fails.  Logs the failure and proceeds to 
-the next device.
-
-=cut
-
-sub _get_next_linkscan_failure
-{
-	my($skip_unchanged) = @_;
-        push @_scan_device_failures, $current_scan_device;
-        &main::print_log("[Scan all link tables] WARN: failure occurred when scanning "
-                	. $current_scan_device->get_object_name . ".  Moving on...");
-        &_get_next_linkscan($skip_unchanged);
-
-}
-
-=item C<_get_next_linkscan()>
-
-Gets the next device to scan.
-
-=cut
-
-sub _get_next_linkscan
-{
-	my($skip_unchanged, $changed_device) = @_;
-	my $checking = 0;
-	if (!defined($changed_device)) {
-		$current_scan_device = shift @_scan_devices;
-		if ($skip_unchanged && $current_scan_device && ($current_scan_device != &Insteon::active_interface)){
-			## check if aldb_delta has changed;
-			$current_scan_device->_aldb->{_aldb_unchanged_callback} = '&Insteon::_get_next_linkscan('.$skip_unchanged.')';
-			$current_scan_device->_aldb->{_aldb_changed_callback} = '&Insteon::_get_next_linkscan('.$skip_unchanged.', '.$current_scan_device->get_object_name.')';
-			$current_scan_device->_aldb->{_failure_callback} = '&Insteon::_get_next_linkscan_failure('.$skip_unchanged.')';
-			$current_scan_device->_aldb->query_aldb_delta("check");
-			$checking = 1;
-		}
-	} else {
-		$current_scan_device = $changed_device;
-	}
-	if ($current_scan_device && ($checking == 0))
-        {
-          	&main::print_log("[Scan all link tables] Now scanning: "
-                	. $current_scan_device->get_object_name . " ("
-                        . ($_scan_cnt - scalar @_scan_devices)
-                        . " of $_scan_cnt)");
-                # pass first the success callback followed by the failure callback
-          	$current_scan_device->scan_link_table('&Insteon::_get_next_linkscan('.$skip_unchanged.')','&Insteon::_get_next_linkscan_failure('.$skip_unchanged.')');
-    	} elsif (scalar(@_scan_devices) == 0 && ($checking == 0))
-    	{
-          	&main::print_log("[Scan all link tables] All tables have completed scanning");
-                my $_scan_failure_cnt = scalar @_scan_device_failures;
-                if ($_scan_failure_cnt){
-			my $obj_list;
-			for my $failed_obj (@_scan_device_failures){
-				$obj_list .= $failed_obj->get_object_name .", ";
-			}
-			::print_log("[Scan all link tables] However, some failures "
-				."were noted with the following devices: $obj_list");
-		}
-    	}
-}
-
-=item C<sync_all_links()>
-
-Initiates a process that will walk through every device that is a Insteon::InterfaceController 
-calling the device's sync_links() command.  sync_all_links() loads up the module
-global variable @_sync_devices then kicks off the recursive call backs by calling
-_get_next_linksync.
-
-Paramter B<audit_mode> - Causes sync to walk through but not actually 
-send any commands to the devices.  Useful with the insteon:3 debug setting for 
-troubleshooting. 
-
-=cut
-
-sub sync_all_links
-{
-	my ($audit_mode) = @_;
-        &main::print_log("[Sync all links] Starting now!");
-        @_sync_devices = ();
-	# iterate over all registered objects and compare whether the link tables match defined scene linkages in known Insteon_Links
-	for my $obj (&Insteon::find_members('Insteon::BaseController'))
-	{
-		my %sync_req = ('sync_object' => $obj, 'audit_mode' => ($audit_mode) ? 1 : 0);
-		&main::print_log("[Sync all links] Adding " . $obj->get_object_name
-			. " to sync queue");
-		push @_sync_devices, \%sync_req
-	}
-
-        $_sync_cnt = scalar @_sync_devices;
-
-        &_get_next_linksync();
-}
-
-=item C<_get_next_linksync()>
-
-Calls the sync_links() function for each device in the module global variable 
-@_sync_devices.  This function will be called recursively since the callback 
-passed to sync_links() is this function again.  Will also ask sync_links() to 
-call _get_next_linksync_failure() if sync_links() fails. 
-
-=cut
-
-sub _get_next_linksync
-{
-   	$current_scan_device = shift @_scan_devices;
-	my $sync_req_ptr = shift(@_sync_devices);
-        my %sync_req = ($sync_req_ptr) ? %$sync_req_ptr : undef;
-        if (%sync_req)
-        {
-
-        	$current_sync_device = $sync_req{'sync_object'};
-        }
-        else
-        {
-        	$current_sync_device = undef;
-        }
-
-	if ($current_sync_device)
-        {
-          	&main::print_log("[Sync all links] Now syncing: "
-                	. $current_sync_device->get_object_name . " ("
-                        . ($_sync_cnt - scalar @_sync_devices)
-                        . " of $_sync_cnt)");
-		my $skip_deaf = 1;
-                # pass first the success callback followed by the failure callback
-          	$current_sync_device->sync_links($sync_req{'audit_mode'}, '&Insteon::_get_next_linksync()','&Insteon::_get_next_linksync_failure()', $skip_deaf);
-    	}
-        else
-        {
-          	&main::print_log("[Sync all links] All links have completed syncing");
-                my $_sync_failure_cnt = scalar @_sync_device_failures;
-                if ($_sync_failure_cnt){
-			my $obj_list;
-			for my $failed_obj (@_sync_device_failures){
-				$obj_list .= $failed_obj->get_object_name .", ";
-			}
-			::print_log("[Sync all links] WARN! Failures occured, "
-				."some links involving the following objects remain out-of-sync: $obj_list");
-		}
-    	}
-
-}
-
-=item C<_get_next_linksync()>
-
-Called by the failure callback in a device's sync_links() function.  Will add
-the failed device to the module global variable @_sync_device_failures. 
-
-=cut
-
-sub _get_next_linksync_failure
-{
-        push @_sync_device_failures, $current_sync_device 
-		unless (grep{$current_sync_device == $_} @_sync_device_failures);
-        &main::print_log("[Sync all links] WARN: failure occurred when syncing links for "
-                	. $current_sync_device->get_object_name . ". Resuming sync queue if it exists.");
-	my $num_sync_queue = @{$$current_sync_device{sync_queue}};
-	if ($num_sync_queue){
-		$current_sync_device->_process_sync_queue();
-	}
-	else { #No other pending links in the queue
-		&_get_next_linksync();
-	}
-
-}
-
-=item C<ping_all([count)>
-
-Walks through every Insteon device and pings it as many times as defined by 
-count.  See L<Insteon::BaseDevice::ping|Insteon::BaseInsteon::BaseDevice::ping> 
-for a more detailed description of ping.
-
-=cut
-
-sub ping_all
-{
-	my ($p_count) = @_;
-	if (defined $p_count){
-		$_ping_count = $p_count;
-		@_ping_devices = ();
-		push @_ping_devices, Insteon::find_members("Insteon::BaseDevice");
-		main::print_log("[Insteon::Ping All Devices] Ping All Devices $p_count times");
-	}
-	if (@_ping_devices)
-	{
-		my $current_ping_device;
-		while(@_ping_devices)
-		{
-			$current_ping_device = pop @_ping_devices;
-			next unless $current_ping_device->is_root();
-			next unless $current_ping_device->is_responder(); 
-			last;
-		}
-		$current_ping_device->ping($_ping_count, '&Insteon::ping_all()')
-                		if $current_ping_device->can('ping');
-	} else
-	{
-		$_ping_count = 0;
-		main::print_log("[Insteon::Ping All Devices] Ping All Complete");
-	}
-}
-
-=item C<log_all_ADLB_status()>
-
-Walks through every Insteon device and logs:
-
-=back
-
-=over8
-
-=item * 
-
-Hop Count
-
-=item * 
-
-Engine Version
-
-=item * 
-
-ALDB Type
-
-=item * 
-
-ALDB Health
-
-=item * 
-
-ALDB Scan Time
-
-=back
-
-=over
-
-=cut
-
-sub log_all_ADLB_status
-{
-	my @_log_ALDB_devices = ();
-	# alwayws include the active interface (e.g., plm)
-#	push @_log_ALDB_devices, &Insteon::active_interface;
-
-	push @_log_ALDB_devices, Insteon::find_members("Insteon::BaseDevice");
-
-	# don't try to scan devices that are not responders
-	if (@_log_ALDB_devices)
-	{
-		my $log_ALDB_cnt = @_log_ALDB_devices;
-		my $count = 0;
-		foreach my $current_log_ALDB_device (@_log_ALDB_devices)
-		{
-			$count++;
-			if ($current_log_ALDB_device->is_root and
-				!($current_log_ALDB_device->isa('Insteon::InterfaceController')))
-			{
-				&main::print_log("[log all device ALDB status] Now logging: "
-					. $current_log_ALDB_device->get_object_name()
-					. " ($count of $log_ALDB_cnt)");
-				$current_log_ALDB_device->log_aldb_status();
-			} else
-			{
-				main::print_log("[log all device ALDB status] INFO: !!! "
-					. $current_log_ALDB_device->get_object_name
-					. " is NOT a candidate for logging ($count of $log_ALDB_cnt)");
-			}
-		}
-		main::print_log("[log all device ALDB status] All devices have completed logging");
-	} else
-	{
-		main::print_log("[log all device ALDB status] WARN: No insteon devices could be found");
-	}
-}
-
-=item C<print_all_message_stats>
-
-Walks through every Insteon device and prints statistical information about
-its message handling, as well as a summary average of the entire network.  See 
-L<Insteon::BaseDevice::print_message_stats|Insteon::BaseInsteon::BaseDevice::print_message_stats> 
-for more detailed information.
-
-This command adds the following extra data points:
-
-=back
-
-=over8
-
-=item * 
-
-Unk_Error - The number of messages which have arrived at the PLM which cannot
-be associated with any know device.
-
-=back
-
-=over
-
-=cut
-
-sub print_all_message_stats
-{
-    my @_log_devices = ();
-	push @_log_devices, Insteon::find_members("Insteon::BaseDevice");
-
-	if (@_log_devices)
-	{
-		#Initialize all of the tracking variables
-		my $retry_average = 0;
-    	my $fail_percentage = 0;
-    	my $corrupt_percentage = 0; 
-    	my $dupe_percentage = 0;
-    	my $avg_hops_left = 0;
-    	my $avg_max_hops = 0;
-		my $avg_out_hops = 0;
-    	my $curr_hops_avg = 0;
-    	
-		my $incoming_count_log = 0;
-		my $corrupt_count_log = 0;
-		my $dupe_count_log = 0;
-		my $retry_count_log = 0;
-		my $outgoing_count_log = 0;
-		my $fail_count_log = 0;
-		my $default_hop_count = 0;
-		my $hops_left_count = 0;
-		my $max_hops_count = 0;
-		my $outgoing_hop_count =0;
-		
-		my $device_count = 0;
-
-		foreach my $current_log_device (@_log_devices)
-		{
-			#Skip non-root items
-			next unless $current_log_device->is_root;
-			
-			$device_count++;
-			
-			#Prints the Individual Message for the Device
-			$current_log_device->print_message_stats;
-			
-			#Add values for each device to the master count
-			$incoming_count_log += $current_log_device->incoming_count_log;
-			$corrupt_count_log += $current_log_device->corrupt_count_log;
-			$dupe_count_log += $current_log_device->dupe_count_log;
-			$retry_count_log += $current_log_device->retry_count_log;
-			$outgoing_count_log += $current_log_device->outgoing_count_log;
-			$fail_count_log += $current_log_device->fail_count_log;
-			$default_hop_count += $current_log_device->default_hop_count;
-			$hops_left_count += $current_log_device->hops_left_count;
-			$max_hops_count += $current_log_device->max_hops_count;
-			$outgoing_hop_count += $current_log_device->outgoing_hop_count;
-		}
-		
-		#Calculate the averages
-	    $retry_average = sprintf("%.1f", ($retry_count_log / 
-	        $outgoing_count_log) + 1) if ($outgoing_count_log > 0); 
-	    $fail_percentage = sprintf("%.1f", ($fail_count_log / 
-	        $outgoing_count_log) * 100 ) if ($outgoing_count_log > 0);
-	    $corrupt_percentage = sprintf("%.1f", ($corrupt_count_log / 
-	        $incoming_count_log) * 100 ) if ($incoming_count_log > 0);
-	    $dupe_percentage = sprintf("%.1f", ($dupe_count_log / 
-	        $incoming_count_log) * 100 ) if ($incoming_count_log > 0);
-	    $avg_hops_left = sprintf("%.1f", ($hops_left_count / 
-	        $incoming_count_log)) if ($incoming_count_log > 0);
-	    $avg_max_hops = sprintf("%.1f", ($max_hops_count / 
-	        $incoming_count_log)) if ($incoming_count_log > 0);
-    	$avg_out_hops = sprintf("%.1f", ($outgoing_hop_count / 
-        	$outgoing_count_log)) if ($outgoing_count_log > 0);
-    	$curr_hops_avg = sprintf("%.1f", ($default_hop_count / 
-        	$device_count)) if ($device_count > 0);
-    	::print_log(
-	        "[Insteon] Average Network Statistics:\n"
-	        . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops Unk_Error\n"
-	        . sprintf("%6s", $incoming_count_log)
-	        . sprintf("%8s", $corrupt_count_log)
-	        . sprintf("%8s", $corrupt_percentage . '%')
-	        . sprintf("%6s", $dupe_count_log)
-	        . sprintf("%8s", $dupe_percentage . '%')
-	        . sprintf("%9s", $avg_hops_left)
-	        . sprintf("%9s", $avg_max_hops)
-	        . sprintf("%9s", $avg_max_hops - $avg_hops_left)
-	        . sprintf("%10s", &Insteon::active_interface->corrupt_count_log)
-	        . "\n"
-	        . "   Out    Fail   %Fail Retry AvgSend Avg_Hops CurrHops\n"
-	        . sprintf("%6s", $outgoing_count_log)
-	        . sprintf("%8s", $fail_count_log)
-	        . sprintf("%8s", $fail_percentage . '%')
-	        . sprintf("%6s", $retry_count_log)
-	        . sprintf("%8s", $retry_average)
-	        . sprintf("%9s", $avg_out_hops)
-	        . sprintf("%9s", $curr_hops_avg)
-    	);
-		main::print_log("[Insteon::Print_All_Message_Stats] All devices have completed logging");
-	} else
-	{
-		main::print_log("[Insteon::Print_All_Message_Stats] WARN: No insteon devices could be found");
-	}
-}
-
-=item C<reset_all_message_stats>
-
-Walks through every Insteon device and resets the statistical information about
-its message handling.
-
-=cut
-
-sub reset_all_message_stats
-{
-    my @_log_devices = ();
-    &Insteon::active_interface->reset_message_stats;
-    push @_log_devices, Insteon::find_members("Insteon::BaseDevice");
-
-	if (@_log_devices)
-	{
-		foreach my $current_log_device (@_log_devices)
-		{
-			$current_log_device->reset_message_stats 
-                if $current_log_device->can('reset_message_stats');
-		}
-		main::print_log("[Insteon::Reset_All_Message_Stats] All devices have been reset");
-	} else
-	{
-		main::print_log("[Insteon::Reset_All_Message_Stats] WARN: No insteon devices could be found");
-	}
-}
-
-=item C<init()>
-
-Initiates the insteon stack, mostly just sets the trigger. 
-
-=cut
-
-sub init {
-
-    # only run once
-    return if $init_complete;
-    $init_complete = 1;
-
-    # initialize scan and sync counters
-    $_scan_cnt = 0;
-    $_sync_cnt = 0;
-    @_scan_devices = ();
-
-    #################################################################
-    ## Trigger creation
-    #################################################################
-    my ($trigger_event, $trigger_code, $trigger_type);
-
-    my @trigger_info = &main::trigger_get('scan insteon link tables');
-    if (@trigger_info) {
-	# Trigger exists; modify just the minimum so the trigger continues
-	# to work if we change the trigger code, but respect everything
-	# else (trigger type and time to run). This prevents unconditionally
-	# re-enabling the trigger if the user has disabled it.
-	$trigger_event = $trigger_info[0];
-	$trigger_type = $trigger_info[2];
-    } else {
-	# Trigger does not exist; create one with our default values.
-	$trigger_event = "time_cron '00 02 * * *'";
-	$trigger_type = 'NoExpire';
-    }
-
-    $trigger_code = '&Insteon::scan_all_linktables()';
-
-    # Create/update trigger for a nightly link table scan
-    &main::trigger_set($trigger_event, $trigger_code, $trigger_type,
-		       'scan insteon link tables', 1);
-    #################################################################
-
-    @_insteon_plm = ();
-    @_insteon_device = ();
-    @_insteon_link = ();
-
-}
-
-=item C<generate_voice_commands()>
-
-Generates and sets the voice commands for all Insteon devices.
-
-Note: At some point, this function will be pushed out to the specific classes
-so that each class can have its own unique set of voice commands.
-
-=cut
-
-sub generate_voice_commands
-{
-
-    &main::print_log("Generating Voice commands for all Insteon objects");
-    my $object_string;
-    for my $object (&main::list_all_objects) {
-        next unless ref $object;
-        next unless $object->isa('Insteon::BaseInterface') or $object->isa('Insteon::BaseObject');
-        
-        #get object name to use as part of variable in voice command
-        my $object_name = $object->get_object_name;
-        my $object_name_v = $object_name . '_v';
-        $object_string .= "use vars '${object_name}_v';\n";
-        
-        #Convert object name into readable voice command words
-        my $command = $object_name;
-        $command =~ s/^\$//;
-        $command =~ tr/_/ /;
-        
-        my $group = ($object->isa('Insteon_PLM')) ? '' : $object->group;
-        
-        #Get list of all voice commands from the object
-        my $voice_cmds = $object->get_voice_cmds();
-        
-        #Initialize the voice command with all of the possible device commands
-        $object_string .= "$object_name_v  = new Voice_Cmd '$command [" 
-            . join(",", sort keys %$voice_cmds) . "]';\n";
-        
-        #Tie the proper routine to each voice command
-        foreach (keys %$voice_cmds) {
-            $object_string .= "$object_name_v -> tie_event('" . $voice_cmds->{$_}
-                . "', '$_');\n\n";
-        }
-        
-        #Add this object to the list of Insteon Voice Commands on the Web Interface
-        $object_string .= ::store_object_data($object_name_v, 'Voice_Cmd', 'Insteon', 'Insteon_PLM_commands');
-    }
-
-    #Evaluate the resulting object generating string
-    package main;
-    eval $object_string;
-    print "Error in insteon_item_commands: $@\n" if $@;
-    package Insteon;
-}
-
-=item C<add(object)>
-
-Adds object to the list of insteon objects that are managed by the stack.  Makes
-the object eligible for linking, scanning, and global functions.
-
-=cut
-
-sub add
-{
-   my ($object) = @_;
-
-   my $insteon_manager = InsteonManager->instance();
-   if ($insteon_manager->remove_item($object)) {
-      # print out debug info
-   }
-   $insteon_manager->add_item($object);
-}
-
-=item C<find_members(name)>
-
-Called as a non-object routine.  Returns the object named name.
-
-=cut
-
-sub find_members
-{
-   my ($name) = @_;
-
-   my $insteon_manager = InsteonManager->instance();
-   return $insteon_manager->find_members($name);
-}
-
-=item C<get_object(p_id[, p_group])>
-
-Returns the object identified by p_id and p_group.  Where p_id is the 6 digit
-hexadecimal address of the object without periods and group is a two digit
-representation of the group number of the device.
-
-=cut
-
-sub get_object
-{
-	my ($p_deviceid, $p_group) = @_;
-
-	my $retObj = undef;
-
-        my $insteon_manager = InsteonManager->instance();
-        my @search_objects = ();
-        push @search_objects, $insteon_manager->find_members('Insteon::BaseObject');
-	for my $obj (@search_objects)
-	{
-		#Match on Insteon objects only
-	#	if ($obj->isa("Insteon::Insteon_Device"))
-	#	{
-			if (lc $obj->device_id() eq lc $p_deviceid)
-			{
-				if ($p_group)
-				{
-					if (lc $p_group eq lc $obj->group)
-					{
-						$retObj = $obj;
-						last;
-					}
-				} else {
-					$retObj = $obj;
-					last;
-				}
-			}
-	#	}
-	}
-
-	return $retObj;
-}
-
-=item C<active_interface(p_interface)>
-
-Sets p_interface as the new active interface.  Should likely only be called on
-startup or reload.
-
-=cut
-
-sub active_interface
-{
-   my ($interface) = @_;
-   my $insteon_manager = InsteonManager->instance();
-
-   $insteon_manager->_active_interface($interface)
-   	if $interface && ref $interface && $interface->isa('Insteon::BaseInterface');
-#print "############### active interface is: " . $insteon_manager->_active_interface->get_object_name . "\n";
-   return $insteon_manager->_active_interface;
-
-}
-
-=item C<check_all_aldb_versions()>
-
-Walks through every Insteon device and checks the aldb object version for I1 vs. I2
-
-=cut
-
-sub check_all_aldb_versions
-{
-	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices") if ($main::Debug{insteon} >= 4);
-
-	my @ALDB_devices = ();
-	push @ALDB_devices, Insteon::find_members("Insteon::BaseDevice");
-	my $ALDB_cnt = @ALDB_devices;
-	my $count = 0;
-	foreach my $ALDB_device (@ALDB_devices)
-	{
-		$count++;
-		if ($ALDB_device->is_root and
-			!($ALDB_device->isa('Insteon::InterfaceController')))
-		{
-			main::print_log("[Insteon] DEBUG4 Checking aldb version for "
-				. $ALDB_device->get_object_name()
-				. " ($count of $ALDB_cnt)") if ($ALDB_device->debuglevel(4, 'insteon'));
-			$ALDB_device->check_aldb_version();
-		} else
-		{
-			main::print_log("[Insteon] DEBUG4 " . $ALDB_device->get_object_name
-				. " does not have its own aldb ($count of $ALDB_cnt)")
-				if ($ALDB_device->debuglevel(4, 'insteon'));
-		}
-	}
-	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices completed") if ($main::Debug{insteon} >= 4);
-}
-
-sub check_thermo_versions
-{
-	main::print_log("[Insteon] DEBUG4 Initializing thermostat versions") if ($main::Debug{insteon} >= 4);
-
-	my @thermo_devices = ();
-	push @thermo_devices, Insteon::find_members("Insteon::Thermostat");
-	foreach my $thermo_device (@thermo_devices)
-	{
-		if ($thermo_device->isa('Insteon::Thermostat') && 
-			$thermo_device->get_root()->engine_version eq "I2CS"){
-			main::print_log("[Insteon] DEBUG4 Setting thermostat "
-				. $thermo_device->get_object_name() . " to i2CS") 
-			if ($thermo_device->debuglevel(4, 'insteon'));
-			bless $thermo_device, 'Insteon::Thermo_i2CS';
-			$thermo_device->init();
-		}
-		else {
-			main::print_log("[Insteon] DEBUG4 Setting thermostat "
-				. $thermo_device->get_object_name() . " to i1") 
-			if ($thermo_device->debuglevel(4, 'insteon'));
-			bless $thermo_device, 'Insteon::Thermo_i1';
-		}
-	}
-}
-
-=back
-
-=head2 INI PARAMETERS
-
-=over 
-
-=item insteon_menu_states
-
-A comma seperated list of states that will be added as voice commands to dimmable
-devices.
-
-=back
-
-=head2 AUTHOR
-
-Gregg Limming, Kevin Robert Keegan, Micheal Stovenour, many others
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=head1 B<InsteonManager>
-
-=head2 DESCRIPTION
-
-Provides the basic infrastructure for the Insteon stack, contains many of the 
-startup routines.
-
-=head2 INHERITS
-
-L<Class::Singleton|Class::Singleton>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package InsteonManager;
-
-use strict;
-use base 'Class::Singleton';
-
-=item C<_new_instance()>
-
-Defines a new instance of the class.
-
-=cut
-
-sub _new_instance
-{
-	my $class = shift;
-	my $self = bless {}, $class;
-
-	return $self;
-}
-
-=item C<_active_interface()>
-
-Sets and returns the active interface.  Likely should only be caled on startup
-or reload.  It also sets all of the hooks for the Insteon stack.
-
-=cut
-
-sub _active_interface
-{
-   my ($self, $interface) = @_;
-   # setup hooks the first time that an interface is made active
-   if (!($$self{active_interface}) and $interface) {
-      &main::print_log("[Insteon] Setting up initialization hooks") if $main::Debug{insteon};
-      &main::MainLoop_pre_add_hook(\&Insteon::BaseInterface::check_for_data, 1);
-      &main::Reload_post_add_hook(\&Insteon::check_all_aldb_versions, 1);
-      &main::Reload_post_add_hook(\&Insteon::BaseInterface::poll_all, 1);
-      $init_complete = 0;
-      &main::MainLoop_pre_add_hook(\&Insteon::init, 1);
-      &main::Reload_post_add_hook(\&Insteon::check_thermo_versions, 1);
-      &main::Reload_post_add_hook(\&Insteon::generate_voice_commands, 1);
-   }
-   $$self{active_interface} = $interface if $interface;
-   return $$self{active_interface};
-}
-
-=item C<add()>
-
-Adds a list of objects to be tracked.
-
-=cut
-
-sub add
-{
-	my ($self,@p_objects) = @_;
-
-	my @l_objects;
-
-	for my $l_object (@p_objects) {
-		if ($l_object->isa('Group_Item') ) {
-			@l_objects = $$l_object{members};
-			for my $obj (@l_objects) {
-				$self->add($obj);
-			}
-		} else {
-		    $self->add_item($l_object);
-        	}
-	}
-}
-
-=item C<add()>
-
-Adds an object to be tracked.
-
-=cut
-
-sub add_item
-{
-   my ($self,$p_object) = @_;
-
-   push @{$$self{objects}}, $p_object;
-   if ($p_object->isa('Insteon::BaseInterface')) {
-      $self->_active_interface($p_object);
-   }
-   return $p_object;
-}
-
-=item C<remove_all_items()>
-
-Removes all of the Insteon objects.
-
-=cut
-
-sub remove_all_items {
-   my ($self) = @_;
-
-   if (ref $$self{objects}) {
-      foreach (@{$$self{objects}}) {
- #        $_->untie_items($self);
-      }
-   }
-   delete $self->{objects};
-}
-
-=item C<add_item_if_not_present()>
-
-Adds an item to be tracked if it is not already in the list.
-
-=cut
-
-sub add_item_if_not_present {
-   my ($self, $p_object) = @_;
-
-   if (ref $$self{objects}) {
-      foreach (@{$$self{objects}}) {
-         if ($_->equals($p_object)) {
-            return 0;
-         }
-      }
-   }
-   $self->add_item($p_object);
-   return 1;
-}
-
-=item C<remove_item()>
-
-Removes the Insteon object.
-
-=cut
-
-sub remove_item {
-   my ($self, $p_object) = @_;
-   return 0 unless $p_object and ref $p_object;
-   if (ref $$self{objects}) {
-      for (my $i = 0; $i < scalar(@{$$self{objects}}); $i++) {
-         if ($p_object->equals($$self{objects}->[$i])) {
-            splice @{$$self{objects}}, $i, 1;
-            return 1;
-         }
-      }
-   }
-   return 0;
-}
-
-=item C<is_member()>
-
-Returns true if object is in the list.
-
-=cut
-
-sub is_member {
-    my ($self, $p_object) = @_;
-
-    my @l_objects = @{$$self{objects}};
-    for my $l_object (@l_objects) {
-	if ($l_object->equals($p_object)) {
-	    return 1;
-	}
-    }
-    return 0;
-}
-
-=item C<find_members(p_type)>
-
-Find and return all tracked objects of type p_type where p_type is an object
-class.
-
-=cut
-
-sub find_members {
-	my ($self,$p_type) = @_;
-
-	my @l_found;
-	my @l_objects = @{$$self{objects}};
-	for my $l_object (@l_objects) {
-		if ($l_object->isa($p_type)) {
-			push @l_found, $l_object;
-		}
-	}
-	return @l_found;
-}
-
-=back
-
-=head2 INI PARAMETERS
-
-=over
-
-=item C<debug>
-
-For debugging debug=insteon or debug=insteon:level where level is 1-4. 
-
-=back
-
-=head2 AUTHOR
-
-Bruce Winter, Gregg Liming, Kevin Robert Keegan, Michael Stovenour, many others
-
-=head2 SEE ALSO
-
-None
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-MA  02110-1301, USA.
-
-=cut
-
-
-1;
+package Insteon;
+
+use strict;
+
+# Category=Insteon
+
+#@ This module creates voice commands for all insteon related items.
+
+=head1 B<Insteon>
+
+=head2 DESCRIPTION
+
+Provides the basic infrastructure for the Insteon stack, contains many of the 
+startup routines.
+
+=head2 INHERITS
+
+None
+
+=head2 VOICE COMMANDS
+
+=head3 PLM
+
+=over
+
+=item C<Complete Linking as Responder>
+
+If a device is first placed into linking mode, calling this command will cause
+the PLM to complete the link, thus making the PLM the responder.  The 
+C<Link To Interface> device voice command is likely an easier way to do this, 
+but this may be need for hard to reach devices or deaf devices.
+
+=item C<Initiate Linking as Controller>
+
+Call this first, then press and hold the set button on a device that you wish
+to have the PLM control.  The C<Link To Interface> device voice command is 
+likely an easier way to do this, but this may be need for hard to reach devices 
+or deaf devices.  This is also needed for i2cs devices in which the first link
+must currently be manually created this way.
+
+=item C<Cancel Linking>
+
+Cancel either of the above two commands without completing a link.
+
+=item C<Delete Link with PLM>
+
+This does nothing and shoudl be removed.
+
+=item C<Scan Link Table>
+
+This will scan and output to the log only the PLM link table.
+
+=item C<Log Links>
+
+This will output only the PLM link table to log.
+
+=item C<Delete Orphan Links>
+
+Misterhouse will review the state of all of the links in your system, as it knows
+them without any additional scanning.  If any of these links are not defined in
+your mht file or the links are only half links (controller with no responder or
+vice versa) MisterHouse will delete these links.
+
+It is usually best to:
+
+1. Run C<Scan Changed Device Link Tables> first unless you know that the
+information in MisterHouse is up-to-date.
+
+2. Run C<AUDIT Sync All Links> and verify that what is being added is correct.
+
+3. Run C<Sync All Links> to add the links
+
+4. Run C<AUDIT Delete Orphan Links> first to see what will happen.
+
+5. If everything looks right, run C<Delete Orphan Links> to clean up the old links
+
+Deleting the orphan links will make your devices happier.  If you have unintended
+links on your devices, they can run slower and may unnecessarily increase the 
+number of messages sent on your network.
+
+=item C<AUDIT Delete Orphan Links>
+
+Does the same thing as C<Delete Orphan Links> but doesn't actually delete anything
+instead it just prints what it would have done to the log.
+
+=item C<Scan All Device Link Tables>
+
+Scans the link tables of the PLM and all devices on your network.  On a large
+network this can take sometime.  You can generally run C<Scan Changed Device Link Tables>
+which is much faster without any issue.
+
+=item C<Scan Changed Device Link Tables>
+
+Scans the link tables of the PLM and all devices whose link tables have changed
+on your network.
+
+=item C<Sync All Links>
+
+Similar to C<Delete Orphan Links> exccept this adds any links that are missing.
+This is helpful when adding a bunch of new devices, new scenes, or cleaning things
+up.
+
+See the workflow described in C<Delete Orphan Links>.
+
+=item C<AUDIT Sync All Links>
+
+Same as C<Sync All Links> but prints what it would do to the log, without doing
+anything else.
+
+=item C<print all message stats>
+
+Prints the message stats for all devices plus a summary of the entire network
+stats.  For full details on what is contained in this printout please see
+the description for the C<print message stats> voice command under the device
+heading below.
+
+=item C<reset all message stats>
+
+Resets all the message stats for all devices including the Unk_Error stat.
+
+=item C<stress test All devices>
+
+Performs a 5 count stress test on all devices on the network.  See the description
+of what a stress test is under the device voice commands.
+
+=item C<ping test All devices>
+
+Performs a 5 count ping test on all devices on the network.  See the description
+of what a ping test is under the device voice commands.
+
+=item C<Log All Device ALDB Status>
+
+Logs some details about each device to the log.  See C<log_all_ADLB_status()>
+
+=back
+
+=head3 Devices
+
+=over
+
+=item C<on>
+
+Turns the device on.
+
+=item C<off>
+
+Turns the device off.
+
+=item C<Sync Links>
+
+Similar to C<Sync All Links> above, but this will only add links that are related
+to this device.  Useful when adding a new device.
+
+=item C<Link to Interface>
+
+Will create the controller/responder links between the device and the PLM.
+
+=item C<Unlink with Interface>
+
+Will delete the controller/responder links between the device and the PLM.  
+Useful if you are removing a device from your network.
+
+=item C<Status>
+
+Requests the status of the device.
+
+=item C<Get Engine Version>
+
+Requests the engine version of the device.  Generally you would not need to call
+this, but every now and then it is needed when a new device is installed.
+
+=item C<Scan Link Table>
+
+This will scan and output to the log only the link table of this device.
+
+=item C<Log Links>
+
+Will output to the log only the link table of this device.
+
+=item C<Initiate Linking as Controller>
+
+Generally only available for PLM Scenes.  This places the PLM in linking mode
+and adds any device which the set button is pressed for 4 seconds as a responder
+to this scene.  Generally not needed.
+
+=item C<Cancel Linking>
+
+Cancels the above linking session without creating a link.
+
+=item C<Run Stress Test>
+
+Simulates a read of a 5 link addresses from the device.  This routine is meant to 
+be used as a diagnostic tool.
+
+This is also similar to the C<ping> test, however, rather than simply requesting
+an ACK, this requests a full set of data equivalent to a link entry.  Similar to
+C<ping> this should be used with C<print_message_log> to diagnose issues and try
+different settings.
+
+=item C<Run Ping Test>
+
+Sends 5 ping messages to the device.  A ping message is a basic 
+message that simply asks the device to respond with an ACKnowledgement.  For
+i1 devices this will send a standard length command, for i2 and i2cs devices
+this will send an extended ping command.  In both cases, the device responds
+back with a standard length ACKnowledgement only.
+
+Much like the ping command in IP networks, this command is useful for testing the
+connectivity of a device on your network.  You likely want to use this in 
+conjunction with the C<print_message_log> routine.  For example, you can use 
+this to compare the message stats for a device when changing settings in 
+MisterHouse.
+
+=item C<Print Message Stats>
+
+Prints message statistics for this device to the print log.  
+
+=back
+
+=over8
+
+=item * 
+
+In - The number of incoming messages received
+
+=item * 
+
+Corrupt - The number of incoming corrupt messages received
+
+=item * 
+
+%Corrpt - Of the incoming messages received, the percentage that were 
+corrupt
+
+=item *
+
+Dupe - The number of duplicate messages that have been received from this 
+device.
+
+=item *
+
+%Dupe - The percentage of duplilicate incoming messages received.
+
+=item *
+
+Hops_Left - The average hops left in the messages received from this device.
+
+=item *
+
+Max_Hops - The average maximum hops in the messages received from this device.
+
+=item *
+
+Act_Hops - Max_Hops - Hops_Left, this is the average number of hops that have
+been required for a message sent from the device to reach MisterHouse.
+
+=item * 
+
+Out - The number of unique outgoing messages, without retries, sent. 
+
+=item * 
+
+Fail - The number times that all retries were exhausted without a successful
+delivery of a message.
+
+=item * 
+
+%Fail - Of the outgoing messages sent, the percentage that failed.
+
+=item * 
+
+Retry - The number of retry attempts that have been made to deliver a message. 
+Ideally this is 0, but Sends/Msg is a better indication of this parameter.
+
+=item * 
+
+AvgSend - The average number of send attempts that must be made in order to 
+successfully deliver a message.  Ideally this would be 1.0.  
+
+NOTE: If the number of retries exceeds the value set in the configuration file 
+for Insteon_retry_count, MisterHouse will abandon sending the message.  As a 
+result, as this number approaches Insteon_retry_count it becomes a less accurate 
+representation of the number of retries needed to reach a device.
+
+=item *
+
+Avg_Hops - The average number of hops that have been used by MisterHouse when
+sending messages to this device.
+
+=item *
+
+Hop_Count - The current hop count being used by MH.  This count is dynamically
+controlled by MH and is not reset by calling C<reset_message_stats>
+
+=back
+
+=over
+
+=item C<Reset Message Stats>
+
+Resets the message stats back to 0 for this device.
+
+=back
+
+=head2 METHODS
+
+=over
+
+=cut
+
+
+my (@_insteon_plm,@_insteon_device,@_insteon_link,@_scannable_link,$_scan_cnt,$_sync_cnt,$_sync_failure_cnt);
+my $init_complete;
+my (@_scan_devices,@_scan_device_failures,$current_scan_device);
+my (@_sync_devices,@_sync_device_failures,$current_sync_device);
+my ($_stress_test_count, $_stress_test_one_pass, @_stress_test_devices);
+my ($_ping_count, @_ping_devices);
+
+=item C<stress_test_all(count, [is_one_pass])>
+
+Sequentially goes through every Insteon device and performs a stress_test on it.  
+See L<Insteon::BaseDevice::stress_test|Insteon::BaseInsteon::BaseDevice::stress_test> 
+for a more detailed description of stress_test.
+
+Parameters:
+	Count: defines the number of stress_tests to perform on each device.
+	is_one_pass: if true, all stress_tests will be performed on a device
+		before proceeding to the next device. if false, the routine 
+		loops through all devices performing one stress_test on each 
+		device before moving on to the next device.
+
+=cut
+
+sub stress_test_all
+{
+	my ($p_count, $is_one_pass) = @_;
+	if (defined $p_count){
+		$_stress_test_count = $p_count; 
+		$_stress_test_one_pass = $is_one_pass;
+		@_stress_test_devices = undef; 
+		push @_stress_test_devices, Insteon::find_members("Insteon::BaseDevice");
+		main::print_log("[Insteon::Stress Test All Devices] Stress Testing All Devices $p_count times");
+	};	
+	if (!@_stress_test_devices) {
+		#Iteration may be complete, start over from the beginning
+		$_stress_test_count = ($_stress_test_one_pass) ? 0 : $_stress_test_count--; 
+		push @_stress_test_devices, Insteon::find_members("Insteon::BaseDevice");
+	}
+	if ($_stress_test_count > 0){
+		my $current_stress_test_device;
+		my $complete_callback = '&Insteon::stress_test_all()';
+		while (@_stress_test_devices){
+			$current_stress_test_device = pop @_stress_test_devices;
+			next unless $current_stress_test_device->is_root();
+			next unless $current_stress_test_device->is_responder();
+			last;
+		}
+		my $run_count = ($_stress_test_one_pass) ? $_stress_test_count : 1;
+		if (ref $current_stress_test_device && $current_stress_test_device->can('stress_test')){
+			$current_stress_test_device->stress_test($run_count, $complete_callback);
+		}
+	} 
+	else {
+		$_stress_test_one_pass = 0;
+		main::print_log("[Insteon::Stress Test All Devices] Complete");
+	}
+}
+
+=item C<scan_all_linktables()>
+
+Walks through every Insteon device calling the device's scan links command.
+Does not output anything but will recreate the device's aldb from the actual
+entries in the device.
+
+=cut
+
+sub scan_all_linktables
+{
+	my $skip_unchanged = pop(@_);
+	$skip_unchanged = 0 if (ref $skip_unchanged || !defined($skip_unchanged));
+	if ($current_scan_device)
+        {
+        	&main::print_log("[Scan all linktables] WARN: link already underway. Ignoring request for new scan ...");
+                return;
+        }
+        my @candidate_devices = ();
+        # clear @_scan_devices
+        @_scan_devices = ();
+        @_scan_device_failures = ();
+        $current_scan_device = undef;
+        # alwayws include the active interface (e.g., plm)
+       	push @_scan_devices, &Insteon::active_interface;
+
+       	push @candidate_devices, &Insteon::find_members("Insteon::BaseDevice");
+
+        # don't try to scan devices that are not responders
+        if (@candidate_devices)
+        {
+        	foreach (@candidate_devices)
+        	{
+        		my $candidate_object = $_;
+        		if ($candidate_object->is_root and
+                		!($candidate_object->is_deaf
+                		or $candidate_object->isa('Insteon::InterfaceController')))
+                	{
+		       		push @_scan_devices, $candidate_object;
+                		&main::print_log("[Scan all linktables] INFO1: "
+                        		. $candidate_object->get_object_name
+                        		. " will be scanned.") if $candidate_object->debuglevel(1, 'insteon');
+        		}
+                	else
+                	{
+                		&main::print_log("[Scan all linktables] INFO: !!! "
+                        		. $candidate_object->get_object_name
+                        		. " is NOT a candidate for scanning.");
+                	}
+		}
+        }
+        else
+        {
+        	&main::print_log("[Scan all linktables] WARN: No insteon devices could be found");
+        }
+        $_scan_cnt = scalar @_scan_devices;
+
+        &_get_next_linkscan($skip_unchanged);
+}
+
+=item C<_get_next_linkscan_failure()>
+
+Called if a the scanning of a device fails.  Logs the failure and proceeds to 
+the next device.
+
+=cut
+
+sub _get_next_linkscan_failure
+{
+	my($skip_unchanged) = @_;
+        push @_scan_device_failures, $current_scan_device;
+        &main::print_log("[Scan all link tables] WARN: failure occurred when scanning "
+                	. $current_scan_device->get_object_name . ".  Moving on...");
+        &_get_next_linkscan($skip_unchanged);
+
+}
+
+=item C<_get_next_linkscan()>
+
+Gets the next device to scan.
+
+=cut
+
+sub _get_next_linkscan
+{
+	my($skip_unchanged, $changed_device) = @_;
+	my $checking = 0;
+	if (!defined($changed_device)) {
+		$current_scan_device = shift @_scan_devices;
+		if ($skip_unchanged && $current_scan_device && ($current_scan_device != &Insteon::active_interface)){
+			## check if aldb_delta has changed;
+			$current_scan_device->_aldb->{_aldb_unchanged_callback} = '&Insteon::_get_next_linkscan('.$skip_unchanged.')';
+			$current_scan_device->_aldb->{_aldb_changed_callback} = '&Insteon::_get_next_linkscan('.$skip_unchanged.', '.$current_scan_device->get_object_name.')';
+			$current_scan_device->_aldb->{_failure_callback} = '&Insteon::_get_next_linkscan_failure('.$skip_unchanged.')';
+			$current_scan_device->_aldb->query_aldb_delta("check");
+			$checking = 1;
+		}
+	} else {
+		$current_scan_device = $changed_device;
+	}
+	if ($current_scan_device && ($checking == 0))
+        {
+          	&main::print_log("[Scan all link tables] Now scanning: "
+                	. $current_scan_device->get_object_name . " ("
+                        . ($_scan_cnt - scalar @_scan_devices)
+                        . " of $_scan_cnt)");
+                # pass first the success callback followed by the failure callback
+          	$current_scan_device->scan_link_table('&Insteon::_get_next_linkscan('.$skip_unchanged.')','&Insteon::_get_next_linkscan_failure('.$skip_unchanged.')');
+    	} elsif (scalar(@_scan_devices) == 0 && ($checking == 0))
+    	{
+          	&main::print_log("[Scan all link tables] All tables have completed scanning");
+                my $_scan_failure_cnt = scalar @_scan_device_failures;
+                if ($_scan_failure_cnt){
+			my $obj_list;
+			for my $failed_obj (@_scan_device_failures){
+				$obj_list .= $failed_obj->get_object_name .", ";
+			}
+			::print_log("[Scan all link tables] However, some failures "
+				."were noted with the following devices: $obj_list");
+		}
+    	}
+}
+
+=item C<sync_all_links()>
+
+Initiates a process that will walk through every device that is a Insteon::InterfaceController 
+calling the device's sync_links() command.  sync_all_links() loads up the module
+global variable @_sync_devices then kicks off the recursive call backs by calling
+_get_next_linksync.
+
+Paramter B<audit_mode> - Causes sync to walk through but not actually 
+send any commands to the devices.  Useful with the insteon:3 debug setting for 
+troubleshooting. 
+
+=cut
+
+sub sync_all_links
+{
+	my ($audit_mode) = @_;
+        &main::print_log("[Sync all links] Starting now!");
+        @_sync_devices = ();
+	# iterate over all registered objects and compare whether the link tables match defined scene linkages in known Insteon_Links
+	for my $obj (&Insteon::find_members('Insteon::BaseController'))
+	{
+		my %sync_req = ('sync_object' => $obj, 'audit_mode' => ($audit_mode) ? 1 : 0);
+		&main::print_log("[Sync all links] Adding " . $obj->get_object_name
+			. " to sync queue");
+		push @_sync_devices, \%sync_req
+	}
+
+        $_sync_cnt = scalar @_sync_devices;
+
+        &_get_next_linksync();
+}
+
+=item C<_get_next_linksync()>
+
+Calls the sync_links() function for each device in the module global variable 
+@_sync_devices.  This function will be called recursively since the callback 
+passed to sync_links() is this function again.  Will also ask sync_links() to 
+call _get_next_linksync_failure() if sync_links() fails. 
+
+=cut
+
+sub _get_next_linksync
+{
+   	$current_scan_device = shift @_scan_devices;
+	my $sync_req_ptr = shift(@_sync_devices);
+        my %sync_req = ($sync_req_ptr) ? %$sync_req_ptr : undef;
+        if (%sync_req)
+        {
+
+        	$current_sync_device = $sync_req{'sync_object'};
+        }
+        else
+        {
+        	$current_sync_device = undef;
+        }
+
+	if ($current_sync_device)
+        {
+          	&main::print_log("[Sync all links] Now syncing: "
+                	. $current_sync_device->get_object_name . " ("
+                        . ($_sync_cnt - scalar @_sync_devices)
+                        . " of $_sync_cnt)");
+		my $skip_deaf = 1;
+                # pass first the success callback followed by the failure callback
+          	$current_sync_device->sync_links($sync_req{'audit_mode'}, '&Insteon::_get_next_linksync()','&Insteon::_get_next_linksync_failure()', $skip_deaf);
+    	}
+        else
+        {
+          	&main::print_log("[Sync all links] All links have completed syncing");
+                my $_sync_failure_cnt = scalar @_sync_device_failures;
+                if ($_sync_failure_cnt){
+			my $obj_list;
+			for my $failed_obj (@_sync_device_failures){
+				$obj_list .= $failed_obj->get_object_name .", ";
+			}
+			::print_log("[Sync all links] WARN! Failures occured, "
+				."some links involving the following objects remain out-of-sync: $obj_list");
+		}
+    	}
+
+}
+
+=item C<_get_next_linksync()>
+
+Called by the failure callback in a device's sync_links() function.  Will add
+the failed device to the module global variable @_sync_device_failures. 
+
+=cut
+
+sub _get_next_linksync_failure
+{
+        push @_sync_device_failures, $current_sync_device 
+		unless (grep{$current_sync_device == $_} @_sync_device_failures);
+        &main::print_log("[Sync all links] WARN: failure occurred when syncing links for "
+                	. $current_sync_device->get_object_name . ". Resuming sync queue if it exists.");
+	my $num_sync_queue = @{$$current_sync_device{sync_queue}};
+	if ($num_sync_queue){
+		$current_sync_device->_process_sync_queue();
+	}
+	else { #No other pending links in the queue
+		&_get_next_linksync();
+	}
+
+}
+
+=item C<ping_all([count)>
+
+Walks through every Insteon device and pings it as many times as defined by 
+count.  See L<Insteon::BaseDevice::ping|Insteon::BaseInsteon::BaseDevice::ping> 
+for a more detailed description of ping.
+
+=cut
+
+sub ping_all
+{
+	my ($p_count) = @_;
+	if (defined $p_count){
+		$_ping_count = $p_count;
+		@_ping_devices = ();
+		push @_ping_devices, Insteon::find_members("Insteon::BaseDevice");
+		main::print_log("[Insteon::Ping All Devices] Ping All Devices $p_count times");
+	}
+	if (@_ping_devices)
+	{
+		my $current_ping_device;
+		while(@_ping_devices)
+		{
+			$current_ping_device = pop @_ping_devices;
+			next unless $current_ping_device->is_root();
+			next unless $current_ping_device->is_responder(); 
+			last;
+		}
+		$current_ping_device->ping($_ping_count, '&Insteon::ping_all()')
+                		if $current_ping_device->can('ping');
+	} else
+	{
+		$_ping_count = 0;
+		main::print_log("[Insteon::Ping All Devices] Ping All Complete");
+	}
+}
+
+=item C<log_all_ADLB_status()>
+
+Walks through every Insteon device and logs:
+
+=back
+
+=over8
+
+=item * 
+
+Hop Count
+
+=item * 
+
+Engine Version
+
+=item * 
+
+ALDB Type
+
+=item * 
+
+ALDB Health
+
+=item * 
+
+ALDB Scan Time
+
+=back
+
+=over
+
+=cut
+
+sub log_all_ADLB_status
+{
+	my @_log_ALDB_devices = ();
+	# alwayws include the active interface (e.g., plm)
+#	push @_log_ALDB_devices, &Insteon::active_interface;
+
+	push @_log_ALDB_devices, Insteon::find_members("Insteon::BaseDevice");
+
+	# don't try to scan devices that are not responders
+	if (@_log_ALDB_devices)
+	{
+		my $log_ALDB_cnt = @_log_ALDB_devices;
+		my $count = 0;
+		foreach my $current_log_ALDB_device (@_log_ALDB_devices)
+		{
+			$count++;
+			if ($current_log_ALDB_device->is_root and
+				!($current_log_ALDB_device->isa('Insteon::InterfaceController')))
+			{
+				&main::print_log("[log all device ALDB status] Now logging: "
+					. $current_log_ALDB_device->get_object_name()
+					. " ($count of $log_ALDB_cnt)");
+				$current_log_ALDB_device->log_aldb_status();
+			} else
+			{
+				main::print_log("[log all device ALDB status] INFO: !!! "
+					. $current_log_ALDB_device->get_object_name
+					. " is NOT a candidate for logging ($count of $log_ALDB_cnt)");
+			}
+		}
+		main::print_log("[log all device ALDB status] All devices have completed logging");
+	} else
+	{
+		main::print_log("[log all device ALDB status] WARN: No insteon devices could be found");
+	}
+}
+
+=item C<print_all_message_stats>
+
+Walks through every Insteon device and prints statistical information about
+its message handling, as well as a summary average of the entire network.  See 
+L<Insteon::BaseDevice::print_message_stats|Insteon::BaseInsteon::BaseDevice::print_message_stats> 
+for more detailed information.
+
+This command adds the following extra data points:
+
+=back
+
+=over8
+
+=item * 
+
+Unk_Error - The number of messages which have arrived at the PLM which cannot
+be associated with any know device.
+
+=back
+
+=over
+
+=cut
+
+sub print_all_message_stats
+{
+    my @_log_devices = ();
+	push @_log_devices, Insteon::find_members("Insteon::BaseDevice");
+
+	if (@_log_devices)
+	{
+		#Initialize all of the tracking variables
+		my $retry_average = 0;
+    	my $fail_percentage = 0;
+    	my $corrupt_percentage = 0; 
+    	my $dupe_percentage = 0;
+    	my $avg_hops_left = 0;
+    	my $avg_max_hops = 0;
+		my $avg_out_hops = 0;
+    	my $curr_hops_avg = 0;
+    	
+		my $incoming_count_log = 0;
+		my $corrupt_count_log = 0;
+		my $dupe_count_log = 0;
+		my $retry_count_log = 0;
+		my $outgoing_count_log = 0;
+		my $fail_count_log = 0;
+		my $default_hop_count = 0;
+		my $hops_left_count = 0;
+		my $max_hops_count = 0;
+		my $outgoing_hop_count =0;
+		
+		my $device_count = 0;
+
+		foreach my $current_log_device (@_log_devices)
+		{
+			#Skip non-root items
+			next unless $current_log_device->is_root;
+			
+			$device_count++;
+			
+			#Prints the Individual Message for the Device
+			$current_log_device->print_message_stats;
+			
+			#Add values for each device to the master count
+			$incoming_count_log += $current_log_device->incoming_count_log;
+			$corrupt_count_log += $current_log_device->corrupt_count_log;
+			$dupe_count_log += $current_log_device->dupe_count_log;
+			$retry_count_log += $current_log_device->retry_count_log;
+			$outgoing_count_log += $current_log_device->outgoing_count_log;
+			$fail_count_log += $current_log_device->fail_count_log;
+			$default_hop_count += $current_log_device->default_hop_count;
+			$hops_left_count += $current_log_device->hops_left_count;
+			$max_hops_count += $current_log_device->max_hops_count;
+			$outgoing_hop_count += $current_log_device->outgoing_hop_count;
+		}
+		
+		#Calculate the averages
+	    $retry_average = sprintf("%.1f", ($retry_count_log / 
+	        $outgoing_count_log) + 1) if ($outgoing_count_log > 0); 
+	    $fail_percentage = sprintf("%.1f", ($fail_count_log / 
+	        $outgoing_count_log) * 100 ) if ($outgoing_count_log > 0);
+	    $corrupt_percentage = sprintf("%.1f", ($corrupt_count_log / 
+	        $incoming_count_log) * 100 ) if ($incoming_count_log > 0);
+	    $dupe_percentage = sprintf("%.1f", ($dupe_count_log / 
+	        $incoming_count_log) * 100 ) if ($incoming_count_log > 0);
+	    $avg_hops_left = sprintf("%.1f", ($hops_left_count / 
+	        $incoming_count_log)) if ($incoming_count_log > 0);
+	    $avg_max_hops = sprintf("%.1f", ($max_hops_count / 
+	        $incoming_count_log)) if ($incoming_count_log > 0);
+    	$avg_out_hops = sprintf("%.1f", ($outgoing_hop_count / 
+        	$outgoing_count_log)) if ($outgoing_count_log > 0);
+    	$curr_hops_avg = sprintf("%.1f", ($default_hop_count / 
+        	$device_count)) if ($device_count > 0);
+    	::print_log(
+	        "[Insteon] Average Network Statistics:\n"
+	        . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops Unk_Error\n"
+	        . sprintf("%6s", $incoming_count_log)
+	        . sprintf("%8s", $corrupt_count_log)
+	        . sprintf("%8s", $corrupt_percentage . '%')
+	        . sprintf("%6s", $dupe_count_log)
+	        . sprintf("%8s", $dupe_percentage . '%')
+	        . sprintf("%9s", $avg_hops_left)
+	        . sprintf("%9s", $avg_max_hops)
+	        . sprintf("%9s", $avg_max_hops - $avg_hops_left)
+	        . sprintf("%10s", &Insteon::active_interface->corrupt_count_log)
+	        . "\n"
+	        . "   Out    Fail   %Fail Retry AvgSend Avg_Hops CurrHops\n"
+	        . sprintf("%6s", $outgoing_count_log)
+	        . sprintf("%8s", $fail_count_log)
+	        . sprintf("%8s", $fail_percentage . '%')
+	        . sprintf("%6s", $retry_count_log)
+	        . sprintf("%8s", $retry_average)
+	        . sprintf("%9s", $avg_out_hops)
+	        . sprintf("%9s", $curr_hops_avg)
+    	);
+		main::print_log("[Insteon::Print_All_Message_Stats] All devices have completed logging");
+	} else
+	{
+		main::print_log("[Insteon::Print_All_Message_Stats] WARN: No insteon devices could be found");
+	}
+}
+
+=item C<reset_all_message_stats>
+
+Walks through every Insteon device and resets the statistical information about
+its message handling.
+
+=cut
+
+sub reset_all_message_stats
+{
+    my @_log_devices = ();
+    &Insteon::active_interface->reset_message_stats;
+    push @_log_devices, Insteon::find_members("Insteon::BaseDevice");
+
+	if (@_log_devices)
+	{
+		foreach my $current_log_device (@_log_devices)
+		{
+			$current_log_device->reset_message_stats 
+                if $current_log_device->can('reset_message_stats');
+		}
+		main::print_log("[Insteon::Reset_All_Message_Stats] All devices have been reset");
+	} else
+	{
+		main::print_log("[Insteon::Reset_All_Message_Stats] WARN: No insteon devices could be found");
+	}
+}
+
+=item C<init()>
+
+Initiates the insteon stack, mostly just sets the trigger. 
+
+=cut
+
+sub init {
+
+    # only run once
+    return if $init_complete;
+    $init_complete = 1;
+
+    # initialize scan and sync counters
+    $_scan_cnt = 0;
+    $_sync_cnt = 0;
+    @_scan_devices = ();
+
+    #################################################################
+    ## Trigger creation
+    #################################################################
+    my ($trigger_event, $trigger_code, $trigger_type);
+
+    my @trigger_info = &main::trigger_get('scan insteon link tables');
+    if (@trigger_info) {
+	# Trigger exists; modify just the minimum so the trigger continues
+	# to work if we change the trigger code, but respect everything
+	# else (trigger type and time to run). This prevents unconditionally
+	# re-enabling the trigger if the user has disabled it.
+	$trigger_event = $trigger_info[0];
+	$trigger_type = $trigger_info[2];
+    } else {
+	# Trigger does not exist; create one with our default values.
+	$trigger_event = "time_cron '00 02 * * *'";
+	$trigger_type = 'NoExpire';
+    }
+
+    $trigger_code = '&Insteon::scan_all_linktables()';
+
+    # Create/update trigger for a nightly link table scan
+    &main::trigger_set($trigger_event, $trigger_code, $trigger_type,
+		       'scan insteon link tables', 1);
+    #################################################################
+
+    @_insteon_plm = ();
+    @_insteon_device = ();
+    @_insteon_link = ();
+
+}
+
+=item C<generate_voice_commands()>
+
+Generates and sets the voice commands for all Insteon devices.
+
+Note: At some point, this function will be pushed out to the specific classes
+so that each class can have its own unique set of voice commands.
+
+=cut
+
+sub generate_voice_commands
+{
+
+    &main::print_log("Generating Voice commands for all Insteon objects");
+    my $object_string;
+    for my $object (&main::list_all_objects) {
+        next unless ref $object;
+        next unless $object->isa('Insteon::BaseInterface') or $object->isa('Insteon::BaseObject');
+        
+        #get object name to use as part of variable in voice command
+        my $object_name = $object->get_object_name;
+        my $object_name_v = $object_name . '_v';
+        $object_string .= "use vars '${object_name}_v';\n";
+        
+        #Convert object name into readable voice command words
+        my $command = $object_name;
+        $command =~ s/^\$//;
+        $command =~ tr/_/ /;
+        
+        my $group = ($object->isa('Insteon_PLM')) ? '' : $object->group;
+        
+        #Get list of all voice commands from the object
+        my $voice_cmds = $object->get_voice_cmds();
+        
+        #Initialize the voice command with all of the possible device commands
+        $object_string .= "$object_name_v  = new Voice_Cmd '$command [" 
+            . join(",", sort keys %$voice_cmds) . "]';\n";
+        
+        #Tie the proper routine to each voice command
+        foreach (keys %$voice_cmds) {
+            $object_string .= "$object_name_v -> tie_event('" . $voice_cmds->{$_}
+                . "', '$_');\n\n";
+        }
+        
+        #Add this object to the list of Insteon Voice Commands on the Web Interface
+        $object_string .= ::store_object_data($object_name_v, 'Voice_Cmd', 'Insteon', 'Insteon_PLM_commands');
+    }
+
+    #Evaluate the resulting object generating string
+    package main;
+    eval $object_string;
+    print "Error in insteon_item_commands: $@\n" if $@;
+    package Insteon;
+}
+
+=item C<add(object)>
+
+Adds object to the list of insteon objects that are managed by the stack.  Makes
+the object eligible for linking, scanning, and global functions.
+
+=cut
+
+sub add
+{
+   my ($object) = @_;
+
+   my $insteon_manager = InsteonManager->instance();
+   if ($insteon_manager->remove_item($object)) {
+      # print out debug info
+   }
+   $insteon_manager->add_item($object);
+}
+
+=item C<find_members(name)>
+
+Called as a non-object routine.  Returns the object named name.
+
+=cut
+
+sub find_members
+{
+   my ($name) = @_;
+
+   my $insteon_manager = InsteonManager->instance();
+   return $insteon_manager->find_members($name);
+}
+
+=item C<get_object(p_id[, p_group])>
+
+Returns the object identified by p_id and p_group.  Where p_id is the 6 digit
+hexadecimal address of the object without periods and group is a two digit
+representation of the group number of the device.
+
+=cut
+
+sub get_object
+{
+	my ($p_deviceid, $p_group) = @_;
+
+	my $retObj = undef;
+
+        my $insteon_manager = InsteonManager->instance();
+        my @search_objects = ();
+        push @search_objects, $insteon_manager->find_members('Insteon::BaseObject');
+	for my $obj (@search_objects)
+	{
+		#Match on Insteon objects only
+	#	if ($obj->isa("Insteon::Insteon_Device"))
+	#	{
+			if (lc $obj->device_id() eq lc $p_deviceid)
+			{
+				if ($p_group)
+				{
+					if (lc $p_group eq lc $obj->group)
+					{
+						$retObj = $obj;
+						last;
+					}
+				} else {
+					$retObj = $obj;
+					last;
+				}
+			}
+	#	}
+	}
+
+	return $retObj;
+}
+
+=item C<active_interface(p_interface)>
+
+Sets p_interface as the new active interface.  Should likely only be called on
+startup or reload.
+
+=cut
+
+sub active_interface
+{
+   my ($interface) = @_;
+   my $insteon_manager = InsteonManager->instance();
+
+   $insteon_manager->_active_interface($interface)
+   	if $interface && ref $interface && $interface->isa('Insteon::BaseInterface');
+#print "############### active interface is: " . $insteon_manager->_active_interface->get_object_name . "\n";
+   return $insteon_manager->_active_interface;
+
+}
+
+=item C<check_all_aldb_versions()>
+
+Walks through every Insteon device and checks the aldb object version for I1 vs. I2
+
+=cut
+
+sub check_all_aldb_versions
+{
+	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices") if ($main::Debug{insteon} >= 4);
+
+	my @ALDB_devices = ();
+	push @ALDB_devices, Insteon::find_members("Insteon::BaseDevice");
+	my $ALDB_cnt = @ALDB_devices;
+	my $count = 0;
+	foreach my $ALDB_device (@ALDB_devices)
+	{
+		$count++;
+		if ($ALDB_device->is_root and
+			!($ALDB_device->isa('Insteon::InterfaceController')))
+		{
+			main::print_log("[Insteon] DEBUG4 Checking aldb version for "
+				. $ALDB_device->get_object_name()
+				. " ($count of $ALDB_cnt)") if ($ALDB_device->debuglevel(4, 'insteon'));
+			$ALDB_device->check_aldb_version();
+		} else
+		{
+			main::print_log("[Insteon] DEBUG4 " . $ALDB_device->get_object_name
+				. " does not have its own aldb ($count of $ALDB_cnt)")
+				if ($ALDB_device->debuglevel(4, 'insteon'));
+		}
+	}
+	main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices completed") if ($main::Debug{insteon} >= 4);
+}
+
+sub check_thermo_versions
+{
+	main::print_log("[Insteon] DEBUG4 Initializing thermostat versions") if ($main::Debug{insteon} >= 4);
+
+	my @thermo_devices = ();
+	push @thermo_devices, Insteon::find_members("Insteon::Thermostat");
+	foreach my $thermo_device (@thermo_devices)
+	{
+		if ($thermo_device->isa('Insteon::Thermostat') && 
+			$thermo_device->get_root()->engine_version eq "I2CS"){
+			main::print_log("[Insteon] DEBUG4 Setting thermostat "
+				. $thermo_device->get_object_name() . " to i2CS") 
+			if ($thermo_device->debuglevel(4, 'insteon'));
+			bless $thermo_device, 'Insteon::Thermo_i2CS';
+			$thermo_device->init();
+		}
+		else {
+			main::print_log("[Insteon] DEBUG4 Setting thermostat "
+				. $thermo_device->get_object_name() . " to i1") 
+			if ($thermo_device->debuglevel(4, 'insteon'));
+			bless $thermo_device, 'Insteon::Thermo_i1';
+		}
+	}
+}
+
+=back
+
+=head2 INI PARAMETERS
+
+=over 
+
+=item insteon_menu_states
+
+A comma seperated list of states that will be added as voice commands to dimmable
+devices.
+
+=back
+
+=head2 AUTHOR
+
+Gregg Limming, Kevin Robert Keegan, Micheal Stovenour, many others
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=head1 B<InsteonManager>
+
+=head2 DESCRIPTION
+
+Provides the basic infrastructure for the Insteon stack, contains many of the 
+startup routines.
+
+=head2 INHERITS
+
+L<Class::Singleton|Class::Singleton>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package InsteonManager;
+
+use strict;
+use base 'Class::Singleton';
+
+=item C<_new_instance()>
+
+Defines a new instance of the class.
+
+=cut
+
+sub _new_instance
+{
+	my $class = shift;
+	my $self = bless {}, $class;
+
+	return $self;
+}
+
+=item C<_active_interface()>
+
+Sets and returns the active interface.  Likely should only be caled on startup
+or reload.  It also sets all of the hooks for the Insteon stack.
+
+=cut
+
+sub _active_interface
+{
+   my ($self, $interface) = @_;
+   # setup hooks the first time that an interface is made active
+   if (!($$self{active_interface}) and $interface) {
+      &main::print_log("[Insteon] Setting up initialization hooks") if $main::Debug{insteon};
+      &main::MainLoop_pre_add_hook(\&Insteon::BaseInterface::check_for_data, 1);
+      &main::Reload_post_add_hook(\&Insteon::check_all_aldb_versions, 1);
+      &main::Reload_post_add_hook(\&Insteon::BaseInterface::poll_all, 1);
+      $init_complete = 0;
+      &main::MainLoop_pre_add_hook(\&Insteon::init, 1);
+      &main::Reload_post_add_hook(\&Insteon::check_thermo_versions, 1);
+      &main::Reload_post_add_hook(\&Insteon::generate_voice_commands, 1);
+   }
+   $$self{active_interface} = $interface if $interface;
+   return $$self{active_interface};
+}
+
+=item C<add()>
+
+Adds a list of objects to be tracked.
+
+=cut
+
+sub add
+{
+	my ($self,@p_objects) = @_;
+
+	my @l_objects;
+
+	for my $l_object (@p_objects) {
+		if ($l_object->isa('Group_Item') ) {
+			@l_objects = $$l_object{members};
+			for my $obj (@l_objects) {
+				$self->add($obj);
+			}
+		} else {
+		    $self->add_item($l_object);
+        	}
+	}
+}
+
+=item C<add()>
+
+Adds an object to be tracked.
+
+=cut
+
+sub add_item
+{
+   my ($self,$p_object) = @_;
+
+   push @{$$self{objects}}, $p_object;
+   if ($p_object->isa('Insteon::BaseInterface')) {
+      $self->_active_interface($p_object);
+   }
+   return $p_object;
+}
+
+=item C<remove_all_items()>
+
+Removes all of the Insteon objects.
+
+=cut
+
+sub remove_all_items {
+   my ($self) = @_;
+
+   if (ref $$self{objects}) {
+      foreach (@{$$self{objects}}) {
+ #        $_->untie_items($self);
+      }
+   }
+   delete $self->{objects};
+}
+
+=item C<add_item_if_not_present()>
+
+Adds an item to be tracked if it is not already in the list.
+
+=cut
+
+sub add_item_if_not_present {
+   my ($self, $p_object) = @_;
+
+   if (ref $$self{objects}) {
+      foreach (@{$$self{objects}}) {
+         if ($_->equals($p_object)) {
+            return 0;
+         }
+      }
+   }
+   $self->add_item($p_object);
+   return 1;
+}
+
+=item C<remove_item()>
+
+Removes the Insteon object.
+
+=cut
+
+sub remove_item {
+   my ($self, $p_object) = @_;
+   return 0 unless $p_object and ref $p_object;
+   if (ref $$self{objects}) {
+      for (my $i = 0; $i < scalar(@{$$self{objects}}); $i++) {
+         if ($p_object->equals($$self{objects}->[$i])) {
+            splice @{$$self{objects}}, $i, 1;
+            return 1;
+         }
+      }
+   }
+   return 0;
+}
+
+=item C<is_member()>
+
+Returns true if object is in the list.
+
+=cut
+
+sub is_member {
+    my ($self, $p_object) = @_;
+
+    my @l_objects = @{$$self{objects}};
+    for my $l_object (@l_objects) {
+	if ($l_object->equals($p_object)) {
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+=item C<find_members(p_type)>
+
+Find and return all tracked objects of type p_type where p_type is an object
+class.
+
+=cut
+
+sub find_members {
+	my ($self,$p_type) = @_;
+
+	my @l_found;
+	my @l_objects = @{$$self{objects}};
+	for my $l_object (@l_objects) {
+		if ($l_object->isa($p_type)) {
+			push @l_found, $l_object;
+		}
+	}
+	return @l_found;
+}
+
+=back
+
+=head2 INI PARAMETERS
+
+=over
+
+=item C<debug>
+
+For debugging debug=insteon or debug=insteon:level where level is 1-4. 
+
+=back
+
+=head2 AUTHOR
+
+Bruce Winter, Gregg Liming, Kevin Robert Keegan, Michael Stovenour, many others
+
+=head2 SEE ALSO
+
+None
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+MA  02110-1301, USA.
+
+=cut
+
+
+1;
diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index eec478977..3a4a3a5f9 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -1,2805 +1,2805 @@
-package Insteon::AllLinkDatabase;
-
-=head1 B<Insteon::AllLinkDatabase>
-
-=head2 SYNOPSIS
-
-Generic class implementation of an insteon device's all link database.
-
-=head2 DESCRIPTION
-
-Generally this object should be interacted with through the insteon objects and 
-not by directly calling any of the following methods.
-
-=head2 INHERITS
-
-None
-
-=head2 METHODS
-
-=over
-
-=cut
-
-use strict;
-
-=item C<new()>
-
-Instantiate a new object.
-
-=cut
-
-sub new
-{
-	my ($class, $device) = @_;
-	my $self={};
-	bless $self,$class;
-        $$self{device} = $device;
-        $self->health("unknown"); # unknown
-	$self->aldb_version("I1");
-	return $self;
-}
-
-sub _send_cmd
-{
-   my ($self, $msg) = @_;
-   $$self{device}->_send_cmd($msg);
-}
-
-=item C<aldb_version([i1|i2])>
-
-Used to track the ALDB version type.
-
-If provided, saves version to memory.
-
-Returns the saved version type.
-
-=cut
-
-sub aldb_version
-{
-	my ($self, $aldb_version) = @_;
-	$$self{aldb_version} = $aldb_version if defined $aldb_version;
-	return $$self{aldb_version};
-}
-
-=item C<health([out-of-sync|unknown|empty|good])>
-
-Used to track the health of MisterHouse's copy of a device's ALDB.
-
-If provided, saves status to memory.
-
-Returns the saved health status.
-
-=cut
-
-sub health
-{
-	my ($self, $health) = @_;
-        $$self{health} = $health if defined $health;
-        return $$self{health};
-}
-
-=item C<get_linkkey($deviceid, $group, $is_controller, $data3)>
-
-Used to track the health of MisterHouse's copy of a device's ALDB.
-
-If provided, saves status to memory.
-
-Returns the saved health status.
-
-=cut
-
-sub get_linkkey {
-	my ($self, $deviceid, $group, $is_controller, $data3) = @_;
-	my $linkkey = $deviceid . $group . $is_controller;
-	# Data3 is irrelevant for the PLM itself, b/c for controller records
-	# data3 will always be equal to group.  And for responder records it 
-	# should always be 00, therefor blank data3 so it isn't used
-	if ($$self{device}->isa('Insteon_PLM')){
-		$data3 = '00';
-	}
-	# '00' and '01' are generally interchangable for $data3 values and are
-	# the most common values.  So to make searching easier we only 
-	# add data3 if it is unique
-	$linkkey .= $data3 if ($data3 ne '00' and $data3 ne '01');
-	return lc $linkkey;
-}
-
-=item C<scandatetime([seconds])>
-
-Used to track the time, in unix time seconds, of the last ALDB scan.
-
-If provided, saves the time to memory.
-
-Returns the time of the last ALDB scan.
-
-=cut
-
-sub scandatetime
-{
-	my ($self, $scandatetime) = @_;
-        $$self{scandatetime} = $scandatetime if defined $scandatetime;
-        return $$self{scandatetime};
-}
-
-=item C<aldb_delta([hex])>
-
-Used to track the ALDB Delta.  The ALDB Delta starts at 00 and iterates
-+1 for each change to a device's ALDB.  The ALDB Delta will be reset to 00 
-whenever power is lost to the device or if the device is factory reset.
-
-If provided, saves the hex value to memory. (This should likely only be done by
-C<query_aldb_delta()>)
-
-Returns the current ALDB Delta.
-
-=cut
-
-sub aldb_delta
-{
-        my ($self, $p_aldb_delta) = @_;
-        $$self{aldb_delta} = $p_aldb_delta if defined($p_aldb_delta);  
-        return $$self{aldb_delta};
-}
-
-=item C<query_aldb_delta([check|set])>
-
-Interacts with the device's ALDB Delta.
-
-If called with "check", MisterHouse will query the device to obtain the current
-ALDB Delta.  If the ALDB Delta matches the version stored in C<aldb_delta> 
-MisterHouse will eval the code stored in C<$self->{_aldb_unchanged_callback}>.
-If the ALDB Delta does not match, MisterHouse will eval the code stored in
-C<$self->{_aldb_changed_callback}>.
-
-If called with "set" will cause MisterHouse to query the device for its ALDB
-Delta and will store it with C<aldb_delta>.
-
-=cut
-
-sub query_aldb_delta
-{
-        my ($self, $action) = @_;
-        $$self{aldb_delta_action} = $action;
-        if ($action eq "check" && $self->health ne "good" && $self->health ne "empty"){
-		&::print_log("[Insteon::AllLinkDatabase] WARN The link table for "
-			. $self->{device}->get_object_name . " is out-of-sync.");
-		if (defined $self->{_aldb_changed_callback}) {
-			package main;
-			my $callback = $self->{_aldb_changed_callback};
-			$self->{_aldb_changed_callback} = undef;
-			eval ($callback);
-			&::print_log("[Insteon::AllLinkDatabase] " . $self->{device}->get_object_name . ": error during scan callback $@")
-				if $@ and $self->{device}->debuglevel(1, 'insteon');
-			package Insteon::AllLinkDatabase;
-		}
-        } elsif ($action eq "check" && ((&main::get_tickcount - $self->scandatetime()) <= 2000)){
-		#if we just did a aldb_query less than 2 seconds ago, don't repeat
-		&::print_log("[Insteon::AllLinkDatabase] The link table for "
-			. $self->{device}->get_object_name . " is in sync.");
-		#Further extend Scan Time in case of serial aldb requests
-		$self->scandatetime(&main::get_tickcount);
-		if (defined $self->{_aldb_unchanged_callback}) {
-			package main;
-			my $callback = $self->{_aldb_unchanged_callback};
-			$self->{_aldb_unchanged_callback} = undef;
-			eval ($callback);
-			&::print_log("[Insteon::AllLinkDatabase] " . $self->{device}->get_object_name . ": error during scan callback $@")
-				if $@ and $self->{device}->debuglevel(1, 'insteon');
-			package Insteon::AllLinkDatabase;
-		}
-        } else {
-        	my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'status_request');
-        	if (defined($$self{_failure_callback})) {$message->failure_callback($$self{_failure_callback})};
-        	$self->_send_cmd($message);
-        }
-}
-
-=item C<restore_string()>
-
-This is called by mh on exit to save the cached ALDB of a device to persistant data.
-
-=cut
-
-sub restore_string
-{
-	my ($self) = @_;
-	my $restore_string = '';
-	if ($$self{aldb}) {
-		my $aldb = '';
-		foreach my $aldb_key (keys %{$$self{aldb}}) {
-			next unless $aldb_key eq 'empty' || $aldb_key eq 'duplicates' || $$self{aldb}{$aldb_key}{inuse};
-			$aldb .= '|' if $aldb; # separate sections
-			my $record = '';
-			if ($aldb_key eq 'empty') {
-				foreach my $address (@{$$self{aldb}{empty}}) {
-					$record .= ';' if $record;
-					$record .= $address;
-				}
-				$record = 'empty=' . $record;
-			} elsif ($aldb_key eq 'duplicates') {
-				my $duplicate_record = '';
-				foreach my $address (@{$$self{aldb}{duplicates}}) {
-					$duplicate_record .= ';' if $duplicate_record;
-					$duplicate_record .= $address;
-				}
-				$record = 'duplicates=' . $duplicate_record;
-			} else {
-				my %aldb_record = %{$$self{aldb}{$aldb_key}};
-				foreach my $record_key (keys %aldb_record) {
-					next unless $aldb_record{$record_key};
-					$record .= ',' if $record;
-					$record .= $record_key . '=' . $aldb_record{$record_key};
-				}
-			}
-			$aldb .= $record;
-		}
-		if (defined $self->scandatetime)
-                {
-			$restore_string .= $$self{device}->get_object_name . "->_aldb->scandatetime(q~" . $self->scandatetime . "~) if "
-                        	. $$self{device}->get_object_name . "->_aldb;\n";
-                }
-		if (defined $self->aldb_delta)
-		{
-			$restore_string .= $$self{device}->get_object_name . "->_aldb->aldb_delta(q~" . $self->aldb_delta . "~) if "
-				. $$self{device}->get_object_name . "->_aldb;\n";
-		}
-		$restore_string .= $$self{device}->get_object_name . "->_aldb->health(q~" . $self->health . "~) if "
-                        	. $$self{device}->get_object_name . "->_aldb;\n";
-		$restore_string .= $$self{device}->get_object_name . "->_aldb->restore_aldb(q~$aldb~) if " . $$self{device}->get_object_name . "->_aldb;\n";
-        }
-	return $restore_string;
-}
-
-=item C<restore_aldb()>
-
-Used to reload MisterHouse's cached version of a device's ALDB on restart.
-
-=cut
-
-sub restore_aldb
-{
-	my ($self,$aldb) = @_;
-	if ($aldb) {
-		foreach my $aldb_section (split(/\|/,$aldb)) {
-			my %aldb_record = ();
-			my @aldb_empty = ();
-			my @aldb_duplicates = ();
-			my $deviceid = '';
-			my $groupid = '01';
-			my $is_controller = 0;
-			my $subaddress = '00';
-			foreach my $aldb_entry (split(/,/,$aldb_section)) {
-				my ($key,$value) = split(/=/,$aldb_entry);
-				next unless $key and defined($value) and $value ne '';
-				if ($key eq 'empty') {
-					@aldb_empty = split(/;/,$value);
-				} elsif ($key eq 'duplicates') {
-					@aldb_duplicates = split(/;/,$value);
-				} else {
-					$deviceid = lc $value if ($key eq 'deviceid');
-					$groupid = lc $value if ($key eq 'group');
-					$is_controller = $value if ($key eq 'is_controller');
-					$subaddress = $value if ($key eq 'data3');
-					$aldb_record{$key} = $value if $key and defined($value);
-				}
-			}
-			if (@aldb_empty) {
-				@{$$self{aldb}{empty}} = @aldb_empty;
-			} elsif (@aldb_duplicates) {
-				@{$$self{aldb}{duplicates}} = @aldb_duplicates;
-			} elsif (scalar %aldb_record) {
-				next unless $deviceid;
-				my $aldbkey = $self->get_linkkey($deviceid, $groupid, 
-							$is_controller, $subaddress);
-				%{$$self{aldb}{$aldbkey}} = %aldb_record;
-			}
-		}
-#		$self->log_alllink_table();
-	}
-}
-
-=item C<scan_link_table()>
-
-Scans a device's link table and caches a copy.
-
-=cut
-
-sub scan_link_table
-{
-	my ($self,$success_callback,$failure_callback) = @_;
-	$$self{_mem_activity} = 'scan';
-	$$self{_success_callback} = ($success_callback) ? $success_callback : undef;
-	$$self{_failure_callback} = ($failure_callback) ? $failure_callback : undef;
-	$self->health('out-of-sync'); # allow acknowledge to set otherwise
-	if($self->isa('Insteon::ALDB_i1')) {
-		$self->_peek('0FF8',0);
-	} else {
-		$self->send_read_aldb('0000');
-	}
-}
-
-=item C<delete_link([link details])>
-
-Deletes a specific link from a device.  Generally called by C<delete_orphan_links()>.
-
-=cut
-
-sub delete_link
-{
-	my ($self, $parms_text) = @_;
-	my %link_parms;
-	if ($parms_text eq 'ok' or $parms_text eq 'fail'){
-		%link_parms = %{$self->{callback_parms}};
-		$$self{callback_parms} = undef;
-		$link_parms{aldb_check} = $parms_text;
-	} 
-	elsif (@_ > 2)
-	{
-		shift @_;
-		%link_parms = @_;
-	}
-	else
-	{
-		%link_parms = &main::parse_func_parms($parms_text);
-	}
-	$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
-	$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
-	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
-		## Check whether ALDB is in sync
-		$self->{callback_parms} = \%link_parms;
-		$$self{_aldb_unchanged_callback} = '&Insteon::AllLinkDatabase::delete_link('.$$self{device}->{object_name}."->_aldb, 'ok')";
-		$$self{_aldb_changed_callback} = '&Insteon::AllLinkDatabase::delete_link('.$$self{device}->{object_name}."->_aldb, 'fail')";
-		$self->query_aldb_delta("check");
-	} elsif ($link_parms{aldb_check} eq "fail"){
-		&::print_log("[Insteon::AllLinkDatabase] WARN: Link NOT deleted, please rescan this device and sync again.");
-		if ($link_parms{callback})
-		{
-			package main;
-			eval($link_parms{callback});
-			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
-				if $@ and $self->{device}->debuglevel(1, 'insteon');
-			package Insteon::AllLinkDatabase;
-		}
-	} elsif ($link_parms{address} && $link_parms{aldb_check} eq "ok")
-	{
-		&main::print_log("[Insteon::AllLinkDatabase] Now deleting link [0x$link_parms{address}]");
-		$$self{_mem_activity} = 'delete';
-		$$self{pending_aldb}{address} = $link_parms{address};
-		if($self->isa('Insteon::ALDB_i1')) {
-			$self->_peek($link_parms{address},0);
-		} else {
-			$self->_write_delete($link_parms{address});
-		}
-
-	}
-	elsif ($link_parms{aldb_check} eq "ok")
-	{
-		my $insteon_object = $link_parms{object};
-		my $deviceid = ($insteon_object) ? $insteon_object->device_id : $link_parms{deviceid};
-		my $groupid = $link_parms{group};
-		$groupid = '01' unless $groupid;
-		my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
-		my $subaddress = ($link_parms{data3}) ? $link_parms{data3} : '00';
-		# get the address via lookup into the hash
-		my $key = $self->get_linkkey($deviceid, $groupid, $is_controller, $subaddress);
-		my $address = $$self{aldb}{$key}{address};
-		if ($address)
-		{
-			&main::print_log("[Insteon::AllLinkDatabase] Now deleting link [0x$address] with the following data"
-				. " deviceid=$deviceid, groupid=$groupid, is_controller=$is_controller, subaddress=$subaddress");
-			# now, alter the flags byte such that the in_use flag is set to 0
-			$$self{_mem_activity} = 'delete';
-			$$self{pending_aldb}{deviceid} = lc $deviceid;
-			$$self{pending_aldb}{group} = $groupid;
-			$$self{pending_aldb}{is_controller} = $is_controller;
-			$$self{pending_aldb}{address} = $address;
-			$$self{pending_aldb}{data3} = $subaddress;
-			if($self->isa('Insteon::ALDB_i1')) {
-				$self->_peek($address,0);
-			} else {
-				$self->_write_delete($address);
-			}
-		}
-		else
-		{
-			&main::print_log('[Insteon::AllLinkDatabase] WARN: (' . $$self{device}->get_object_name 
-				. ') attempt to delete link that does not exist!'
-				. " deviceid=$deviceid, groupid=$groupid, is_controller=$is_controller, subaddress=$subaddress");
-			if ($link_parms{callback})
-			{
-				package main;
-				eval($link_parms{callback});
-				&::print_log("[Insteon::AllLinkDatabase] error encountered during delete_link callback: " . $@)
-					if $@ and $self->{device}->debuglevel(1, 'insteon');
-				package Insteon::AllLinkDataBase;
-			}
-		}
-	}
-}
-
-=item C<delete_orphan_links()>
-
-Reviews the cached version of the link database for the device and removes
-links from THIS device which are not present in the mht file, link to non-existant
-devices, or which are only half-links.
-
-Since this routine only processes this device, it is best to run the voice 
-command 'delete all orphan links' from the interface so that all devices are 
-scanned and processed.
-
-=cut
-
-sub delete_orphan_links
-{
-	my ($self, $audit_mode, $failure_callback) = @_;
-	@{$$self{delete_queue}} = (); # reset the work queue
-	$$self{delete_queue_processed} = 0;
-	my $selfname = $$self{device}->get_object_name;
-
-	# first, make sure that the health of ALDB is ok
-	if ($self->health ne 'good' || $$self{device}->is_deaf) {
-		my $sent_to_failure = 0;
-		if ($$self{device}->is_deaf) {
-			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Will not delete links on deaf device: $selfname");
-		} 
-		elsif ($self->health eq 'empty'){
-			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Skipping $selfname, because it has no links");
-		}
-		else {
-			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping $selfname because health: "
-				. $self->health . ". Please rescan the link table of this device and rerun delete "
-				. "orphans if necessary");
-			#log the failure
-			$sent_to_failure = 1;
-			if ($failure_callback) {
-				package main;
-				eval ($failure_callback);
-				&::print_log("[Insteon::AllLinkDatabase] error in delete orphans failure callback: " . $@)
-					if $@ and $self->{device}->debuglevel(1, 'insteon');
-				package Insteon::AllLinkDatabase;
-			}
-		}
-		if (!$$self{device}->isa('Insteon_PLM') && !$sent_to_failure){
-			$self->_process_delete_queue();
-		}
-		return;
-	}
-
-	# Loop through the device's ALDB table
-	LINKKEY: for my $linkkey (keys %{$$self{aldb}}) {
-		# Skip empty addresses
-		next LINKKEY if ($linkkey eq 'empty');
-		
-		# Define delete request
-		my %delete_req = (callback => "$selfname->_aldb->_process_delete_queue()",
-				  failure_callback => $failure_callback);
-
-		# Delete duplicate entries
-		if ($linkkey eq 'duplicates') {
-			push my @duplicate_addresses, @{$$self{aldb}{duplicates}};
-			foreach (@duplicate_addresses) {
-				%delete_req = (%delete_req, address => $_, cause => "it is a duplicate record");
-				push @{$$self{delete_queue}}, \%delete_req;
-			}
-			next LINKKEY;
-		}
-
-		# Initialize Variables
-		my ($linked_device, $plm_scene, $controller_object, $link_defined,
-			$controller_id, $responder_id, $link_data3, $recip_data3, 
-			$group_object, $data3_object);
-		my $group 		= lc $$self{aldb}{$linkkey}{group};
-		my $is_controller 	= $$self{aldb}{$linkkey}{is_controller};
-		my $data3 		= lc $$self{aldb}{$linkkey}{data3};
-		my $deviceid 		= lc $$self{aldb}{$linkkey}{deviceid};
-		my $self_id		= lc $$self{device}->device_id;
-		my $interface_id	= $self_id;
-		$interface_id = lc $$self{device}->interface->device_id if (!$$self{device}->isa('Insteon_PLM'));
-		$linked_device = Insteon::get_object($deviceid,'01');
-		$linked_device = Insteon::active_interface() if ($deviceid eq $interface_id);
-		$group_object = ($is_controller) ? Insteon::get_object($self_id, $group) : Insteon::get_object($deviceid, $group);
-		$data3_object = Insteon::get_object($self_id, $data3);
-		%delete_req = (%delete_req, deviceid => $deviceid, group => $group,
-			is_controller => $is_controller, data3 => $data3);
-
-		# Is the linked device defined in MH?
-		if (! ref $linked_device) {
-			$delete_req{cause} = "no device with deviceid: $deviceid could be found";
-			push @{$$self{delete_queue}}, \%delete_req;
-			next LINKKEY;
-		}
-
-		# If link is a PLM Scene, is the PLM Scene defined in MH?
-		if (($linked_device->isa("Insteon_PLM") and !$is_controller)||
-		($$self{device}->isa("Insteon_PLM") and $is_controller)) {
-			$plm_scene = Insteon::get_object('000000', $group);
-			if (!ref $plm_scene && $group ne '01' && $group ne '00') {
-				$delete_req{cause} = "no plm scene for group $group could be found";
-				push @{$$self{delete_queue}}, \%delete_req;
-				next LINKKEY;
-			}
-		}
-
-		# Is this link defined in MH? 3-Step Process
-		# Define variables based on type of link
-		$controller_id = ($is_controller) ? $self_id : lc $linked_device->device_id;
-		$responder_id = ($is_controller) ? lc $linked_device->device_id : $self_id;
-		$controller_object = Insteon::get_object($controller_id,$group);
-		$controller_object = $plm_scene if (ref $plm_scene);
-
-		# First, iterate over the controller object members to find the link definition
-		MEMBERS: foreach my $member_ref (keys %{$$controller_object{members}}) {
-			my $member = $$controller_object{members}{$member_ref}{object};
-			if ($member->isa('Light_Item')) {
-				my @lights = $member->find_members('Insteon::BaseLight');
-				$member = $lights[0] if (@lights); # pick the first
-			}
-			# For resp, D3 = resp group; For cont, D3 = cont group
-			$link_data3 = ($is_controller) ? $group : $member->group;
-			if (lc($member->device_id) eq $responder_id) {
-				if ($data3 eq $link_data3){
-					$link_defined = 1;
-					$recip_data3 = ($is_controller) ? $member->group : $group;
-					last MEMBERS;
-				} 
-				elsif (($link_data3 eq '00' || $link_data3 eq '01') && 
-					($data3 eq '00' || $data3 eq '01' )){
-					# Allow for 00 or 01 interchangability
-					$link_defined = 1;
-					$recip_data3 = ($is_controller) ? $member->group : $group;
-					last MEMBERS;
-				}
-			} 
-		}
-
-		# Second, is this a PLM->Device, Device->PLM link, these are not members
-		if ($$self{device}->isa("Insteon_PLM")){
-			if ($is_controller && ($group eq '00' || $group eq '01')){
-				#Valid Controller for PLM->Device link
-				$delete_req{skip} = "$selfname -- Skipping reciprocal link check for controller group 00 or 01 link to "
-				. $linked_device->get_object_name; 
-				next LINKKEY;
-			}
-			elsif (!$is_controller && ref $group_object){
-				#Valid Responder for Device->PLM link
-				$link_defined = 1;
-				$recip_data3 = $group;
-			}
-		} 
-		elsif($deviceid eq $interface_id && (ref $data3_object || ($data3 eq '00' || $data3 eq '01'))){
-			if ($is_controller && ref $group_object){
-				#Valid Controller for Device->PLM link
-				$link_defined = 1;
-				$recip_data3 = '00';
-			}
-			elsif (!$is_controller && ($group eq '00' || $group eq '01')) {
-				#Valid Responder for PLM->Device link
-				$link_defined = 1;
-				$recip_data3 = '00';
-			}
-			
-		}
-
-		# Third, delete link if not defined
-		if (!$link_defined){
-			$delete_req{cause} = "link is not defined in MisterHouse";
-			push @{$$self{delete_queue}}, \%delete_req;
-			next LINKKEY;
-		}
-
-		# Do not delete links to deaf devices
-		if ($linked_device->is_deaf) {
-			$delete_req{skip} = "$selfname -- Skipping check for reciprocal links on deaf device " . $linked_device->get_object_name;
-			next LINKKEY;
-		}
-		
-		# Do not delete links to unhealthy devices 
-		if ($linked_device->_aldb->health ne 'good' && $linked_device->_aldb->health ne 'empty') {
-			$delete_req{skip} = "$selfname -- Skipping check for reciprocal links on "
-				. $linked_device->get_object_name . " because aldb health of that device is "
-				. $linked_device->_aldb->health . ". Please rescan this device.";
-			next LINKKEY;
-		}
-		
-		# Do not delete responder links from the PLM (prevents locking i2CS devices)
-		if ($linked_device->isa("Insteon_PLM") and !$is_controller && ($group eq '00' || $group eq '01')) {
-			$delete_req{skip} = "$selfname -- Skipping check for reciprocal controller link on PLM for group 00 or 01.";
-			next LINKKEY;
-		}
-
-		# Does a reciprocal link exist?
-		if (! $linked_device->has_link($$self{device},$group,($is_controller) ? 0 : 1, lc $recip_data3)) {
-			$delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name;
-			push @{$$self{delete_queue}}, \%delete_req;
-		} 
-
-	} # /LINKKEY Loop
-	my $index = 0;
-	foreach (@{$$self{delete_queue}}){
-		my %delete_req = %{$_};
-		my $audit_text = "(AUDIT)" if ($audit_mode);
-		my $log_text;
-		if ($delete_req{skip}){
-			$log_text = "[Insteon::AllLinkDatabase] $audit_text " . $delete_req{skip};
-			splice @{$$self{delete_queue}}, $index, 1;
-		} else {
-			$log_text = "[Insteon::AllLinkDatabase] $audit_text Deleting the following link on $selfname because ";
-			$log_text .= $delete_req{cause} . "\n";
-			PRINT: for (keys %delete_req) {
-				next PRINT if (($_ eq 'cause') || ($_ eq 'callback') ||
-						($_ eq 'failure_callback'));
-				$log_text .= "$_ = $delete_req{$_}; ";
-			}
-			if ($delete_req{deviceid}){
-				my $reciprocal_object = Insteon::get_object($delete_req{deviceid}, '01');
-				if (!$delete_req{is_controller}){
-					$reciprocal_object = Insteon::get_object($delete_req{deviceid}, $delete_req{group});
-				}
-				if (ref $reciprocal_object) {
-					$log_text .= "linked device name= " . $reciprocal_object->get_object_name;
-				}
-			}
-			$index ++;
-		}
-		::print_log($log_text);
-	}
-	if ($audit_mode) {
-		@{$$self{delete_queue}} = ();
-	}
-	else {
-		::print_log("[Insteon::AllLinkDatabase] ## Begin processing delete queue for: $selfname");
-	}
-	if (!$$self{device}->isa('Insteon_PLM')) {
-		$self->_process_delete_queue();
-	}
-}
-
-sub _process_delete_queue {
-	my ($self) = @_;
-	my $num_in_queue = @{$$self{delete_queue}};
-	if ($num_in_queue)
-        {
-		my $delete_req_ptr = shift(@{$$self{delete_queue}});
-		my %delete_req = %$delete_req_ptr;
-		if ($delete_req{address})
-                {
-			&::print_log("[Insteon::AllLinkDatabase] (#$num_in_queue) " . $$self{device}->get_object_name . " now deleting duplicate record at address "
-				. $delete_req{address});
-		}
-                else
-                {
-			&::print_log("[Insteon::AllLinkDatabase] (#$num_in_queue) " . $$self{device}->get_object_name . " now deleting orphaned link w/ details: "
-				. (($delete_req{is_controller}) ? "controller" : "responder")
-				. ", " . (($delete_req{object}) ? "device=" . $delete_req{object}->get_object_name
-				: "deviceid=$delete_req{deviceid}") . ", group=$delete_req{group}, cause=$delete_req{cause}");
-		}
-		$self->delete_link(%delete_req);
-		$$self{delete_queue_processed}++;
-	}
-        else
-        {
-        	&::print_log("[Insteon::AllLinkDatabase] Nothing else to do for " . $$self{device}->get_object_name . " after deleting "
-                	. $$self{delete_queue_processed} . " links") if $self->{device}->debuglevel(1, 'insteon');
-		$$self{device}->interface->_aldb->_process_delete_queue($$self{delete_queue_processed});
-	}
-}
-
-=item C<add_duplicate_link_address([address])>
-
-Adds address to the duplicate link hash. Called as part of C<scan_link_table()>.
-
-=cut
-
-sub add_duplicate_link_address
-{
-	my ($self, $address) = @_;
-
-        unshift @{$$self{aldb}{duplicates}}, $address;
-
-        # now, keep the list sorted!
-        @{$$self{aldb}{duplicates}} = sort(@{$$self{aldb}{duplicates}});
-
-}
-
-=item C<delete_duplicate_link_address([address])>
-
-Removes address from the duplicate link hash. Called as part of C<delete_orphan_links()>.
-
-=cut
-
-sub delete_duplicate_link_address
-{
-	my ($self, $address) = @_;
-        my $num_duplicate_link_addresses = 0;
-        
-	$num_duplicate_link_addresses = @{$$self{aldb}{duplicates}} if (defined $$self{aldb}{duplicates});
-        if ($num_duplicate_link_addresses)
-        {
-        	my @temp_duplicates = ();
-        	foreach my $temp_address (@{$$self{aldb}{duplicates}})
-        	{
-                	if ($temp_address ne $address)
-                        {
-                        	push @temp_duplicates, $temp_address;
-                        }
-        	}
-                # keep it sorted
-                @{$$self{aldb}{duplicates}} = sort(@temp_duplicates);
-        }
-}
-
-=item C<add_empty_address([address])>
-
-Adds address to the empty link hash. Called as part of C<delete_orphan_links()> 
-or C<scan_link_table()>.
-
-=cut
-
-sub add_empty_address
-{
-	my ($self, $address) = @_;
-        # before adding it, make sure that it isn't already in the list!!
-        my $num_addresses = 0;
-        $num_addresses = @{$$self{aldb}{empty}} if (defined $$self{aldb}{empty});
-        my $exists = 0;
-        if ($num_addresses and $address)
-        {
-        	foreach my $temp_address (@{$$self{aldb}{empty}})
-        	{
-                	if ($temp_address eq $address)
-                        {
-                        	$exists = 1;
-                                last;
-                        }
-        	}
-        }
-        # add it to the list if it doesn't exist
-        if (!($exists) and $address)
-        {
-		unshift @{$$self{aldb}{empty}}, $address;
-        }
-
-        # now, keep the list sorted!
-        @{$$self{aldb}{empty}} = sort(@{$$self{aldb}{empty}});
-
-}
-
-=item C<get_first_empty_address()>
-
-Returns the highest empty link address, or if no empty addresses exist, returns
-the highest unused address.  Called as part of C<delete_orphan_links()> or 
-C<scan_link_table()>..
-
-=cut
-
-sub get_first_empty_address
-{
-	my ($self) = @_;
-
-        # NOTE: The issue here is that we give up an address from the list
-        #   with the assumption that it will be made non-empty;
-        #   So, if there is a problem during update/add, then will have
-        #   a non-empty, but non-functional entry
-	my $first_address = pop @{$$self{aldb}{empty}};
-
-        if (!($first_address))
-        {
-        	# then, cycle through all of the existing non-empty addresses
-                # to find the lowest one and then decrement by 8
-                #
-                # TO-DO: factor in appropriate use of the "highwater" flag
-                #
-		my $high_address = 0xffff;
-		for my $key (keys %{$$self{aldb}})
-                {
-			next if $key eq 'empty' or $key eq 'duplicates';
-			my $new_address = hex($$self{aldb}{$key}{address});
-			if( $new_address and $new_address < $high_address ) {
-				$high_address = $new_address;
-			}
-		}
-		$first_address = ($high_address > 0) ? sprintf('%04x', $high_address - 8) : 0;
-		main::print_log("[Insteon::AllLinkDatabase] DEBUG4: No empty link entries; using next lowest link address ["
-			.$first_address."]") if $self->{device}->debuglevel(4, 'insteon');
-	} else {
-		main::print_log("[Insteon::AllLinkDatabase] DEBUG4: Found empty address ["
-			.$first_address."] in empty array") if $self->{device}->debuglevel(4, 'insteon');
-	}
-
-        return $first_address;
-}
-
-=item C<add_link(link_params)>
-
-Adds the link to the device's ALDB.  Generally called from the "sync links" or 
-"link to interface" voice commands.
-
-=cut
-
-sub add_link
-{
-	my ($self, $parms_text) = @_;
-	my %link_parms;
-	if ($parms_text eq 'ok' or $parms_text eq 'fail'){
-		%link_parms = %{$self->{callback_parms}};
-		$$self{callback_parms} = undef;
-		$link_parms{aldb_check} = $parms_text;
-	}
-	elsif (@_ > 2)
-        {
-		shift @_;
-		%link_parms = @_;
-	}
-        else
-        {
-		%link_parms = &main::parse_func_parms($parms_text);
-	}
-	my $device_id;
-	my $insteon_object = $link_parms{object};
-	my $group = $link_parms{group};
-	if (!(defined($insteon_object)))
-        {
-		$device_id = lc $link_parms{deviceid};
-		$insteon_object = &Insteon::get_object($device_id, $group);
-	}
-        else
-        {
-		$device_id = lc $insteon_object->device_id;
-	}
-	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
-
-	# For I2CS devices the default data3 for links is 01
-	# For all other devices the default data3 for links is 00
-	my $data3_default = '00';
-	if ($insteon_object->can('engine_version') && $insteon_object->engine_version eq 'I2CS') {
-		$data3_default = '01';
-	}
-	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
-	$data3 = $data3_default if ($data3 eq '00' || $data3 eq '01');
-
-	# check whether the link already exists
-	my $key = $self->get_linkkey($device_id, $group, $is_controller, $data3);
-	$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
-	$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
-	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
-		## Check whether ALDB is in sync
-		$self->{callback_parms} = \%link_parms;
-		$$self{_aldb_unchanged_callback} = '&Insteon::AllLinkDatabase::add_link('.$$self{device}->{object_name}."->_aldb, 'ok')";
-		$$self{_aldb_changed_callback} = '&Insteon::AllLinkDatabase::add_link('.$$self{device}->{object_name}."->_aldb, 'fail')";
-		$self->query_aldb_delta("check");
-	} elsif ($link_parms{aldb_check} eq "fail"){
-		&::print_log("[Insteon::AllLinkDatabase] WARN: Link NOT added, please rescan this device and sync again.");
-		if ($link_parms{callback})
-		{
-			package main;
-			eval($link_parms{callback});
-			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
-				if $@ and $self->{device}->debuglevel(1, 'insteon');
-			package Insteon::AllLinkDatabase;
-		}
-	}
-	elsif (defined $$self{aldb}{$key} && defined $$self{aldb}{$key}{inuse})
-        {
-		&::print_log("[Insteon::AllLinkDatabase] WARN: attempt to add link to " 
-			. $$self{device}->get_object_name 
-			. " that already exists! object=" . $insteon_object->get_object_name 
-			. ", group=$group, is_controller=$is_controller, data3=$data3");
-		if ($link_parms{callback})
-                {
-			package main;
-			eval($link_parms{callback});
-			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " 
-				. $$self{device}->get_object_name . ":" . $@)
-				if $@ and $self->{device}->debuglevel(1, 'insteon');
-			package Insteon::AllLinkDatabase;
-		}
-	}
-	elsif ($link_parms{aldb_check} eq "ok")
-        {
-		# strip optional % sign to append on_level
-		my $on_level = $link_parms{on_level};
-		$on_level =~ s/(\d)%?/$1/;
-		$on_level = '100' unless defined($on_level); # 100% == on is the default
-		# strip optional s (seconds) to append ramp_rate
-		my $ramp_rate = $link_parms{ramp_rate};
-		$ramp_rate =~ s/(\d)s?/$1/;
-		$ramp_rate = '0.1' unless $ramp_rate; # 0.1s is the default
-		# get the first available memory location
-		my $address = $self->get_first_empty_address();
-                if ($address)
-                {
-			&::print_log("[Insteon::AllLinkDatabase] DEBUG2: adding link record to " . $$self{device}->get_object_name
-				. " light level controlled by " . $insteon_object->get_object_name
-		       		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate")
-                                if $self->{device}->debuglevel(2, 'insteon');
-			my ($data1, $data2);
-			if($link_parms{is_controller}) {
-				$data1 = '03';  #application retries == 3
-				$data2 = '00';  #ignored for controller entries
-			} else {
-				$data1 = &Insteon::DimmableLight::convert_level($on_level);
-				$data2 = ($$self{device}->isa('Insteon::DimmableLight')) ? &Insteon::DimmableLight::convert_ramp($ramp_rate) : '00';
-			}
-			#data3 is defined above
-			$$self{_mem_activity} = 'add';
-			$self->_write_link($address, $device_id, $group, $is_controller, $data1, $data2, $data3);
-			# TO-DO: ensure that pop'd address is restored back to queue if the transaction fails
-                }
-                else
-                {
-			&::print_log("[Insteon::AllLinkDatabase] ERROR: adding link record failed because "
-                        	. $$self{device}->get_object_name
-				. " does not have a record of the first empty ALDB record."
-                                . " Please rescan this device's link table")
-                                if $self->{device}->debuglevel(1, 'insteon');
-
-                         if ($$self{_success_callback})
-                         {
-				package main;
-				eval ($$self{_success_callback});
-				&::print_log("[Insteon::AllLinkDatabase] WARN1: Error encountered during callback: " . $@)
-			 		if $@ and $self->{device}->debuglevel(1, 'insteon');
-			 	package Insteon::AllLinkDatabase;
-                         }
-                }
-	}
-}
-
-=item C<update_link(link_params)>
-
-Updates the on_level and/or ramp_rate associated with a link to match the defined
-value in MisterHouse. Generally called from the "sync links" voice command.
-
-=cut
-
-sub update_link
-{
-	my ($self, %link_parms) = @_;
-	if ($_[1] eq 'ok' or $_[1] eq 'fail'){
-		%link_parms = %{$self->{callback_parms}};
-		$$self{callback_parms} = undef;
-		$link_parms{aldb_check} = $_[1];
-	}
-	my $insteon_object = $link_parms{object};
-	my $group = $link_parms{group};
-	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
-	# strip optional % sign to append on_level
-	my $on_level = $link_parms{on_level};
-	$on_level =~ s/(\d+)%?/$1/;
-	# strip optional s (seconds) to append ramp_rate
-	my $ramp_rate = $link_parms{ramp_rate};
-	$ramp_rate =~ s/(\d)s?/$1/;
-	&::print_log("[Insteon::AllLinkDatabase] updating " . $$self{device}->get_object_name . " light level controlled by " . $insteon_object->get_object_name
-		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate") if $self->{device}->debuglevel(1, 'insteon');
-	my $data1 = &Insteon::DimmableLight::convert_level($on_level);
-	my $data2 = ($$self{device}->isa('Insteon::DimmableLight')) ? &Insteon::DimmableLight::convert_ramp($ramp_rate) : '00';
-
-	# For I2CS devices the default data3 for links is 01
-	# For all other devices the default data3 for links is 00
-	my $data3_default = '00';
-	if ($insteon_object->can('engine_version') && $insteon_object->engine_version eq 'I2CS') {
-		$data3_default = '01';
-	}
-	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
-	$data3 = $data3_default if ($data3 eq '00' || $data3 eq '01');
-
-	$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
-	$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
-
-	my $deviceid = $insteon_object->device_id;
-	my $key = $self->get_linkkey($deviceid, $group, $is_controller, $data3);
-	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
-		## Check whether ALDB is in sync
-		$self->{callback_parms} = \%link_parms;
-		$$self{_aldb_unchanged_callback} = '&Insteon::AllLinkDatabase::update_link('.$$self{device}->{object_name}."->_aldb, 'ok')";
-		$$self{_aldb_changed_callback} = '&Insteon::AllLinkDatabase::update_link('.$$self{device}->{object_name}."->_aldb, 'fail')";
-		$self->query_aldb_delta("check");
-	} elsif ($link_parms{aldb_check} eq "fail"){
-		&::print_log("[Insteon::AllLinkDatabase] WARN: Cannot update link, please rescan this device and sync again.");
-		if ($link_parms{callback})
-		{
-			package main;
-			eval($link_parms{callback});
-			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
-				if $@ and $self->{device}->debuglevel(1, 'insteon');
-			package Insteon::AllLinkDatabase;
-		}
-	}
-	elsif (defined $$self{aldb}{$key} && $link_parms{aldb_check} eq "ok"){	
-		my $address = $$self{aldb}{$key}{address};
-		$$self{_mem_activity} = 'update';
-		$self->_write_link($address, $deviceid, $group, $is_controller, $data1, $data2, $data3);
-	} else {
-		&::print_log("[Insteon::AllLinkDatabase] ERROR: updating link record failed because "
-			. $$self{device}->get_object_name
-			. " does not have an existing ALDB entry key=$key")
-			if $self->{device}->debuglevel(1, 'insteon');
-
-		if ($$self{_success_callback})
-		{
-			package main;
-			eval ($$self{_success_callback});
-			&::print_log("[Insteon::AllLinkDatabase] WARN1: Error encountered during ack callback: " . $@)
-				if $@ and $self->{device}->debuglevel(1, 'insteon');
-			package Insteon::AllLinkDatabase;
-		}
-	}
-}
-
-=item C<log_alllink_table()>
-
-Prints a human readable form of MisterHouse's cached version of a device's ALDB
-to the print log.  Called as part of the "scan links" voice command
-or in response to the "log links" voice command.
-
-=cut
-
-sub log_alllink_table
-{
-	my ($self) = @_;
-	my %aldb;
-
-	&::print_log("[Insteon::AllLinkDatabase] Link table for "
-        	. $$self{device}->get_object_name
-                . " health: " . $self->health);
-
-	# We want to log links sorted by ALDB address. Since the ALDB
-	# addresses are scattered throughout the %{$$self{aldb}} hash,
-	# and it is not easy to obtain them in a linear manner,
-	# we build a new data structure that will allow us to easily
-	# traverse the ALDB by address in a sorted manner. The new
-	# data structure is a bidimensional hash (%aldb) where rows
-	# are the ALDB addresses and the columns can be "empty"
-	# (indicates that the ALDB at the corresponding address is
-	# empty), "duplicate" (indicates that the ALDB at the
-	# corresponding address is a duplicate), or a hash key (which
-	# indicates that the ALDB at corresponding address contains
-	# a link).
-	foreach my $aldbkey (keys %{$$self{aldb}})
-        {
-	    if ($aldbkey eq "empty")
-            {
-		foreach my $address (@{$$self{aldb}{empty}})
-                {
-		    $aldb{$address}{empty} = undef; # Any value will do
-		}
-	    }
-            elsif ($aldbkey eq "duplicates")
-            {
-		foreach my $address (@{$$self{aldb}{duplicates}})
-                {
-		    $aldb{$address}{duplicate} = undef; # Any value will do
-		}
-	    }
-            else
-            {
-		$aldb{$$self{aldb}{$aldbkey}{address} }{$aldbkey} = $$self{aldb}{$aldbkey};
-	    }
-	}
-
-	# Finally traverse the ALDB, but this time sorted by ALDB address
-        if ($self->health eq 'good')
-        {
-		foreach my $address (sort keys %aldb)
-           	{
-			my $log_msg = "[Insteon::AllLinkDatabase] [0x$address] ";
-
-			if (exists $aldb{$address}{empty})
-                        {
-		    		$log_msg .= "is empty";
-			}
-                        elsif (exists $aldb{$address}{duplicate})
-                        {
-		    		$log_msg .= "holds a duplicate entry";
-			}
-                        else
-                        {
-		   		my ($key) = keys %{$aldb{$address} }; # There's only 1 key
-		    		my $aldb_entry = $aldb{$address}{$key};
-		    		my $is_controller = $aldb_entry->{is_controller};
-		    		my $device;
-
-		    		if ($$self{device}->interface()->device_id()
-					&& ($$self{device}->interface()->device_id()
-                                        eq $aldb_entry->{deviceid}))
-                                {
-			    		$device = $$self{device}->interface;
-		    		}
-                                else
-                                {
-			    		$device = &Insteon::get_object($aldb_entry->{deviceid},'01');
-		    		}
-		    		my $object_name = ($device) ? $device->get_object_name : $aldb_entry->{deviceid};
-
-		    		my $on_level = 'unknown';
-		    		if (defined $aldb_entry->{data1})
-                                {
-			    		if ($aldb_entry->{data1})
-                                        {
-				    		$on_level = int((hex($aldb_entry->{data1})*100/255) + .5) . "%";
-			    		}
-                                        else
-                                        {
-				    		$on_level = '0%';
-			    		}
-		    		}
-
-		    		my $rspndr_group = $aldb_entry->{data3};
-		    		$rspndr_group = '01' if $rspndr_group eq '00';
-
-		    		my $ramp_rate = 'unknown';
-		    		if ($aldb_entry->{data2})
-                                {
-			    		if (!($$self{device}->isa('Insteon::DimmableLight'))
-                                        	or (!$is_controller and ($rspndr_group != '01')))
-                                        {
-				    		$ramp_rate = 'none';
-				    		$on_level = $on_level eq '0%' ? 'off' : 'on';
-			    		}
-                                        else
-                                        {
-				    		$ramp_rate = &Insteon::DimmableLight::get_ramp_from_code($aldb_entry->{data2}) . "s";
-			    		}
-		    		}
-
-		    		$log_msg .= $is_controller ? "contlr($aldb_entry->{group}) "
-				    . "record to $object_name, "
-				    . "(d1:$aldb_entry->{data1}, "
-				    . "d2:$aldb_entry->{data2}, "
-				    . "d3:$aldb_entry->{data3})"
-				: "rspndr($rspndr_group) record to $object_name "
-				    . "($aldb_entry->{group}): onlevel=$on_level "
-				    . "and ramp=$ramp_rate "
-				    . "(d3:$aldb_entry->{data3})";
-			}
-
-			&::print_log($log_msg);
-		}
-        }
-        else
-        {
-		main::print_log("[Insteon::AllLinkDatabase] ALDB is ".$self->health." and will not be listed");
-        }
-}
-
-=item C<has_link(link_details)>
-
-Checks and returns true if a link with the passed details exists on the device
-or false if it does not.  Generally called as part of C<delete_orphan_links()>.
-
-=cut
-
-sub has_link
-{
-	my ($self, $insteon_object, $group, $is_controller, $data3) = @_;
-	my $deviceid;
-	if ($insteon_object->isa('Insteon::AllLinkDatabase')) {
-		$deviceid = $$insteon_object{device}->device_id;
-	} else {
-		$deviceid = lc $insteon_object->device_id;
-	}
-	my $key = $self->get_linkkey($deviceid, $group, $is_controller, $data3);
-	return (defined $$self{aldb}{$key});
-}
-
-=back
-
-=head2 INI PARAMETERS
-
-None
-
-=head2 AUTHOR
-
-Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-package Insteon::ALDB_i1;
-
-=head1 B<Insteon::ALDB_i1>
-
-=head2 SYNOPSIS
-
-Unique class for storing a cahced copy of a verion i1 device's ALDB.
-
-=head2 DESCRIPTION
-
-Generally this object should be interacted with through the insteon objects and 
-not by directly calling any of the following methods.
-
-=head2 INHERITS
-
-L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-use strict;
-
-@Insteon::ALDB_i1::ISA = ('Insteon::AllLinkDatabase');
-
-=item C<new()>
-
-Instantiate a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$device) = @_;
-
-	my $self = new Insteon::AllLinkDatabase($device);
-	bless $self,$class;
-	$self->aldb_version("I1");
-	return $self;
-}
-
-sub _on_poke
-{
-	my ($self,%msg) = @_;
-        my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'peek');
-	if (($$self{_mem_activity} eq 'update') or ($$self{_mem_activity} eq 'add'))
-        {
-		if ($$self{_mem_action} eq 'aldb_flag')
-                {
-			$$self{_mem_action} = 'aldb_group';
-			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-                        $message->extra($$self{_mem_lsb});
-                        $message->failure_callback($$self{_failure_callback});
-			$self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'aldb_group')
-                {
-			$$self{_mem_action} = 'aldb_devhi';
-			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-                        $message->extra($$self{_mem_lsb});
-                        $message->failure_callback($$self{_failure_callback});
-			$self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'aldb_devhi')
-                {
-			$$self{_mem_action} = 'aldb_devmid';
-			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-                        $message->extra($$self{_mem_lsb});
-                        $message->failure_callback($$self{_failure_callback});
-			$self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'aldb_devmid')
-                {
-			$$self{_mem_action} = 'aldb_devlo';
-			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-                        $message->extra($$self{_mem_lsb});
-                        $message->failure_callback($$self{_failure_callback});
-			$self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'aldb_devlo')
-                {
-			$$self{_mem_action} = 'aldb_data1';
-			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-                        $message->extra($$self{_mem_lsb});
-                        $message->failure_callback($$self{_failure_callback});
-			$self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'aldb_data1')
-                {
-			$$self{_mem_action} = 'aldb_data2';
-			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-                        $message->extra($$self{_mem_lsb});
-                        $message->failure_callback($$self{_failure_callback});
-			$self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'aldb_data2')
-                {
-			$$self{_mem_action} = 'aldb_data3';
-			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-                        $message->extra($$self{_mem_lsb});
-                        $message->failure_callback($$self{_failure_callback});
-			$self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'aldb_data3')
-                {
-			## update the aldb records w/ the changes that were made
-			my $aldbkey = $self->get_linkkey($$self{pending_aldb}{deviceid},
-							$$self{pending_aldb}{group},
-							$$self{pending_aldb}{is_controller},
-							$$self{pending_aldb}{data3});
-			$$self{aldb}{$aldbkey}{data1} = $$self{pending_aldb}{data1};
-			$$self{aldb}{$aldbkey}{data2} = $$self{pending_aldb}{data2};
-			$$self{aldb}{$aldbkey}{data3} = $$self{pending_aldb}{data3};
-			$$self{aldb}{$aldbkey}{inuse} = 1; # needed so that restore string will preserve record
-			if ($$self{_mem_activity} eq 'add')
-                        {
-				$$self{aldb}{$aldbkey}{is_controller} = $$self{pending_aldb}{is_controller};
-				$$self{aldb}{$aldbkey}{deviceid} = lc $$self{pending_aldb}{deviceid};
-				$$self{aldb}{$aldbkey}{group} = lc $$self{pending_aldb}{group};
-				$$self{aldb}{$aldbkey}{address} = $$self{pending_aldb}{address};
-				$self->health("good");
-			}
-			# clear out mem_activity flag
-			$$self{_mem_activity} = undef;
-			$self->health("good");
-			# Put the new ALDB Delta into memory
-			$self->query_aldb_delta('set');
-		}
-	}
-        elsif ($$self{_mem_activity} eq 'update_local')
-        {
-		if ($$self{_mem_action} eq 'local_onlevel')
-                {
-			$$self{_mem_lsb} = '21';
-			$$self{_mem_action} = 'local_ramprate';
-                        $message->extra($$self{_mem_lsb});
-                        $message->failure_callback($$self{_failure_callback});
-			$self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'local_ramprate')
-                {
-			if ($$self{device}->isa('Insteon::KeyPadLincRelay') or $$self{device}->isa('Insteon::KeyPadLinc'))
-                        {
-				# update from eeprom--only a kpl issue
-				$message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'do_read_ee');
-                                $self->_send_cmd($message);
-			}
-			# Put the new ALDB Delta into memory
-			$self->query_aldb_delta('set');
-		}
-	}
-        elsif ($$self{_mem_activity} eq 'update_flags')
-        {
-		# update from eeprom--only a kpl issue
-		$message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'do_read_ee');
-                $message->failure_callback($$self{_failure_callback});
-                $self->_send_cmd($message);
-	}
-        elsif ($$self{_mem_activity} eq 'delete')
-        {
-		# clear out mem_activity flag
-		$$self{_mem_activity} = undef;
-		# add the address of the deleted link to the empty list
-		$self->add_empty_address($$self{pending_aldb}{address});
-                # and, remove from the duplicates list (if it is a member)
-                $self->delete_duplicate_link_address($$self{pending_aldb}{address});
-		if (exists $$self{pending_aldb}{deviceid})
-                {
-			my $key = $self->get_linkkey($$self{pending_aldb}{deviceid},
-							$$self{pending_aldb}{group}, 
-							$$self{pending_aldb}{is_controller},
-							$$self{pending_aldb}{data3});
-			delete $$self{aldb}{$key};
-		}
-		$self->health("good");
-		# Put the new ALDB Delta into memory
-		$self->query_aldb_delta('set');
-	}
-}
-
-sub _on_peek
-{
-	my ($self,%msg) = @_;
-        my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'peek');
-	if ($msg{is_extended}) {
-		&::print_log("[Insteon::ALDB_i1]: extended peek for " . $$self{device}->{object_name}
-		. " is " . $msg{extra}) if $self->{device}->debuglevel(1, 'insteon');
-	}
-        else
-        {
-		if ($$self{_mem_action} eq 'aldb_peek')
-                {
-			if ($$self{_mem_activity} eq 'scan')
-                        {
-				$$self{_mem_action} = 'aldb_flag';
-				# if the device is responding to the peek, then init the link table
-				#   if at the very start of a scan
-				if (lc $$self{_mem_msb} eq '0f' and lc $$self{_mem_lsb} eq 'f8'
-					&& !$$self{_stress_test_act})
-                                {
-					# reinit the aldb hash as there will be a new one
-					$$self{aldb} = undef;
-					# reinit the empty address list
-					@{$$self{aldb}{empty}} = ();
-					# and, also the duplicates list
-					@{$$self{aldb}{duplicates}} = ();
-				}
-			}
-                        elsif ($$self{_mem_activity} eq 'update')
-                        {
-				$$self{_mem_action} = 'aldb_data1';
-			}
-                        elsif ($$self{_mem_activity} eq 'update_local')
-                        {
-				$$self{_mem_action} = 'local_onlevel';
-			}
-                        elsif ($$self{_mem_activity} eq 'update_flags')
-                        {
-				$$self{_mem_action} = 'update_flags';
-			}
-                        elsif ($$self{_mem_activity} eq 'delete')
-                        {
-				$$self{_mem_action} = 'aldb_flag';
-			}
-                        elsif ($$self{_mem_activity} eq 'add')
-                        {
-				$$self{_mem_action} = 'aldb_flag';
-			}
-                       	$message->extra($$self{_mem_lsb});
-                        $message->failure_callback($$self{_failure_callback});
-                       	$self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'aldb_flag')
-                {
-			if ($$self{_mem_activity} eq 'scan')
-                        {
-                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
-                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
-				my $flag = hex($msg{extra});
-				$$self{pending_aldb}{inuse} = ($flag & 0x80) ? 1 : 0;
-				$$self{pending_aldb}{is_controller} = ($flag & 0x40) ? 1 : 0;
-				$$self{pending_aldb}{highwater} = ($flag & 0x02) ? 1 : 0;
-                        	if ($$self{_stress_test_act} && !($$self{pending_aldb}{highwater})){
-                        		::print_log("[Insteon::ALDB_i1] You need to create a link on this device before running stress_test");
-                        		$$self{_mem_activity} = undef;
-                        		$$self{_mem_action} = undef;
-                        		$$self{_stress_test_act} = 0;
-                        		$$self{device}->stress_test();
-                        	}
-				elsif (!($$self{pending_aldb}{highwater}))
-                                {
-					# since this is the last unused memory location, then add it to the empty list
-					$self->add_empty_address($$self{_mem_msb} . $$self{_mem_lsb});
-					$$self{_mem_action} = undef;
-					# clear out mem_activity flag
-					$$self{_mem_activity} = undef;
-                                   	if (lc $$self{_mem_msb} eq '0f' and lc $$self{_mem_lsb} eq 'f8')
-                                        {
-                                        	# set health as empty for now
-                                        	$self->health("empty");
-					}
-                                        else
-                                        {
-                                        	$self->health("good");
-                                        }
-
-					&::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name . " completed link memory scan")
-						if $self->{device}->debuglevel(1, 'insteon');
-					$self->health("good");
-					# Put the new ALDB Delta into memory
-					$self->query_aldb_delta('set');
-				}
-                                elsif ($$self{pending_aldb}{inuse})
-                                {
-					$$self{pending_aldb}{flag} = $msg{extra};
-					## confirm that we have a high-water mark; otherwise stop
-					$$self{pending_aldb}{address} = $$self{_mem_msb} . $$self{_mem_lsb};
-					$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-					$$self{_mem_action} = 'aldb_group';
-                                	$message->extra($$self{_mem_lsb});
-                        		$message->failure_callback($$self{_failure_callback});
-                                	$self->_send_cmd($message);
-				} else {
-					$self->add_empty_address($$self{_mem_msb} . $$self{_mem_lsb});
-					if ($$self{_mem_activity} eq 'scan'){
-						my $newaddress = sprintf("%04X", hex($$self{_mem_msb} . $$self{_mem_lsb}) - 8);
-						$$self{pending_aldb} = undef;
-						$self->_peek($newaddress);
-					}
-				}
-			}
-                        elsif ($$self{_mem_activity} eq 'add')
-                        {
-                        	# TO-DO!!! Eventually add the ability to set the highwater mark
-                                #  the below flags never reset the highwater mark so that
-                                #  the scanner will continue scanning extra empty records
-				my $flag = ($$self{pending_aldb}{is_controller}) ? 'E2' : 'A2';
-				$$self{pending_aldb}{flag} = $flag;
-                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
-                                $message->extra($flag);
-                        	$message->failure_callback($$self{_failure_callback});
-                                $self->_send_cmd($message);
-			}
-                        elsif ($$self{_mem_activity} eq 'delete')
-                        {
-                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
-                                $message->extra('02');
-                        	$message->failure_callback($$self{_failure_callback});
-                                $self->_send_cmd($message);
-			}
-		}
-                elsif ($$self{_mem_action} eq 'aldb_group')
-                {
-			if ($$self{_mem_activity} eq 'scan')
-                        {
-                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
-                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
-				$$self{pending_aldb}{group} = lc $msg{extra};
-				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-				$$self{_mem_action} = 'aldb_devhi';
-                               	$message->extra($$self{_mem_lsb});
-			}
-                        else
-                        {
-                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
-                                $message->extra($$self{pending_aldb}{group});
-			}
-                        $message->failure_callback($$self{_failure_callback});
-                        $self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'aldb_devhi')
-                {
-			if ($$self{_mem_activity} eq 'scan')
-                        {
-                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
-                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
-				$$self{pending_aldb}{deviceid} = lc $msg{extra};
-				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-				$$self{_mem_action} = 'aldb_devmid';
-                               	$message->extra($$self{_mem_lsb});
-			}
-                        elsif ($$self{_mem_activity} eq 'add')
-                        {
-				my $devid = substr($$self{pending_aldb}{deviceid},0,2);
-                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
-                                $message->extra($devid);
-			}
-                        $message->failure_callback($$self{_failure_callback});
-                        $self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'aldb_devmid')
-                {
-			if ($$self{_mem_activity} eq 'scan')
-                        {
-                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
-                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
-				$$self{pending_aldb}{deviceid} .= lc $msg{extra};
-				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-				$$self{_mem_action} = 'aldb_devlo';
-                               	$message->extra($$self{_mem_lsb});
-			}
-                        elsif ($$self{_mem_activity} eq 'add')
-                        {
-				my $devid = substr($$self{pending_aldb}{deviceid},2,2);
-                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
-                                $message->extra($devid);
-			}
-                        $message->failure_callback($$self{_failure_callback});
-                        $self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'aldb_devlo')
-                {
-			if ($$self{_mem_activity} eq 'scan')
-                        {
-                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
-                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
-				$$self{pending_aldb}{deviceid} .= lc $msg{extra};
-				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-				$$self{_mem_action} = 'aldb_data1';
-                               	$message->extra($$self{_mem_lsb});
-                        	$message->failure_callback($$self{_failure_callback});
-                               	$self->_send_cmd($message);
-			}
-                        elsif ($$self{_mem_activity} eq 'add')
-                        {
-				my $devid = substr($$self{pending_aldb}{deviceid},4,2);
-                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
-                                $message->extra($devid);
-                        	$message->failure_callback($$self{_failure_callback});
-                                $self->_send_cmd($message);
-			}
-		}
-                elsif ($$self{_mem_action} eq 'aldb_data1')
-                {
-			if ($$self{_mem_activity} eq 'scan')
-                        {
-                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
-                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
-				$$self{_mem_action} = 'aldb_data2';
-				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-				$$self{pending_aldb}{data1} = $msg{extra};
-                               	$message->extra($$self{_mem_lsb});
-                        	$message->failure_callback($$self{_failure_callback});
-                               	$self->_send_cmd($message);
-			}
-                        elsif ($$self{_mem_activity} eq 'update' or $$self{_mem_activity} eq 'add')
-                        {
-				# poke the new value
-                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
-                                $message->extra($$self{pending_aldb}{data1});
-                        	$message->failure_callback($$self{_failure_callback});
-                                $self->_send_cmd($message);
-			}
-		}
-                elsif ($$self{_mem_action} eq 'aldb_data2')
-                {
-			if ($$self{_mem_activity} eq 'scan')
-                        {
-                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
-                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
-				$$self{pending_aldb}{data2} = $msg{extra};
-				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
-				$$self{_mem_action} = 'aldb_data3';
-                               	$message->extra($$self{_mem_lsb});
-                        	$message->failure_callback($$self{_failure_callback});
-                               	$self->_send_cmd($message);
-			}
-                        elsif ($$self{_mem_activity} eq 'update' or $$self{_mem_activity} eq 'add')
-                        {
-				# poke the new value
-                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
-                                $message->extra($$self{pending_aldb}{data2});
-                        	$message->failure_callback($$self{_failure_callback});
-                                $self->_send_cmd($message);
-			}
-		}
-                elsif ($$self{_mem_action} eq 'aldb_data3')
-                {
-			if ($$self{_mem_activity} eq 'scan')
-                        {
-                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
-                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
-				$$self{pending_aldb}{data3} = $msg{extra};
-
-                        	if ($$self{_stress_test_act}){
-                        		$$self{_stress_test_act} = 0;
-                        		$$self{_mem_activity} = undef;
-                        		$$self{_mem_action} = undef;
-                        		$$self{device}->stress_test();
-                        	}
-				elsif ($$self{pending_aldb}{highwater})
-                                {
-					if ($$self{pending_aldb}{inuse})
-                                        {
-					# save pending_aldb and then clear it out
-						my $aldbkey = $self->get_linkkey($$self{pending_aldb}{deviceid},
-										$$self{pending_aldb}{group},
-										$$self{pending_aldb}{is_controller},
-										$$self{pending_aldb}{data3});
-						# check for duplicates
-						if (exists $$self{aldb}{$aldbkey} && $$self{aldb}{$aldbkey}{inuse})
-                                                {
-							$self->add_duplicate_link_address($$self{pending_aldb}{address});
-						}
-                                                else
-                                                {
-							%{$$self{aldb}{$aldbkey}} = %{$$self{pending_aldb}};
-						}
-					}
-                                        else
-                                        {
-						$self->add_empty_address($$self{pending_aldb}{address});
-					}
-					my $newaddress = sprintf("%04X", hex($$self{pending_aldb}{address}) - 8);
-					$$self{pending_aldb} = undef;
-					$self->_peek($newaddress);
-				}
-			}
-                        elsif ($$self{_mem_activity} eq 'update' or $$self{_mem_activity} eq 'add')
-                        {
-				# poke the new value
-                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
-                                $message->extra($$self{pending_aldb}{data3});
-                        	$message->failure_callback($$self{_failure_callback});
-                                $self->_send_cmd($message);
-			}
-		}
-                elsif ($$self{_mem_action} eq 'local_onlevel')
-                {
-			my $device = $$self{device};
-			my $on_level = $$device{_onlevel};
-			$on_level = &Insteon::DimmableLight::convert_level($on_level);
-                        $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
-                        $message->extra($on_level);
-                        $message->failure_callback($$self{_failure_callback});
-                        $self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'local_ramprate')
-                {
-                        my $device = $$self{device};
-			my $ramp_rate = $$device{_ramprate};
-			$ramp_rate = '1f' unless $ramp_rate;
-                        $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
-                        $message->extra($ramp_rate);
-                        $message->failure_callback($$self{_failure_callback});
-                        $self->_send_cmd($message);
-		}
-                elsif ($$self{_mem_action} eq 'update_flags')
-                {
-			my $flags = $$self{_operating_flags};
-                        $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
-                        $message->extra($flags);
-                        $message->failure_callback($$self{_failure_callback});
-                        $self->_send_cmd($message);
-		}
-		else {
-		::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name 
-			. ": unhandled _mem_action=".$$self{_mem_action})
-			if $self->{device}->debuglevel(1, 'insteon');
-		}
-	}
-}
-
-=item C<update_local_properties()>
-
-Used to update the local on level and ramp rate of a device.  Called by 
-L<Insteon::BaseDevice::update_local_properties()|Insteon::BaseInsteon/Insteon::BaseDevice>.
-
-=cut
-
-sub update_local_properties
-{
-	my ($self, $aldb_check) = @_;
-	if (defined($aldb_check)){
-		$$self{_mem_activity} = 'update_local';
-		$self->_peek('0032'); # 0032 is the address for the onlevel
-	} else {
-		$$self{_aldb_unchanged_callback} = '&Insteon::ALDB_i1::update_local_properties('.$$self{device}->{object_name}."->_aldb, 1)";
-		$$self{_aldb_changed_callback} = '&Insteon::ALDB_i1::update_local_properties('.$$self{device}->{object_name}."->_aldb, 1)";
-		$self->query_aldb_delta("check");
-	}
-}
-
-=item C<update_flags()>
-
-Used to update the flags of a device.  Called by L<Insteon::KeyPadLinc::update_flags()|Insteon::Lighting/Insteon::KeyPadLinc>.
-
-=cut
-
-sub update_flags
-{
-	my ($self, $flags, $aldb_check) = @_;
-	return unless defined $flags;
-	if (defined($aldb_check)){
-		$$self{_mem_activity} = 'update_flags';
-		$$self{_operating_flags} = $flags;
-		$self->_peek('0023');
-	} else {
-		$$self{_aldb_unchanged_callback} = '&Insteon::ALDB_i1::update_flags('.$$self{device}->{object_name}."->_aldb, '$flags', 1)";
-		$$self{_aldb_changed_callback} = '&Insteon::ALDB_i1::update_flags('.$$self{device}->{object_name}."->_aldb, '$flags', 1)";
-		$self->query_aldb_delta("check");
-	}
-}
-
-=item C<get_link_record()>
-
-Gets and returns the details of a link.  Called by L<Insteon::BaseController::update_members()|Insteon::BaseInsteon/Insteon::BaseController>.
-
-NOTE - This routine may be obsolete, its parent routine is not called by any code.
-
-=cut
-
-sub get_link_record
-{
-	my ($self,$link_key) = @_;
-	my %link_record = ();
-	%link_record = %{$$self{aldb}{$link_key}} if $$self{aldb}{$link_key};
-	return %link_record;
-}
-
-sub _write_link
-{
-	my ($self, $address, $deviceid, $group, $is_controller, $data1, $data2, $data3) = @_;
-	if ($address)
-        {
-		&::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name . " address: $address found for device: $deviceid and group: $group");
-		# change address for start of change to be address + offset
-		if ($$self{_mem_activity} eq 'update')
-                {
-			$address = sprintf('%04X',hex($address) + 5);
-		}
-		$$self{pending_aldb}{address} = $address;
-		$$self{pending_aldb}{deviceid} = lc $deviceid;
-		$$self{pending_aldb}{group} = lc $group;
-		$$self{pending_aldb}{is_controller} = $is_controller;
-		$$self{pending_aldb}{data1} = (defined $data1) ? lc $data1 : '00';
-		$$self{pending_aldb}{data2} = (defined $data2) ? lc $data2 : '00';
-		$$self{pending_aldb}{data3} = (defined $data3) ? lc $data3 : '00';
-		$self->_peek($address);
-	}
-        else
-        {
-		&::print_log("[Insteon::ALDB_i1] WARN: " . $$self{device}->get_object_name
-			. " write_link failure: no address available for record to device: $deviceid and group: $group" .
-				" and is_controller: $is_controller");;
-                if ($$self{_success_callback})
-                {
-			package main;
-			eval ($$self{_success_callback});
-			&::print_log("[Insteon::ALDB_i1] WARN1: Error encountered during ack callback: " . $@)
-		 		if $@ and $self->{device}->debuglevel(1, 'insteon');
-		 	package Insteon::ALDB_i1;
-                }
-	}
-}
-
-sub _peek
-{
-	my ($self, $address, $extended) = @_;
-	my $msb = substr($address,0,2);
-	my $lsb = substr($address,2,2);
-	if ($extended)
-        {
-        	my $message = $self->device->derive_message('peek','insteon_ext_send',
-			$lsb . "0000000000000000000000000000");
-                $self->interface->queue_message($message);
-
-	}
-        else
-        {
-		$$self{_mem_lsb} = $lsb;
-		$$self{_mem_msb} = $msb;
-		$$self{_mem_action} = 'aldb_peek';
-		&::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name . " accessing memory at location: 0x" . $address);
-                my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'set_address_msb');
-                $message->extra($msb);
-                $message->failure_callback($$self{_failure_callback});
-                $self->_send_cmd($message);
-#		$self->_send_cmd('command' => 'set_address_msb', 'extra' => $msb, 'is_synchronous' => 1);
-	}
-}
-
-=back
-
-=head2 INI PARAMETERS
-
-None
-
-=head2 AUTHOR
-
-Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-package Insteon::ALDB_i2;
-
-=head1 B<Insteon::ALDB_i2>
-
-=head2 SYNOPSIS
-
-Unique class for storing a cahced copy of a verion i2 device's ALDB.
-
-=head2 DESCRIPTION
-
-Generally this object should be interacted with through the insteon objects and 
-not by directly calling any of the following methods.
-
-=head2 INHERITS
-
-L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-use strict;
-
-@Insteon::ALDB_i2::ISA = ('Insteon::AllLinkDatabase');
-
-=item C<new()>
-
-Instantiate a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$device) = @_;
-
-	my $self = new Insteon::AllLinkDatabase($device);
-	bless $self,$class;
-	$self->aldb_version("I2");
-	return $self;
-}
-
-=item C<on_read_write_aldb()>
-
-Called as part of any process to read or write to a device's ALDB.
-
-=cut
-
-sub on_read_write_aldb
-{
-	my ($self, %msg) = @_;
-	my $clear_message = 1; #Default Action is to Clear the Current Message
-	&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
-		. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-		. lc $msg{extra} . " for _mem_activity=".$$self{_mem_activity}
-		 ." _mem_action=". $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
-
-	if ($$self{_mem_action} eq 'aldb_i2read')
-	{
-		#This is an ACK. Will be followed by a Link Data message, so don't clear
-		$clear_message = 0;
-		#Only move to the next state if the received message is a device ack
-		#if the ack is dropped the retransmission logic will resend the request
-		if($msg{is_ack}) {
-			$$self{_mem_action} = 'aldb_i2readack';
-			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
-				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received ack")
-				if  $self->{device}->debuglevel(3, 'insteon');
-		} else {
-			#otherwise just ignore the message because it is out of sequence
-			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
-				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] ack not received. "
-				. "ignoring message") if  $self->{device}->debuglevel(3, 'insteon');
-		}
-		
-	}
-	elsif ($$self{_mem_action} eq 'aldb_i2readack')
-	{
-		if($msg{is_ack}) {
-			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
-				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received duplicate ack. Ignoring.")
-				if  $self->{device}->debuglevel(3, 'insteon');
-				$clear_message = 0;
-		} elsif(length($msg{extra})<30)
-		{
-			&::print_log("[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed: "
-				. $$self{device}->get_object_name
-				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
-			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
-			#can't clear message, if valid message doesn't arrive
-			#resend logic will kick in
-			$clear_message = 0;
-		} elsif ($$self{_mem_msb} . $$self{_mem_lsb} ne '0000' and 
-				$$self{_mem_msb} . $$self{_mem_lsb} ne substr($msg{extra},6,4)){
-			::print_log("[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed, "
-				. " address received did not match address requested: "
-				. $$self{device}->get_object_name
-				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
-			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
-			#can't clear message, if valid message doesn't arrive
-			#resend logic will kick in
-			$clear_message = 0;
-		}
-		elsif ($$self{_stress_test_act}){
-			$$self{_mem_activity} = undef;
-                        $$self{_mem_action} = undef;
-                	$$self{_stress_test_act} = 0;
-        		$$self{device}->stress_test();
-        	}
-		else
-		{
-			# init the link table if at the very start of a scan
-			if (lc $$self{_mem_msb} eq '00' and lc $$self{_mem_lsb} eq '00')
-			{
-				main::print_log("[Insteon::ALDB_i2] DEBUG4: Start of scan; initializing aldb structure") 
-					if  $self->{device}->debuglevel(4, 'insteon');
-				# reinit the aldb hash as there will be a new one
-				$$self{aldb} = undef;
-				# reinit the empty address list
-				@{$$self{aldb}{empty}} = ();
-				# and, also the duplicates list
-				@{$$self{aldb}{duplicates}} = ();
-				$$self{_mem_msb} = substr($msg{extra},6,2);
-				$$self{_mem_lsb} = substr($msg{extra},8,2);
-			}
-
-			#$msg{extra} includes cmd2 at the beginning so cmd2.d1.d2.d3...
-			#e.g. 0001010fff00a2042042d3fe1c00cc
-			# 0:cmd2:00       - unused
-			# 2:  D1:01       - unused
-			# 4:  D2:01       - command (read aldb response)
-			# 6:  D3:0fff     - aldb address (first entry in this case)
-			#10:  D5:00       - unused in responses
-			#12:  D6:a2       - flags
-			#14:  D7:04       - group number
-			#16:  D8:11.31.a2 - device id
-			#22: D11:fe       - link data 1
-			#24: D12:1c       - link data 2
-			#26: D13:00       - link data 3 (unused)
-			#28: D14:cc       - unused in i2; checksum in i2CS
-			
-			$$self{pending_aldb}{address} = substr($msg{extra},6,4);
-			
-			$$self{pending_aldb}{flag} = substr($msg{extra},12,2);
-			my $flag = hex($$self{pending_aldb}{flag});
-			$$self{pending_aldb}{inuse} = ($flag & 0x80) ? 1 : 0;
-			$$self{pending_aldb}{is_controller} = ($flag & 0x40) ? 1 : 0;
-			$$self{pending_aldb}{highwater} = ($flag & 0x02) ? 1 : 0;
-			unless($$self{pending_aldb}{highwater})
-			{
-				#highwater is set for every entry that has been used before
-				#highwater being 0 indicates entry has never been used (i.e. top of list)
-				# since this is the last unused memory location, then add it to the empty list
-				&::print_log("[Insteon::ALDB_i2] WARNING: highwater not set but marked inuse: "
-					. $$self{device}->get_object_name
-					. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
-					. lc $msg{extra} . " for " .  $$self{_mem_action}) 
-					if(($$self{pending_aldb}{inuse}) and $self->{device}->debuglevel(3, 'insteon'));
-				main::print_log("[Insteon::ALDB_i2] DEBUG4: scan done; adding last address ["
-					. $$self{_mem_msb} . $$self{_mem_lsb} ."] to empty array") 
-					if  $self->{device}->debuglevel(4, 'insteon');
-				$self->add_empty_address($$self{_mem_msb} . $$self{_mem_lsb});
-				# scan done; clear out state flags
-				$$self{_mem_action} = undef;
-				$$self{_mem_activity} = undef;
-				if (lc $$self{_mem_msb} eq '0f' and lc $$self{_mem_lsb} eq 'ff')
-				{
-					# set health as empty for now
-					$self->health("empty");
-				}
-				else
-				{
-					$self->health("good");
-				}
-
-				&::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name 
-					. " completed link memory scan: status: " . $self->health())
-					if $self->{device}->debuglevel(1, 'insteon');
-				$self->health("good");
-				# Put the new ALDB Delta into memory
-				$self->query_aldb_delta('set');
-			}
-			else #($$self{pending_aldb}{highwater})
-			{
-				unless($$self{pending_aldb}{inuse})
-				{
-					main::print_log("[Insteon::ALDB_i2] DEBUG4: inuse flag == false; adding address ["
-						. $$self{_mem_msb} . $$self{_mem_lsb} ."] to empty array") 
-						if  $self->{device}->debuglevel(4, 'insteon');
-					$self->add_empty_address($$self{pending_aldb}{address});
-				}
-				else
-				{
-					$$self{pending_aldb}{group} = lc substr($msg{extra},14,2);
-					$$self{pending_aldb}{deviceid} = lc substr($msg{extra},16,6);
-					$$self{pending_aldb}{data1} = lc substr($msg{extra},22,2);
-					$$self{pending_aldb}{data2} = lc substr($msg{extra},24,2);
-					$$self{pending_aldb}{data3} = lc substr($msg{extra},26,2);
-
-					# save pending_aldb and then clear it out
-					my $aldbkey = $self->get_linkkey($$self{pending_aldb}{deviceid},
-									$$self{pending_aldb}{group},
-									$$self{pending_aldb}{is_controller},
-									$$self{pending_aldb}{data3});
-					# check for duplicates
-					if (exists $$self{aldb}{$aldbkey} && $$self{aldb}{$aldbkey}{inuse})
-					{
-						main::print_log("[Insteon::ALDB_i2] DEBUG4: duplicate link found; adding address ["
-							. $$self{_mem_msb} . $$self{_mem_lsb} ."] to duplicates array") 
-							if  $self->{device}->debuglevel(4, 'insteon');
-						$self->add_duplicate_link_address($$self{pending_aldb}{address});
-					}
-					else
-					{
-						main::print_log("[Insteon::ALDB_i2] DEBUG4: active link found; adding address ["
-							. $$self{_mem_msb} . $$self{_mem_lsb} ."] to aldb") 
-							if  $self->{device}->debuglevel(4, 'insteon');
-						%{$$self{aldb}{$aldbkey}} = %{$$self{pending_aldb}};
-					}
-				}
-
-				#keep going; request the next record
-				$self->send_read_aldb(sprintf("%04x", hex($$self{pending_aldb}{address}) - 8));
-				
-			} #($$self{pending_aldb}{highwater})
-		} #else $msg{extra} !< 30
-	}
-	elsif ($$self{_mem_action} eq 'aldb_i2writeack')
-	{
-		unless ($$self{_mem_activity} eq 'delete') {
-			## update the aldb records w/ the changes that were made
-			my $aldbkey = $self->get_linkkey($$self{pending_aldb}{deviceid},
-							$$self{pending_aldb}{group},
-							$$self{pending_aldb}{is_controller},
-							$$self{pending_aldb}{data3});
-			$$self{aldb}{$aldbkey}{data1} = $$self{pending_aldb}{data1};
-			$$self{aldb}{$aldbkey}{data2} = $$self{pending_aldb}{data2};
-			$$self{aldb}{$aldbkey}{data3} = $$self{pending_aldb}{data3};
-			$$self{aldb}{$aldbkey}{inuse} = 1; # needed so that restore string will preserve record
-			if ($$self{_mem_activity} eq 'add')
-			{
-				$$self{aldb}{$aldbkey}{is_controller} = $$self{pending_aldb}{is_controller};
-				$$self{aldb}{$aldbkey}{deviceid} = lc $$self{pending_aldb}{deviceid};
-				$$self{aldb}{$aldbkey}{group} = lc $$self{pending_aldb}{group};
-				$$self{aldb}{$aldbkey}{address} = $$self{pending_aldb}{address};
-			}
-			$$self{_mem_activity} = undef;
-			$$self{_mem_action} = undef;
-			$$self{pending_aldb} = undef;
-			main::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name 
-				. " link write completed for [".$$self{aldb}{$aldbkey}{address}."]")
-				if $self->{device}->debuglevel(3, 'insteon');
-			$self->health("good");
-			# Put the new ALDB Delta into memory
-			$self->query_aldb_delta('set');
-		} else {
-			# clear out mem_activity flag
-			$$self{_mem_activity} = undef;
-			# add the address of the deleted link to the empty list
-			$self->add_empty_address($$self{pending_aldb}{address});
-	                # and, remove from the duplicates list (if it is a member)
-	                $self->delete_duplicate_link_address($$self{pending_aldb}{address});
-			if (exists $$self{pending_aldb}{deviceid})
-	                {
-				my $key = $self->get_linkkey($$self{pending_aldb}{deviceid},
-							$$self{pending_aldb}{group}, 
-							$$self{pending_aldb}{is_controller},
-							$$self{pending_aldb}{data3});
-				delete $$self{aldb}{$key};
-			}
-			$self->health("good");
-			# Put the new ALDB Delta into memory
-			$self->query_aldb_delta('set');
-		}
-	}
-	else
-	{
-		main::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name 
-			. ": unhandled _mem_action=".$$self{_mem_action})
-			if $self->{device}->debuglevel(1, 'insteon');
-		$clear_message = 0;
-	}
-	return $clear_message;
-}
-
-sub _write_link
-{
-	my ($self, $address, $deviceid, $group, $is_controller, $data1, $data2, $data3) = @_;
-	if ($address)
-        {
-		&::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name . " writing address: $address for device: $deviceid and group: $group");
-
-		my $message = new Insteon::InsteonMessage('insteon_ext_send', $$self{device}, 'read_write_aldb');
-
-		#cmd2.00.write_aldb_record.addr_msb.addr_lsb.byte_count.d6-d14 bytes to write
-		my $message_extra = '00'.'00'.'02';
-
-		$$self{pending_aldb}{address} = $address;
-		$message_extra .= $address;
-
-		$message_extra .= '08';  #write 8 bytes
-		
-		#D6-D13 aldb entry:  flags.group.deviceid(3).data1.data2.data3
-		#flags
-		$$self{pending_aldb}{is_controller} = $is_controller;
-		my $flag = ($$self{pending_aldb}{is_controller}) ? 'E2' : 'A2';
-		$$self{pending_aldb}{flag} = $flag;
-		$message_extra .= $flag;
-
-		#group
-		$$self{pending_aldb}{group} = lc $group;
-		$message_extra .= $$self{pending_aldb}{group};
-
-		#device ID
-		$$self{pending_aldb}{deviceid} = lc $deviceid;
-		$message_extra .= $$self{pending_aldb}{deviceid};
-
-		#data1 - data3
-		$$self{pending_aldb}{data1} = (defined $data1) ? lc $data1 : '00';
-		$message_extra .= $$self{pending_aldb}{data1}; 
-		$$self{pending_aldb}{data2} = (defined $data2) ? lc $data2 : '00';
-		$message_extra .= $$self{pending_aldb}{data2}; 
-		$$self{pending_aldb}{data3} = (defined $data3) ? lc $data3 : '00';
-		$message_extra .= $$self{pending_aldb}{data3}; 
-		$message_extra .= '00';  #byte 14
-		$message->extra($message_extra);
-		$$self{_mem_action} = 'aldb_i2writeack';
-		$message->failure_callback($$self{_failure_callback});
-		$self->_send_cmd($message);
-	}
-        else
-        {
-		&::print_log("[Insteon::ALDB_i2] WARN: " . $$self{device}->get_object_name
-			. " write_link failure: no address available for record to device: $deviceid and group: $group" .
-				" and is_controller: $is_controller");
-                if ($$self{_success_callback})
-                {
-			package main;
-			eval ($$self{_success_callback});
-			&::print_log("[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: " . $@)
-		 		if $@ and $self->{device}->debuglevel(1, 'insteon');
-		 	package Insteon::ALDB_i2;
-                }
-	}
-}
-
-sub _write_delete
-{
-	#pending_aldb must be populated before calling
-	my ($self, $address) = @_;
-
-	if ($address)
-        {
-		&::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name . " writing address as deleted: $address");
-
-		my $message = new Insteon::InsteonMessage('insteon_ext_send', $$self{device}, 'read_write_aldb');
-
-		#cmd2.00.write_aldb_record.addr_msb.addr_mid.addr_lsb.byte_count.d6-d14 bytes to write
-		my $message_extra = '00'.'00'.'02';
-		$message_extra .= $address;
-		$message_extra .= '08';  #write 8 bytes
-		
-		#D6-D13 aldb entry:  flags.group.deviceid(3).data1.data2.data3
-		#flag = 02 deleted
-		$message_extra .= '02';
-		#group
-		$message_extra .= '00';
-		#device ID
-		$message_extra .= '000000';
-		#data1 - data3
-		$message_extra .= '00'; 
-		$message_extra .= '00'; 
-		$message_extra .= '00';
-		#byte 14 
-		$message_extra .= '00';
-
-		$message->extra($message_extra);
-		$$self{_mem_action} = 'aldb_i2writeack';
-		$message->failure_callback($$self{_failure_callback});
-		$self->_send_cmd($message);
-	}
-        else
-        {
-		&::print_log("[Insteon::ALDB_i2] WARN: " . $$self{device}->get_object_name
-			. " write_delete failure: no address available");
-                if ($$self{_success_callback})
-                {
-			package main;
-			eval ($$self{_success_callback});
-			&::print_log("[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: " . $@)
-		 		if $@ and $self->{device}->debuglevel(1, 'insteon');
-		 	package Insteon::ALDB_i2;
-                }
-	}
-}
-
-=item C<send_read_aldb()>
-
-Called as part of "scan link table" voice command.
-
-=cut
-
-sub send_read_aldb
-{
-	my ($self, $address) = @_;
-
-	$$self{_mem_msb} = substr($address,0,2);
-	$$self{_mem_lsb} = substr($address,2,2);
-	$$self{_mem_action} = 'aldb_i2read';
-	main::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name . " reading ALDB at location: 0x" . $address);
-	my $message = new Insteon::InsteonMessage('insteon_ext_send', $$self{device}, 'read_write_aldb');
-	#cmd2.00.read_aldb_record.addr_msb.addr_lsb.record_count(0 for all).d6-d14 unused
-	$message->extra("00"."00"."00".$$self{_mem_msb}.$$self{_mem_lsb}."01"."000000000000000000");
-	$message->failure_callback($$self{_failure_callback});
-	$self->_send_cmd($message);
-}
-
-=back
-
-=head2 INI PARAMETERS
-
-None
-
-=head2 AUTHOR
-
-Michael Stovenour
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-package Insteon::ALDB_PLM;
-
-=head1 B<Insteon::ALDB_PLM>
-
-=head2 SYNOPSIS
-
-Unique class for storing a cahced copy of a the PLM's link database.
-
-=head2 DESCRIPTION
-
-Generally this object should be interacted with through the insteon objects and 
-not by directly calling any of the following methods.
-
-=head2 INHERITS
-
-L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-use strict;
-
-@Insteon::ALDB_PLM::ISA = ('Insteon::AllLinkDatabase');
-
-=item C<new()>
-
-Instantiate a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$device) = @_;
-
-	my $self = new Insteon::AllLinkDatabase($device);
-	bless $self,$class;
-	return $self;
-}
-
-=item C<restore_string()>
-
-This is called by mh on exit to save the cached ALDB of a device to persistant data.
-
-=cut
-
-sub restore_string
-{
-	my ($self) = @_;
-        my $restore_string = '';
-	if ($$self{aldb})
-        {
-		my $link = '';
-		foreach my $link_key (keys %{$$self{aldb}})
-                {
-			$link .= '|' if $link; # separate sections
-			my %link_record = %{$$self{aldb}{$link_key}};
-			my $record = '';
-			foreach my $record_key (keys %link_record)
-                        {
-				next unless $link_record{$record_key};
-				$record .= ',' if $record;
-				$record .= $record_key . '=' . $link_record{$record_key};
-			}
-			$link .= $record;
-		}
-		$restore_string .= $$self{device}->get_object_name . "->_aldb->restore_linktable(q~$link~) if " . $$self{device}->get_object_name . "->_aldb;\n";
-	}
-	if (defined $self->scandatetime)
-        {
-		$restore_string .= $$self{device}->get_object_name . "->_aldb->scandatetime(q~" . $self->scandatetime . "~) if "
-                        	. $$self{device}->get_object_name . "->_aldb;\n";
-        }
-	$restore_string .= $$self{device}->get_object_name . "->_aldb->health(q~" . $self->health . "~) if "
-                        	. $$self{device}->get_object_name . "->_aldb;\n";
-	return $restore_string;
-}
-
-=item C<restore_linktable()>
-
-Used to reload MisterHouse's cached version of a device's ALDB on restart.
-
-=cut
-
-sub restore_linktable
-{
-	my ($self, $links) = @_;
-	if ($links)
-	{
-		foreach my $link_section (split(/\|/,$links))
-		{
-			my %link_record = ();
-			my $deviceid = '';
-			my $groupid = '01';
-			my $is_controller = 0;
-			my $subaddress = '';
-			foreach my $link_record (split(/,/,$link_section))
-			{
-				my ($key,$value) = split(/=/,$link_record);
-				$deviceid = $value if ($key eq 'deviceid');
-				$groupid = $value if ($key eq 'group');
-				$is_controller = $value if ($key eq 'is_controller');
-				$subaddress = $value if ($key eq 'data3');
-				$link_record{$key} = $value if $key and defined($value);
-			}
-			my $linkkey = $self->get_linkkey($deviceid, $groupid, $is_controller, $subaddress);
-			%{$$self{aldb}{lc $linkkey}} = %link_record;
-		}
-	}
-}
-
-=item C<log_alllink_table()>
-
-Prints a human readable form of MisterHouse's cached version of a device's ALDB
-to the print log.  Called as part of the "scan links" voice command
-or in response to the "log links" voice command.
-
-=cut
-
-sub log_alllink_table
-{
-	my ($self) = @_;
-        &::print_log("[Insteon::ALDB_PLM] Link table health: " . $self->health);
-	foreach my $linkkey (sort(keys(%{$$self{aldb}}))) {
-		my $is_controller = $$self{aldb}{$linkkey}{is_controller};
-		my $group = $$self{aldb}{$linkkey}{group};
-		$group = '01' if $group eq '00';
-		my $deviceid = $$self{aldb}{$linkkey}{deviceid};
-		my $linked_subgroup = '01';
-		my $controller_device;
-		my $controller_name;
-		if (!$is_controller){
-			$linked_subgroup = $group;
-		}
-		elsif ($group ne '00' && $group ne '01') {
-			$controller_device = Insteon::get_object('000000',$group);
-			$controller_name = $controller_device->get_object_name . " ($group)";
-		}
-		else {
-			$controller_name = $group;
-		}
-		my $linked_object = Insteon::get_object($deviceid,$linked_subgroup);
-		my $linked_name = '';
-		if ($linked_object) {
-			$linked_name = $linked_object->get_object_name;
-		}
-		else {
-			$linked_name = uc substr($deviceid,0,2) . '.' .
-				       uc substr($deviceid,2,2) . '.' .
-				       uc substr($deviceid,4,2);
-		}
-		&::print_log("[Insteon::ALDB_PLM] " .
-			(($is_controller) ? "cntlr($controller_name) record to "
-			. $linked_name
-			: "responder record to " . $linked_name . "($$self{aldb}{$linkkey}{group})")
-			. " (d1=$$self{aldb}{$linkkey}{data1}, d2=$$self{aldb}{$linkkey}{data2}, "
-			. "d3=$$self{aldb}{$linkkey}{data3})");
-	}
-}
-
-=item C<parse_alllink()>
-
-Parses the alllink message sent from the PLM.
-
-=cut
-
-sub parse_alllink
-{
-	my ($self, $data) = @_;
-	if (substr($data,0,6))
-        {
-		my %link = ();
-		my $flag = substr($data,0,1);
-		$link{is_controller} = (hex($flag) & 0x04) ? 1 : 0;
-		$link{flags} = substr($data,0,2);
-		$link{group} = lc substr($data,2,2);
-		$link{deviceid} = lc substr($data,4,6);
-		$link{data1} = substr($data,10,2);
-		$link{data2} = substr($data,12,2);
-		$link{data3} = substr($data,14,2);
-		my $key = $self->get_linkkey($link{deviceid}, $link{group}, 
-					$link{is_controller}, $link{data3});
-		%{$$self{aldb}{lc $key}} = %link;
-	}
-}
-
-=item C<get_first_alllink()>
-
-Sends the request for the first alllink entry on the PLM.
-
-=cut
-
-sub get_first_alllink
-{
-	my ($self) = @_;
-        $self->health('out-of-sync'); # set as corrupt and allow acknowledge to set otherwise
-	$$self{device}->queue_message(new Insteon::InsteonMessage('all_link_first_rec', $$self{device}));
-}
-
-=item C<get_next_alllink()>
-
-Sends the request for the next alllink entry on the PLM.
-
-=cut
-
-sub get_next_alllink
-{
-	my ($self) = @_;
-	$$self{device}->queue_message(new Insteon::InsteonMessage('all_link_next_rec', $$self{device}));
-}
-
-=item C<delete_orphan_links()>
-
-Reviews the cached version of all of the ALDBs and based on this review removes
-links from this device which are not present in the mht file, not defined in the 
-code, or links which are only half-links..
-
-=cut
-
-sub delete_orphan_links
-{
-	my ($self, $audit_mode) = @_;
-
-        &::print_log("[Insteon::ALDB_PLM] #### NOW BEGINNING DELETE ORPHAN LINKS ####");
-
-	$self->SUPER::delete_orphan_links($audit_mode);
-
-	# iterate over all registered objects and compare whether the link tables match defined scene linkages in known Insteon_Links
-	for my $obj (&Insteon::find_members('Insteon::BaseDevice'))
-	{
-		#Match on real objects only
-		if (($obj->is_root))
-		{
-			my %delete_req = ('root_object' => $obj, 'audit_mode' => $audit_mode);
-			push @{$$self{delete_queue}}, \%delete_req;
-		}
-	}
-
-	$self->_process_delete_queue();
-}
-
-sub _process_delete_queue {
-	my ($self, $p_num_deleted) = @_;
-	$$self{delete_queue_processed} += $p_num_deleted if $p_num_deleted;
-	my $num_in_queue = @{$$self{delete_queue}};
-	if ($num_in_queue)
-        {
-		my $delete_req_ptr = shift(@{$$self{delete_queue}});
-		my %delete_req = %$delete_req_ptr;
-		my $failure_callback = $$self{device}->get_object_name . 
-					"->_aldb->_process_delete_queue_failure";
-		# distinguish between deleting PLM links and processing delete orphans for a root item
-		if ($delete_req{'root_object'})
-                {
-			$$self{current_delete_device} = $delete_req{'root_object'}->get_object_name;
-			$delete_req{'root_object'}->delete_orphan_links(($delete_req{'audit_mode'}) ? 1 : 0, $failure_callback);
-		}
-                else
-                {
-			$$self{current_delete_device} = $$self{device}->get_object_name;
-			&::print_log("[Insteon::ALDB_PLM] now deleting orphaned link w/ details: "
-				. (($delete_req{is_controller}) ? "controller($delete_req{data3})" : "responder")
-				. ", " . (($delete_req{object}) ? "object=" . $delete_req{object}->get_object_name
-				: "deviceid=$delete_req{deviceid}") . ", group=$delete_req{group}")
-				if $self->{device}->debuglevel(1, 'insteon');
-				$delete_req{failure_callback} = $failure_callback;
-			$self->delete_link(%delete_req);
-			$$self{delete_queue_processed}++;
-		}
-	}
-	else {
-		::print_log("[Insteon::ALDB_PLM] Delete All Links has Completed.");
-		my $_delete_failure_cnt = scalar $$self{_delete_device_failures};
-		if ($_delete_failure_cnt) {
-			my $obj_list;
-			for my $failed_obj (@{$$self{_delete_device_failures}}){
-				$obj_list .= $failed_obj .", ";
-			}
-			::print_log("[Insteon::ALDB_PLM] However, some failures were ".
-				"noted with the following devices: $obj_list");
-		}
-		::print_log("[Insteon::ALDB_PLM] A total of $$self{delete_queue_processed} orphaned link records were deleted.");
-		::print_log("[Insteon::ALDB_PLM] #### END DELETE ORPHAN LINKS ####");
-	}
-}
-
-sub _process_delete_queue_failure {
-	my ($self) = @_;
-	push @{$$self{_delete_device_failures}}, $$self{current_delete_device};
-	::print_log("[Insteon::ALDB_PLM] WARN: failure occurred when deleting orphan links from: "
-			. $$self{current_delete_device} . ".  Moving on...");
-	$self->_process_delete_queue;
-
-}
-
-=item C<delete_link([link details])>
-
-Deletes a specific link from a device.  Generally called by C<delete_orphan_links()>.
-
-=cut
-
-sub delete_link
-{
-	# linkkey is concat of: deviceid, group, is_controller
-	my ($self, $parms_text) = @_;
-	my %link_parms;
-	if (@_ > 2)
-        {
-		shift @_;
-		%link_parms = @_;
-	}
-        else
-        {
-		%link_parms = &main::parse_func_parms($parms_text);
-	}
-	my $num_deleted = 0;
-	my $insteon_object = $link_parms{object};
-	my $deviceid = ($insteon_object) ? $insteon_object->device_id : $link_parms{deviceid};
-	my $group = $link_parms{group};
-	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
-	my $subaddress = (defined $link_parms{data3}) ? $link_parms{data3} : '00';
-	my $linkkey = $self->get_linkkey($deviceid, $group, $is_controller, $subaddress);
-	if (defined $$self{aldb}{$linkkey})
-        {
-		my $cmd = '80'
-			. $$self{aldb}{$linkkey}{flags}
-			. $$self{aldb}{$linkkey}{group}
-			. $$self{aldb}{$linkkey}{deviceid}
-			. $$self{aldb}{$linkkey}{data1}
-			. $$self{aldb}{$linkkey}{data2}
-			. $$self{aldb}{$linkkey}{data3};
-		delete $$self{aldb}{$linkkey};
-		$num_deleted = 1;
-                my $message = new Insteon::InsteonMessage('all_link_manage_rec', $$self{device});
-		$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
-		$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
-                $message->interface_data($cmd);
-		$$self{device}->queue_message($message);
-	}
-        else
-        {
-		&::print_log("[Insteon::ALDB_PLM] no entry in linktable could be found for: ".
-		"deviceid=$deviceid, group=$group, is_controller=$is_controller, subaddress=$subaddress");
-		if ($link_parms{callback})
-                {
-			package main;
-			eval ($link_parms{callback});
-			&::print_log("[Insteon_PLM] error in add link callback: " . $@)
-				if $@ and $self->{device}->debuglevel(1, 'insteon');
-			package Insteon_PLM;
-		}
-	}
-	return $num_deleted;
-}
-
-=item C<add_link(link_params)>
-
-Adds the link to the device's ALDB.  Generally called from the "sync links" or 
-"link to interface" voice commands.
-
-=cut
-
-sub add_link
-{
-	my ($self, $parms_text) = @_;
-	my %link_parms;
-	if (@_ > 2)
-        {
-		shift @_;
-		%link_parms = @_;
-	}
-        else
-        {
-		%link_parms = &main::parse_func_parms($parms_text);
-	}
-	my $device_id;
-	my $group =  ($link_parms{group}) ? $link_parms{group} : '01';
-	my $insteon_object = $link_parms{object};
-	if (!(defined($insteon_object)))
-        {
-		$device_id = lc $link_parms{deviceid};
-		$insteon_object = &Insteon::get_object($device_id, $group);
-	}
-        else
-        {
-		$device_id = lc $insteon_object->device_id;
-	}
-	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
-	my $subaddress = (defined $link_parms{data3}) ? $link_parms{data3} : '00';
-	my $linkkey = $self->get_linkkey($device_id, $group, $is_controller, $subaddress);
-	if (defined $$self{aldb}{$linkkey})
-        {
-		&::print_log("[Insteon::ALDB_PLM] WARN: attempt to add link to PLM that already exists! "
-			. "deviceid=$device_id, group=$group, is_controller=$is_controller, subaddress=$subaddress");
-		if ($link_parms{callback})
-                {
-			package main;
-			eval ($link_parms{callback});
-			&::print_log("[Insteon::ALDB_PLM] error in add link callback: " . $@)
-				if $@ and $self->{device}->debuglevel(1, 'insteon');
-			package Insteon_PLM;
-		}
-	}
-        else
-        {
-		# The modem developers guide appears to be wrong regarding control
-		# codes.  40 and 41 will respond with a NACK if a record for that
-		# group/device/is_controller combination already exist.  It appears 
-		# that code 20 can be used to edit existing but not create new records.
-		# However, since data1-3 are consistent for all PLM links we never
-		# really need to update a PLM link.  NB prior MH code did not set
-		# data3 on control records to the group, however this does not 
-		# appear to have any adverse effects, and the current MH code will
-		# not flag these entries as being incorrect or requiring an update
-		my $control_code = ($is_controller) ? '40' : '41';
-		# flags should be 'a2' for responder and 'e2' for controller
-		my $flags = ($is_controller) ? 'E2' : 'A2';
-		my $data1 = (defined $link_parms{data1}) ? $link_parms{data1} : (($is_controller) ? '01' : '00');
-		my $data2 = (defined $link_parms{data2}) ? $link_parms{data2} : '00';
-		my $data3 = (defined $link_parms{data3}) ? $link_parms{data3} : '00';
-		# from looking at manually linked records, data1 and data2 are both 00 for responder records
-		# and, data1 is 01 and usually data2 is 00 for controller records
-
-		my $cmd = $control_code
-			. $flags
-			. $group
-			. $device_id
-			. $data1
-			. $data2
-			. $data3;
-		$$self{aldb}{$linkkey}{flags} = lc $flags;
-		$$self{aldb}{$linkkey}{group} = lc $group;
-		$$self{aldb}{$linkkey}{is_controller} = $is_controller;
-		$$self{aldb}{$linkkey}{deviceid} = lc $device_id;
-		$$self{aldb}{$linkkey}{data1} = lc $data1;
-		$$self{aldb}{$linkkey}{data2} = lc $data2;
-		$$self{aldb}{$linkkey}{data3} = lc $data3;
-		$$self{aldb}{$linkkey}{inuse} = 1;
-		$self->health('good') if($self->health() eq 'empty');
-                my $message =  new Insteon::InsteonMessage('all_link_manage_rec', $$self{device});
-                $message->interface_data($cmd);
-		$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
-		$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
-                $message->interface_data($cmd);
-		$$self{device}->queue_message($message);
-	}
-}
-
-=item C<has_link(link_details)>
-
-Checks and returns true if a link with the passed details exists on the device
-or false if it does not.  Generally called as part of C<delete_orphan_links()>.
-
-=cut
-
-sub has_link
-{
-	my ($self, $insteon_object, $group, $is_controller, $data3) = @_;
-	my $key = $self->get_linkkey($insteon_object->device_id, 
-				$group, $is_controller, $data3);
-	return (defined $$self{aldb}{$key});
-}
-
-=back
-
-=head2 INI PARAMETERS
-
-None
-
-=head2 AUTHOR
-
-Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-
-1;
+package Insteon::AllLinkDatabase;
+
+=head1 B<Insteon::AllLinkDatabase>
+
+=head2 SYNOPSIS
+
+Generic class implementation of an insteon device's all link database.
+
+=head2 DESCRIPTION
+
+Generally this object should be interacted with through the insteon objects and 
+not by directly calling any of the following methods.
+
+=head2 INHERITS
+
+None
+
+=head2 METHODS
+
+=over
+
+=cut
+
+use strict;
+
+=item C<new()>
+
+Instantiate a new object.
+
+=cut
+
+sub new
+{
+	my ($class, $device) = @_;
+	my $self={};
+	bless $self,$class;
+        $$self{device} = $device;
+        $self->health("unknown"); # unknown
+	$self->aldb_version("I1");
+	return $self;
+}
+
+sub _send_cmd
+{
+   my ($self, $msg) = @_;
+   $$self{device}->_send_cmd($msg);
+}
+
+=item C<aldb_version([i1|i2])>
+
+Used to track the ALDB version type.
+
+If provided, saves version to memory.
+
+Returns the saved version type.
+
+=cut
+
+sub aldb_version
+{
+	my ($self, $aldb_version) = @_;
+	$$self{aldb_version} = $aldb_version if defined $aldb_version;
+	return $$self{aldb_version};
+}
+
+=item C<health([out-of-sync|unknown|empty|good])>
+
+Used to track the health of MisterHouse's copy of a device's ALDB.
+
+If provided, saves status to memory.
+
+Returns the saved health status.
+
+=cut
+
+sub health
+{
+	my ($self, $health) = @_;
+        $$self{health} = $health if defined $health;
+        return $$self{health};
+}
+
+=item C<get_linkkey($deviceid, $group, $is_controller, $data3)>
+
+Used to track the health of MisterHouse's copy of a device's ALDB.
+
+If provided, saves status to memory.
+
+Returns the saved health status.
+
+=cut
+
+sub get_linkkey {
+	my ($self, $deviceid, $group, $is_controller, $data3) = @_;
+	my $linkkey = $deviceid . $group . $is_controller;
+	# Data3 is irrelevant for the PLM itself, b/c for controller records
+	# data3 will always be equal to group.  And for responder records it 
+	# should always be 00, therefor blank data3 so it isn't used
+	if ($$self{device}->isa('Insteon_PLM')){
+		$data3 = '00';
+	}
+	# '00' and '01' are generally interchangable for $data3 values and are
+	# the most common values.  So to make searching easier we only 
+	# add data3 if it is unique
+	$linkkey .= $data3 if ($data3 ne '00' and $data3 ne '01');
+	return lc $linkkey;
+}
+
+=item C<scandatetime([seconds])>
+
+Used to track the time, in unix time seconds, of the last ALDB scan.
+
+If provided, saves the time to memory.
+
+Returns the time of the last ALDB scan.
+
+=cut
+
+sub scandatetime
+{
+	my ($self, $scandatetime) = @_;
+        $$self{scandatetime} = $scandatetime if defined $scandatetime;
+        return $$self{scandatetime};
+}
+
+=item C<aldb_delta([hex])>
+
+Used to track the ALDB Delta.  The ALDB Delta starts at 00 and iterates
++1 for each change to a device's ALDB.  The ALDB Delta will be reset to 00 
+whenever power is lost to the device or if the device is factory reset.
+
+If provided, saves the hex value to memory. (This should likely only be done by
+C<query_aldb_delta()>)
+
+Returns the current ALDB Delta.
+
+=cut
+
+sub aldb_delta
+{
+        my ($self, $p_aldb_delta) = @_;
+        $$self{aldb_delta} = $p_aldb_delta if defined($p_aldb_delta);  
+        return $$self{aldb_delta};
+}
+
+=item C<query_aldb_delta([check|set])>
+
+Interacts with the device's ALDB Delta.
+
+If called with "check", MisterHouse will query the device to obtain the current
+ALDB Delta.  If the ALDB Delta matches the version stored in C<aldb_delta> 
+MisterHouse will eval the code stored in C<$self->{_aldb_unchanged_callback}>.
+If the ALDB Delta does not match, MisterHouse will eval the code stored in
+C<$self->{_aldb_changed_callback}>.
+
+If called with "set" will cause MisterHouse to query the device for its ALDB
+Delta and will store it with C<aldb_delta>.
+
+=cut
+
+sub query_aldb_delta
+{
+        my ($self, $action) = @_;
+        $$self{aldb_delta_action} = $action;
+        if ($action eq "check" && $self->health ne "good" && $self->health ne "empty"){
+		&::print_log("[Insteon::AllLinkDatabase] WARN The link table for "
+			. $self->{device}->get_object_name . " is out-of-sync.");
+		if (defined $self->{_aldb_changed_callback}) {
+			package main;
+			my $callback = $self->{_aldb_changed_callback};
+			$self->{_aldb_changed_callback} = undef;
+			eval ($callback);
+			&::print_log("[Insteon::AllLinkDatabase] " . $self->{device}->get_object_name . ": error during scan callback $@")
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
+			package Insteon::AllLinkDatabase;
+		}
+        } elsif ($action eq "check" && ((&main::get_tickcount - $self->scandatetime()) <= 2000)){
+		#if we just did a aldb_query less than 2 seconds ago, don't repeat
+		&::print_log("[Insteon::AllLinkDatabase] The link table for "
+			. $self->{device}->get_object_name . " is in sync.");
+		#Further extend Scan Time in case of serial aldb requests
+		$self->scandatetime(&main::get_tickcount);
+		if (defined $self->{_aldb_unchanged_callback}) {
+			package main;
+			my $callback = $self->{_aldb_unchanged_callback};
+			$self->{_aldb_unchanged_callback} = undef;
+			eval ($callback);
+			&::print_log("[Insteon::AllLinkDatabase] " . $self->{device}->get_object_name . ": error during scan callback $@")
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
+			package Insteon::AllLinkDatabase;
+		}
+        } else {
+        	my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'status_request');
+        	if (defined($$self{_failure_callback})) {$message->failure_callback($$self{_failure_callback})};
+        	$self->_send_cmd($message);
+        }
+}
+
+=item C<restore_string()>
+
+This is called by mh on exit to save the cached ALDB of a device to persistant data.
+
+=cut
+
+sub restore_string
+{
+	my ($self) = @_;
+	my $restore_string = '';
+	if ($$self{aldb}) {
+		my $aldb = '';
+		foreach my $aldb_key (keys %{$$self{aldb}}) {
+			next unless $aldb_key eq 'empty' || $aldb_key eq 'duplicates' || $$self{aldb}{$aldb_key}{inuse};
+			$aldb .= '|' if $aldb; # separate sections
+			my $record = '';
+			if ($aldb_key eq 'empty') {
+				foreach my $address (@{$$self{aldb}{empty}}) {
+					$record .= ';' if $record;
+					$record .= $address;
+				}
+				$record = 'empty=' . $record;
+			} elsif ($aldb_key eq 'duplicates') {
+				my $duplicate_record = '';
+				foreach my $address (@{$$self{aldb}{duplicates}}) {
+					$duplicate_record .= ';' if $duplicate_record;
+					$duplicate_record .= $address;
+				}
+				$record = 'duplicates=' . $duplicate_record;
+			} else {
+				my %aldb_record = %{$$self{aldb}{$aldb_key}};
+				foreach my $record_key (keys %aldb_record) {
+					next unless $aldb_record{$record_key};
+					$record .= ',' if $record;
+					$record .= $record_key . '=' . $aldb_record{$record_key};
+				}
+			}
+			$aldb .= $record;
+		}
+		if (defined $self->scandatetime)
+                {
+			$restore_string .= $$self{device}->get_object_name . "->_aldb->scandatetime(q~" . $self->scandatetime . "~) if "
+                        	. $$self{device}->get_object_name . "->_aldb;\n";
+                }
+		if (defined $self->aldb_delta)
+		{
+			$restore_string .= $$self{device}->get_object_name . "->_aldb->aldb_delta(q~" . $self->aldb_delta . "~) if "
+				. $$self{device}->get_object_name . "->_aldb;\n";
+		}
+		$restore_string .= $$self{device}->get_object_name . "->_aldb->health(q~" . $self->health . "~) if "
+                        	. $$self{device}->get_object_name . "->_aldb;\n";
+		$restore_string .= $$self{device}->get_object_name . "->_aldb->restore_aldb(q~$aldb~) if " . $$self{device}->get_object_name . "->_aldb;\n";
+        }
+	return $restore_string;
+}
+
+=item C<restore_aldb()>
+
+Used to reload MisterHouse's cached version of a device's ALDB on restart.
+
+=cut
+
+sub restore_aldb
+{
+	my ($self,$aldb) = @_;
+	if ($aldb) {
+		foreach my $aldb_section (split(/\|/,$aldb)) {
+			my %aldb_record = ();
+			my @aldb_empty = ();
+			my @aldb_duplicates = ();
+			my $deviceid = '';
+			my $groupid = '01';
+			my $is_controller = 0;
+			my $subaddress = '00';
+			foreach my $aldb_entry (split(/,/,$aldb_section)) {
+				my ($key,$value) = split(/=/,$aldb_entry);
+				next unless $key and defined($value) and $value ne '';
+				if ($key eq 'empty') {
+					@aldb_empty = split(/;/,$value);
+				} elsif ($key eq 'duplicates') {
+					@aldb_duplicates = split(/;/,$value);
+				} else {
+					$deviceid = lc $value if ($key eq 'deviceid');
+					$groupid = lc $value if ($key eq 'group');
+					$is_controller = $value if ($key eq 'is_controller');
+					$subaddress = $value if ($key eq 'data3');
+					$aldb_record{$key} = $value if $key and defined($value);
+				}
+			}
+			if (@aldb_empty) {
+				@{$$self{aldb}{empty}} = @aldb_empty;
+			} elsif (@aldb_duplicates) {
+				@{$$self{aldb}{duplicates}} = @aldb_duplicates;
+			} elsif (scalar %aldb_record) {
+				next unless $deviceid;
+				my $aldbkey = $self->get_linkkey($deviceid, $groupid, 
+							$is_controller, $subaddress);
+				%{$$self{aldb}{$aldbkey}} = %aldb_record;
+			}
+		}
+#		$self->log_alllink_table();
+	}
+}
+
+=item C<scan_link_table()>
+
+Scans a device's link table and caches a copy.
+
+=cut
+
+sub scan_link_table
+{
+	my ($self,$success_callback,$failure_callback) = @_;
+	$$self{_mem_activity} = 'scan';
+	$$self{_success_callback} = ($success_callback) ? $success_callback : undef;
+	$$self{_failure_callback} = ($failure_callback) ? $failure_callback : undef;
+	$self->health('out-of-sync'); # allow acknowledge to set otherwise
+	if($self->isa('Insteon::ALDB_i1')) {
+		$self->_peek('0FF8',0);
+	} else {
+		$self->send_read_aldb('0000');
+	}
+}
+
+=item C<delete_link([link details])>
+
+Deletes a specific link from a device.  Generally called by C<delete_orphan_links()>.
+
+=cut
+
+sub delete_link
+{
+	my ($self, $parms_text) = @_;
+	my %link_parms;
+	if ($parms_text eq 'ok' or $parms_text eq 'fail'){
+		%link_parms = %{$self->{callback_parms}};
+		$$self{callback_parms} = undef;
+		$link_parms{aldb_check} = $parms_text;
+	} 
+	elsif (@_ > 2)
+	{
+		shift @_;
+		%link_parms = @_;
+	}
+	else
+	{
+		%link_parms = &main::parse_func_parms($parms_text);
+	}
+	$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
+	$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
+	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
+		## Check whether ALDB is in sync
+		$self->{callback_parms} = \%link_parms;
+		$$self{_aldb_unchanged_callback} = '&Insteon::AllLinkDatabase::delete_link('.$$self{device}->{object_name}."->_aldb, 'ok')";
+		$$self{_aldb_changed_callback} = '&Insteon::AllLinkDatabase::delete_link('.$$self{device}->{object_name}."->_aldb, 'fail')";
+		$self->query_aldb_delta("check");
+	} elsif ($link_parms{aldb_check} eq "fail"){
+		&::print_log("[Insteon::AllLinkDatabase] WARN: Link NOT deleted, please rescan this device and sync again.");
+		if ($link_parms{callback})
+		{
+			package main;
+			eval($link_parms{callback});
+			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
+			package Insteon::AllLinkDatabase;
+		}
+	} elsif ($link_parms{address} && $link_parms{aldb_check} eq "ok")
+	{
+		&main::print_log("[Insteon::AllLinkDatabase] Now deleting link [0x$link_parms{address}]");
+		$$self{_mem_activity} = 'delete';
+		$$self{pending_aldb}{address} = $link_parms{address};
+		if($self->isa('Insteon::ALDB_i1')) {
+			$self->_peek($link_parms{address},0);
+		} else {
+			$self->_write_delete($link_parms{address});
+		}
+
+	}
+	elsif ($link_parms{aldb_check} eq "ok")
+	{
+		my $insteon_object = $link_parms{object};
+		my $deviceid = ($insteon_object) ? $insteon_object->device_id : $link_parms{deviceid};
+		my $groupid = $link_parms{group};
+		$groupid = '01' unless $groupid;
+		my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
+		my $subaddress = ($link_parms{data3}) ? $link_parms{data3} : '00';
+		# get the address via lookup into the hash
+		my $key = $self->get_linkkey($deviceid, $groupid, $is_controller, $subaddress);
+		my $address = $$self{aldb}{$key}{address};
+		if ($address)
+		{
+			&main::print_log("[Insteon::AllLinkDatabase] Now deleting link [0x$address] with the following data"
+				. " deviceid=$deviceid, groupid=$groupid, is_controller=$is_controller, subaddress=$subaddress");
+			# now, alter the flags byte such that the in_use flag is set to 0
+			$$self{_mem_activity} = 'delete';
+			$$self{pending_aldb}{deviceid} = lc $deviceid;
+			$$self{pending_aldb}{group} = $groupid;
+			$$self{pending_aldb}{is_controller} = $is_controller;
+			$$self{pending_aldb}{address} = $address;
+			$$self{pending_aldb}{data3} = $subaddress;
+			if($self->isa('Insteon::ALDB_i1')) {
+				$self->_peek($address,0);
+			} else {
+				$self->_write_delete($address);
+			}
+		}
+		else
+		{
+			&main::print_log('[Insteon::AllLinkDatabase] WARN: (' . $$self{device}->get_object_name 
+				. ') attempt to delete link that does not exist!'
+				. " deviceid=$deviceid, groupid=$groupid, is_controller=$is_controller, subaddress=$subaddress");
+			if ($link_parms{callback})
+			{
+				package main;
+				eval($link_parms{callback});
+				&::print_log("[Insteon::AllLinkDatabase] error encountered during delete_link callback: " . $@)
+					if $@ and $self->{device}->debuglevel(1, 'insteon');
+				package Insteon::AllLinkDataBase;
+			}
+		}
+	}
+}
+
+=item C<delete_orphan_links()>
+
+Reviews the cached version of the link database for the device and removes
+links from THIS device which are not present in the mht file, link to non-existant
+devices, or which are only half-links.
+
+Since this routine only processes this device, it is best to run the voice 
+command 'delete all orphan links' from the interface so that all devices are 
+scanned and processed.
+
+=cut
+
+sub delete_orphan_links
+{
+	my ($self, $audit_mode, $failure_callback) = @_;
+	@{$$self{delete_queue}} = (); # reset the work queue
+	$$self{delete_queue_processed} = 0;
+	my $selfname = $$self{device}->get_object_name;
+
+	# first, make sure that the health of ALDB is ok
+	if ($self->health ne 'good' || $$self{device}->is_deaf) {
+		my $sent_to_failure = 0;
+		if ($$self{device}->is_deaf) {
+			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Will not delete links on deaf device: $selfname");
+		} 
+		elsif ($self->health eq 'empty'){
+			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: Skipping $selfname, because it has no links");
+		}
+		else {
+			::print_log("[Insteon::AllLinkDatabase] Delete orphan links: skipping $selfname because health: "
+				. $self->health . ". Please rescan the link table of this device and rerun delete "
+				. "orphans if necessary");
+			#log the failure
+			$sent_to_failure = 1;
+			if ($failure_callback) {
+				package main;
+				eval ($failure_callback);
+				&::print_log("[Insteon::AllLinkDatabase] error in delete orphans failure callback: " . $@)
+					if $@ and $self->{device}->debuglevel(1, 'insteon');
+				package Insteon::AllLinkDatabase;
+			}
+		}
+		if (!$$self{device}->isa('Insteon_PLM') && !$sent_to_failure){
+			$self->_process_delete_queue();
+		}
+		return;
+	}
+
+	# Loop through the device's ALDB table
+	LINKKEY: for my $linkkey (keys %{$$self{aldb}}) {
+		# Skip empty addresses
+		next LINKKEY if ($linkkey eq 'empty');
+		
+		# Define delete request
+		my %delete_req = (callback => "$selfname->_aldb->_process_delete_queue()",
+				  failure_callback => $failure_callback);
+
+		# Delete duplicate entries
+		if ($linkkey eq 'duplicates') {
+			push my @duplicate_addresses, @{$$self{aldb}{duplicates}};
+			foreach (@duplicate_addresses) {
+				%delete_req = (%delete_req, address => $_, cause => "it is a duplicate record");
+				push @{$$self{delete_queue}}, \%delete_req;
+			}
+			next LINKKEY;
+		}
+
+		# Initialize Variables
+		my ($linked_device, $plm_scene, $controller_object, $link_defined,
+			$controller_id, $responder_id, $link_data3, $recip_data3, 
+			$group_object, $data3_object);
+		my $group 		= lc $$self{aldb}{$linkkey}{group};
+		my $is_controller 	= $$self{aldb}{$linkkey}{is_controller};
+		my $data3 		= lc $$self{aldb}{$linkkey}{data3};
+		my $deviceid 		= lc $$self{aldb}{$linkkey}{deviceid};
+		my $self_id		= lc $$self{device}->device_id;
+		my $interface_id	= $self_id;
+		$interface_id = lc $$self{device}->interface->device_id if (!$$self{device}->isa('Insteon_PLM'));
+		$linked_device = Insteon::get_object($deviceid,'01');
+		$linked_device = Insteon::active_interface() if ($deviceid eq $interface_id);
+		$group_object = ($is_controller) ? Insteon::get_object($self_id, $group) : Insteon::get_object($deviceid, $group);
+		$data3_object = Insteon::get_object($self_id, $data3);
+		%delete_req = (%delete_req, deviceid => $deviceid, group => $group,
+			is_controller => $is_controller, data3 => $data3);
+
+		# Is the linked device defined in MH?
+		if (! ref $linked_device) {
+			$delete_req{cause} = "no device with deviceid: $deviceid could be found";
+			push @{$$self{delete_queue}}, \%delete_req;
+			next LINKKEY;
+		}
+
+		# If link is a PLM Scene, is the PLM Scene defined in MH?
+		if (($linked_device->isa("Insteon_PLM") and !$is_controller)||
+		($$self{device}->isa("Insteon_PLM") and $is_controller)) {
+			$plm_scene = Insteon::get_object('000000', $group);
+			if (!ref $plm_scene && $group ne '01' && $group ne '00') {
+				$delete_req{cause} = "no plm scene for group $group could be found";
+				push @{$$self{delete_queue}}, \%delete_req;
+				next LINKKEY;
+			}
+		}
+
+		# Is this link defined in MH? 3-Step Process
+		# Define variables based on type of link
+		$controller_id = ($is_controller) ? $self_id : lc $linked_device->device_id;
+		$responder_id = ($is_controller) ? lc $linked_device->device_id : $self_id;
+		$controller_object = Insteon::get_object($controller_id,$group);
+		$controller_object = $plm_scene if (ref $plm_scene);
+
+		# First, iterate over the controller object members to find the link definition
+		MEMBERS: foreach my $member_ref (keys %{$$controller_object{members}}) {
+			my $member = $$controller_object{members}{$member_ref}{object};
+			if ($member->isa('Light_Item')) {
+				my @lights = $member->find_members('Insteon::BaseLight');
+				$member = $lights[0] if (@lights); # pick the first
+			}
+			# For resp, D3 = resp group; For cont, D3 = cont group
+			$link_data3 = ($is_controller) ? $group : $member->group;
+			if (lc($member->device_id) eq $responder_id) {
+				if ($data3 eq $link_data3){
+					$link_defined = 1;
+					$recip_data3 = ($is_controller) ? $member->group : $group;
+					last MEMBERS;
+				} 
+				elsif (($link_data3 eq '00' || $link_data3 eq '01') && 
+					($data3 eq '00' || $data3 eq '01' )){
+					# Allow for 00 or 01 interchangability
+					$link_defined = 1;
+					$recip_data3 = ($is_controller) ? $member->group : $group;
+					last MEMBERS;
+				}
+			} 
+		}
+
+		# Second, is this a PLM->Device, Device->PLM link, these are not members
+		if ($$self{device}->isa("Insteon_PLM")){
+			if ($is_controller && ($group eq '00' || $group eq '01')){
+				#Valid Controller for PLM->Device link
+				$delete_req{skip} = "$selfname -- Skipping reciprocal link check for controller group 00 or 01 link to "
+				. $linked_device->get_object_name; 
+				next LINKKEY;
+			}
+			elsif (!$is_controller && ref $group_object){
+				#Valid Responder for Device->PLM link
+				$link_defined = 1;
+				$recip_data3 = $group;
+			}
+		} 
+		elsif($deviceid eq $interface_id && (ref $data3_object || ($data3 eq '00' || $data3 eq '01'))){
+			if ($is_controller && ref $group_object){
+				#Valid Controller for Device->PLM link
+				$link_defined = 1;
+				$recip_data3 = '00';
+			}
+			elsif (!$is_controller && ($group eq '00' || $group eq '01')) {
+				#Valid Responder for PLM->Device link
+				$link_defined = 1;
+				$recip_data3 = '00';
+			}
+			
+		}
+
+		# Third, delete link if not defined
+		if (!$link_defined){
+			$delete_req{cause} = "link is not defined in MisterHouse";
+			push @{$$self{delete_queue}}, \%delete_req;
+			next LINKKEY;
+		}
+
+		# Do not delete links to deaf devices
+		if ($linked_device->is_deaf) {
+			$delete_req{skip} = "$selfname -- Skipping check for reciprocal links on deaf device " . $linked_device->get_object_name;
+			next LINKKEY;
+		}
+		
+		# Do not delete links to unhealthy devices 
+		if ($linked_device->_aldb->health ne 'good' && $linked_device->_aldb->health ne 'empty') {
+			$delete_req{skip} = "$selfname -- Skipping check for reciprocal links on "
+				. $linked_device->get_object_name . " because aldb health of that device is "
+				. $linked_device->_aldb->health . ". Please rescan this device.";
+			next LINKKEY;
+		}
+		
+		# Do not delete responder links from the PLM (prevents locking i2CS devices)
+		if ($linked_device->isa("Insteon_PLM") and !$is_controller && ($group eq '00' || $group eq '01')) {
+			$delete_req{skip} = "$selfname -- Skipping check for reciprocal controller link on PLM for group 00 or 01.";
+			next LINKKEY;
+		}
+
+		# Does a reciprocal link exist?
+		if (! $linked_device->has_link($$self{device},$group,($is_controller) ? 0 : 1, lc $recip_data3)) {
+			$delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name;
+			push @{$$self{delete_queue}}, \%delete_req;
+		} 
+
+	} # /LINKKEY Loop
+	my $index = 0;
+	foreach (@{$$self{delete_queue}}){
+		my %delete_req = %{$_};
+		my $audit_text = "(AUDIT)" if ($audit_mode);
+		my $log_text;
+		if ($delete_req{skip}){
+			$log_text = "[Insteon::AllLinkDatabase] $audit_text " . $delete_req{skip};
+			splice @{$$self{delete_queue}}, $index, 1;
+		} else {
+			$log_text = "[Insteon::AllLinkDatabase] $audit_text Deleting the following link on $selfname because ";
+			$log_text .= $delete_req{cause} . "\n";
+			PRINT: for (keys %delete_req) {
+				next PRINT if (($_ eq 'cause') || ($_ eq 'callback') ||
+						($_ eq 'failure_callback'));
+				$log_text .= "$_ = $delete_req{$_}; ";
+			}
+			if ($delete_req{deviceid}){
+				my $reciprocal_object = Insteon::get_object($delete_req{deviceid}, '01');
+				if (!$delete_req{is_controller}){
+					$reciprocal_object = Insteon::get_object($delete_req{deviceid}, $delete_req{group});
+				}
+				if (ref $reciprocal_object) {
+					$log_text .= "linked device name= " . $reciprocal_object->get_object_name;
+				}
+			}
+			$index ++;
+		}
+		::print_log($log_text);
+	}
+	if ($audit_mode) {
+		@{$$self{delete_queue}} = ();
+	}
+	else {
+		::print_log("[Insteon::AllLinkDatabase] ## Begin processing delete queue for: $selfname");
+	}
+	if (!$$self{device}->isa('Insteon_PLM')) {
+		$self->_process_delete_queue();
+	}
+}
+
+sub _process_delete_queue {
+	my ($self) = @_;
+	my $num_in_queue = @{$$self{delete_queue}};
+	if ($num_in_queue)
+        {
+		my $delete_req_ptr = shift(@{$$self{delete_queue}});
+		my %delete_req = %$delete_req_ptr;
+		if ($delete_req{address})
+                {
+			&::print_log("[Insteon::AllLinkDatabase] (#$num_in_queue) " . $$self{device}->get_object_name . " now deleting duplicate record at address "
+				. $delete_req{address});
+		}
+                else
+                {
+			&::print_log("[Insteon::AllLinkDatabase] (#$num_in_queue) " . $$self{device}->get_object_name . " now deleting orphaned link w/ details: "
+				. (($delete_req{is_controller}) ? "controller" : "responder")
+				. ", " . (($delete_req{object}) ? "device=" . $delete_req{object}->get_object_name
+				: "deviceid=$delete_req{deviceid}") . ", group=$delete_req{group}, cause=$delete_req{cause}");
+		}
+		$self->delete_link(%delete_req);
+		$$self{delete_queue_processed}++;
+	}
+        else
+        {
+        	&::print_log("[Insteon::AllLinkDatabase] Nothing else to do for " . $$self{device}->get_object_name . " after deleting "
+                	. $$self{delete_queue_processed} . " links") if $self->{device}->debuglevel(1, 'insteon');
+		$$self{device}->interface->_aldb->_process_delete_queue($$self{delete_queue_processed});
+	}
+}
+
+=item C<add_duplicate_link_address([address])>
+
+Adds address to the duplicate link hash. Called as part of C<scan_link_table()>.
+
+=cut
+
+sub add_duplicate_link_address
+{
+	my ($self, $address) = @_;
+
+        unshift @{$$self{aldb}{duplicates}}, $address;
+
+        # now, keep the list sorted!
+        @{$$self{aldb}{duplicates}} = sort(@{$$self{aldb}{duplicates}});
+
+}
+
+=item C<delete_duplicate_link_address([address])>
+
+Removes address from the duplicate link hash. Called as part of C<delete_orphan_links()>.
+
+=cut
+
+sub delete_duplicate_link_address
+{
+	my ($self, $address) = @_;
+        my $num_duplicate_link_addresses = 0;
+        
+	$num_duplicate_link_addresses = @{$$self{aldb}{duplicates}} if (defined $$self{aldb}{duplicates});
+        if ($num_duplicate_link_addresses)
+        {
+        	my @temp_duplicates = ();
+        	foreach my $temp_address (@{$$self{aldb}{duplicates}})
+        	{
+                	if ($temp_address ne $address)
+                        {
+                        	push @temp_duplicates, $temp_address;
+                        }
+        	}
+                # keep it sorted
+                @{$$self{aldb}{duplicates}} = sort(@temp_duplicates);
+        }
+}
+
+=item C<add_empty_address([address])>
+
+Adds address to the empty link hash. Called as part of C<delete_orphan_links()> 
+or C<scan_link_table()>.
+
+=cut
+
+sub add_empty_address
+{
+	my ($self, $address) = @_;
+        # before adding it, make sure that it isn't already in the list!!
+        my $num_addresses = 0;
+        $num_addresses = @{$$self{aldb}{empty}} if (defined $$self{aldb}{empty});
+        my $exists = 0;
+        if ($num_addresses and $address)
+        {
+        	foreach my $temp_address (@{$$self{aldb}{empty}})
+        	{
+                	if ($temp_address eq $address)
+                        {
+                        	$exists = 1;
+                                last;
+                        }
+        	}
+        }
+        # add it to the list if it doesn't exist
+        if (!($exists) and $address)
+        {
+		unshift @{$$self{aldb}{empty}}, $address;
+        }
+
+        # now, keep the list sorted!
+        @{$$self{aldb}{empty}} = sort(@{$$self{aldb}{empty}});
+
+}
+
+=item C<get_first_empty_address()>
+
+Returns the highest empty link address, or if no empty addresses exist, returns
+the highest unused address.  Called as part of C<delete_orphan_links()> or 
+C<scan_link_table()>..
+
+=cut
+
+sub get_first_empty_address
+{
+	my ($self) = @_;
+
+        # NOTE: The issue here is that we give up an address from the list
+        #   with the assumption that it will be made non-empty;
+        #   So, if there is a problem during update/add, then will have
+        #   a non-empty, but non-functional entry
+	my $first_address = pop @{$$self{aldb}{empty}};
+
+        if (!($first_address))
+        {
+        	# then, cycle through all of the existing non-empty addresses
+                # to find the lowest one and then decrement by 8
+                #
+                # TO-DO: factor in appropriate use of the "highwater" flag
+                #
+		my $high_address = 0xffff;
+		for my $key (keys %{$$self{aldb}})
+                {
+			next if $key eq 'empty' or $key eq 'duplicates';
+			my $new_address = hex($$self{aldb}{$key}{address});
+			if( $new_address and $new_address < $high_address ) {
+				$high_address = $new_address;
+			}
+		}
+		$first_address = ($high_address > 0) ? sprintf('%04x', $high_address - 8) : 0;
+		main::print_log("[Insteon::AllLinkDatabase] DEBUG4: No empty link entries; using next lowest link address ["
+			.$first_address."]") if $self->{device}->debuglevel(4, 'insteon');
+	} else {
+		main::print_log("[Insteon::AllLinkDatabase] DEBUG4: Found empty address ["
+			.$first_address."] in empty array") if $self->{device}->debuglevel(4, 'insteon');
+	}
+
+        return $first_address;
+}
+
+=item C<add_link(link_params)>
+
+Adds the link to the device's ALDB.  Generally called from the "sync links" or 
+"link to interface" voice commands.
+
+=cut
+
+sub add_link
+{
+	my ($self, $parms_text) = @_;
+	my %link_parms;
+	if ($parms_text eq 'ok' or $parms_text eq 'fail'){
+		%link_parms = %{$self->{callback_parms}};
+		$$self{callback_parms} = undef;
+		$link_parms{aldb_check} = $parms_text;
+	}
+	elsif (@_ > 2)
+        {
+		shift @_;
+		%link_parms = @_;
+	}
+        else
+        {
+		%link_parms = &main::parse_func_parms($parms_text);
+	}
+	my $device_id;
+	my $insteon_object = $link_parms{object};
+	my $group = $link_parms{group};
+	if (!(defined($insteon_object)))
+        {
+		$device_id = lc $link_parms{deviceid};
+		$insteon_object = &Insteon::get_object($device_id, $group);
+	}
+        else
+        {
+		$device_id = lc $insteon_object->device_id;
+	}
+	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
+
+	# For I2CS devices the default data3 for links is 01
+	# For all other devices the default data3 for links is 00
+	my $data3_default = '00';
+	if ($insteon_object->can('engine_version') && $insteon_object->engine_version eq 'I2CS') {
+		$data3_default = '01';
+	}
+	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
+	$data3 = $data3_default if ($data3 eq '00' || $data3 eq '01');
+
+	# check whether the link already exists
+	my $key = $self->get_linkkey($device_id, $group, $is_controller, $data3);
+	$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
+	$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
+	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
+		## Check whether ALDB is in sync
+		$self->{callback_parms} = \%link_parms;
+		$$self{_aldb_unchanged_callback} = '&Insteon::AllLinkDatabase::add_link('.$$self{device}->{object_name}."->_aldb, 'ok')";
+		$$self{_aldb_changed_callback} = '&Insteon::AllLinkDatabase::add_link('.$$self{device}->{object_name}."->_aldb, 'fail')";
+		$self->query_aldb_delta("check");
+	} elsif ($link_parms{aldb_check} eq "fail"){
+		&::print_log("[Insteon::AllLinkDatabase] WARN: Link NOT added, please rescan this device and sync again.");
+		if ($link_parms{callback})
+		{
+			package main;
+			eval($link_parms{callback});
+			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
+			package Insteon::AllLinkDatabase;
+		}
+	}
+	elsif (defined $$self{aldb}{$key} && defined $$self{aldb}{$key}{inuse})
+        {
+		&::print_log("[Insteon::AllLinkDatabase] WARN: attempt to add link to " 
+			. $$self{device}->get_object_name 
+			. " that already exists! object=" . $insteon_object->get_object_name 
+			. ", group=$group, is_controller=$is_controller, data3=$data3");
+		if ($link_parms{callback})
+                {
+			package main;
+			eval($link_parms{callback});
+			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " 
+				. $$self{device}->get_object_name . ":" . $@)
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
+			package Insteon::AllLinkDatabase;
+		}
+	}
+	elsif ($link_parms{aldb_check} eq "ok")
+        {
+		# strip optional % sign to append on_level
+		my $on_level = $link_parms{on_level};
+		$on_level =~ s/(\d)%?/$1/;
+		$on_level = '100' unless defined($on_level); # 100% == on is the default
+		# strip optional s (seconds) to append ramp_rate
+		my $ramp_rate = $link_parms{ramp_rate};
+		$ramp_rate =~ s/(\d)s?/$1/;
+		$ramp_rate = '0.1' unless $ramp_rate; # 0.1s is the default
+		# get the first available memory location
+		my $address = $self->get_first_empty_address();
+                if ($address)
+                {
+			&::print_log("[Insteon::AllLinkDatabase] DEBUG2: adding link record to " . $$self{device}->get_object_name
+				. " light level controlled by " . $insteon_object->get_object_name
+		       		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate")
+                                if $self->{device}->debuglevel(2, 'insteon');
+			my ($data1, $data2);
+			if($link_parms{is_controller}) {
+				$data1 = '03';  #application retries == 3
+				$data2 = '00';  #ignored for controller entries
+			} else {
+				$data1 = &Insteon::DimmableLight::convert_level($on_level);
+				$data2 = ($$self{device}->isa('Insteon::DimmableLight')) ? &Insteon::DimmableLight::convert_ramp($ramp_rate) : '00';
+			}
+			#data3 is defined above
+			$$self{_mem_activity} = 'add';
+			$self->_write_link($address, $device_id, $group, $is_controller, $data1, $data2, $data3);
+			# TO-DO: ensure that pop'd address is restored back to queue if the transaction fails
+                }
+                else
+                {
+			&::print_log("[Insteon::AllLinkDatabase] ERROR: adding link record failed because "
+                        	. $$self{device}->get_object_name
+				. " does not have a record of the first empty ALDB record."
+                                . " Please rescan this device's link table")
+                                if $self->{device}->debuglevel(1, 'insteon');
+
+                         if ($$self{_success_callback})
+                         {
+				package main;
+				eval ($$self{_success_callback});
+				&::print_log("[Insteon::AllLinkDatabase] WARN1: Error encountered during callback: " . $@)
+			 		if $@ and $self->{device}->debuglevel(1, 'insteon');
+			 	package Insteon::AllLinkDatabase;
+                         }
+                }
+	}
+}
+
+=item C<update_link(link_params)>
+
+Updates the on_level and/or ramp_rate associated with a link to match the defined
+value in MisterHouse. Generally called from the "sync links" voice command.
+
+=cut
+
+sub update_link
+{
+	my ($self, %link_parms) = @_;
+	if ($_[1] eq 'ok' or $_[1] eq 'fail'){
+		%link_parms = %{$self->{callback_parms}};
+		$$self{callback_parms} = undef;
+		$link_parms{aldb_check} = $_[1];
+	}
+	my $insteon_object = $link_parms{object};
+	my $group = $link_parms{group};
+	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
+	# strip optional % sign to append on_level
+	my $on_level = $link_parms{on_level};
+	$on_level =~ s/(\d+)%?/$1/;
+	# strip optional s (seconds) to append ramp_rate
+	my $ramp_rate = $link_parms{ramp_rate};
+	$ramp_rate =~ s/(\d)s?/$1/;
+	&::print_log("[Insteon::AllLinkDatabase] updating " . $$self{device}->get_object_name . " light level controlled by " . $insteon_object->get_object_name
+		. " and group: $group with on level: $on_level and ramp rate: $ramp_rate") if $self->{device}->debuglevel(1, 'insteon');
+	my $data1 = &Insteon::DimmableLight::convert_level($on_level);
+	my $data2 = ($$self{device}->isa('Insteon::DimmableLight')) ? &Insteon::DimmableLight::convert_ramp($ramp_rate) : '00';
+
+	# For I2CS devices the default data3 for links is 01
+	# For all other devices the default data3 for links is 00
+	my $data3_default = '00';
+	if ($insteon_object->can('engine_version') && $insteon_object->engine_version eq 'I2CS') {
+		$data3_default = '01';
+	}
+	my $data3 = ($link_parms{data3}) ? $link_parms{data3} : '00';
+	$data3 = $data3_default if ($data3 eq '00' || $data3 eq '01');
+
+	$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
+	$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
+
+	my $deviceid = $insteon_object->device_id;
+	my $key = $self->get_linkkey($deviceid, $group, $is_controller, $data3);
+	if (!defined($link_parms{aldb_check}) && (!$$self{device}->isa('Insteon_PLM'))){
+		## Check whether ALDB is in sync
+		$self->{callback_parms} = \%link_parms;
+		$$self{_aldb_unchanged_callback} = '&Insteon::AllLinkDatabase::update_link('.$$self{device}->{object_name}."->_aldb, 'ok')";
+		$$self{_aldb_changed_callback} = '&Insteon::AllLinkDatabase::update_link('.$$self{device}->{object_name}."->_aldb, 'fail')";
+		$self->query_aldb_delta("check");
+	} elsif ($link_parms{aldb_check} eq "fail"){
+		&::print_log("[Insteon::AllLinkDatabase] WARN: Cannot update link, please rescan this device and sync again.");
+		if ($link_parms{callback})
+		{
+			package main;
+			eval($link_parms{callback});
+			&::print_log("[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@)
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
+			package Insteon::AllLinkDatabase;
+		}
+	}
+	elsif (defined $$self{aldb}{$key} && $link_parms{aldb_check} eq "ok"){	
+		my $address = $$self{aldb}{$key}{address};
+		$$self{_mem_activity} = 'update';
+		$self->_write_link($address, $deviceid, $group, $is_controller, $data1, $data2, $data3);
+	} else {
+		&::print_log("[Insteon::AllLinkDatabase] ERROR: updating link record failed because "
+			. $$self{device}->get_object_name
+			. " does not have an existing ALDB entry key=$key")
+			if $self->{device}->debuglevel(1, 'insteon');
+
+		if ($$self{_success_callback})
+		{
+			package main;
+			eval ($$self{_success_callback});
+			&::print_log("[Insteon::AllLinkDatabase] WARN1: Error encountered during ack callback: " . $@)
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
+			package Insteon::AllLinkDatabase;
+		}
+	}
+}
+
+=item C<log_alllink_table()>
+
+Prints a human readable form of MisterHouse's cached version of a device's ALDB
+to the print log.  Called as part of the "scan links" voice command
+or in response to the "log links" voice command.
+
+=cut
+
+sub log_alllink_table
+{
+	my ($self) = @_;
+	my %aldb;
+
+	&::print_log("[Insteon::AllLinkDatabase] Link table for "
+        	. $$self{device}->get_object_name
+                . " health: " . $self->health);
+
+	# We want to log links sorted by ALDB address. Since the ALDB
+	# addresses are scattered throughout the %{$$self{aldb}} hash,
+	# and it is not easy to obtain them in a linear manner,
+	# we build a new data structure that will allow us to easily
+	# traverse the ALDB by address in a sorted manner. The new
+	# data structure is a bidimensional hash (%aldb) where rows
+	# are the ALDB addresses and the columns can be "empty"
+	# (indicates that the ALDB at the corresponding address is
+	# empty), "duplicate" (indicates that the ALDB at the
+	# corresponding address is a duplicate), or a hash key (which
+	# indicates that the ALDB at corresponding address contains
+	# a link).
+	foreach my $aldbkey (keys %{$$self{aldb}})
+        {
+	    if ($aldbkey eq "empty")
+            {
+		foreach my $address (@{$$self{aldb}{empty}})
+                {
+		    $aldb{$address}{empty} = undef; # Any value will do
+		}
+	    }
+            elsif ($aldbkey eq "duplicates")
+            {
+		foreach my $address (@{$$self{aldb}{duplicates}})
+                {
+		    $aldb{$address}{duplicate} = undef; # Any value will do
+		}
+	    }
+            else
+            {
+		$aldb{$$self{aldb}{$aldbkey}{address} }{$aldbkey} = $$self{aldb}{$aldbkey};
+	    }
+	}
+
+	# Finally traverse the ALDB, but this time sorted by ALDB address
+        if ($self->health eq 'good')
+        {
+		foreach my $address (sort keys %aldb)
+           	{
+			my $log_msg = "[Insteon::AllLinkDatabase] [0x$address] ";
+
+			if (exists $aldb{$address}{empty})
+                        {
+		    		$log_msg .= "is empty";
+			}
+                        elsif (exists $aldb{$address}{duplicate})
+                        {
+		    		$log_msg .= "holds a duplicate entry";
+			}
+                        else
+                        {
+		   		my ($key) = keys %{$aldb{$address} }; # There's only 1 key
+		    		my $aldb_entry = $aldb{$address}{$key};
+		    		my $is_controller = $aldb_entry->{is_controller};
+		    		my $device;
+
+		    		if ($$self{device}->interface()->device_id()
+					&& ($$self{device}->interface()->device_id()
+                                        eq $aldb_entry->{deviceid}))
+                                {
+			    		$device = $$self{device}->interface;
+		    		}
+                                else
+                                {
+			    		$device = &Insteon::get_object($aldb_entry->{deviceid},'01');
+		    		}
+		    		my $object_name = ($device) ? $device->get_object_name : $aldb_entry->{deviceid};
+
+		    		my $on_level = 'unknown';
+		    		if (defined $aldb_entry->{data1})
+                                {
+			    		if ($aldb_entry->{data1})
+                                        {
+				    		$on_level = int((hex($aldb_entry->{data1})*100/255) + .5) . "%";
+			    		}
+                                        else
+                                        {
+				    		$on_level = '0%';
+			    		}
+		    		}
+
+		    		my $rspndr_group = $aldb_entry->{data3};
+		    		$rspndr_group = '01' if $rspndr_group eq '00';
+
+		    		my $ramp_rate = 'unknown';
+		    		if ($aldb_entry->{data2})
+                                {
+			    		if (!($$self{device}->isa('Insteon::DimmableLight'))
+                                        	or (!$is_controller and ($rspndr_group != '01')))
+                                        {
+				    		$ramp_rate = 'none';
+				    		$on_level = $on_level eq '0%' ? 'off' : 'on';
+			    		}
+                                        else
+                                        {
+				    		$ramp_rate = &Insteon::DimmableLight::get_ramp_from_code($aldb_entry->{data2}) . "s";
+			    		}
+		    		}
+
+		    		$log_msg .= $is_controller ? "contlr($aldb_entry->{group}) "
+				    . "record to $object_name, "
+				    . "(d1:$aldb_entry->{data1}, "
+				    . "d2:$aldb_entry->{data2}, "
+				    . "d3:$aldb_entry->{data3})"
+				: "rspndr($rspndr_group) record to $object_name "
+				    . "($aldb_entry->{group}): onlevel=$on_level "
+				    . "and ramp=$ramp_rate "
+				    . "(d3:$aldb_entry->{data3})";
+			}
+
+			&::print_log($log_msg);
+		}
+        }
+        else
+        {
+		main::print_log("[Insteon::AllLinkDatabase] ALDB is ".$self->health." and will not be listed");
+        }
+}
+
+=item C<has_link(link_details)>
+
+Checks and returns true if a link with the passed details exists on the device
+or false if it does not.  Generally called as part of C<delete_orphan_links()>.
+
+=cut
+
+sub has_link
+{
+	my ($self, $insteon_object, $group, $is_controller, $data3) = @_;
+	my $deviceid;
+	if ($insteon_object->isa('Insteon::AllLinkDatabase')) {
+		$deviceid = $$insteon_object{device}->device_id;
+	} else {
+		$deviceid = lc $insteon_object->device_id;
+	}
+	my $key = $self->get_linkkey($deviceid, $group, $is_controller, $data3);
+	return (defined $$self{aldb}{$key});
+}
+
+=back
+
+=head2 INI PARAMETERS
+
+None
+
+=head2 AUTHOR
+
+Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+package Insteon::ALDB_i1;
+
+=head1 B<Insteon::ALDB_i1>
+
+=head2 SYNOPSIS
+
+Unique class for storing a cahced copy of a verion i1 device's ALDB.
+
+=head2 DESCRIPTION
+
+Generally this object should be interacted with through the insteon objects and 
+not by directly calling any of the following methods.
+
+=head2 INHERITS
+
+L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+use strict;
+
+@Insteon::ALDB_i1::ISA = ('Insteon::AllLinkDatabase');
+
+=item C<new()>
+
+Instantiate a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$device) = @_;
+
+	my $self = new Insteon::AllLinkDatabase($device);
+	bless $self,$class;
+	$self->aldb_version("I1");
+	return $self;
+}
+
+sub _on_poke
+{
+	my ($self,%msg) = @_;
+        my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'peek');
+	if (($$self{_mem_activity} eq 'update') or ($$self{_mem_activity} eq 'add'))
+        {
+		if ($$self{_mem_action} eq 'aldb_flag')
+                {
+			$$self{_mem_action} = 'aldb_group';
+			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+                        $message->extra($$self{_mem_lsb});
+                        $message->failure_callback($$self{_failure_callback});
+			$self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'aldb_group')
+                {
+			$$self{_mem_action} = 'aldb_devhi';
+			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+                        $message->extra($$self{_mem_lsb});
+                        $message->failure_callback($$self{_failure_callback});
+			$self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'aldb_devhi')
+                {
+			$$self{_mem_action} = 'aldb_devmid';
+			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+                        $message->extra($$self{_mem_lsb});
+                        $message->failure_callback($$self{_failure_callback});
+			$self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'aldb_devmid')
+                {
+			$$self{_mem_action} = 'aldb_devlo';
+			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+                        $message->extra($$self{_mem_lsb});
+                        $message->failure_callback($$self{_failure_callback});
+			$self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'aldb_devlo')
+                {
+			$$self{_mem_action} = 'aldb_data1';
+			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+                        $message->extra($$self{_mem_lsb});
+                        $message->failure_callback($$self{_failure_callback});
+			$self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'aldb_data1')
+                {
+			$$self{_mem_action} = 'aldb_data2';
+			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+                        $message->extra($$self{_mem_lsb});
+                        $message->failure_callback($$self{_failure_callback});
+			$self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'aldb_data2')
+                {
+			$$self{_mem_action} = 'aldb_data3';
+			$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+                        $message->extra($$self{_mem_lsb});
+                        $message->failure_callback($$self{_failure_callback});
+			$self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'aldb_data3')
+                {
+			## update the aldb records w/ the changes that were made
+			my $aldbkey = $self->get_linkkey($$self{pending_aldb}{deviceid},
+							$$self{pending_aldb}{group},
+							$$self{pending_aldb}{is_controller},
+							$$self{pending_aldb}{data3});
+			$$self{aldb}{$aldbkey}{data1} = $$self{pending_aldb}{data1};
+			$$self{aldb}{$aldbkey}{data2} = $$self{pending_aldb}{data2};
+			$$self{aldb}{$aldbkey}{data3} = $$self{pending_aldb}{data3};
+			$$self{aldb}{$aldbkey}{inuse} = 1; # needed so that restore string will preserve record
+			if ($$self{_mem_activity} eq 'add')
+                        {
+				$$self{aldb}{$aldbkey}{is_controller} = $$self{pending_aldb}{is_controller};
+				$$self{aldb}{$aldbkey}{deviceid} = lc $$self{pending_aldb}{deviceid};
+				$$self{aldb}{$aldbkey}{group} = lc $$self{pending_aldb}{group};
+				$$self{aldb}{$aldbkey}{address} = $$self{pending_aldb}{address};
+				$self->health("good");
+			}
+			# clear out mem_activity flag
+			$$self{_mem_activity} = undef;
+			$self->health("good");
+			# Put the new ALDB Delta into memory
+			$self->query_aldb_delta('set');
+		}
+	}
+        elsif ($$self{_mem_activity} eq 'update_local')
+        {
+		if ($$self{_mem_action} eq 'local_onlevel')
+                {
+			$$self{_mem_lsb} = '21';
+			$$self{_mem_action} = 'local_ramprate';
+                        $message->extra($$self{_mem_lsb});
+                        $message->failure_callback($$self{_failure_callback});
+			$self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'local_ramprate')
+                {
+			if ($$self{device}->isa('Insteon::KeyPadLincRelay') or $$self{device}->isa('Insteon::KeyPadLinc'))
+                        {
+				# update from eeprom--only a kpl issue
+				$message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'do_read_ee');
+                                $self->_send_cmd($message);
+			}
+			# Put the new ALDB Delta into memory
+			$self->query_aldb_delta('set');
+		}
+	}
+        elsif ($$self{_mem_activity} eq 'update_flags')
+        {
+		# update from eeprom--only a kpl issue
+		$message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'do_read_ee');
+                $message->failure_callback($$self{_failure_callback});
+                $self->_send_cmd($message);
+	}
+        elsif ($$self{_mem_activity} eq 'delete')
+        {
+		# clear out mem_activity flag
+		$$self{_mem_activity} = undef;
+		# add the address of the deleted link to the empty list
+		$self->add_empty_address($$self{pending_aldb}{address});
+                # and, remove from the duplicates list (if it is a member)
+                $self->delete_duplicate_link_address($$self{pending_aldb}{address});
+		if (exists $$self{pending_aldb}{deviceid})
+                {
+			my $key = $self->get_linkkey($$self{pending_aldb}{deviceid},
+							$$self{pending_aldb}{group}, 
+							$$self{pending_aldb}{is_controller},
+							$$self{pending_aldb}{data3});
+			delete $$self{aldb}{$key};
+		}
+		$self->health("good");
+		# Put the new ALDB Delta into memory
+		$self->query_aldb_delta('set');
+	}
+}
+
+sub _on_peek
+{
+	my ($self,%msg) = @_;
+        my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'peek');
+	if ($msg{is_extended}) {
+		&::print_log("[Insteon::ALDB_i1]: extended peek for " . $$self{device}->{object_name}
+		. " is " . $msg{extra}) if $self->{device}->debuglevel(1, 'insteon');
+	}
+        else
+        {
+		if ($$self{_mem_action} eq 'aldb_peek')
+                {
+			if ($$self{_mem_activity} eq 'scan')
+                        {
+				$$self{_mem_action} = 'aldb_flag';
+				# if the device is responding to the peek, then init the link table
+				#   if at the very start of a scan
+				if (lc $$self{_mem_msb} eq '0f' and lc $$self{_mem_lsb} eq 'f8'
+					&& !$$self{_stress_test_act})
+                                {
+					# reinit the aldb hash as there will be a new one
+					$$self{aldb} = undef;
+					# reinit the empty address list
+					@{$$self{aldb}{empty}} = ();
+					# and, also the duplicates list
+					@{$$self{aldb}{duplicates}} = ();
+				}
+			}
+                        elsif ($$self{_mem_activity} eq 'update')
+                        {
+				$$self{_mem_action} = 'aldb_data1';
+			}
+                        elsif ($$self{_mem_activity} eq 'update_local')
+                        {
+				$$self{_mem_action} = 'local_onlevel';
+			}
+                        elsif ($$self{_mem_activity} eq 'update_flags')
+                        {
+				$$self{_mem_action} = 'update_flags';
+			}
+                        elsif ($$self{_mem_activity} eq 'delete')
+                        {
+				$$self{_mem_action} = 'aldb_flag';
+			}
+                        elsif ($$self{_mem_activity} eq 'add')
+                        {
+				$$self{_mem_action} = 'aldb_flag';
+			}
+                       	$message->extra($$self{_mem_lsb});
+                        $message->failure_callback($$self{_failure_callback});
+                       	$self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'aldb_flag')
+                {
+			if ($$self{_mem_activity} eq 'scan')
+                        {
+                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
+                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
+				my $flag = hex($msg{extra});
+				$$self{pending_aldb}{inuse} = ($flag & 0x80) ? 1 : 0;
+				$$self{pending_aldb}{is_controller} = ($flag & 0x40) ? 1 : 0;
+				$$self{pending_aldb}{highwater} = ($flag & 0x02) ? 1 : 0;
+                        	if ($$self{_stress_test_act} && !($$self{pending_aldb}{highwater})){
+                        		::print_log("[Insteon::ALDB_i1] You need to create a link on this device before running stress_test");
+                        		$$self{_mem_activity} = undef;
+                        		$$self{_mem_action} = undef;
+                        		$$self{_stress_test_act} = 0;
+                        		$$self{device}->stress_test();
+                        	}
+				elsif (!($$self{pending_aldb}{highwater}))
+                                {
+					# since this is the last unused memory location, then add it to the empty list
+					$self->add_empty_address($$self{_mem_msb} . $$self{_mem_lsb});
+					$$self{_mem_action} = undef;
+					# clear out mem_activity flag
+					$$self{_mem_activity} = undef;
+                                   	if (lc $$self{_mem_msb} eq '0f' and lc $$self{_mem_lsb} eq 'f8')
+                                        {
+                                        	# set health as empty for now
+                                        	$self->health("empty");
+					}
+                                        else
+                                        {
+                                        	$self->health("good");
+                                        }
+
+					&::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name . " completed link memory scan")
+						if $self->{device}->debuglevel(1, 'insteon');
+					$self->health("good");
+					# Put the new ALDB Delta into memory
+					$self->query_aldb_delta('set');
+				}
+                                elsif ($$self{pending_aldb}{inuse})
+                                {
+					$$self{pending_aldb}{flag} = $msg{extra};
+					## confirm that we have a high-water mark; otherwise stop
+					$$self{pending_aldb}{address} = $$self{_mem_msb} . $$self{_mem_lsb};
+					$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+					$$self{_mem_action} = 'aldb_group';
+                                	$message->extra($$self{_mem_lsb});
+                        		$message->failure_callback($$self{_failure_callback});
+                                	$self->_send_cmd($message);
+				} else {
+					$self->add_empty_address($$self{_mem_msb} . $$self{_mem_lsb});
+					if ($$self{_mem_activity} eq 'scan'){
+						my $newaddress = sprintf("%04X", hex($$self{_mem_msb} . $$self{_mem_lsb}) - 8);
+						$$self{pending_aldb} = undef;
+						$self->_peek($newaddress);
+					}
+				}
+			}
+                        elsif ($$self{_mem_activity} eq 'add')
+                        {
+                        	# TO-DO!!! Eventually add the ability to set the highwater mark
+                                #  the below flags never reset the highwater mark so that
+                                #  the scanner will continue scanning extra empty records
+				my $flag = ($$self{pending_aldb}{is_controller}) ? 'E2' : 'A2';
+				$$self{pending_aldb}{flag} = $flag;
+                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
+                                $message->extra($flag);
+                        	$message->failure_callback($$self{_failure_callback});
+                                $self->_send_cmd($message);
+			}
+                        elsif ($$self{_mem_activity} eq 'delete')
+                        {
+                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
+                                $message->extra('02');
+                        	$message->failure_callback($$self{_failure_callback});
+                                $self->_send_cmd($message);
+			}
+		}
+                elsif ($$self{_mem_action} eq 'aldb_group')
+                {
+			if ($$self{_mem_activity} eq 'scan')
+                        {
+                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
+                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
+				$$self{pending_aldb}{group} = lc $msg{extra};
+				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+				$$self{_mem_action} = 'aldb_devhi';
+                               	$message->extra($$self{_mem_lsb});
+			}
+                        else
+                        {
+                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
+                                $message->extra($$self{pending_aldb}{group});
+			}
+                        $message->failure_callback($$self{_failure_callback});
+                        $self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'aldb_devhi')
+                {
+			if ($$self{_mem_activity} eq 'scan')
+                        {
+                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
+                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
+				$$self{pending_aldb}{deviceid} = lc $msg{extra};
+				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+				$$self{_mem_action} = 'aldb_devmid';
+                               	$message->extra($$self{_mem_lsb});
+			}
+                        elsif ($$self{_mem_activity} eq 'add')
+                        {
+				my $devid = substr($$self{pending_aldb}{deviceid},0,2);
+                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
+                                $message->extra($devid);
+			}
+                        $message->failure_callback($$self{_failure_callback});
+                        $self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'aldb_devmid')
+                {
+			if ($$self{_mem_activity} eq 'scan')
+                        {
+                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
+                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
+				$$self{pending_aldb}{deviceid} .= lc $msg{extra};
+				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+				$$self{_mem_action} = 'aldb_devlo';
+                               	$message->extra($$self{_mem_lsb});
+			}
+                        elsif ($$self{_mem_activity} eq 'add')
+                        {
+				my $devid = substr($$self{pending_aldb}{deviceid},2,2);
+                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
+                                $message->extra($devid);
+			}
+                        $message->failure_callback($$self{_failure_callback});
+                        $self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'aldb_devlo')
+                {
+			if ($$self{_mem_activity} eq 'scan')
+                        {
+                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
+                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
+				$$self{pending_aldb}{deviceid} .= lc $msg{extra};
+				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+				$$self{_mem_action} = 'aldb_data1';
+                               	$message->extra($$self{_mem_lsb});
+                        	$message->failure_callback($$self{_failure_callback});
+                               	$self->_send_cmd($message);
+			}
+                        elsif ($$self{_mem_activity} eq 'add')
+                        {
+				my $devid = substr($$self{pending_aldb}{deviceid},4,2);
+                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
+                                $message->extra($devid);
+                        	$message->failure_callback($$self{_failure_callback});
+                                $self->_send_cmd($message);
+			}
+		}
+                elsif ($$self{_mem_action} eq 'aldb_data1')
+                {
+			if ($$self{_mem_activity} eq 'scan')
+                        {
+                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
+                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
+				$$self{_mem_action} = 'aldb_data2';
+				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+				$$self{pending_aldb}{data1} = $msg{extra};
+                               	$message->extra($$self{_mem_lsb});
+                        	$message->failure_callback($$self{_failure_callback});
+                               	$self->_send_cmd($message);
+			}
+                        elsif ($$self{_mem_activity} eq 'update' or $$self{_mem_activity} eq 'add')
+                        {
+				# poke the new value
+                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
+                                $message->extra($$self{pending_aldb}{data1});
+                        	$message->failure_callback($$self{_failure_callback});
+                                $self->_send_cmd($message);
+			}
+		}
+                elsif ($$self{_mem_action} eq 'aldb_data2')
+                {
+			if ($$self{_mem_activity} eq 'scan')
+                        {
+                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
+                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
+				$$self{pending_aldb}{data2} = $msg{extra};
+				$$self{_mem_lsb} = sprintf("%02X", hex($$self{_mem_lsb}) + 1);
+				$$self{_mem_action} = 'aldb_data3';
+                               	$message->extra($$self{_mem_lsb});
+                        	$message->failure_callback($$self{_failure_callback});
+                               	$self->_send_cmd($message);
+			}
+                        elsif ($$self{_mem_activity} eq 'update' or $$self{_mem_activity} eq 'add')
+                        {
+				# poke the new value
+                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
+                                $message->extra($$self{pending_aldb}{data2});
+                        	$message->failure_callback($$self{_failure_callback});
+                                $self->_send_cmd($message);
+			}
+		}
+                elsif ($$self{_mem_action} eq 'aldb_data3')
+                {
+			if ($$self{_mem_activity} eq 'scan')
+                        {
+                        	&::print_log("[Insteon::ALDB_i1] DEBUG3: " . $$self{device}->get_object_name
+                                	. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
+                                        . lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
+				$$self{pending_aldb}{data3} = $msg{extra};
+
+                        	if ($$self{_stress_test_act}){
+                        		$$self{_stress_test_act} = 0;
+                        		$$self{_mem_activity} = undef;
+                        		$$self{_mem_action} = undef;
+                        		$$self{device}->stress_test();
+                        	}
+				elsif ($$self{pending_aldb}{highwater})
+                                {
+					if ($$self{pending_aldb}{inuse})
+                                        {
+					# save pending_aldb and then clear it out
+						my $aldbkey = $self->get_linkkey($$self{pending_aldb}{deviceid},
+										$$self{pending_aldb}{group},
+										$$self{pending_aldb}{is_controller},
+										$$self{pending_aldb}{data3});
+						# check for duplicates
+						if (exists $$self{aldb}{$aldbkey} && $$self{aldb}{$aldbkey}{inuse})
+                                                {
+							$self->add_duplicate_link_address($$self{pending_aldb}{address});
+						}
+                                                else
+                                                {
+							%{$$self{aldb}{$aldbkey}} = %{$$self{pending_aldb}};
+						}
+					}
+                                        else
+                                        {
+						$self->add_empty_address($$self{pending_aldb}{address});
+					}
+					my $newaddress = sprintf("%04X", hex($$self{pending_aldb}{address}) - 8);
+					$$self{pending_aldb} = undef;
+					$self->_peek($newaddress);
+				}
+			}
+                        elsif ($$self{_mem_activity} eq 'update' or $$self{_mem_activity} eq 'add')
+                        {
+				# poke the new value
+                                $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
+                                $message->extra($$self{pending_aldb}{data3});
+                        	$message->failure_callback($$self{_failure_callback});
+                                $self->_send_cmd($message);
+			}
+		}
+                elsif ($$self{_mem_action} eq 'local_onlevel')
+                {
+			my $device = $$self{device};
+			my $on_level = $$device{_onlevel};
+			$on_level = &Insteon::DimmableLight::convert_level($on_level);
+                        $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
+                        $message->extra($on_level);
+                        $message->failure_callback($$self{_failure_callback});
+                        $self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'local_ramprate')
+                {
+                        my $device = $$self{device};
+			my $ramp_rate = $$device{_ramprate};
+			$ramp_rate = '1f' unless $ramp_rate;
+                        $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
+                        $message->extra($ramp_rate);
+                        $message->failure_callback($$self{_failure_callback});
+                        $self->_send_cmd($message);
+		}
+                elsif ($$self{_mem_action} eq 'update_flags')
+                {
+			my $flags = $$self{_operating_flags};
+                        $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'poke');
+                        $message->extra($flags);
+                        $message->failure_callback($$self{_failure_callback});
+                        $self->_send_cmd($message);
+		}
+		else {
+		::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name 
+			. ": unhandled _mem_action=".$$self{_mem_action})
+			if $self->{device}->debuglevel(1, 'insteon');
+		}
+	}
+}
+
+=item C<update_local_properties()>
+
+Used to update the local on level and ramp rate of a device.  Called by 
+L<Insteon::BaseDevice::update_local_properties()|Insteon::BaseInsteon/Insteon::BaseDevice>.
+
+=cut
+
+sub update_local_properties
+{
+	my ($self, $aldb_check) = @_;
+	if (defined($aldb_check)){
+		$$self{_mem_activity} = 'update_local';
+		$self->_peek('0032'); # 0032 is the address for the onlevel
+	} else {
+		$$self{_aldb_unchanged_callback} = '&Insteon::ALDB_i1::update_local_properties('.$$self{device}->{object_name}."->_aldb, 1)";
+		$$self{_aldb_changed_callback} = '&Insteon::ALDB_i1::update_local_properties('.$$self{device}->{object_name}."->_aldb, 1)";
+		$self->query_aldb_delta("check");
+	}
+}
+
+=item C<update_flags()>
+
+Used to update the flags of a device.  Called by L<Insteon::KeyPadLinc::update_flags()|Insteon::Lighting/Insteon::KeyPadLinc>.
+
+=cut
+
+sub update_flags
+{
+	my ($self, $flags, $aldb_check) = @_;
+	return unless defined $flags;
+	if (defined($aldb_check)){
+		$$self{_mem_activity} = 'update_flags';
+		$$self{_operating_flags} = $flags;
+		$self->_peek('0023');
+	} else {
+		$$self{_aldb_unchanged_callback} = '&Insteon::ALDB_i1::update_flags('.$$self{device}->{object_name}."->_aldb, '$flags', 1)";
+		$$self{_aldb_changed_callback} = '&Insteon::ALDB_i1::update_flags('.$$self{device}->{object_name}."->_aldb, '$flags', 1)";
+		$self->query_aldb_delta("check");
+	}
+}
+
+=item C<get_link_record()>
+
+Gets and returns the details of a link.  Called by L<Insteon::BaseController::update_members()|Insteon::BaseInsteon/Insteon::BaseController>.
+
+NOTE - This routine may be obsolete, its parent routine is not called by any code.
+
+=cut
+
+sub get_link_record
+{
+	my ($self,$link_key) = @_;
+	my %link_record = ();
+	%link_record = %{$$self{aldb}{$link_key}} if $$self{aldb}{$link_key};
+	return %link_record;
+}
+
+sub _write_link
+{
+	my ($self, $address, $deviceid, $group, $is_controller, $data1, $data2, $data3) = @_;
+	if ($address)
+        {
+		&::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name . " address: $address found for device: $deviceid and group: $group");
+		# change address for start of change to be address + offset
+		if ($$self{_mem_activity} eq 'update')
+                {
+			$address = sprintf('%04X',hex($address) + 5);
+		}
+		$$self{pending_aldb}{address} = $address;
+		$$self{pending_aldb}{deviceid} = lc $deviceid;
+		$$self{pending_aldb}{group} = lc $group;
+		$$self{pending_aldb}{is_controller} = $is_controller;
+		$$self{pending_aldb}{data1} = (defined $data1) ? lc $data1 : '00';
+		$$self{pending_aldb}{data2} = (defined $data2) ? lc $data2 : '00';
+		$$self{pending_aldb}{data3} = (defined $data3) ? lc $data3 : '00';
+		$self->_peek($address);
+	}
+        else
+        {
+		&::print_log("[Insteon::ALDB_i1] WARN: " . $$self{device}->get_object_name
+			. " write_link failure: no address available for record to device: $deviceid and group: $group" .
+				" and is_controller: $is_controller");;
+                if ($$self{_success_callback})
+                {
+			package main;
+			eval ($$self{_success_callback});
+			&::print_log("[Insteon::ALDB_i1] WARN1: Error encountered during ack callback: " . $@)
+		 		if $@ and $self->{device}->debuglevel(1, 'insteon');
+		 	package Insteon::ALDB_i1;
+                }
+	}
+}
+
+sub _peek
+{
+	my ($self, $address, $extended) = @_;
+	my $msb = substr($address,0,2);
+	my $lsb = substr($address,2,2);
+	if ($extended)
+        {
+        	my $message = $self->device->derive_message('peek','insteon_ext_send',
+			$lsb . "0000000000000000000000000000");
+                $self->interface->queue_message($message);
+
+	}
+        else
+        {
+		$$self{_mem_lsb} = $lsb;
+		$$self{_mem_msb} = $msb;
+		$$self{_mem_action} = 'aldb_peek';
+		&::print_log("[Insteon::ALDB_i1] " . $$self{device}->get_object_name . " accessing memory at location: 0x" . $address);
+                my $message = new Insteon::InsteonMessage('insteon_send', $$self{device}, 'set_address_msb');
+                $message->extra($msb);
+                $message->failure_callback($$self{_failure_callback});
+                $self->_send_cmd($message);
+#		$self->_send_cmd('command' => 'set_address_msb', 'extra' => $msb, 'is_synchronous' => 1);
+	}
+}
+
+=back
+
+=head2 INI PARAMETERS
+
+None
+
+=head2 AUTHOR
+
+Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+package Insteon::ALDB_i2;
+
+=head1 B<Insteon::ALDB_i2>
+
+=head2 SYNOPSIS
+
+Unique class for storing a cahced copy of a verion i2 device's ALDB.
+
+=head2 DESCRIPTION
+
+Generally this object should be interacted with through the insteon objects and 
+not by directly calling any of the following methods.
+
+=head2 INHERITS
+
+L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+use strict;
+
+@Insteon::ALDB_i2::ISA = ('Insteon::AllLinkDatabase');
+
+=item C<new()>
+
+Instantiate a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$device) = @_;
+
+	my $self = new Insteon::AllLinkDatabase($device);
+	bless $self,$class;
+	$self->aldb_version("I2");
+	return $self;
+}
+
+=item C<on_read_write_aldb()>
+
+Called as part of any process to read or write to a device's ALDB.
+
+=cut
+
+sub on_read_write_aldb
+{
+	my ($self, %msg) = @_;
+	my $clear_message = 1; #Default Action is to Clear the Current Message
+	&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
+		. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
+		. lc $msg{extra} . " for _mem_activity=".$$self{_mem_activity}
+		 ." _mem_action=". $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
+
+	if ($$self{_mem_action} eq 'aldb_i2read')
+	{
+		#This is an ACK. Will be followed by a Link Data message, so don't clear
+		$clear_message = 0;
+		#Only move to the next state if the received message is a device ack
+		#if the ack is dropped the retransmission logic will resend the request
+		if($msg{is_ack}) {
+			$$self{_mem_action} = 'aldb_i2readack';
+			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
+				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received ack")
+				if  $self->{device}->debuglevel(3, 'insteon');
+		} else {
+			#otherwise just ignore the message because it is out of sequence
+			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
+				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] ack not received. "
+				. "ignoring message") if  $self->{device}->debuglevel(3, 'insteon');
+		}
+		
+	}
+	elsif ($$self{_mem_action} eq 'aldb_i2readack')
+	{
+		if($msg{is_ack}) {
+			&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
+				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received duplicate ack. Ignoring.")
+				if  $self->{device}->debuglevel(3, 'insteon');
+				$clear_message = 0;
+		} elsif(length($msg{extra})<30)
+		{
+			&::print_log("[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed: "
+				. $$self{device}->get_object_name
+				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
+				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
+			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
+			#can't clear message, if valid message doesn't arrive
+			#resend logic will kick in
+			$clear_message = 0;
+		} elsif ($$self{_mem_msb} . $$self{_mem_lsb} ne '0000' and 
+				$$self{_mem_msb} . $$self{_mem_lsb} ne substr($msg{extra},6,4)){
+			::print_log("[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed, "
+				. " address received did not match address requested: "
+				. $$self{device}->get_object_name
+				. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
+				. lc $msg{extra} . " for " .  $$self{_mem_action}) if  $self->{device}->debuglevel(3, 'insteon');
+			$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
+			#can't clear message, if valid message doesn't arrive
+			#resend logic will kick in
+			$clear_message = 0;
+		}
+		elsif ($$self{_stress_test_act}){
+			$$self{_mem_activity} = undef;
+                        $$self{_mem_action} = undef;
+                	$$self{_stress_test_act} = 0;
+        		$$self{device}->stress_test();
+        	}
+		else
+		{
+			# init the link table if at the very start of a scan
+			if (lc $$self{_mem_msb} eq '00' and lc $$self{_mem_lsb} eq '00')
+			{
+				main::print_log("[Insteon::ALDB_i2] DEBUG4: Start of scan; initializing aldb structure") 
+					if  $self->{device}->debuglevel(4, 'insteon');
+				# reinit the aldb hash as there will be a new one
+				$$self{aldb} = undef;
+				# reinit the empty address list
+				@{$$self{aldb}{empty}} = ();
+				# and, also the duplicates list
+				@{$$self{aldb}{duplicates}} = ();
+				$$self{_mem_msb} = substr($msg{extra},6,2);
+				$$self{_mem_lsb} = substr($msg{extra},8,2);
+			}
+
+			#$msg{extra} includes cmd2 at the beginning so cmd2.d1.d2.d3...
+			#e.g. 0001010fff00a2042042d3fe1c00cc
+			# 0:cmd2:00       - unused
+			# 2:  D1:01       - unused
+			# 4:  D2:01       - command (read aldb response)
+			# 6:  D3:0fff     - aldb address (first entry in this case)
+			#10:  D5:00       - unused in responses
+			#12:  D6:a2       - flags
+			#14:  D7:04       - group number
+			#16:  D8:11.31.a2 - device id
+			#22: D11:fe       - link data 1
+			#24: D12:1c       - link data 2
+			#26: D13:00       - link data 3 (unused)
+			#28: D14:cc       - unused in i2; checksum in i2CS
+			
+			$$self{pending_aldb}{address} = substr($msg{extra},6,4);
+			
+			$$self{pending_aldb}{flag} = substr($msg{extra},12,2);
+			my $flag = hex($$self{pending_aldb}{flag});
+			$$self{pending_aldb}{inuse} = ($flag & 0x80) ? 1 : 0;
+			$$self{pending_aldb}{is_controller} = ($flag & 0x40) ? 1 : 0;
+			$$self{pending_aldb}{highwater} = ($flag & 0x02) ? 1 : 0;
+			unless($$self{pending_aldb}{highwater})
+			{
+				#highwater is set for every entry that has been used before
+				#highwater being 0 indicates entry has never been used (i.e. top of list)
+				# since this is the last unused memory location, then add it to the empty list
+				&::print_log("[Insteon::ALDB_i2] WARNING: highwater not set but marked inuse: "
+					. $$self{device}->get_object_name
+					. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
+					. lc $msg{extra} . " for " .  $$self{_mem_action}) 
+					if(($$self{pending_aldb}{inuse}) and $self->{device}->debuglevel(3, 'insteon'));
+				main::print_log("[Insteon::ALDB_i2] DEBUG4: scan done; adding last address ["
+					. $$self{_mem_msb} . $$self{_mem_lsb} ."] to empty array") 
+					if  $self->{device}->debuglevel(4, 'insteon');
+				$self->add_empty_address($$self{_mem_msb} . $$self{_mem_lsb});
+				# scan done; clear out state flags
+				$$self{_mem_action} = undef;
+				$$self{_mem_activity} = undef;
+				if (lc $$self{_mem_msb} eq '0f' and lc $$self{_mem_lsb} eq 'ff')
+				{
+					# set health as empty for now
+					$self->health("empty");
+				}
+				else
+				{
+					$self->health("good");
+				}
+
+				&::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name 
+					. " completed link memory scan: status: " . $self->health())
+					if $self->{device}->debuglevel(1, 'insteon');
+				$self->health("good");
+				# Put the new ALDB Delta into memory
+				$self->query_aldb_delta('set');
+			}
+			else #($$self{pending_aldb}{highwater})
+			{
+				unless($$self{pending_aldb}{inuse})
+				{
+					main::print_log("[Insteon::ALDB_i2] DEBUG4: inuse flag == false; adding address ["
+						. $$self{_mem_msb} . $$self{_mem_lsb} ."] to empty array") 
+						if  $self->{device}->debuglevel(4, 'insteon');
+					$self->add_empty_address($$self{pending_aldb}{address});
+				}
+				else
+				{
+					$$self{pending_aldb}{group} = lc substr($msg{extra},14,2);
+					$$self{pending_aldb}{deviceid} = lc substr($msg{extra},16,6);
+					$$self{pending_aldb}{data1} = lc substr($msg{extra},22,2);
+					$$self{pending_aldb}{data2} = lc substr($msg{extra},24,2);
+					$$self{pending_aldb}{data3} = lc substr($msg{extra},26,2);
+
+					# save pending_aldb and then clear it out
+					my $aldbkey = $self->get_linkkey($$self{pending_aldb}{deviceid},
+									$$self{pending_aldb}{group},
+									$$self{pending_aldb}{is_controller},
+									$$self{pending_aldb}{data3});
+					# check for duplicates
+					if (exists $$self{aldb}{$aldbkey} && $$self{aldb}{$aldbkey}{inuse})
+					{
+						main::print_log("[Insteon::ALDB_i2] DEBUG4: duplicate link found; adding address ["
+							. $$self{_mem_msb} . $$self{_mem_lsb} ."] to duplicates array") 
+							if  $self->{device}->debuglevel(4, 'insteon');
+						$self->add_duplicate_link_address($$self{pending_aldb}{address});
+					}
+					else
+					{
+						main::print_log("[Insteon::ALDB_i2] DEBUG4: active link found; adding address ["
+							. $$self{_mem_msb} . $$self{_mem_lsb} ."] to aldb") 
+							if  $self->{device}->debuglevel(4, 'insteon');
+						%{$$self{aldb}{$aldbkey}} = %{$$self{pending_aldb}};
+					}
+				}
+
+				#keep going; request the next record
+				$self->send_read_aldb(sprintf("%04x", hex($$self{pending_aldb}{address}) - 8));
+				
+			} #($$self{pending_aldb}{highwater})
+		} #else $msg{extra} !< 30
+	}
+	elsif ($$self{_mem_action} eq 'aldb_i2writeack')
+	{
+		unless ($$self{_mem_activity} eq 'delete') {
+			## update the aldb records w/ the changes that were made
+			my $aldbkey = $self->get_linkkey($$self{pending_aldb}{deviceid},
+							$$self{pending_aldb}{group},
+							$$self{pending_aldb}{is_controller},
+							$$self{pending_aldb}{data3});
+			$$self{aldb}{$aldbkey}{data1} = $$self{pending_aldb}{data1};
+			$$self{aldb}{$aldbkey}{data2} = $$self{pending_aldb}{data2};
+			$$self{aldb}{$aldbkey}{data3} = $$self{pending_aldb}{data3};
+			$$self{aldb}{$aldbkey}{inuse} = 1; # needed so that restore string will preserve record
+			if ($$self{_mem_activity} eq 'add')
+			{
+				$$self{aldb}{$aldbkey}{is_controller} = $$self{pending_aldb}{is_controller};
+				$$self{aldb}{$aldbkey}{deviceid} = lc $$self{pending_aldb}{deviceid};
+				$$self{aldb}{$aldbkey}{group} = lc $$self{pending_aldb}{group};
+				$$self{aldb}{$aldbkey}{address} = $$self{pending_aldb}{address};
+			}
+			$$self{_mem_activity} = undef;
+			$$self{_mem_action} = undef;
+			$$self{pending_aldb} = undef;
+			main::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name 
+				. " link write completed for [".$$self{aldb}{$aldbkey}{address}."]")
+				if $self->{device}->debuglevel(3, 'insteon');
+			$self->health("good");
+			# Put the new ALDB Delta into memory
+			$self->query_aldb_delta('set');
+		} else {
+			# clear out mem_activity flag
+			$$self{_mem_activity} = undef;
+			# add the address of the deleted link to the empty list
+			$self->add_empty_address($$self{pending_aldb}{address});
+	                # and, remove from the duplicates list (if it is a member)
+	                $self->delete_duplicate_link_address($$self{pending_aldb}{address});
+			if (exists $$self{pending_aldb}{deviceid})
+	                {
+				my $key = $self->get_linkkey($$self{pending_aldb}{deviceid},
+							$$self{pending_aldb}{group}, 
+							$$self{pending_aldb}{is_controller},
+							$$self{pending_aldb}{data3});
+				delete $$self{aldb}{$key};
+			}
+			$self->health("good");
+			# Put the new ALDB Delta into memory
+			$self->query_aldb_delta('set');
+		}
+	}
+	else
+	{
+		main::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name 
+			. ": unhandled _mem_action=".$$self{_mem_action})
+			if $self->{device}->debuglevel(1, 'insteon');
+		$clear_message = 0;
+	}
+	return $clear_message;
+}
+
+sub _write_link
+{
+	my ($self, $address, $deviceid, $group, $is_controller, $data1, $data2, $data3) = @_;
+	if ($address)
+        {
+		&::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name . " writing address: $address for device: $deviceid and group: $group");
+
+		my $message = new Insteon::InsteonMessage('insteon_ext_send', $$self{device}, 'read_write_aldb');
+
+		#cmd2.00.write_aldb_record.addr_msb.addr_lsb.byte_count.d6-d14 bytes to write
+		my $message_extra = '00'.'00'.'02';
+
+		$$self{pending_aldb}{address} = $address;
+		$message_extra .= $address;
+
+		$message_extra .= '08';  #write 8 bytes
+		
+		#D6-D13 aldb entry:  flags.group.deviceid(3).data1.data2.data3
+		#flags
+		$$self{pending_aldb}{is_controller} = $is_controller;
+		my $flag = ($$self{pending_aldb}{is_controller}) ? 'E2' : 'A2';
+		$$self{pending_aldb}{flag} = $flag;
+		$message_extra .= $flag;
+
+		#group
+		$$self{pending_aldb}{group} = lc $group;
+		$message_extra .= $$self{pending_aldb}{group};
+
+		#device ID
+		$$self{pending_aldb}{deviceid} = lc $deviceid;
+		$message_extra .= $$self{pending_aldb}{deviceid};
+
+		#data1 - data3
+		$$self{pending_aldb}{data1} = (defined $data1) ? lc $data1 : '00';
+		$message_extra .= $$self{pending_aldb}{data1}; 
+		$$self{pending_aldb}{data2} = (defined $data2) ? lc $data2 : '00';
+		$message_extra .= $$self{pending_aldb}{data2}; 
+		$$self{pending_aldb}{data3} = (defined $data3) ? lc $data3 : '00';
+		$message_extra .= $$self{pending_aldb}{data3}; 
+		$message_extra .= '00';  #byte 14
+		$message->extra($message_extra);
+		$$self{_mem_action} = 'aldb_i2writeack';
+		$message->failure_callback($$self{_failure_callback});
+		$self->_send_cmd($message);
+	}
+        else
+        {
+		&::print_log("[Insteon::ALDB_i2] WARN: " . $$self{device}->get_object_name
+			. " write_link failure: no address available for record to device: $deviceid and group: $group" .
+				" and is_controller: $is_controller");
+                if ($$self{_success_callback})
+                {
+			package main;
+			eval ($$self{_success_callback});
+			&::print_log("[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: " . $@)
+		 		if $@ and $self->{device}->debuglevel(1, 'insteon');
+		 	package Insteon::ALDB_i2;
+                }
+	}
+}
+
+sub _write_delete
+{
+	#pending_aldb must be populated before calling
+	my ($self, $address) = @_;
+
+	if ($address)
+        {
+		&::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name . " writing address as deleted: $address");
+
+		my $message = new Insteon::InsteonMessage('insteon_ext_send', $$self{device}, 'read_write_aldb');
+
+		#cmd2.00.write_aldb_record.addr_msb.addr_mid.addr_lsb.byte_count.d6-d14 bytes to write
+		my $message_extra = '00'.'00'.'02';
+		$message_extra .= $address;
+		$message_extra .= '08';  #write 8 bytes
+		
+		#D6-D13 aldb entry:  flags.group.deviceid(3).data1.data2.data3
+		#flag = 02 deleted
+		$message_extra .= '02';
+		#group
+		$message_extra .= '00';
+		#device ID
+		$message_extra .= '000000';
+		#data1 - data3
+		$message_extra .= '00'; 
+		$message_extra .= '00'; 
+		$message_extra .= '00';
+		#byte 14 
+		$message_extra .= '00';
+
+		$message->extra($message_extra);
+		$$self{_mem_action} = 'aldb_i2writeack';
+		$message->failure_callback($$self{_failure_callback});
+		$self->_send_cmd($message);
+	}
+        else
+        {
+		&::print_log("[Insteon::ALDB_i2] WARN: " . $$self{device}->get_object_name
+			. " write_delete failure: no address available");
+                if ($$self{_success_callback})
+                {
+			package main;
+			eval ($$self{_success_callback});
+			&::print_log("[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: " . $@)
+		 		if $@ and $self->{device}->debuglevel(1, 'insteon');
+		 	package Insteon::ALDB_i2;
+                }
+	}
+}
+
+=item C<send_read_aldb()>
+
+Called as part of "scan link table" voice command.
+
+=cut
+
+sub send_read_aldb
+{
+	my ($self, $address) = @_;
+
+	$$self{_mem_msb} = substr($address,0,2);
+	$$self{_mem_lsb} = substr($address,2,2);
+	$$self{_mem_action} = 'aldb_i2read';
+	main::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name . " reading ALDB at location: 0x" . $address);
+	my $message = new Insteon::InsteonMessage('insteon_ext_send', $$self{device}, 'read_write_aldb');
+	#cmd2.00.read_aldb_record.addr_msb.addr_lsb.record_count(0 for all).d6-d14 unused
+	$message->extra("00"."00"."00".$$self{_mem_msb}.$$self{_mem_lsb}."01"."000000000000000000");
+	$message->failure_callback($$self{_failure_callback});
+	$self->_send_cmd($message);
+}
+
+=back
+
+=head2 INI PARAMETERS
+
+None
+
+=head2 AUTHOR
+
+Michael Stovenour
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+package Insteon::ALDB_PLM;
+
+=head1 B<Insteon::ALDB_PLM>
+
+=head2 SYNOPSIS
+
+Unique class for storing a cahced copy of a the PLM's link database.
+
+=head2 DESCRIPTION
+
+Generally this object should be interacted with through the insteon objects and 
+not by directly calling any of the following methods.
+
+=head2 INHERITS
+
+L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+use strict;
+
+@Insteon::ALDB_PLM::ISA = ('Insteon::AllLinkDatabase');
+
+=item C<new()>
+
+Instantiate a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$device) = @_;
+
+	my $self = new Insteon::AllLinkDatabase($device);
+	bless $self,$class;
+	return $self;
+}
+
+=item C<restore_string()>
+
+This is called by mh on exit to save the cached ALDB of a device to persistant data.
+
+=cut
+
+sub restore_string
+{
+	my ($self) = @_;
+        my $restore_string = '';
+	if ($$self{aldb})
+        {
+		my $link = '';
+		foreach my $link_key (keys %{$$self{aldb}})
+                {
+			$link .= '|' if $link; # separate sections
+			my %link_record = %{$$self{aldb}{$link_key}};
+			my $record = '';
+			foreach my $record_key (keys %link_record)
+                        {
+				next unless $link_record{$record_key};
+				$record .= ',' if $record;
+				$record .= $record_key . '=' . $link_record{$record_key};
+			}
+			$link .= $record;
+		}
+		$restore_string .= $$self{device}->get_object_name . "->_aldb->restore_linktable(q~$link~) if " . $$self{device}->get_object_name . "->_aldb;\n";
+	}
+	if (defined $self->scandatetime)
+        {
+		$restore_string .= $$self{device}->get_object_name . "->_aldb->scandatetime(q~" . $self->scandatetime . "~) if "
+                        	. $$self{device}->get_object_name . "->_aldb;\n";
+        }
+	$restore_string .= $$self{device}->get_object_name . "->_aldb->health(q~" . $self->health . "~) if "
+                        	. $$self{device}->get_object_name . "->_aldb;\n";
+	return $restore_string;
+}
+
+=item C<restore_linktable()>
+
+Used to reload MisterHouse's cached version of a device's ALDB on restart.
+
+=cut
+
+sub restore_linktable
+{
+	my ($self, $links) = @_;
+	if ($links)
+	{
+		foreach my $link_section (split(/\|/,$links))
+		{
+			my %link_record = ();
+			my $deviceid = '';
+			my $groupid = '01';
+			my $is_controller = 0;
+			my $subaddress = '';
+			foreach my $link_record (split(/,/,$link_section))
+			{
+				my ($key,$value) = split(/=/,$link_record);
+				$deviceid = $value if ($key eq 'deviceid');
+				$groupid = $value if ($key eq 'group');
+				$is_controller = $value if ($key eq 'is_controller');
+				$subaddress = $value if ($key eq 'data3');
+				$link_record{$key} = $value if $key and defined($value);
+			}
+			my $linkkey = $self->get_linkkey($deviceid, $groupid, $is_controller, $subaddress);
+			%{$$self{aldb}{lc $linkkey}} = %link_record;
+		}
+	}
+}
+
+=item C<log_alllink_table()>
+
+Prints a human readable form of MisterHouse's cached version of a device's ALDB
+to the print log.  Called as part of the "scan links" voice command
+or in response to the "log links" voice command.
+
+=cut
+
+sub log_alllink_table
+{
+	my ($self) = @_;
+        &::print_log("[Insteon::ALDB_PLM] Link table health: " . $self->health);
+	foreach my $linkkey (sort(keys(%{$$self{aldb}}))) {
+		my $is_controller = $$self{aldb}{$linkkey}{is_controller};
+		my $group = $$self{aldb}{$linkkey}{group};
+		$group = '01' if $group eq '00';
+		my $deviceid = $$self{aldb}{$linkkey}{deviceid};
+		my $linked_subgroup = '01';
+		my $controller_device;
+		my $controller_name;
+		if (!$is_controller){
+			$linked_subgroup = $group;
+		}
+		elsif ($group ne '00' && $group ne '01') {
+			$controller_device = Insteon::get_object('000000',$group);
+			$controller_name = $controller_device->get_object_name . " ($group)";
+		}
+		else {
+			$controller_name = $group;
+		}
+		my $linked_object = Insteon::get_object($deviceid,$linked_subgroup);
+		my $linked_name = '';
+		if ($linked_object) {
+			$linked_name = $linked_object->get_object_name;
+		}
+		else {
+			$linked_name = uc substr($deviceid,0,2) . '.' .
+				       uc substr($deviceid,2,2) . '.' .
+				       uc substr($deviceid,4,2);
+		}
+		&::print_log("[Insteon::ALDB_PLM] " .
+			(($is_controller) ? "cntlr($controller_name) record to "
+			. $linked_name
+			: "responder record to " . $linked_name . "($$self{aldb}{$linkkey}{group})")
+			. " (d1=$$self{aldb}{$linkkey}{data1}, d2=$$self{aldb}{$linkkey}{data2}, "
+			. "d3=$$self{aldb}{$linkkey}{data3})");
+	}
+}
+
+=item C<parse_alllink()>
+
+Parses the alllink message sent from the PLM.
+
+=cut
+
+sub parse_alllink
+{
+	my ($self, $data) = @_;
+	if (substr($data,0,6))
+        {
+		my %link = ();
+		my $flag = substr($data,0,1);
+		$link{is_controller} = (hex($flag) & 0x04) ? 1 : 0;
+		$link{flags} = substr($data,0,2);
+		$link{group} = lc substr($data,2,2);
+		$link{deviceid} = lc substr($data,4,6);
+		$link{data1} = substr($data,10,2);
+		$link{data2} = substr($data,12,2);
+		$link{data3} = substr($data,14,2);
+		my $key = $self->get_linkkey($link{deviceid}, $link{group}, 
+					$link{is_controller}, $link{data3});
+		%{$$self{aldb}{lc $key}} = %link;
+	}
+}
+
+=item C<get_first_alllink()>
+
+Sends the request for the first alllink entry on the PLM.
+
+=cut
+
+sub get_first_alllink
+{
+	my ($self) = @_;
+        $self->health('out-of-sync'); # set as corrupt and allow acknowledge to set otherwise
+	$$self{device}->queue_message(new Insteon::InsteonMessage('all_link_first_rec', $$self{device}));
+}
+
+=item C<get_next_alllink()>
+
+Sends the request for the next alllink entry on the PLM.
+
+=cut
+
+sub get_next_alllink
+{
+	my ($self) = @_;
+	$$self{device}->queue_message(new Insteon::InsteonMessage('all_link_next_rec', $$self{device}));
+}
+
+=item C<delete_orphan_links()>
+
+Reviews the cached version of all of the ALDBs and based on this review removes
+links from this device which are not present in the mht file, not defined in the 
+code, or links which are only half-links..
+
+=cut
+
+sub delete_orphan_links
+{
+	my ($self, $audit_mode) = @_;
+
+        &::print_log("[Insteon::ALDB_PLM] #### NOW BEGINNING DELETE ORPHAN LINKS ####");
+
+	$self->SUPER::delete_orphan_links($audit_mode);
+
+	# iterate over all registered objects and compare whether the link tables match defined scene linkages in known Insteon_Links
+	for my $obj (&Insteon::find_members('Insteon::BaseDevice'))
+	{
+		#Match on real objects only
+		if (($obj->is_root))
+		{
+			my %delete_req = ('root_object' => $obj, 'audit_mode' => $audit_mode);
+			push @{$$self{delete_queue}}, \%delete_req;
+		}
+	}
+
+	$self->_process_delete_queue();
+}
+
+sub _process_delete_queue {
+	my ($self, $p_num_deleted) = @_;
+	$$self{delete_queue_processed} += $p_num_deleted if $p_num_deleted;
+	my $num_in_queue = @{$$self{delete_queue}};
+	if ($num_in_queue)
+        {
+		my $delete_req_ptr = shift(@{$$self{delete_queue}});
+		my %delete_req = %$delete_req_ptr;
+		my $failure_callback = $$self{device}->get_object_name . 
+					"->_aldb->_process_delete_queue_failure";
+		# distinguish between deleting PLM links and processing delete orphans for a root item
+		if ($delete_req{'root_object'})
+                {
+			$$self{current_delete_device} = $delete_req{'root_object'}->get_object_name;
+			$delete_req{'root_object'}->delete_orphan_links(($delete_req{'audit_mode'}) ? 1 : 0, $failure_callback);
+		}
+                else
+                {
+			$$self{current_delete_device} = $$self{device}->get_object_name;
+			&::print_log("[Insteon::ALDB_PLM] now deleting orphaned link w/ details: "
+				. (($delete_req{is_controller}) ? "controller($delete_req{data3})" : "responder")
+				. ", " . (($delete_req{object}) ? "object=" . $delete_req{object}->get_object_name
+				: "deviceid=$delete_req{deviceid}") . ", group=$delete_req{group}")
+				if $self->{device}->debuglevel(1, 'insteon');
+				$delete_req{failure_callback} = $failure_callback;
+			$self->delete_link(%delete_req);
+			$$self{delete_queue_processed}++;
+		}
+	}
+	else {
+		::print_log("[Insteon::ALDB_PLM] Delete All Links has Completed.");
+		my $_delete_failure_cnt = scalar $$self{_delete_device_failures};
+		if ($_delete_failure_cnt) {
+			my $obj_list;
+			for my $failed_obj (@{$$self{_delete_device_failures}}){
+				$obj_list .= $failed_obj .", ";
+			}
+			::print_log("[Insteon::ALDB_PLM] However, some failures were ".
+				"noted with the following devices: $obj_list");
+		}
+		::print_log("[Insteon::ALDB_PLM] A total of $$self{delete_queue_processed} orphaned link records were deleted.");
+		::print_log("[Insteon::ALDB_PLM] #### END DELETE ORPHAN LINKS ####");
+	}
+}
+
+sub _process_delete_queue_failure {
+	my ($self) = @_;
+	push @{$$self{_delete_device_failures}}, $$self{current_delete_device};
+	::print_log("[Insteon::ALDB_PLM] WARN: failure occurred when deleting orphan links from: "
+			. $$self{current_delete_device} . ".  Moving on...");
+	$self->_process_delete_queue;
+
+}
+
+=item C<delete_link([link details])>
+
+Deletes a specific link from a device.  Generally called by C<delete_orphan_links()>.
+
+=cut
+
+sub delete_link
+{
+	# linkkey is concat of: deviceid, group, is_controller
+	my ($self, $parms_text) = @_;
+	my %link_parms;
+	if (@_ > 2)
+        {
+		shift @_;
+		%link_parms = @_;
+	}
+        else
+        {
+		%link_parms = &main::parse_func_parms($parms_text);
+	}
+	my $num_deleted = 0;
+	my $insteon_object = $link_parms{object};
+	my $deviceid = ($insteon_object) ? $insteon_object->device_id : $link_parms{deviceid};
+	my $group = $link_parms{group};
+	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
+	my $subaddress = (defined $link_parms{data3}) ? $link_parms{data3} : '00';
+	my $linkkey = $self->get_linkkey($deviceid, $group, $is_controller, $subaddress);
+	if (defined $$self{aldb}{$linkkey})
+        {
+		my $cmd = '80'
+			. $$self{aldb}{$linkkey}{flags}
+			. $$self{aldb}{$linkkey}{group}
+			. $$self{aldb}{$linkkey}{deviceid}
+			. $$self{aldb}{$linkkey}{data1}
+			. $$self{aldb}{$linkkey}{data2}
+			. $$self{aldb}{$linkkey}{data3};
+		delete $$self{aldb}{$linkkey};
+		$num_deleted = 1;
+                my $message = new Insteon::InsteonMessage('all_link_manage_rec', $$self{device});
+		$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
+		$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
+                $message->interface_data($cmd);
+		$$self{device}->queue_message($message);
+	}
+        else
+        {
+		&::print_log("[Insteon::ALDB_PLM] no entry in linktable could be found for: ".
+		"deviceid=$deviceid, group=$group, is_controller=$is_controller, subaddress=$subaddress");
+		if ($link_parms{callback})
+                {
+			package main;
+			eval ($link_parms{callback});
+			&::print_log("[Insteon_PLM] error in add link callback: " . $@)
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
+			package Insteon_PLM;
+		}
+	}
+	return $num_deleted;
+}
+
+=item C<add_link(link_params)>
+
+Adds the link to the device's ALDB.  Generally called from the "sync links" or 
+"link to interface" voice commands.
+
+=cut
+
+sub add_link
+{
+	my ($self, $parms_text) = @_;
+	my %link_parms;
+	if (@_ > 2)
+        {
+		shift @_;
+		%link_parms = @_;
+	}
+        else
+        {
+		%link_parms = &main::parse_func_parms($parms_text);
+	}
+	my $device_id;
+	my $group =  ($link_parms{group}) ? $link_parms{group} : '01';
+	my $insteon_object = $link_parms{object};
+	if (!(defined($insteon_object)))
+        {
+		$device_id = lc $link_parms{deviceid};
+		$insteon_object = &Insteon::get_object($device_id, $group);
+	}
+        else
+        {
+		$device_id = lc $insteon_object->device_id;
+	}
+	my $is_controller = ($link_parms{is_controller}) ? 1 : 0;
+	my $subaddress = (defined $link_parms{data3}) ? $link_parms{data3} : '00';
+	my $linkkey = $self->get_linkkey($device_id, $group, $is_controller, $subaddress);
+	if (defined $$self{aldb}{$linkkey})
+        {
+		&::print_log("[Insteon::ALDB_PLM] WARN: attempt to add link to PLM that already exists! "
+			. "deviceid=$device_id, group=$group, is_controller=$is_controller, subaddress=$subaddress");
+		if ($link_parms{callback})
+                {
+			package main;
+			eval ($link_parms{callback});
+			&::print_log("[Insteon::ALDB_PLM] error in add link callback: " . $@)
+				if $@ and $self->{device}->debuglevel(1, 'insteon');
+			package Insteon_PLM;
+		}
+	}
+        else
+        {
+		# The modem developers guide appears to be wrong regarding control
+		# codes.  40 and 41 will respond with a NACK if a record for that
+		# group/device/is_controller combination already exist.  It appears 
+		# that code 20 can be used to edit existing but not create new records.
+		# However, since data1-3 are consistent for all PLM links we never
+		# really need to update a PLM link.  NB prior MH code did not set
+		# data3 on control records to the group, however this does not 
+		# appear to have any adverse effects, and the current MH code will
+		# not flag these entries as being incorrect or requiring an update
+		my $control_code = ($is_controller) ? '40' : '41';
+		# flags should be 'a2' for responder and 'e2' for controller
+		my $flags = ($is_controller) ? 'E2' : 'A2';
+		my $data1 = (defined $link_parms{data1}) ? $link_parms{data1} : (($is_controller) ? '01' : '00');
+		my $data2 = (defined $link_parms{data2}) ? $link_parms{data2} : '00';
+		my $data3 = (defined $link_parms{data3}) ? $link_parms{data3} : '00';
+		# from looking at manually linked records, data1 and data2 are both 00 for responder records
+		# and, data1 is 01 and usually data2 is 00 for controller records
+
+		my $cmd = $control_code
+			. $flags
+			. $group
+			. $device_id
+			. $data1
+			. $data2
+			. $data3;
+		$$self{aldb}{$linkkey}{flags} = lc $flags;
+		$$self{aldb}{$linkkey}{group} = lc $group;
+		$$self{aldb}{$linkkey}{is_controller} = $is_controller;
+		$$self{aldb}{$linkkey}{deviceid} = lc $device_id;
+		$$self{aldb}{$linkkey}{data1} = lc $data1;
+		$$self{aldb}{$linkkey}{data2} = lc $data2;
+		$$self{aldb}{$linkkey}{data3} = lc $data3;
+		$$self{aldb}{$linkkey}{inuse} = 1;
+		$self->health('good') if($self->health() eq 'empty');
+                my $message =  new Insteon::InsteonMessage('all_link_manage_rec', $$self{device});
+                $message->interface_data($cmd);
+		$$self{_success_callback} = ($link_parms{callback}) ? $link_parms{callback} : undef;
+		$$self{_failure_callback} = ($link_parms{failure_callback}) ? $link_parms{failure_callback} : undef;
+                $message->interface_data($cmd);
+		$$self{device}->queue_message($message);
+	}
+}
+
+=item C<has_link(link_details)>
+
+Checks and returns true if a link with the passed details exists on the device
+or false if it does not.  Generally called as part of C<delete_orphan_links()>.
+
+=cut
+
+sub has_link
+{
+	my ($self, $insteon_object, $group, $is_controller, $data3) = @_;
+	my $key = $self->get_linkkey($insteon_object->device_id, 
+				$group, $is_controller, $data3);
+	return (defined $$self{aldb}{$key});
+}
+
+=back
+
+=head2 INI PARAMETERS
+
+None
+
+=head2 AUTHOR
+
+Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+
+1;
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index efe8ab1a7..d115da551 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -1,3669 +1,3669 @@
-=head1 B<Insteon::BaseObject>
-
-=head2 SYNOPSIS
-
-Usage
-
-In user code:
-
-    $ip_patio_light = new Insteon_Device($myPLM,"33.44.55");
-    $ip_patio_light->set("ON");
-
-=head2 DESCRIPTION
-
-Generic class implementation of an Insteon Device.
-
-=head2 INHERITS
-
-L<Generic_Item|Generic_Item>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::BaseObject;
-
-use strict;
-use Insteon::AllLinkDatabase;
-
-@Insteon::BaseObject::ISA = ('Generic_Item');
-
-our %message_types = (
-						on => 0x11,
-						off => 0x13
-);
-
-our %nack_messages = (
-   fb => 'illegal_value_in_cmd',
-   fc => 'pre_nak_long_db_search',
-   fd => 'bad_checksum_or_unknown_cmd',
-   fe => 'load_sense_detects_no_load',
-   ff => 'sender_id_not_in_responder_aldb',
-);
-
-=item C<derive_link_state([state])>
-
-Takes the various states available to insteon devices and returns a derived 
-state of either ON or OFF.
-
-=cut
-
-sub derive_link_state
-{
-	my ($self, $p_state) = @_;
-	$p_state = $self if !(ref $self); #Old code made direct calls
-	#Convert Relative State to Absolute State
-	if ($p_state =~ /^([+-])(\d+)/) {
-		my $rel_state = $1 . $2;
-		my $curr_state = '100';
-		$curr_state = '0' if ($self->state eq 'off');
-		$curr_state = $1 if $self->state =~ /(\d{1,3})/;
-		$p_state = $curr_state + $rel_state;
-		$p_state = 'on' if ($p_state > 0);
-		$p_state = 'off' if ($p_state <= 0);
-	}
-	
-	my $link_state = 'on';
-	if ($p_state eq 'off' or $p_state eq 'off_fast')
-	{
-		$link_state = 'off';
-	}
-	elsif ($p_state =~ /\d+%?/)
-	{
-		my ($dim_state) = $p_state =~ /(\d+)%?/;
-		$link_state = 'off' if $dim_state == 0;
-	}
-
-	return $link_state;
-}
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-	my $self={};
-	bless $self,$class;
-
-        $$self{message_types} = \%message_types;
-
-	if (defined $p_deviceid) {
-		my ($deviceid, $group) = $p_deviceid =~ /(\w\w\.\w\w\.\w\w):?(.+)?/;
-		# if a group is passed in, then assume it can be a controller
-		$$self{is_controller} = ($group) ? 1 : 0;
-		$self->device_id($deviceid);
-		$group = '01' unless $group;
-		$group = '0' . $group if length($group) == 1;
-		$self->group(uc $group);
-	}
-
-        if ($p_interface) {
-        	$self->interface($p_interface);
-        } else {
-        	$self->interface(&Insteon::active_interface());
-        }
-
-	$self->restore_data('default_hop_count', 'engine_version');
-
-	$self->initialize();
-	$$self{max_hops} = 3;
-	$$self{min_hops} = 0;
-	$$self{level} = undef;
-	$$self{flag} = "0F";
-	$$self{ackMode} = "1";
-	$$self{awaiting_ack} = 0;
-	$$self{is_acknowledged} = 0;
-	$$self{max_queue_time} = $::config_parms{'Insteon_PLM_max_queue_time'};
-	$$self{max_queue_time} = 10 unless $$self{max_queue_time}; # 10 seconds is max time allowed in command stack
-	@{$$self{command_stack}} = ();
-	$$self{_onlevel} = undef;
-	$$self{is_responder} = 1;
-        $$self{default_hop_count} = 0;
-	$$self{timeout_factor} = 1.0;
-	$$self{is_deaf} = 0;
-
-	&Insteon::add($self);
-	return $self;
-}
-
-=item C<initialize()>
-
-A former holdover from when MisterHouse used to ping devices to get their device
-category.  May not be needed anymore.
-
-=cut
-
-sub initialize
-{
-	my ($self) = @_;
-	$$self{m_write} = 1;
-	$$self{m_is_locally_set} = 0;
-	# persist local, simple attribs
-}
-
-=item C<interface([interface])>
-
-Used to store and return the associated interface of a device.
-
-If provided, stores interface as the device's interface.
-
-=cut
-
-sub interface
-{
-	my ($self,$p_interface) = @_;
-        if (defined $p_interface) {
-		$$self{interface} = $p_interface;
-        }
-        elsif (!($$self{interface}))
-        {
-        	$$self{interface} = &Insteon::active_interface;
-        }
-	return $$self{interface};
-}
-
-=item C<device_id([id])>
-
-Used to store and return the associated device_id of a device.
-
-If provided, stores id as the device's id.
-
-Returns device id without any delimiters.
-
-=cut
-
-sub device_id
-{
-	my ($self,$p_device_id) = @_;
-
-	if (defined $p_device_id)
-	{
-		$p_device_id =~ /(\w\w)\W?(\w\w)\W?(\w\w)/;
-		$$self{device_id}=$1 . $2 . $3;
-	}
-	return $$self{device_id};
-}
-
-=item C<group([group])>
-
-Used to store and return the associated group of a device.
-
-If provided, stores group as the device group.
-
-=cut
-
-sub group
-{
-	my ($self, $p_group) = @_;
-	$$self{m_group} = $p_group if $p_group;
-	return $$self{m_group};
-}
-
-=item C<timeout_factor($float)>
-
-Changes the amount of time MH will wait to receive a response from a device before
-resending the message.  The value set will be multiplied by the predefined value
-in MH.  $float can be set to any positive decimal number.  For example using 1.0
-will not change the preset values; 1.1 will increase the time MH waits by 10%; and
-0.9 will force MH to wait for only 90% of the predefined time.
-
-This value is NOT saved on reboot, as such likely should be called in a $Reload loop.
-
-=cut
-
-sub timeout_factor {
-	my ($self, $factor) = @_;
-	$$self{timeout_factor} = $factor if $factor;
-	return $$self{timeout_factor};
-}
-
-=item C<max_hops($int)>
-
-Sets the maximum number of hops that may be used in a message sent to the device.
-The default and maximum number is 3.  $int is an integer between 0-3.
-
-This value is NOT saved on reboot, as such likely should be called in a $Reload loop.
-
-=cut
-
-sub max_hops {
-	my ($self, $hops) = @_;
-	$$self{max_hops} = $hops if $hops;
-	return $$self{max_hops};
-}
-
-=item C<min_hops($int)>
-
-Sets the minimum number of hops that may be used in a message sent to the device.
-The default and minimum number is 0.  $int is an integer between 0-3.
-
-This value is NOT saved on reboot, as such likely should be called in a $Reload loop.
-
-=cut
-
-sub min_hops {
-	my ($self, $hops) = @_;
-	$$self{min_hops} = $hops if $hops;
-	return $$self{min_hops};
-}
-
-=item C<default_hop_count([hops])>
-
-Used to track the number of hops needed to reach a device.  Will store the past
-20 hop counts for the device.  Hop counts are added based on the number of hops
-needed for an incomming message to arrive.  Additionally, any time a message is
-resent, a hop count equal to the prior default_hop_count + 1 is added.
-
-If provided, stores hop as a new hop count for the device.  If more than 20 hop
-counts have been stored, will drop the oldest hop count until only 20 exist.
-
-Returns the highest hop count of the past 20 hop counts
-
-=cut
-
-sub default_hop_count
-{
-	my ($self, $hop_count) = @_;
-	if (defined($hop_count)){
-		::print_log("[Insteon::BaseObject] DEBUG3: Adding hop count of " . $hop_count . " to hop_array of "
-			. $self->get_object_name) if $self->debuglevel(3, 'insteon');
-		if (!defined(@{$$self{hop_array}})) {
-			unshift(@{$$self{hop_array}}, $$self{default_hop_count});
-			$$self{hop_sum} = $$self{default_hop_count};
-		}
-		#Calculate a simple moving average
-		unshift(@{$$self{hop_array}}, $hop_count); 
-		$$self{hop_sum} += ${$$self{hop_array}}[0];
-		$$self{hop_sum} -= pop(@{$$self{hop_array}}) if (scalar(@{$$self{hop_array}}) >10);
-		$$self{default_hop_count} = int(($$self{hop_sum} / scalar(@{$$self{hop_array}})) + 0.5);
-
-		::print_log("[Insteon::BaseObject] DEBUG4: ".$self->get_object_name
-			."->default_hop_count()=".$$self{default_hop_count}
-			." :: hop_array[]=". join("",@{$$self{hop_array}})) 
-			if $self->debuglevel(4, 'insteon');
-	}
-
-	#Allow for per-device settings
-	$$self{default_hop_count} = $$self{max_hops} if ($$self{max_hops} &&
-		$$self{default_hop_count} > $$self{max_hops});
-	$$self{default_hop_count} = $$self{min_hops} if ($$self{min_hops} &&
-		$$self{default_hop_count} < $$self{min_hops});	
-	
-        return $$self{default_hop_count};
-}
-
-=item C<engine_version([i1|i2|i2cs])>
-
-Used to store and return the associated engine version of a device.
-
-If provided, stores the engine version of the device.
-
-=cut
-
-sub engine_version
-{
-        my ($self, $p_engine_version) = @_;
-        $$self{engine_version} = $p_engine_version if $p_engine_version;
-        return $$self{engine_version};
-}
-
-=item C<equals([object])>
-
-Returns 1 if object is the same as $self, otherwise returns 0.
-
-=cut
-
-sub equals
-{
-	my ($self, $compare_object) = @_;
-        # make sure that the compare_object is legitimate
-        return 0 unless $compare_object && ref $compare_object && $compare_object->isa('Insteon::BaseObject');
-        return 1 if $compare_object eq $self;
-        # self and compare_object need to have device_ids and groups to be equal
-        return 0 unless $self->device_id && $self->group && $compare_object->device_id && $compare_object->group;
-        return 1 if (($compare_object->device_id eq $self->device_id)
-        	&& ($compare_object->group eq $self->group));
-	# default to false;
-        return 0;
-}
-
-=item C<set(state[,setby,response])>
-
-Used to set the device state.  If called by device or a device linked to device, 
-calls C<set_receive()>.  If called by something 
-else, will send the command to the device.
-
-=cut
-
-sub set
-{
-	my ($self,$p_state,$p_setby,$p_response) = @_;
-	return if &main::check_for_tied_filters($self, $p_state);
-
-	# Override any set_with_timer requests
-	if ($$self{set_timer}) {
-		&Timer::unset($$self{set_timer});
-		delete $$self{set_timer};
-	}
-
-	if ($self->_is_valid_state($p_state)) {
-		# always reset the is_locally_set property unless set_by is the device
-		$$self{m_is_locally_set} = 0 unless ref $p_setby and $p_setby eq $self;
-
-		if ($p_state eq 'toggle')
-		{
-			$p_state = ($self->state eq 'on')? 'off' : 'on';
-		}
-
-		my $setby_name = $p_setby;
-		$setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
-		if (ref $p_setby and $p_setby eq $self)
-		{ #If set by device, update MH state,
-			my $derived_state = $self->derive_link_state($p_state);
-			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
-				. "::set_receive($derived_state, $setby_name)") if $self->debuglevel(1, 'insteon');
-			$self->set_receive($derived_state,$p_setby,$p_response);
-			$self->set_linked_devices($p_state);
-		} 
-		elsif (ref $p_setby and $p_setby eq $self->interface) 
-		{ #If set by interface, this was a manual status_request response
-			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
-				. "::set_receive($p_state, $setby_name)") if $self->debuglevel(1, 'insteon');
-			$self->set_receive($p_state,$p_setby,$p_response);
-		}
-		else { # Not called by device, send set command
-			if ($self->is_responder){
-				my $message = $self->derive_message($p_state);
-				$self->_send_cmd($message);
-				&::print_log("[Insteon::BaseObject] " . $self->get_object_name() . "::set($p_state, $setby_name)")
-					if $self->debuglevel(1, 'insteon');
-				$self->is_acknowledged(0);
-				$$self{pending_state} = $p_state;
-				$$self{pending_setby} = $p_setby;
-				$$self{pending_response} = $p_response;
-			} 
-			else {
-				::print_log("[Insteon::BaseObject] " . $self->get_object_name()
-					. " is not a responder and cannot be set to a state.");	
-			}
-		}
-		$self->level($p_state) if $self->can('level'); # update the level value
-	} else {
-		&::print_log("[Insteon::BaseObject] failed state validation with state=$p_state");
-	}
-}
-
-=item C<is_acknowledged([ack])>
-
-If ack is true, calls C<set_receive()>.  If ack is false, clears awaiting_ack flag.
-
-=cut
-
-sub is_acknowledged
-{
-	my ($self, $p_ack) = @_;
-        if (defined $p_ack)
-        {
-       		if ($p_ack)
-                {
-			$self->set_receive($$self{pending_state},$$self{pending_setby}, $$self{pending_response}) if defined $$self{pending_state};
-		}
-                else
-                {
-                	# if we are not acknowledged, then clear the awaiting acknowledgement flag
-                        #   we won't do the converse as it is set in _process_command_stack
-                	$$self{awaiting_ack} = 0;
-                }
-		$$self{is_acknowledged} = $p_ack;
-		$$self{pending_state} = undef;
-		$$self{pending_setby} = undef;
-		$$self{pending_response} = undef;
-        }
-	return $$self{is_acknowledged};
-}
-
-=item C<set_receive(state[,setby,response])>
-
-Updates the device state in MisterHouse.  Triggers state_now, state_changed, and
-state_final variables to update accordingly.  Which causes tie_events to occur.
-
-If state was set to the same state within the last 1 second, then this is ignored.
-This prevents the accidental calling of state_now if duplicate messages are received.
-
-=cut
-
-sub set_receive
-{
-	my ($self, $p_state, $p_setby, $p_response) = @_;
-	my $curr_milli = sprintf('%.0f', &main::get_tickcount);
-	my $window = 1000;
-	$p_state = $self->derive_link_state($p_state);
-	if (($p_state eq $self->state || $p_state eq $self->state_final)
-		&& ($curr_milli - $$self{set_milliseconds} < $window)){
-		::print_log("[Insteon::BaseObject] Ignoring duplicate set " . $p_state .
-			" state command for " . $self->get_object_name . " received in " .
-			"less than $window milliseconds") if $self->debuglevel(1, 'insteon'); 
-	} else {
-		$$self{set_milliseconds} = $curr_milli;
-		$self->level($p_state) if $self->can('level'); # update the level value
-		$self->SUPER::set($p_state, $p_setby, $p_response);
-	}
-}
-
-=item C<set_with_timer(state, time, return_state, additional_return_states)>
-
-NOTE - This routine appears to be nearly identical, if not identical to the
-C<Generic_Item::set_with_timer()> routine, it is not clear why this routine is
-needed here.
-
-See full description of this routine in C<Generic_Item>
-
-=cut
-
-sub set_with_timer {
-	my ($self, $state, $time, $return_state, $additional_return_states) = @_;
-	return if &main::check_for_tied_filters($self, $state);
-
-	$self->set($state) unless $state eq '';
-
-	return unless $time;
-
-	my $state_change = ($state eq 'off') ? 'on' : 'off';
-	$state_change = $return_state if defined $return_state;
-	$state_change = $self->{state} if $return_state and lc $return_state eq 'previous';
-
-	$state_change .= ';' . $additional_return_states if $additional_return_states;
-
-	$$self{set_timer} = &Timer::new() unless $$self{set_timer};
-	my $object_name = $self->{object_name};
-	my $action = "$object_name->set('$state_change')";
-	$$self{set_timer}->set($time, $action);
-}
-
-sub _send_cmd
-{
-	my ($self, $message) = @_;
-#	$msg{type} = 'standard' unless $msg{type};
-
-#        my $message = $self->derive_message($msg{command},$msg{type},$msg{extra});
-
-        if ($message->command eq 'peek'
-              	or $message->command eq 'poke'
-               	or $message->command eq 'status_request'
-                or $message->command eq 'do_read_ee'
-                or $message->command eq 'set_address_msb'
-                or $message->command eq 'read_write_aldb'
-            )
-	{
-        	push(@{$$self{command_stack}}, $message);
-	}
-        else
-        {
-		unshift(@{$$self{command_stack}},$message);
-	}
-	$self->_process_command_stack();
-}
-
-=item C<derive_message([command,extra])>
-
-Generates and returns a basic on/off message from a command.
-
-=cut
-
-sub derive_message
-{
-	my ($self, $p_command, $p_extra) = @_;
-	my @args;
-	my $level;
-
-	#msg id
-	my ($command, $subcommand) = split(/:/, $p_command, 2);
-	$command=lc($command);
-#	&::print_log("XLATE:$msg:$substate:$p_state:");
-
-        my $message;
-
-        if ($self->isa("Insteon::BaseController"))
-        {
-	# only send out as all-link if the link originates from the plm
-		if ($self->isa("Insteon::InterfaceController"))
-                { # return the size of the command stack
-                        $message = new Insteon::InsteonMessage('all_link_send', $self);
-		}
-                elsif ($self->is_root)
-                { # return the size of the command stack
-			$message = new Insteon::InsteonMessage('insteon_send', $self);
-		} else {
-			# silently ignore as this is now permitted if via "surrogate"
-		}
-	} elsif ($self->isa("Insteon::BaseObject")) {
-		$message = new Insteon::InsteonMessage('insteon_send', $self);
-        }
-
-	if (!(defined $p_extra)) {
-		if ($command eq 'on')
-		{
-			if ($self->can('local_onlevel') && defined $self->local_onlevel) {
-				$level = 2.55 * $self->local_onlevel;
-				$command = 'on_fast';
-			} else {
-				$level=255;
-			}
-		} elsif ($command eq 'off')
-		{
-			$level = 0;
-		} elsif ($command=~/^([1]?[0-9]?[0-9])/)
-		{
-			if ($1 < 1) {
-				$command='off';
-				$level = 0;
-			} else {
-				$level = ($self->isa('Insteon::DimmableLight')) ? $1 * 2.55 : 255;
-				$command='on';
-			}
-		}
-	}
-
-	# confirm that the resulting $msg is legitimate
-	if (!(defined($self->message_type_code($command)))) {
-		&::print_log("[Insteon::BaseInsteon] invalid state=$command") if $self->debuglevel(1, 'insteon');
-		return undef;
-	}
-
-	if ($self->isa("Insteon::InterfaceController")) 
-	{
-		$message->extra('00') #All PLM Scenes are Cmd2=00;
-	} elsif ($p_extra)
-	{       $message->extra($p_extra);
-
-	} elsif ($subcommand) {
-		$message->extra($subcommand);
-	} else {
-		if ($command eq 'on')
-		{
-			$message->extra(sprintf("%02X",int($level+.5)));
-		} else {
-			$message->extra('00');
-		}
-	}
-
-        $message->command($command);
-	return $message;
-}
-
-=item C<message_type_code(msg)>
-
-Takes msg, a text based msg type, and returns the corresponding text version of
-the hexadecimal message type.
-
-=cut
-
-sub message_type_code
-{
-    my ($self, $msg) = @_;
-    return $$self{message_types}->{$msg};
-}
-
-=item C<message_type_hex(msg)>
-
-Takes msg, a text based msg type, and returns the corresponding message type as
-a hex.
-
-=cut
-
-sub message_type_hex
-{
-    my ($self, $msg) = @_;
-    return unpack( 'H*', pack( 'c', $self->message_type_code($msg)));
-}
-
-=item C<message_type(cmd)>
-
-Takes cmd, text based hexadecimal code, and returns the text based description
-of the message code.
-
-=cut
-
-sub message_type
-{
-    my ($self, $cmd1) = @_;
-    my $msg_type;
-    my $msg_type_ptr = $$self{message_types};
-    my %msg_types = %$msg_type_ptr;
-    for my $key (keys %msg_types){
-    	if (pack("C",$msg_types{$key}) eq pack("H*",$cmd1))
-    	{
-#    		&::print_log("[Insteon::BaseObject] found: $key");
-		$msg_type=$key;
-		last;
-	}
-    }
-    return $msg_type;
-}
-
-sub _is_info_request
-{
-	my ($self, $cmd, $ack_setby, %msg) = @_;
-	my $is_info_request = 0;
-	if ($cmd eq 'status_request') {
-		$is_info_request++;
-		my $ack_on_level = sprintf("%d", int((hex($msg{extra}) * 100 / 255)+.5));
-		&::print_log("[Insteon::BaseObject] received status for " .
-			$self->{object_name} . " with on-level: $ack_on_level%, "
-			. "hops left: $msg{hopsleft}") if $self->debuglevel(1, 'insteon');
-		$self->level($ack_on_level) if $self->can('level'); # update the level value
-		if ($ack_on_level == 0) {
-			$self->set('off', $ack_setby);
-		} elsif ($ack_on_level > 0 and !($self->isa('Insteon::DimmableLight'))) {
-			$self->set('on', $ack_setby);
-		} else {
-			$self->set($ack_on_level . '%', $ack_setby);
-		}
-		# if this were a scene controller, then also propogate the result to all members
-		my $callback;
-		if ($self->_aldb->{aldb_delta_action} eq 'set'){
-			if ($msg{cmd_code} eq "00") {
-				$self->_aldb->{_mem_activity} = 'delete';
-				$self->_aldb->{pending_aldb}{address} = $self->_aldb->get_first_empty_address();
-				if($self->_aldb->isa('Insteon::ALDB_i1')) {
-					$self->_aldb->_peek($self->_aldb->{pending_aldb}{address},0);
-				} else {
-					$self->_aldb->_write_delete($self->_aldb->{pending_aldb}{address});
-				}
-			} else {
-				$self->_aldb->aldb_delta($msg{cmd_code});
-				$self->_aldb->scandatetime(&main::get_tickcount);
-				&::print_log("[Insteon::BaseObject] The Link Table Version for "
-					. $self->{object_name} . " has been updated to version number " . $self->_aldb->aldb_delta());
-				if (defined $self->_aldb->{_success_callback}) {
-					$callback = $self->_aldb->{_success_callback};
-					$self->_aldb->{_success_callback} = undef;
-				}
-			}
-		}
-		elsif ($self->_aldb->{aldb_delta_action} eq 'check')
-		{
-			if ($self->_aldb->aldb_delta() eq $msg{cmd_code}){
-				&::print_log("[Insteon::BaseObject] The link table for "
-					. $self->{object_name} . " is in sync.");
-				#Link Table Scan Successful, Record Current Time
-				$self->_aldb->scandatetime(&main::get_tickcount);
-				if (defined $self->_aldb->{_aldb_unchanged_callback}) {
-					$callback = $self->_aldb->{_aldb_unchanged_callback};
-					$self->_aldb->{_aldb_unchanged_callback} = undef;
-				}
-			} else {
-				&::print_log("[Insteon::BaseObject] WARN The link table for "
-					. $self->{object_name} . " is out-of-sync.");
-				$self->_aldb->health('out-of-sync');
-				if (defined $self->_aldb->{_aldb_changed_callback}) {
-					$callback = $self->_aldb->{_aldb_changed_callback};
-					$self->_aldb->{_aldb_changed_callback} = undef;
-				}
-			}
-		}
-		$self->_aldb->{aldb_delta_action} = undef;
-		$self->_aldb->health('out-of-sync') if($self->_aldb->aldb_delta() ne $msg{cmd_code});
-		if ($callback){
-			package main;
-			eval ($callback);
-			&::print_log("[Insteon::BaseObject] " . $self->get_object_name . ": error during scan callback $@")
-				if $@ and $self->debuglevel(1, 'insteon');
-			package Insteon::BaseObject;                		
-		}
-	}
-	elsif ( $cmd eq 'get_engine_version' ) {
-		$is_info_request++;
-		my @engine_types = (qw/I1 I2 I2CS/);
-		my $version = $engine_types[$msg{extra}];
-		$self->engine_version($version);
-		&::print_log("[Insteon::BaseObject] received engine version for " 
-			. $self->{object_name} . " of $version. "
-			. "hops left: $msg{hopsleft}") if $self->debuglevel(1, 'insteon');
-	}
-	return $is_info_request;
-}
-
-sub _process_message
-{
-	my ($self,$p_setby,%msg) = @_;
-	my $p_state = undef;
-
-	# the current approach assumes that links from other controllers to some responder
-	# would be seen by the plm by also direct linking the controller as a responder
-	# and not putting the plm into monitor mode.  This means that updating the state
-	# of the responder based upon the link controller's request is handled
-	# by Insteon_Link.
-
-	main::print_log("[Insteon::BaseObject] WARN: Message has invalid checksum")
-		if ($self->debuglevel(1, 'insteon') && !($msg{crc_valid}) 
-		&& $msg{is_extended} && $self->engine_version() eq 'I2CS');
-
-	my $clear_message = 0;
-	$$self{m_is_locally_set} = 1 if $msg{source} eq lc $self->device_id;
-	$self->default_hop_count($msg{maxhops}-$msg{hopsleft}) if (!$self->isa('Insteon::InterfaceController'));
-	if ($msg{is_ack}) {
-		#Default to clearing message transaction for ACK
-		$clear_message = 1;
-		my $corrupt_cmd = 0;
-		my $pending_cmd = ($$self{_prior_msg}) ? $$self{_prior_msg}->command : $msg{command};
-		if ($$self{awaiting_ack})
-                {
-			my $ack_setby = (ref $$self{m_status_request_pending})
-				? $$self{m_status_request_pending} : $p_setby;
-			if ($self->_is_info_request($pending_cmd,$ack_setby,%msg))
-                        {
-				$self->is_acknowledged(1);
-				$$self{m_status_request_pending} = 0;
-				$self->_process_command_stack(%msg);
-			}
-                        elsif ($pending_cmd eq 'peek')
-                        {
-                        	if ($msg{cmd_code} eq $self->message_type_hex($pending_cmd)) {
-					$self->_aldb->_on_peek(%msg) if $self->_aldb;
-					$self->_process_command_stack(%msg);
-                        	} else {
-                        		$corrupt_cmd = 1;
-                        		$clear_message = 0;
-                        	}
-			}
-                        elsif ($pending_cmd eq 'set_address_msb')
-                        {
-                        	if ($msg{cmd_code} eq $self->message_type_hex($pending_cmd)) {
-					$self->_aldb->_on_peek(%msg) if $self->_aldb;
-					$self->_process_command_stack(%msg);
-                        	} else {
-                        		$corrupt_cmd = 1;
-                        		$clear_message = 0;
-                        	}
-			}
-                        elsif (($pending_cmd eq 'poke'))
-                        {
-                        	if ($msg{cmd_code} eq $self->message_type_hex($pending_cmd)) {
-					$self->_aldb->_on_poke(%msg) if $self->_aldb;
-					$self->_process_command_stack(%msg);
-                        	} else {
-                        		$corrupt_cmd = 1;
-                        		$clear_message = 0;
-                        	}
-			}
-			elsif ($pending_cmd eq 'read_write_aldb') {
-                        	if ($msg{cmd_code} eq $self->message_type_hex($pending_cmd)) {
-					$clear_message = $self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
-					$self->_process_command_stack(%msg) if ($clear_message);
-                        	} else {
-                        		$corrupt_cmd = 1;
-                        		$clear_message = 0;
-                        	}
-			}
-			elsif ($pending_cmd eq 'ping'){
-				$corrupt_cmd = 1 if ($msg{cmd_code} ne $self->message_type_hex($pending_cmd));
-				$corrupt_cmd = 1 if ($msg{extra} ne sprintf ("%02d", $$self{ping_count}));
-				if (!$corrupt_cmd){
-					$self->_process_command_stack(%msg);
-					&::print_log("[Insteon::BaseObject] received ping acknowledgement from " . $self->{object_name})
-						if $self->debuglevel(1, 'insteon');
-					$self->ping();
-					$clear_message = 1;
-				}
-			}
-			elsif ($pending_cmd eq 'linking_mode'){
-				$corrupt_cmd = 1 if ($msg{cmd_code} ne $self->message_type_hex($pending_cmd));
-				if (!$corrupt_cmd){
-					&::print_log("[Insteon::BaseObject] received linking mode ACK from " . $self->{object_name})
-						if $self->debuglevel(1, 'insteon');
-					$self->interface->_set_timeout('xmit', 2000);
-					$clear_message = 0;
-				}
-			}
-			else
-                        {
-				if (($pending_cmd eq 'do_read_ee') && 
-					($self->_aldb->health eq "good" || $self->_aldb->health eq "empty") &&
-					($self->isa('Insteon::KeyPadLincRelay') || $self->isa('Insteon::KeyPadLinc'))){
-					## Update_Flags ends up here, set aldb_delta to new value
-					$self->_aldb->query_aldb_delta("set");
-				}
-				$self->is_acknowledged(1);
-				# signal receipt of message to the command stack in case commands are queued
-				$self->_process_command_stack(%msg);
-				&::print_log("[Insteon::BaseObject] received command/state (awaiting) acknowledge from " . $self->{object_name}
-					. ": $pending_cmd and data: $msg{extra}") if $self->debuglevel(1, 'insteon');
-			}
-		}
-                else
-                {
-			# allow non-synchronous messages to also use the _is_info_request hook
-			$self->_is_info_request($pending_cmd,$p_setby,%msg);
-			$self->is_acknowledged(1);
-			# signal receipt of message to the command stack in case commands are queued
-			$self->_process_command_stack(%msg);
-			&::print_log("[Insteon::BaseObject] received command/state acknowledge from " . $self->{object_name}
-				. ": " . (($msg{command}) ? $msg{command} : "(unknown)")
-				. " and data: $msg{extra}") if $self->debuglevel(1, 'insteon');
-		}
-		if ($corrupt_cmd) {
-			main::print_log("[Insteon::BaseObject] WARN: received a message from "
-				. $self->get_object_name . " in response to a "
-				. $pending_cmd . " command, but the command code "
-				. $msg{cmd_code} . " is incorrect. Ignorring received message.");
-			$self->corrupt_count_log(1) if $self->can('corrupt_count_log');
-			$p_setby->active_message->no_hop_increase(1);
-		} 
-	}
-        elsif ($msg{is_nack})
-        {
-		#Default to clearing message transaction for NAK
-		$clear_message = 1;
-		if ($self->isa('Insteon::BaseLight')) {
-			&::print_log("[Insteon::BaseObject] WARN!! encountered a nack message ("
-			. $self->get_nack_msg_for( $msg{extra} ) .") for " . $self->{object_name}
-			. ".  It may be unplugged, have a burned out bulb, or this may be a new I2CS "
-			. "type device that must first be manually linked to the PLM using the set button.") 
-			if $self->debuglevel(1, 'insteon');
-		}
-		else 
-		{
-			&::print_log("[Insteon::BaseObject] WARN!! encountered a nack message ("
-			. $self->get_nack_msg_for( $msg{extra} ) .") for " . $self->{object_name}
-			. " ... skipping");
-		}
-		$p_setby->active_message->no_hop_increase(1);
-		$self->is_acknowledged(0);
-		$self->_process_command_stack(%msg);
-		if($p_setby->active_message->failure_callback)
-		{
-			main::print_log("[Insteon::BaseObject] WARN: Now calling message failure callback: "
-				. $p_setby->active_message->failure_callback) if $self->debuglevel(1, 'insteon');
-			$self->failure_reason('NAK');
-			package main;
-			eval $p_setby->active_message->failure_callback;
-			main::print_log("[Insteon::BaseObject] problem w/ retry callback: $@") if $@;
-			package Insteon::BaseObject;
-		}
-		$p_setby->active_message->no_hop_increase(1);
-		$self->is_acknowledged(0);
-		$self->_process_command_stack(%msg);
-	}
-        elsif ($msg{command} eq 'start_manual_change')
-        {
-		$$self{manual_direction} = $msg{extra};
-		$$self{manual_start} = ::get_tickcount() - (($msg{maxhops}-$msg{hopsleft})*50);
-	} elsif ($msg{command} eq 'stop_manual_change') {
-		# Determine percent change based on time interval
-		my $finish_time = &main::get_tickcount - (($msg{maxhops}-$msg{hopsleft})*50);
-		my $total_time = $finish_time - $$self{manual_start};
-		my $percent_change = int($total_time / 42);
-		if ($$self{manual_direction} eq '00') {
-			$percent_change = "-".$percent_change;
-		} else {
-			$percent_change = "+".$percent_change;
-		}
-		$self->set($percent_change, $self);
-	} elsif ($msg{command} eq 'read_write_aldb') {
-		if ($self->_aldb){
-			$clear_message = $self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
-			$self->_process_command_stack(%msg) if($clear_message);
-		}
-	} elsif ($msg{type} eq 'broadcast') {
-		$self->devcat($msg{devcat});
-		$self->firmware($msg{firmware});
-		&::print_log("[Insteon::BaseObject] device category: $msg{devcat}"
-			. " firmware: $msg{firmware} received for " . $self->{object_name});
-	} else {
-		## TO-DO: make sure that the state passed by command is something that is reasonable to set
-		$p_state = $msg{command};
-                if ($msg{type} eq 'alllink')
-                {
-			if ($msg{command} eq 'link_cleanup_report'){
-				if ($msg{extra} == 0){
-					::print_log("[Insteon::BaseObject] DEBUG Received AllLink Cleanup Success for "
-						. $self->{object_name}) if $self->debuglevel(1, 'insteon');
-				} else {
-					::print_log("[Insteon::BaseObject] WARN " . $msg{extra} . " Device(s) failed to "
-						. "acknowledge the command from " . $self->{object_name});
-				}
-			} else {
-				$self->set($p_state, $self);
-				$$self{_pending_cleanup} = 1;
-				#Wait to avoid clobbering incomming subsequent cleanup messages
-				my @links = $self->find_members('Insteon::BaseDevice');
-				#Timeout is the number of linked devices multiplied by
-				#the maximum hop length for a direct message and an ACK
-				#PLM is the +1
-				my $timeout = (scalar(@links)+1) * 300;
-				::print_log("[Insteon::BaseObject] DEBUG3 Delaying any outgoing messages ". 
-					"by $timeout milliseconds to avoid collision with subsequent cleanup ".
-					"messages from " . $self->get_object_name) if ($self->debuglevel(3, 'insteon'));
-				$self->interface->_set_timeout('xmit', $timeout);
-			}
-                }
-                elsif ($msg{type} eq 'cleanup')
-                {
-                	if (($self->state eq $p_state or $self->state_final eq $p_state)
-                		and $$self{_pending_cleanup}){
-				::print_log("[Insteon::BaseObject] Ignoring Received Direct AllLink Cleanup Message for " 
-					. $self->{object_name} . " since AllLink Broadcast Message was Received.") if $self->debuglevel(1, 'insteon');
-                	} else {
-				$self->set($p_state, $self);
-			}
-			$$self{_pending_cleanup} = 0;
-		} else {
-			main::print_log("[Insteon::BaseObject] Ignoring unsupported command from " 
-				. $self->{object_name}) if $self->debuglevel(1, 'insteon');
-			$self->corrupt_count_log(1) if $self->can('corrupt_count_log');
-                }
-	}
-	return $clear_message;
-}
-
-sub _process_command_stack
-{
-	my ($self, %ackmsg) = @_;
-	if (%ackmsg) { # which may also be something that can be interpretted as a "nack"
-		# determine whether to unset awaiting_ack
-		# for now, be "dumb" and just unset it
-		$$self{awaiting_ack} = 0;
-	}
-	if (!($$self{awaiting_ack})) {
-		my $callback = undef;
-		my $message = pop(@{$$self{command_stack}});
-		# convert ptr to cmd hash
-		if ($message)
-                {
-                        my $plm_queue_size = $self->interface->queue_message($message);
-
-			# send msg
-                        if ($message->command eq 'peek'
-                        	or $message->command eq 'poke'
-                        	or $message->command eq 'status_request'
-                                or $message->command eq 'get_engine_version'
-                                or $message->command eq 'id_request'
-                                or $message->command eq 'do_read_ee'
-                                or $message->command eq 'set_address_msb'
-                                or $message->command eq 'sensor_status'
-                                or $message->command eq 'set_operating_flags'
-                                or $message->command eq 'get_operating_flags'
-                                or $message->command eq 'read_write_aldb'
-                                or $message->command eq 'thermostat_control'
-                                or $message->command eq 'thermostat_get_zone_info'
-                                or $message->command eq 'extended_set_get'
-                                or $message->command eq 'ping'
-                                or $message->command eq 'linking_mode' 
-                                )
-                        {
-				$$self{awaiting_ack} = 1;
-			}
-                        else
-                        {
-				$$self{awaiting_ack} = 0;
-			}
-
-			$$self{_prior_msg} = $message;
-			# TO-DO: adjust timer based upon (1) type of message and (2) retry_count
-			my $queue_time = $$self{max_queue_time} + $plm_queue_size;
-			# if is_synchronous, then no other command can be sent until an insteon ack or nack is received
-			# for this command
-		} else {
-			# and, always clear awaiting_ack and _prior_msg
-			$$self{awaiting_ack} = 0;
-			$$self{_prior_msg} = undef;
-		}
-		if ($callback) {
-			package main;
-			eval ($callback);
-			&::print_log("[Insteon::BaseObject] error in queue timer callback: " . $@)
-				if $@ and $self->debuglevel(1, 'insteon');
-			package Insteon::BaseObject;
-		}
-	} else {
-#		&::print_log("[Insteon_Device] " . $self->get_object_name . " command queued but not yet sent; awaiting ack from prior command") if $self->debuglevel(1, 'insteon');
-	}
-}
-
-sub _is_valid_state
-{
-	my ($self,$state) = @_;
-	if (!(defined($state)) or $state eq '') {
-		return 0;
-	}
-
-	my ($msg, $substate) = split(/:/, $state, 2);
-	$msg=lc($msg);
-
-	if ($msg=~/^[+-]?([1]?[0-9]?[0-9])/)
-	{
-		if ($1 < 1) {
-			$msg='off';
-		} else {
-			$msg='on';
-		}
-	}
-        elsif ($msg eq 'toggle')
-        {
-        	if ($self->state eq 'on')
-                {
-                	$msg = 'off';
-                }
-                elsif ($self->state eq 'off')
-                {
-                	$msg = 'on';
-                }
-        }
-
-	# confirm that the resulting $msg is legitimate
-	if (!(defined($$self{message_types}{$msg}))) {
-		return 0;
-	} else {
-		return 1;
-	}
-}
-
-=item C<get_nack_msg_for(msg)>
-
-Takes msg, text based hexadecimal code, and returns the text based description
-of the NACK code.
-
-=cut
-
-sub get_nack_msg_for {
-   my ($self,$msg) = @_;
-   return $nack_messages{ $msg };
-}
-
-=item C<failure_reason>
-
-Stores the resaon for the most recent message failure [NAK | timeout].  Used to 
-process message callbacks after a message fails.  If called with no parameter 
-returns the saved failure reason.
-
-Parameters:
-	reason: failure reason
-
-Returns: failure reason
-
-=cut 
-
-sub failure_reason
-{
-        my ($self, $reason) = @_;
-        $$self{failure_reason} = $reason if $reason;
-        return $$self{failure_reason};
-}
-
-=item C<get_voice_cmds>
-
-Returns a hash of voice commands where the key is the voice command name and the
-value is the perl code to run when the voice command name is called.
-
-Higher classes which inherit this object may add to this list of voice commands by
-redefining this routine while inheriting this routine using the SUPER function.
-
-This routine is called by L<Insteon::generate_voice_commands> to generate the
-necessary voice commands.
-
-=cut 
-
-sub get_voice_cmds
-{
-    my ($self) = @_;
-    my %voice_cmds = (
-        #The Sync Links routine really resides in DeviceController, but that
-        #class seems a little redundant as in practice all devices are controllers
-        #in some sense.  As a result, that class will likely be folded into 
-        #BaseObject/Device at some future date.  In order to avoid a bizarre
-        #inheritance of this routine by higher classes, this command was placed
-        #here
-        'sync links' => $self->get_object_name . '->sync_links(0)'
-    );
-    return \%voice_cmds;
-}
-
-sub _aldb
-{
-   my ($self) = @_;
-   my $root_obj = $self->get_root();
-   return $$root_obj{aldb};
-}
-
-=item C<is_deaf()>
-
-Returns true if the device must be awake in order to respond to messages.  Most
-devices are not deaf, currently devices that are deaf are battery operated
-devices such as the Motion Sensor, RemoteLinc and TriggerLinc.
-
-At the BaseObject level all devices are defined as not deaf.  Objects which
-inherit BaseObject should redefine is_deaf as necessary.
-
-=cut
-
-sub is_deaf
-{
-	my ($self) = @_;
-	return $$self{is_deaf};
-}
-
-=item C<is_controller()>
-
-Returns true if the device is a controller.
-
-=cut
-
-sub is_controller
-{
-	my ($self) = @_;
-	return $$self{is_controller};
-}
-
-=item C<is_responder([1|0])>
-
-Stores and returns whether a device is a responder.
-
-=cut
-
-sub is_responder
-{
-	my ($self,$is_responder) = @_;
-	$$self{is_responder} = $is_responder if defined $is_responder;
-	if ($self->is_root || $self->isa('Insteon::InterfaceController')) {
-		return $$self{is_responder};
-	}
-        else
-        {
-		my $root_obj = $self->get_root();
-		if (ref $root_obj)
-                {
-			return $$root_obj{is_responder};
-		}
-                else
-                {
-			return 0;
-		}
-	}
-}
-
-=back
-
-=head2 INI PARAMETERS
-
-=over 
-
-=item Insteon_PLM_max_queue_time
-
-Was previously used to set the maximum amount of time
-a message could remain in the queue.  This parameter is no longer used in the code
-but it still appears in the initialization.  It may be removed at a future date.  
-This also gets set in L<Insteon::BaseDevice|Insteon::BaseInsteon/Insteon::BaseDevice>
-as well for some reason, but is not used there either.
-
-=back
-
-=head2 AUTHOR
-
-Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
-
-=head2 NOTES
-
-Special thanks to:
-	Brian Warren for significant testing and patches
-	Bruce Winter - MH
-
-=head2 SEE ALSO
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-####################################
-###            #####################
-### BaseDevice #####################
-###            #####################
-####################################
-
-=head1 B<Insteon::BaseDevice>
-
-=head2 DESCRIPTION
-
-Generic class implementation of a Base Insteon Device.
-
-=head2 INHERITS
-
-L<Insteon::BaseObject|Insteon::BaseInsteon/Insteon::BaseObject>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::BaseDevice;
-
-@Insteon::BaseDevice::ISA = ('Insteon::BaseObject');
-
-our %message_types = (
-   %Insteon::BaseObject::message_types,
-   assign_to_group => 0x01,
-   delete_from_group => 0x02,
-   link_cleanup_report => 0x06,
-   linking_mode => 0x09,
-   unlinking_mode => 0x0A,
-   get_engine_version => 0x0D,
-   ping => 0x0F,
-   id_request => 0x10,
-   on_fast => 0x12,
-   off_fast => 0x14,
-   start_manual_change => 0x17,
-   stop_manual_change => 0x18,
-   status_request => 0x19,
-   get_operating_flags => 0x1f,
-   set_operating_flags => 0x20,
-   do_read_ee => 0x24,
-   remote_set_button_tap => 0x25,
-   set_led_status => 0x27,
-   set_address_msb => 0x28,
-   poke => 0x29,
-   poke_extended => 0x2a,
-   peek => 0x2b,
-   peek_internal => 0x2c,
-   poke_internal => 0x2d,
-   extended_set_get => 0x2e,
-   read_write_aldb => 0x2f,
-);
-
-
-my %operating_flags = (
-   'program_lock_on' => '00',
-   'program_lock_off' => '01',
-   'led_on_during_tx' => '02',
-   'led_off_during_tx' => '03',
-   'resume_dim_on' => '04',
-   'beeper_enabled' => '04',
-   'resume_dim_off' => '05',
-   'beeper_off' => '05',
-   'eight_key_kpl' => '06',
-   'load_sense_on' => '06',
-   'six_key_kpl' => '07',
-   'load_sense_off' => '07',
-   'led_backlight_off' => '08',
-   'led_off' => '08',
-   'led_backlight_on' => '09',
-   'led_enabled' => '09',
-   'key_beep_enabled' => '0a',
-   'one_minute_warn_disabled' => '0a',
-   'key_beep_off' => '0b',
-   'one_minute_warn_enabled' => '0b'
-);
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-	my $self= new Insteon::BaseObject($p_deviceid,$p_interface);
-	bless $self,$class;
-
-        $$self{message_types} = \%message_types;
-        $$self{operating_flags} = \%operating_flags;
-
-        if ($self->group eq '01') {
-           $$self{aldb} = new Insteon::ALDB_i1($self);
-        }
-
-	$self->restore_data('devcat', 'firmware', 'level', 'retry_count_log', 'fail_count_log', 
-        'outgoing_count_log', 'incoming_count_log', 'corrupt_count_log',
-        'dupe_count_log', 'hops_left_count', 'max_hops_count',
-        'outgoing_hop_count');
-
-	$self->initialize();
-	$self->rate(undef);
-	$$self{level} = undef;
-	$$self{flag} = "0F";
-	$$self{ackMode} = "1";
-	$$self{awaiting_ack} = 0;
-	$$self{is_acknowledged} = 0;
-	$$self{max_queue_time} = $::config_parms{'Insteon_PLM_max_queue_time'};
-	$$self{max_queue_time} = 10 unless $$self{max_queue_time}; # 10 seconds is max time allowed in command stack
-	@{$$self{command_stack}} = ();
-	$$self{_onlevel} = undef;
-    $$self{retry_count_log} = 0;
-    $$self{fail_count_log} = 0;
-    $$self{outgoing_count_log} = 0;
-    $$self{incoming_count_log} = 0;
-    $$self{corrupt_count_log} = 0;
-    $$self{dupe_count_log} = 0;
-    $$self{hops_left_count} = 0;
-    $$self{max_hops_count} = 0;
-    $$self{outgoing_hop_count} = 0;
-
-
-	return $self;
-}
-
-=item C<initialize()>
-
-A former holdover from when MisterHouse used to ping devices to get their device
-category.  May not be needed anymore.
-
-=cut
-
-sub initialize
-{
-	my ($self) = @_;
-	$$self{m_write} = 1;
-	$$self{m_is_locally_set} = 0;
-	# persist local, simple attribs
-}
-
-=item C<rate([rate])>
-
-Used to store and return the associated ramp rate of a device.
-
-If provided, stores rate as the device's ramp rate in MisterHouse.
-
-=cut
-
-sub rate
-{
-	my ($self,$p_rate) = @_;
-	$$self{rate} = $p_rate if defined $p_rate;
-	return $$self{rate};
-}
-
-=item C<link_to_interface([group,data3])>
-
-If a controller link from the device to the interface does not exist, this will
-create that link on the device.
-
-Next, if a responder link from the device to the interface does not exist on the 
-interface, this will create that link on the interface.
-
-The group is the group on the device that is the controller, such as a button on
-a keypad link.  It will default to 01.
-
-Data3 is optional and is used to set the Data3 value in the controller link on 
-the device.
-
-=cut
-
-sub link_to_interface
-{
-	my ($self,$p_group, $p_data3, $step) = @_;
-	$p_group = $self->group unless (defined $p_group);
-	$p_data3 = $self->group unless (defined $p_data3);
-	my $success_callback_prefix = $self->get_object_name."->link_to_interface(\"$p_group\",\"$p_data3\",";
-	my $success_callback = "";
-	my $failure_callback = '::print_log("[Insteon::BaseInsteon] Error: The Link_To_Interface '.
-		'routine failed for device: '.$self->get_object_name.'")';
-	$step = 0 if ($step eq '');
-	if ($step == 0) { #If NAK on get_engine, then this is an I2CS device
-		$success_callback = $success_callback_prefix . "\"1\")";
-		$failure_callback = $self->get_object_name."->link_to_interface_i2cs(\"$p_group\",\"$p_data3\")";
-		$self->get_engine_version($success_callback, $failure_callback);	
-	}
-	elsif ($step == 1) { #Add Link from object->PLM
-		$success_callback = $success_callback_prefix . "\"2\")";
-		my %link_info = ( object => $self->interface, group => $p_group, is_controller => 1,
-			callback => "$success_callback", failure_callback=> "$failure_callback");
-		$link_info{data3} = $p_data3 if $p_data3;
-	        if ($self->_aldb) {
-		   $self->_aldb->add_link(%link_info);
-	        }
-	        else
-	        {
-	           &main::print_log("[Insteon::BaseInsteon] Error: This item, " . $self->get_object_name .
-	              ", does not have an ALDB object.  Linking is not permitted.");
-	        }
-	}
-	elsif ($step == 2){ #Add Link from PLM->object
-		$success_callback = $success_callback_prefix . "\"3\")";
-		my $link_info = "deviceid=" . lc ($self->device_id) . " group=$p_group is_controller=0 " .
-			"callback=$success_callback failure_callback=$failure_callback";	
-	        $self->interface->add_link($link_info);
-	}
-	elsif ($step == 3){ #Add surrogate link on device if surrogate exists
-		if (ref $$self{surrogate}){
-			$success_callback = $success_callback_prefix . "\"4\")";
-			my $surrogate_group = $$self{surrogate}->group;
-			my %link_info = ( object => $self->interface, 
-				group => $surrogate_group, is_controller => 0,
-				callback => "$success_callback", 
-				failure_callback=> "$failure_callback",
-				data3 => $p_group);
-			$self->_aldb->add_link(%link_info);
-		} else {
-			::print_log('[Insteon::BaseInsteon] Link_To_Interface successfully completed'.
-				' for device ' .$self->get_object_name);	
-		}
-	}
-	elsif ($step == 4){ #Add surrogate link on PLM if surrogate exists
-		$success_callback = $success_callback_prefix . "\"5\")";
-		my $surrogate_group = $$self{surrogate}->group;
-		my %link_info = ( deviceid=> lc($self->device_id), 
-			group => $surrogate_group, is_controller => 1,
-			callback => "$success_callback", 
-			failure_callback=> "$failure_callback",
-			data3 => $surrogate_group);
-		$self->interface->add_link(%link_info);
-	}
-	elsif ($step == 5){
-		::print_log('[Insteon::BaseInsteon] Link_To_Interface successfully completed'.
-			' for device ' .$self->get_object_name);			
-	}
-}
-
-=item C<link_to_interface_i2cs([group,data3])>
-
-Performs the same task as C<link_to_interface> however this routine is designed
-to perform the initial link to I2CS devices.  These devices cannot be initially
-linked to the PLM in the normal way.  This process requires more steps than the
-normal routine which will take longer to perform and therefore is more prone to
-faile.  As such, this should likely only be used if necessary.
-
-=cut
-
-sub link_to_interface_i2cs
-{
-	my ($self,$p_group, $p_data3, $step) = @_;
-	my $success_callback_prefix = $self->get_object_name."->link_to_interface_i2cs('$p_group','$p_data3',";
-	my $success_callback = "";
-	my $failure_callback = "::print_log('[Insteon::BaseInsteon] Error Link_To_Interface_I2CS ".
-		"routine failed for device: ".$self->get_object_name."')";
-	$step = 0 if ($step eq '');
-	if ($step == 0) { #Put PLM into initiate linking mode
-		$success_callback = $success_callback_prefix . "'1')";
-		$self->interface()->initiate_linking_as_controller('00', $success_callback, $failure_callback);	
-	}
-	elsif ($step == 1) { #Ask device to respond to link request
-		$success_callback = $success_callback_prefix . "'2')";
-		$self->enter_linking_mode($p_group, $success_callback, $failure_callback);	
-	}
-	elsif ($step == 2) { #Scan device to get an accurate link table
-		#return to normal link_to_interface routine if successful
-		$success_callback_prefix = $self->get_object_name."->link_to_interface('$p_group','$p_data3',";
-		$success_callback = $success_callback_prefix . "'1')";
-		$self->scan_link_table($success_callback, $failure_callback);
-	}
-}
-
-=item C<unlink_to_interface([group])>
-
-Will delete the contoller link from the device to the interface if such a link exists.
-
-Next, will delete the responder link from the device to the interface on the 
-interface, if such a link exists.
-
-The group is the group on the device that is the controller, such as a button on
-a keypad link.  It will default to 01.
-
-=cut
-
-sub unlink_to_interface
-{
-	my ($self,$p_group,$step) = @_;
-	$p_group = $self->group unless $p_group;
-	#It is possible to nest all of the callbacks in at once, but the quoting
-	#becomes very complicated and happers readability
-	my $success_callback_prefix = $self->get_object_name."->unlink_to_interface('$p_group',";
-	my $success_callback = "";
-	my $failure_callback = "::print_log('[Insteon::BaseInsteon] ERROR: Unlink_To_Interface ".
-		"failed for device: ".$self->get_object_name."')";
-	$step = 0 if ($step eq '');
-	if ($step == 0) { #Delete link on the device
-	        if ($self->_aldb) {
-	        	$success_callback = $success_callback_prefix . "'1')";
-			$self->_aldb->delete_link(object => $self->interface, 
-				group => $p_group, 
-				data3=> $p_group, is_controller => 1,
-				callback => $success_callback,
-				failure_callback=> $failure_callback);
-	        }
-	        else
-	        {
-	           &main::print_log("[BaseInsteon] This item " . $self->get_object_name .
-	              " does not have an ALDB object.  Unlinking is not permitted.");
-	        }
-	}
-	elsif ($step == 1) { #Delete link on the PLM
-		$success_callback = $success_callback_prefix . "'2')";
-		$self->interface->delete_link(
-			deviceid => lc($self->device_id), 
-			group=> $p_group, is_controller=>0,
-			callback=>$success_callback,
-			failure_callback=>$failure_callback);
-	}
-	elsif ($step == 2){ #Delete surrogate link on device if surrogate exists
-		if (ref $$self{surrogate}){
-			$success_callback = $success_callback_prefix . "'3')";
-			my $surrogate_group = $$self{surrogate}->group;
-			my %link_info = ( object => $self->interface, 
-				group => $surrogate_group, is_controller => 0,
-				callback => "$success_callback", 
-				failure_callback=> "$failure_callback",
-				data3 => $p_group);
-			$self->_aldb->delete_link(%link_info);
-		} else {
-			::print_log("[Insteon::BaseInsteon] Unlink_To_Interface".
-				" successfully completed for device "
-				. $self->get_object_name);	
-		}
-	}
-	elsif ($step == 3){ #Delete surrogate link on PLM if surrogate exists
-		$success_callback = $success_callback_prefix . "'4')";
-		my $surrogate_group = $$self{surrogate}->group;
-		my %link_info = ( deviceid=> lc($self->device_id), 
-			group => $surrogate_group, is_controller => 1,
-			callback => "$success_callback", 
-			failure_callback=> "$failure_callback",
-			data3 => $surrogate_group);
-		$self->interface->delete_link(%link_info);
-	}
-	elsif ($step == 4) {
-		::print_log("[Insteon::BaseInsteon] Unlink_To_Interface".
-			" successfully completed for device "
-			. $self->get_object_name);
-	}
-}
-
-=item C<enter_linking_mode(group, success_callback, failure_callback)>
-
-Places an i2 object into linking mode as if you had held down the set button on 
-the device.  i1 objects will not respond to this command.  This is needed to 
-link i2CS devices that will not respond without a manual link. 
-
-This process is included as part of the link_to_interface voice command and 
-should not need to be called seperately.
-
-Returns: nothing
-
-=cut 
-
-sub enter_linking_mode
-{
-	my ($self,$p_group, $success_callback, $failure_callback) = @_;
-	my $group = $p_group;
-	$group = '01' unless $group;
-	my $extra = sprintf("%02x", $group);
-	$extra .= '0' x (30 - length $extra);
-	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'linking_mode', $extra);
-	$message->success_callback($success_callback);
-	$message->failure_callback($failure_callback);
-	$self->_send_cmd($message);
-}
-
-=item C<set_operating_flag(flag)>
-
-Sets the defined flag on the device.
-
-=cut 
-
-sub set_operating_flag {
-	my ($self, $flag) = @_;
-
-	if (!(exists($$self{operating_flags}{$flag})))
-        {
-		&::print_log("[Insteon::BaseDevice] $flag is not a support operating flag");
-		return;
-	}
-
-	if ($self->is_root and !($self->isa('Insteon::InterfaceController')))
-        {
-        	my $message;
-		if (ref $self->_aldb && $self->_aldb->isa('Insteon::ALDB_i2'))
-		{
-			$message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'set_operating_flags');
-			$message->extra($$self{operating_flags}{$flag} . "0000000000000000000000000000");
-		} else {
-			$message = new Insteon::InsteonMessage('insteon_send', $self, 'set_operating_flags');
-			$message->extra($$self{operating_flags}{$flag});
-		}
-                $self->_send_cmd($message);
-        }
-        else
-        {
-		&::print_log("[Insteon::BaseDevice] " . $self->get_object_name . " is either not a root device or is a plm controlled scene");
-		return;
-	}
-}
-
-=item C<get_operating_flag()>
-
-Requests the device's operating flag and prints it to the log.
-
-=cut 
-
-sub get_operating_flag {
-	my ($self) = @_;
-
-	if ($self->is_root and !($self->isa('Insteon::InterfaceController')))
-        {
-		# TO-DO: check devcat to determine if the action is supported by the device
-                my $message = new Insteon::InsteonMessage('insteon_send', $self, 'get_operating_flags');
-                $self->_send_cmd($message);
-#		$self->_send_cmd('command' => 'get_operating_flags');
-        }
-        else
-        {
-		&::print_log("[Insteon::BaseDevice] " . $self->get_object_name . " is either not a root device or is a plm controlled scene");
-		return;
-	}
-}
-
-=item C<writable(cmd)>
-
-Appears to set and or return the "writable" state.  Does not appear to be used
-in the Insteon code, but may be necessary for supporting other classes?
-
-=cut
-
-sub writable {
-	my ($self, $p_write) = @_;
-	if (defined $p_write)
-        {
-		if ($p_write =~ /r/i or $p_write =~/^0/)
-                {
-			$$self{m_write} = 0;
-		}
-                else
-                {
-			$$self{m_write} = 1;
-		}
-	}
-	return $$self{m_write};
-}
-
-=item C<is_locally_set(cmd)>
-
-Returns the is_locally_set variable.  Doesn't appear to be used in Insteon code.
-Likely was used to test whether setby was equal to the device itself.  May not
-always be properly updated since it appears unused.
-
-=cut
-
-sub is_locally_set {
-	my ($self) = @_;
-	return $$self{m_is_locally_set};
-}
-
-=item C<is_root()>
-
-Returns true if the object is the base object, generally group 01, on the device.
-
-=cut
-
-sub is_root {
-	my ($self) = @_;
-	return (($self->group eq '01') and !($self->isa('Insteon::InterfaceController'))) ? 1 : 0;
-}
-
-=item C<get_root()>
-
-Returns the root object of a device.
-
-=cut
-
-sub get_root {
-	my ($self) = @_;
-	if ($self->is_root)
-        {
-		return $self;
-	}
-        else
-        {
-		my $root_obj = &Insteon::get_object($self->device_id, '01');
-		::print_log ("[Insteon::BaseDevice] ERROR! Cannot find the root object for " 
-			. $self->get_object_name . ". Please check your mht file to make sure "
-			. "that device id " . $self->device_id . ":01 is defined.") 
-			if (!defined($root_obj));
-		return $root_obj;
-	}
-}
-
-=item C<has_link(link_details)>
-
-If a device has an ALDB, passes link_details onto one of the has_link() routines
-within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called as part of C<delete_orphan_links()>.
-
-=cut
-
-sub has_link
-{
-	my ($self, $insteon_object, $group, $is_controller, $subaddress) = @_;
-        my $aldb = $self->get_root()->_aldb;
-        if ($aldb)
-        {
-        	return $aldb->has_link($insteon_object, $group, $is_controller, $subaddress);
-        }
-        else
-        {
-        	return 0;
-        }
-
-}
-
-=item C<add_link(link_params)>
-
-If a device has an ALDB, passes link_details onto one of the add_link() routines
-within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called from the "sync links" or 
-"link to interface" voice commands.
-
-=cut
-
-sub add_link
-{
-	my ($self, $parms_text) = @_;
-        my $aldb = $self->get_root()->_aldb;
-        if ($aldb)
-        {
-        	my %link_parms;
-		if (@_ > 2)
-                {
-			shift @_;
-			%link_parms = @_;
-		}
-                else
-                {
-			%link_parms = &main::parse_func_parms($parms_text);
-		}
-        	$aldb->add_link(%link_parms);
-        }
-
-}
-
-=item C<update_link(link_params)>
-
-If a device has an ALDB, passes link_details onto one of the update_link() routines
-within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>. Generally called from the "sync links" 
-voice command.
-
-=cut
-
-sub update_link
-{
-	my ($self, $parms_text) = @_;
-        my $aldb = $self->get_root()->_aldb;
-        if ($aldb)
-        {
-        	my %link_parms;
-		if (@_ > 2)
-                {
-			shift @_;
-			%link_parms = @_;
-		}
-                else
-                {
-			%link_parms = &main::parse_func_parms($parms_text);
-		}
-        	$aldb->update_link(%link_parms);
-        }
-}
-
-=item C<delete_link([link details])>
-
-If a device has an ALDB, passes link_details onto one of the delete_link() routines
-within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called by C<delete_orphan_links()>.
-
-=cut
-
-sub delete_link
-{
-	my ($self, $parms_text) = @_;
-        my $aldb = $self->get_root()->_aldb;
-        if ($aldb)
-        {
-        	my %link_parms;
-		if (@_ > 2)
-                {
-			shift @_;
-			%link_parms = @_;
-		}
-                else
-                {
-			%link_parms = &main::parse_func_parms($parms_text);
-		}
-        	$aldb->delete_link(%link_parms);
-        }
-}
-
-=item C<scan_link_table()>
-
-Scans a device link table and caches a copy.
-
-=cut
-
-sub scan_link_table
-{
-	my ($self, $success_callback, $failure_callback) = @_;
-        my $aldb = $self->get_root()->_aldb;
-        if ($aldb)
-        {
-        	return $aldb->scan_link_table($success_callback, $failure_callback);
-	}
-
-}
-
-=item C<log_aldb_status()>
-
-Prints a human readable description of various settings and attributes associated 
-with a device including:
-
-Hop Count, Engine Version, ALDB Type, ALDB Health, and Last ALDB Scan Time
-
-=cut
-
-sub log_aldb_status
-{
-	my ($self) = @_;
-	main::print_log( "     Device ID: ".$self->device_id());
-	my $hop_array;
-	$hop_array = join("",@{$$self{hop_array}}) if (defined($$self{hop_array}));
-	main::print_log( "     Hop Count: ".$self->default_hop_count()." :: [$hop_array]");
-	main::print_log( "Engine Version: ".$self->engine_version());
-	my $aldb = $self->get_root()->_aldb;
-	if ($aldb)
-	{
-		main::print_log( "     ALDB Type: ".ref($aldb));
-		main::print_log( "   ALDB Health: ".$aldb->health());
-		main::print_log( "ALDB Scan Time: ".$aldb->scandatetime());
-	}
-}
-
-=item C<remote_set_button_tap([repeat])>
-
-In theory, would have the same effect as manually tapping the set button on the 
-device repeat times.
-
-WARN: Testing using the following does not produce results as expected.  Use at 
-your own risk. [GL]
-
-=cut
-
-sub remote_set_button_tap
-{
-	my ($self,$p_number_taps) = @_;
-	my $taps = ($p_number_taps =~ /2/) ? '02' : '01';
-        my $message = new Insteon::InsteonMessage('insteon_send', $self, 'remote_set_button_tap');
-        $message->extra($taps);
-        $self->_send_cmd($message);
-#	$self->_send_cmd('command' => 'remote_set_button_tap', 'extra' => $taps);
-}
-
-=item C<request_status([requestor])>
-
-Requests the current status of the device and calls C<set()> on the response.  
-This will trigger tied_events.
-
-=cut
-
-sub request_status
-{
-	my ($self, $requestor) = @_;
-	$$self{m_status_request_pending} = ($requestor) ? $requestor : 1;
-        my $message = new Insteon::InsteonMessage('insteon_send', $self, 'status_request');
-        $self->_send_cmd($message);
-#	$self->_send_cmd('command' => 'status_request', 'is_synchronous' => 1);
-}
-
-=item C<get_engine_version>
-
-Queues a get engine version insteon message using L<Insteon::BaseObject::_send_cmd> 
-and sets a message failure callback to L<Insteon::BaseDevice::_get_engine_version_failure>.  
-Message response is processed in L<Insteon::BaseObject::_is_info_request>  
-
-Returns: nothing
-
-=cut 
-
-sub get_engine_version {
-   my ($self, $success_callback, $failure_callback) = @_;
-
-   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'get_engine_version');
-   my $self_object_name = $self->get_object_name;
-   $message->failure_callback("$self_object_name->_get_engine_version_failure();$failure_callback");
-   $message->success_callback($success_callback);
-   $self->_send_cmd($message);
-}
-
-=item C<_get_engine_version_failure>
-
-Callback failure for L<Insteon::BaseDevice::get_engine_version>; called for NAK 
-and message timeout.  Will force engine_version to I2CS which will also remap 
-the aldb version if the device responds with a NAK. Does nothing for timeouts 
-except print a message. 
-
-Returns: nothing
-
-=cut 
-
-sub _get_engine_version_failure
-{
-	my ($self) = @_;
-	my $failure_reason = $self->failure_reason();
-	
-	main::print_log("[Insteon::BaseDevice::_get_engine_version_failure] DEBUG4: "
-		."failure reason: $failure_reason") if $self->debuglevel(4, 'insteon');
-	
-	if($failure_reason eq 'NAK')
-	{
-		#assume I2CS because no other device will NAK this command
-		main::print_log("[Insteon::BaseDevice] WARN: I2CS device (" . $self->get_object_name . ") is not "
-			."linked; Please use 'link to interface' voice command");
-		$self->engine_version('I2CS');
-	}
-	#Clear success callback, otherwise it will run when message is cleared
-	$self->interface->active_message->success_callback('0');
-}
-
-=item C<ping([count])>
-
-Sends the number of ping messages defined by count.  A ping message is a basic 
-message that simply asks the device to respond with an ACKnowledgement.  For
-i1 devices this will send a standard length command, for i2 and i2cs devices
-this will send an extended ping command.  In both cases, the device responds
-back with a standard length ACKnowledgement only.
-
-Much like the ping command in IP networks, this command is useful for testing the
-connectivity of a device on your network.  You likely want to use this in 
-conjunction with the C<print_message_log> routine.  For example, you can use 
-this to compare the message stats for a device when changing settings in 
-MisterHouse.
-
-Parameters:
-	count = the number of pings to send.
-
-Returns: Nothing.
-
-=cut
-
-sub ping
-{
-	my ($self, $p_count, $p_callback) = @_;
-	$$self{ping_count} = $p_count if defined($p_count);
-	$$self{ping_callback} = $p_callback if defined($p_callback);
-	if ($$self{ping_count}) {
-		$$self{ping_count}--;
-		my $message;
-		my $extra = sprintf("%02d", $$self{ping_count});
-		if (uc($self->engine_version) eq 'I1'){
-	    	$message = new Insteon::InsteonMessage('insteon_send', $self, 
-	    		'ping', $extra);
-		}
-		else {
-			my $extra = $extra . '0' x 28;
-			$message = new Insteon::InsteonMessage('insteon_ext_send', $self, 
-				'ping', $extra);
-		}
-		::print_log("[Insteon::BaseDevice] Sending ping request to " 
-			. $self->get_object_name . " " . $$self{ping_count} 
-			. " more ping requests queued.");
-		$message->failure_callback($self->get_object_name . '->ping()');
-		$self->_send_cmd($message);
-	}
-	else {
-		::print_log("[Insteon::BaseDevice] Completed ping queue for " 
-			. $self->get_object_name);
-		if (defined $$self{ping_callback}){
-			my $complete_callback = $$self{ping_callback};
-			package main;
-			eval ($complete_callback);
-			&::print_log("[Insteon::BaseDevice] error in ping callback: " . $@)
-				if $@ and $self->debuglevel(1, 'insteon');
-			package Insteon::BaseDevice;
-			delete $$self{ping_callback};
-		}
-	}
-}
-
-=item C<set_led_status()>
-
-Used to set the led staatus of SwitchLinc companion leds.
-
-=cut 
-
-sub set_led_status
-{
-	my ($self, $status_mask) = @_;
-        my $message = new Insteon::InsteonMessage('insteon_send', $self, 'set_led_status');
-        $message->extra($status_mask);
-        $self->_send_cmd($message);
-#	$self->_send_cmd('command' => 'set_led_status', 'extra' => $status_mask);
-}
-
-=item C<restore_string()>
-
-This is called by mh on exit to save the cached ALDB of a device to persistant data.
-
-=cut
-
-sub restore_string
-{
-	my ($self) = @_;
-	my $restore_string = $self->SUPER::restore_string();
-	if ($self->_aldb)
-        {
-		$restore_string .= $self->_aldb->restore_string();
-        }
-
-	return $restore_string;
-}
-
-=item C<restore_states()>
-
-Obsolete / do not use.
-
-Function should remain so that upgrading users will not have issues starting 
-MH from previous versions that referenced this function in the 
-mh_temp.saved_states file.
-
-=cut
-
-sub restore_states
-{
-	my ($self, $states) = @_;
-}
-
-=item C<restore_aldb()>
-
-Used to reload the aldb of a device on restart.
-
-=cut
-
-sub restore_aldb
-{
-	my ($self,$aldb) = @_;
-	if ($self->_aldb and $aldb)
-        {
-           $self->_aldb->restore_aldb($aldb);
-	}
-}
-
-=item C<devcat()>
-
-Sets and returns the device category of a device.  Devcat can be requested by
-calling C<get_devcat()>.
-
-=cut
-
-sub devcat
-{
-	my ($self, $devcat) = @_;
-	if ($devcat)
-        {
-		$$self{devcat} = $devcat;
-	}
-	return $$self{devcat};
-}
-
-=item C<get_devcat()>
-
-Requests the device category for the device.  The returned value can be obtained
-by calling C<devcat()>.
-
-=cut
-
-sub get_devcat
-{
-	my ($self) = @_;
-        my $message = new Insteon::InsteonMessage('insteon_send', $self, 'id_request');
-        $self->_send_cmd($message);
-}
-
-=item C<firmware()>
-
-Sets and returns the device firmware version.  Value can be obtained from the 
-device by calling C<get_devcat()>.
-
-=cut
-
-sub firmware
-{
-	my ($self, $firmware) = @_;
-	$$self{firmware} = $firmware if (defined $firmware);
-	return $$self{firmware};
-}
-
-=item C<states()>
-
-Sets and returns the available states for a device.
-
-=cut
-
-sub states
-{
-	my ($self, $states) = @_;
-	if ($states)
-        {
-		@{$$self{states}} = split(/,/,$states);
-	}
-	if ($$self{states})
-        {
-		return @{$$self{states}};
-	} else {
-		return undef;
-	}
-
-}
-
-=item C<delete_orphan_links(audit_mode)>
-
-Reviews the cached version of all of the ALDBs and based on this review removes
-links from this device which are not present in the mht file, not defined in the 
-code, or links which are only half-links.
-
-If audit_mode is true, prints the actions that would be taken to the log, but 
-does nothing.
-
-=cut
-
-sub delete_orphan_links
-{
-	my ($self, $audit_mode, $failure_callback) = @_;
-        return $self->_aldb->delete_orphan_links($audit_mode, $failure_callback) if $self->_aldb;
-}
-
-sub _process_delete_queue {
-	my ($self) = @_;
-        $self->_aldb->_process_delete_queue() if $self->_aldb;
-}
-
-=item C<log_alllink_table()>
-
-Prints a human readable form of MisterHouse's cached version of a device's ALDB
-to the print log.  Called as part of the "scan links" voice command
-or in response to the "log links" voice command.
-
-=cut
-
-sub log_alllink_table
-{
-	my ($self) = @_;
-        $self->_aldb->log_alllink_table if $self->_aldb;
-}
-
-=item C<engine_version>
-
-Sets or gets the device object engine version.  If setting the engine version, 
-will also call check_aldb_version to map the aldb correctly for I2 devices. 
-
-Parameters:
-	p_engine_version: [I1|I2|I2CS] to set engine version
-
-Returns: engine version string [I1|I2|I2CS]
-
-=cut 
-
-sub engine_version
-{
-	my ($self, $p_engine_version) = @_;
-	my $engine_version = $self->SUPER::engine_version($p_engine_version);
-	$self->check_aldb_version() if $p_engine_version;
-	return $engine_version;
-}
-
-=item C<retry_count_log([type]>
-
-Sets or gets the number of message retries that have occured for this device 
-since the last time C<reset_message_stats> was called.
-
-If type is set, to any value, will increment retry log by one.
-
-Returns: current retry count.
-
-=cut 
-
-sub retry_count_log
-{
-	my ($self, $retry_count_log) = @_;
-	$self = $self->get_root;
-	$$self{retry_count_log}++ if $retry_count_log;
-	return $$self{retry_count_log};
-} 
-
-=item C<fail_count_log([type]>
-
-Sets or gets the number of message failures that have occured for this device 
-since the last time C<reset_message_stats> was called.
-
-If type is set, to any value, will increment fail log by one.
-
-Returns: current fail count.
-
-=cut 
-
-sub fail_count_log
-{
-    my ($self, $fail_count_log) = @_;
-    $self = $self->get_root;
-	$$self{fail_count_log}++ if $fail_count_log;
-	return $$self{fail_count_log};
-} 
-
-=item C<outgoing_count_log([type]>
-
-Sets or gets the number of outgoing message that have occured for this device 
-since the last time C<reset_message_stats> was called.
-
-If type is set, to any value, will increment output count by one.
-
-Returns: current output count.
-
-=cut 
-
-sub outgoing_count_log
-{
-    my ($self, $outgoing_count_log) = @_;
-    $self = $self->get_root;
-    $$self{outgoing_count_log}++ if $outgoing_count_log;
-	return $$self{outgoing_count_log};
-}
-
-=item C<stress_test(count)>
-
-Simulates a read of a link address from the device.  Repeats this process as many
-times as defined by count.  This routine is meant to be used as a diagnostic tool.
-It is similar to scan_link_table, however, if a failure occurs, this process will
-continue with the next iteration.  Scan link table will stop as soon as a single
-failure occurs.
-
-This is also similar to the C<ping> test, however, rather than simply requesting
-an ACK, this requests a full set of data equivalent to a link entry.  Similar to
-C<ping> this should be used with C<print_message_log> to diagnose issues and try
-different settings.
-
-Note: This routine can create a lot of traffic if count is set very high.  Try
-setting it to 5 first and working your way up.
-
-=cut
-
-sub stress_test
-{
-	my ($self, $p_count, $complete_callback) = @_;
-	$$self{stress_test_count} = $p_count if (defined ($p_count));
-	$$self{stress_test_callback} = $complete_callback if (defined ($complete_callback));
-	if ($$self{stress_test_count}){
-		&::print_log("[Insteon::BaseDevice] " . $self->get_object_name 
-			. " - Stress Test " . $$self{stress_test_count} . " iterations left");
-	        my $aldb = $self->get_root()->_aldb;
-	        if ($aldb)
-	        {
-			$$aldb{_mem_activity} = 'scan';
-			$$aldb{_stress_test_act} = 1;
-			$$aldb{_failure_callback} = $self->get_object_name 
-				. '->stress_test()';
-			if($aldb->isa('Insteon::ALDB_i1')) {
-				$aldb->_peek('0FF8');
-			} else {
-				#Prevents duplicate commands in queue error
-				#Also allows for better identification of 
-				#sequential dupe incoming messages
-				my $odd = $$self{stress_test_count} % 2;
-				if ($odd){
-					$aldb->send_read_aldb('0fff');
-				} else {
-					$aldb->send_read_aldb('0ff7');
-				}
-			}
-		}
-		$$self{stress_test_count}--;
-	} else {
-		&::print_log("[Insteon::BaseDevice] Stress Test Complete for " 
-			. $self->get_object_name);	
-		if (defined $$self{stress_test_callback}){
-			$complete_callback = $$self{stress_test_callback};
-			package main;
-			eval ($complete_callback);
-			&::print_log("[Insteon::BaseDevice] error in stress_test callback: " . $@)
-				if $@ and $self->debuglevel(1, 'insteon');
-			package Insteon::BaseDevice;
-			delete $$self{stress_test_callback};
-		}
-	}
-}
-
-=item C<outgoing_hop_count([type]>
-
-Sets or gets the number of hops that have been used in all outgoing messages
-since the last time C<reset_message_stats> was called.
-
-If type is set, to any value, will increment output count by that value.
-
-Returns: current hop count.
-
-=cut 
-
-sub outgoing_hop_count
-{
-    my ($self, $outgoing_hop_count) = @_;
-    $self = $self->get_root;
-    $$self{outgoing_hop_count} += $outgoing_hop_count if $outgoing_hop_count;
-	return $$self{outgoing_hop_count};
-}
-
-=item C<incoming_count_log([type]>
-
-Sets or gets the number of incoming message that have occured for this device 
-since the last time C<reset_message_stats> was called.
-
-If type is set, to any value, will increment incoming count by one.
-
-Returns: current incoming count.
-
-=cut 
-
-sub incoming_count_log
-{
-    my ($self, $incoming_count_log) = @_;
-    $self = $self->get_root;
-    $$self{incoming_count_log}++ if $incoming_count_log;
-    return $$self{incoming_count_log};
-}
-        
-=item C<corrupt_count_log([type]>
-
-Sets or gets the number of currupt message that have arrived from this device 
-since the last time C<reset_message_stats> was called.
-
-If type is set, to any value, will increment corrupt count by one.
-
-Returns: current corrupt count.
-
-=cut 
-
-sub corrupt_count_log
-{
-    my ($self, $corrupt_count_log) = @_;
-    $self = $self->get_root;
-    $$self{corrupt_count_log}++ if $corrupt_count_log;
-    return $$self{corrupt_count_log};
-}
-
-=item C<dupe_count_log([type]>
-
-Sets or gets the number of duplicate message that have arrived from this device 
-since the last time C<reset_message_stats> was called.
-
-If type is set, to any value, will increment corrupt count by one.
-
-Returns: current duplicate count.
-
-=cut 
-
-sub dupe_count_log
-{
-    my ($self, $dupe_count_log) = @_;
-    $self = $self->get_root;
-    $$self{dupe_count_log}++ if $dupe_count_log;
-    return $$self{dupe_count_log};
-}
-
-=item C<hops_left_count([type]>
-
-Sets or gets the number of hops_left for messages that arrive from this device 
-since the last time C<reset_message_stats> was called.
-
-If type is set, to any value, will increment corrupt count by one.
-
-Returns: current hops_left count.
-
-=cut 
-
-sub hops_left_count
-{
-    my ($self, $hops_left_count) = @_;
-    $self = $self->get_root;
-    $$self{hops_left_count} += $hops_left_count if $hops_left_count;
-    return $$self{hops_left_count};
-}
-
-=item C<max_hops_count([type]>
-
-Sets or gets the number of max_hops for messages that arrive from this device 
-since the last time C<reset_message_stats> was called.
-
-If type is set, to any value, will increment corrupt count by one.
-
-Returns: current duplicate count.
-
-=cut 
-
-sub max_hops_count
-{
-    my ($self, $max_hops_count) = @_;
-    $self = $self->get_root;
-    $$self{max_hops_count} += $max_hops_count if $max_hops_count;
-    return $$self{max_hops_count};
-}
-
-
-=item C<reset_message_stats>
-
-Resets the retry, fail, outgoing, incoming, and corrupt message counters.
-
-=cut 
-
-sub reset_message_stats
-{
-    my ($self) = @_;
-    $self = $self->get_root;
-    $$self{retry_count_log} = 0;
-    $$self{fail_count_log} = 0;
-    $$self{outgoing_count_log} = 0;
-    $$self{incoming_count_log} = 0;
-    $$self{corrupt_count_log} = 0;
-    $$self{dupe_count_log} = 0;
-    $$self{hops_left_count} = 0;
-    $$self{max_hops_count} = 0;
-    $$self{outgoing_hop_count} = 0;
-}
-
-=item C<print_message_stats>
-
-Prints message statistics for this device to the print log.  The output contains:
-
-=back
-
-=over8
-
-=item * 
-
-In - The number of incoming messages received
-
-=item * 
-
-Corrupt - The number of incoming corrupt messages received
-
-=item * 
-
-%Corrpt - Of the incoming messages received, the percentage that were 
-corrupt
-
-=item *
-
-Dupe - The number of duplicate messages that have been received from this 
-device.
-
-=item *
-
-%Dupe - The percentage of duplilicate incoming messages received.
-
-=item *
-
-Hops_Left - The average hops left in the messages received from this device.
-
-=item *
-
-Max_Hops - The average maximum hops in the messages received from this device.
-
-=item *
-
-Act_Hops - Max_Hops - Hops_Left, this is the average number of hops that have
-been required for a message sent from the device to reach MisterHouse.
-
-=item * 
-
-Out - The number of unique outgoing messages, without retries, sent. 
-
-=item * 
-
-Fail - The number times that all retries were exhausted without a successful
-delivery of a message.
-
-=item * 
-
-%Fail - Of the outgoing messages sent, the percentage that failed.
-
-=item * 
-
-Retry - The number of retry attempts that have been made to deliver a message. 
-Ideally this is 0, but Sends/Msg is a better indication of this parameter.
-
-=item * 
-
-AvgSend - The average number of send attempts that must be made in order to 
-successfully deliver a message.  Ideally this would be 1.0.  
-
-NOTE: If the number of retries exceeds the value set in the configuration file 
-for Insteon_retry_count, MisterHouse will abandon sending the message.  As a 
-result, as this number approaches Insteon_retry_count it becomes a less accurate 
-representation of the number of retries needed to reach a device.
-
-=item *
-
-Avg_Hops - The average number of hops that have been used by MisterHouse when
-sending messages to this device.
-
-=item *
-
-Hop_Count - The current hop count being used by MH.  This count is dynamically
-controlled by MH and is not reset by calling C<reset_message_stats>
-
-=back
-
-=over
-
-=cut 
-
-sub print_message_stats
-{
-    my ($self) = @_;
-    $self = $self->get_root;
-    my $object_name = $self->get_object_name;
-    my $retry_average = 0; 
-    $retry_average = sprintf("%.1f", ($$self{retry_count_log} / 
-        $$self{outgoing_count_log}) + 1) if ($$self{outgoing_count_log} > 0);
-    my $fail_percentage = 0; 
-    $fail_percentage = sprintf("%.1f", ($$self{fail_count_log} / 
-        $$self{outgoing_count_log}) * 100 ) if ($$self{outgoing_count_log} > 0);
-    my $corrupt_percentage = 0; 
-    $corrupt_percentage = sprintf("%.1f", ($$self{corrupt_count_log} / 
-        $$self{incoming_count_log}) * 100 ) if ($$self{incoming_count_log} > 0);
-    my $dupe_percentage = 0; 
-    $dupe_percentage = sprintf("%.1f", ($$self{dupe_count_log} / 
-        $$self{incoming_count_log}) * 100 ) if ($$self{incoming_count_log} > 0);
-    my $avg_hops_left = 0; 
-    $avg_hops_left = sprintf("%.1f", ($$self{hops_left_count} / 
-        $$self{incoming_count_log})) if ($$self{incoming_count_log} > 0);
-    my $avg_max_hops = 0; 
-    $avg_max_hops = sprintf("%.1f", ($$self{max_hops_count} / 
-        $$self{incoming_count_log})) if ($$self{incoming_count_log} > 0);
-    my $avg_out_hops = 0;
-    $avg_out_hops = sprintf("%.1f", ($$self{outgoing_hop_count} / 
-        $$self{outgoing_count_log})) if ($$self{outgoing_count_log} > 0);
-    ::print_log(
-        "[Insteon::BaseDevice] Message statistics for $object_name:\n"
-        . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops\n"
-        . sprintf("%6s", $$self{incoming_count_log})
-        . sprintf("%8s", $$self{corrupt_count_log})
-        . sprintf("%8s", $corrupt_percentage . '%')
-        . sprintf("%6s", $$self{dupe_count_log})
-        . sprintf("%8s", $dupe_percentage . '%')
-        . sprintf("%9s", $avg_hops_left)
-        . sprintf("%9s", $avg_max_hops)
-        . sprintf("%9s", $avg_max_hops - $avg_hops_left)
-        . "\n"
-        . "   Out    Fail   %Fail Retry AvgSend Avg_Hops CurrHops\n"
-        . sprintf("%6s", $$self{outgoing_count_log})
-        . sprintf("%8s", $$self{fail_count_log})
-        . sprintf("%8s", $fail_percentage . '%')
-        . sprintf("%6s", $$self{retry_count_log})
-        . sprintf("%8s", $retry_average)
-        . sprintf("%9s", $avg_out_hops)
-        . sprintf("%9s", $self->default_hop_count)
-    );
-}
-
-
-=item C<check_aldb_version>
-
-Because of the way MH saves / restores states "after" object creation
-the aldb must be initially created before the engine_version is restored.
-It is therefore impossible to know the device is i2 before creating
-the aldb object.  The solution is to keep the existing logic which assumes
-the device is peek/poke capable (i1 or i2) and then delete/recreate the 
-aldb object if it is later determined to be an i2 device. 
-
-There is a use case where a device is initially I2 but the user replaces
-the device with an I1 device, reusing the same object name.  In this case
-the object state restore will build an I2 aldb object.  The user must 
-manually initiate the 'get engine version' voice command or stop/start
-MH so the initial poll will detect the change. 
-
-This is called anytime the engine_version is queried (initial startup poll) and
-in the Reload_post_hooks once object_states_restore completes
-
-=cut
-
-sub check_aldb_version
-{
-	my ($self) = @_;
-
-	my $engine_version = $self->SUPER::engine_version();
-	my $new_version = "";
-	if($engine_version and $engine_version ne 'I1' and $self->_aldb->aldb_version() ne 'I2') {
-		$new_version = "I2";
-	}
-	elsif($engine_version eq 'I1' and $self->_aldb->aldb_version() ne 'I1') {
-		$new_version = "I1";
-	}
-	if ($new_version) {
-		main::print_log("[Insteon::BaseDevice] DEBUG4: aldb_version is "
-			.$self->_aldb->aldb_version()." but device is ".$engine_version.
-			".  Remapping aldb version to $new_version") if $self->debuglevel(4, 'insteon');
-		my $restore_string = '';
-		if ($self->_aldb) {
-			$restore_string = $self->_aldb->restore_string();
-		}
-		undef $self->{aldb};
-
-		if ($new_version eq "I2") {
-			$self->{aldb} = new Insteon::ALDB_i2($self);
-		}
-		else {
-			$self->{aldb} = new Insteon::ALDB_i1($self);
-		} 
-		
-		package main;
-		eval ($restore_string);
-		&::print_log("[Insteon::BaseDevice] error in eval creating ALDB object: " . $@)
-			if $@ and $self->debuglevel(1, 'insteon');
-		package Insteon::BaseDevice;
-	}
-}
-
-=item C<get_voice_cmds>
-
-Returns a hash of voice commands where the key is the voice command name and the
-value is the perl code to run when the voice command name is called.
-
-Higher classes which inherit this object may add to this list of voice commands by
-redefining this routine while inheriting this routine using the SUPER function.
-
-This routine is called by L<Insteon::generate_voice_commands> to generate the
-necessary voice commands.
-
-=cut 
-
-sub get_voice_cmds
-{
-    my ($self) = @_;
-    my $object_name = $self->get_object_name;
-    my %voice_cmds = (
-        %{$self->SUPER::get_voice_cmds},
-        'link to interface' => "$object_name->link_to_interface",
-        'unlink with interface' => "$object_name->unlink_to_interface"
-    );
-    if ($self->is_root){
-        %voice_cmds = (
-            %voice_cmds,
-            'status' => "$object_name->request_status",
-            'get engine version' => "$object_name->get_engine_version",
-            'scan link table' => "$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")",
-            'print message stats' => "$object_name->print_message_stats",
-            'reset message stats' => "$object_name->reset_message_stats",
-            'run stress test' => "$object_name->stress_test(5)",
-            'run ping test' => "$object_name->ping(5)",
-            'log links' => "$object_name->log_alllink_table()"
-        )
-    }
-    return \%voice_cmds;
-}
-
-=back
-
-=head2 INI PARAMETERS
-
-=over 
-
-=item Insteon_PLM_max_queue_time
-
-Was previously used to set the maximum amount of time
-a message could remain in the queue.  This parameter is no longer used in the code
-but it still appears in the initialization.  It may be removed at a future date.  
-This also gets set in L<Insteon::BaseObject|Insteon::BaseInsteon/Insteon::BaseObject>
-as well for some reason, but is not used there either.
-
-=back
-
-=head2 AUTHOR
-
-Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-####################################
-###                  ###############
-### MultigroupDevice ###############
-###                  ###############
-####################################
-
-=head1 B<Insteon::MultigroupDevice>
-
-=head2 DESCRIPTION
-
-Contains functions which are unique to insteon devices which have more than
-one group.  This includes, KeyPadLincs, RemoteLincs, FanLincs, Thermostats 
-(i2 versions).
-
-=head2 INHERITS
-
-Nothing.
-
-This package is meant to provide supplemental support and should only be added
-as a secondary inheritance to an object.
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::MultigroupDevice;
-
-=item C<sync_all_links(audit_mode)>
-
-Syncs all links on the object, including all subgroups such as additional
-buttons.
-
-Paramter B<audit_mode> - Causes sync to walk through but not actually 
-send any commands to the devices.  Useful with the insteon:3 debug setting for 
-troubleshooting. 
-
-=cut
-
-sub sync_all_links
-{
-	my ($self, $audit_mode) = @_;
-	$self = $self->get_root();
-	@{$$self{_sync_devices}} = ();
-	@{$$self{_sync_device_failures}} = ();
-	my $device_id = $self->device_id();
-	my ($subgroup_object, $group, $dec_group);
-	
-	::print_log("[Insteon::MultigroupDevice] Sync All Links on device "
-		.$self->get_object_name . " starting ...");
-	# Find all subgroup items check groups from 02 - FF;
-	for ($dec_group = 01; $dec_group <= 255; $dec_group++) {
-		$group = sprintf("%02X", $dec_group);
-		$subgroup_object = Insteon::get_object($device_id, $group);
-		if (ref $subgroup_object){
-			my %sync_req = ('sync_object' => $subgroup_object, 
-					'audit_mode' => ($audit_mode) ? 1 : 0);
-			::print_log("[Insteon::MultigroupDevice] "
-				."Adding " . $subgroup_object->get_object_name 
-				." to sync queue.");
-			push @{$$self{_sync_devices}}, \%sync_req
-		}
-	}
-	$$self{_sync_cnt} = scalar @{$$self{_sync_devices}};
-	$self->_get_next_linksync();
-}
-
-=item C<_get_next_linksync()>
-
-Calls the sync_links() function for each device identified by sync_all_link.  
-This function will be called recursively since the callback passed to sync_links() 
-is this function again.  Will also ask sync_links() to call 
-_get_next_linksync_failure() if sync_links() fails. 
-
-=cut
-
-sub _get_next_linksync
-{
-	my ($self) = @_;
-	$self = $self->get_root();
-	my $sync_req_ptr = shift(@{$$self{_sync_devices}});
-	my %sync_req = ($sync_req_ptr) ? %$sync_req_ptr : undef;
-	my $current_sync_device;
-	if (%sync_req) {
-		$current_sync_device = $sync_req{'sync_object'};
-	}
-	else {
-		$current_sync_device = undef;
-	}
-
-	if ($current_sync_device) {
-		::print_log("[Insteon::MultigroupDevice] Now syncing: "
-			. $current_sync_device->get_object_name . " ("
-			. ($$self{_sync_cnt} - scalar @{$$self{_sync_devices}})
-			. " of ".$$self{_sync_cnt}.")");
-		$current_sync_device->sync_links($sync_req{'audit_mode'}, 
-			$self->get_object_name . '->_get_next_linksync()',
-			$self->get_object_name . '->_get_next_linksync_failure('.$current_sync_device->get_object_name.')');
-	}
-	else {
-		::print_log("[Insteon::MultigroupDevice] All links have completed syncing "
-				. "on device " . $self->get_object_name);
-		my $_sync_failure_cnt = scalar @{$$self{_sync_device_failures}};
-		if ($_sync_failure_cnt) {
-			::print_log("[Insteon::MultigroupDevice] However, some failures were noted:");
-			for my $failed_obj (@{$$self{_sync_device_failures}}) {
-				::print_log("[Insteon::MultigroupDevice] WARN: failure occurred when syncing "
-				. $failed_obj->get_object_name);
-			}
-		}
-	}
-}
-
-=item C<_get_next_linksync()>
-
-Called by the failure callback in a device's sync_links() function.  Will add
-the failed device to the module global variable @_sync_device_failures. 
-
-=cut
-
-sub _get_next_linksync_failure
-{
-	my ($self, $current_sync_device) = @_;
-	$self = $self->get_root();
-	push @{$$self{_sync_device_failures}}, $current_sync_device;
-	::print_log("[Insteon::MultigroupDevice] WARN: failure occurred when syncing "
-		. $current_sync_device->get_object_name . ".  Moving on...");
-	$self->_get_next_linksync();
-}
-
-=back
-
-=head2 AUTHOR
-
-Kevin Robert Keegan
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-####################################
-###                #################
-### BaseController #################
-###                #################
-####################################
-
-=head1 B<Insteon::BaseController>
-
-=head2 DESCRIPTION
-
-Generic class implementation of an Insteon Controller.
-
-=head2 INHERITS
-
-L<Generic_Item|Generic_Item>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::BaseController;
-
-use strict;
-
-@Insteon::BaseController::ISA = ('Generic_Item');
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface,$p_devcat) = @_;
-
-	# note that $p_deviceid will be 00.00.00:<groupnum> if the link uses the interface as the controller
-	my $self = {};
-	bless $self,$class;
-	return $self;
-}
-
-=item C<add(object[,on_level, ramp_rate])>
-
-Adds object as a responder to the device.  If on_level and ramp_rate are specified
-they will be used, otherwise 100% .1s will be used.
-
-=cut
-
-sub add
-{
-	my ($self, $obj, $on_level, $ramp_rate) = @_;
-	if (ref $obj and ($obj->isa('Light_Item') or $obj->isa('Insteon::BaseDevice')))
-        {
-		if ($$self{members} && $$self{members}{$obj})
-                {
-			print "[Insteon::BaseController] An object (" . $obj->{object_name} . ") already exists "
-				. "in this scene.  Aborting add request.\n";
-			return;
-		}
-		if ($on_level =~ /^sur/i)
-                {
-			$on_level = '100%';
-			$$obj{surrogate} = $self;
-		}
-                elsif (lc $on_level eq 'on')
-                {
-			$on_level = '100%';
-		}
-                elsif (lc $on_level eq 'off')
-                {
-			$on_level = '0%';
-		}
-		$on_level = '100%' unless $on_level;
-		$$self{members}{$obj}{on_level} = $on_level;
-		$$self{members}{$obj}{object} = $obj;
-		$ramp_rate =~ s/s$//i;
-		$$self{members}{$obj}{ramp_rate} = $ramp_rate if defined $ramp_rate;
-	} else {
-		&::print_log("[Insteon::BaseController] WARN: unable to add ".$obj->{device_id}.":".$obj->{m_group}
-			." as items of type ".ref($obj)." are not supported!");
-        }
-}
-
-=item C<sync_links(audit_mode)>
-
-Causes MisterHouse to review the list of objects that should be linked to device
-and to check to make sure these links are complete.  If any link is not complete
-MisterHouse will add the link.
-
-If audit_mode is true, MisterHouse will print the actions it would have taken to 
-the log, but will not take any actions.
-
-The process does the following 5 checks in order:
-
- 1. Does a controller link exist for Device-> PLM
- 2. Does a responder link exist on the PLM
-
-it then loops through all of the links defined for a device and checks:
-
- 3. Does the responder link exist
- 4. Is the responder link accurate
- 5. Does the controller link on this device exist
-
-=cut
-
-sub sync_links
-{
-	my ($self, $audit_mode, $callback, $failure_callback, $skip_deaf) = @_;
-	
-	# Intialize Variables
-	@{$$self{sync_queue}} = (); # reset the work queue
-	$$self{sync_queue_callback} = ($callback) ? $callback : undef;
-	$$self{sync_queue_failure_callback} = ($failure_callback) ? $failure_callback : undef;
-	$$self{sync_queue_failure} = undef;
-	my $self_link_name = $self->get_object_name;
-	my $insteon_object = $self->interface;
-	my $interface_object = Insteon::active_interface();
-	my $interface_name = $interface_object->get_object_name;
-	$insteon_object = $self->get_root;
-	::print_log("[Insteon::BaseController] WARN!! A device w/ insteon address: " . $self->device_id . ":01 could not be found. "
-		. "Please double check your items.mht file.") if (!(defined($insteon_object)));
-
-	# Abort if $insteon_object doesn't exist
-	$self->_process_sync_queue() unless $insteon_object;
-	
-	# Warn if device is deaf or ALDB out of sync
-	my $insteon_object_is_syncable = 1;
-	if ($insteon_object->is_deaf && $skip_deaf) {
-		::print_log("[Insteon::BaseController] $self_link_name is deaf, only responder links will be added to devices "
-			."controlled by this device.  To sync links on this device, put it in awake mode and run the 'Sync Links' "
-			."command on this specific device.");
-		$insteon_object_is_syncable = 0;
-	}
-	elsif ($insteon_object->_aldb->health ne 'good' && $insteon_object->_aldb->health ne 'empty'){
-		::print_log("[Insteon::BaseController] WARN! The ALDB of $self_link_name is ".$insteon_object->_aldb->health
-			.", links will be added to devices "
-			."linked to this device, but no links will be added to $self_link_name.  Please rescan this device and attempt "
-			."sync links again.");
-		$insteon_object_is_syncable = 0;
-		$$self{sync_queue_failure} = 1;
-	}
-	
-	# 1. Does a controller link exist for Device-> PLM
-	if (!$insteon_object->isa('Insteon_PLM') && 
-	!$insteon_object->has_link($self->interface,$self->group,1,$self->group) && 
-	$insteon_object_is_syncable) {
-		my %link_req = ( member => $insteon_object, cmd => 'add', object => $self->interface,
-			group => $self->group, is_controller => 1,
-			callback => "$self_link_name->_process_sync_queue()",
-			failure_callback => $failure_callback,
-			data3 => $self->group);
-		$link_req{cause} = "Adding controller record to $self_link_name for $interface_name";
-		push @{$$self{sync_queue}}, \%link_req;
-	}
-		
-	# 2. Does a responder link exist on the PLM
-	if ((!$insteon_object->isa('Insteon_PLM') &&
-	!$self->interface->has_link($insteon_object,$self->group,0,'00'))) {
-		my %link_req = ( member => $self->interface, cmd => 'add', object => $insteon_object,
-			group => $self->group, is_controller => 0,
-			callback => "$self_link_name->_process_sync_queue()",
-			failure_callback => $failure_callback,
-			data3 => '00');
-		$link_req{cause} = "Adding responder record to $interface_name from $self_link_name";
-		push @{$$self{sync_queue}}, \%link_req;
-	}
-
-	# Loop members
-	foreach my $member_ref (keys %{$$self{members}}) {
-		my $member = $$self{members}{$member_ref}{object};
-		
-		# find real device if member is a Light_Item
-		if ($member->isa('Light_Item')) {
-			my @children = $member->find_members('Insteon::BaseDevice');
-			$member = $children[0];
-		}
-		
-		#Initialize Loop Variables
-		my $member_name = $member->get_object_name;
-		my $member_root = $member->get_root;
-		my $requires_update = 0;
-		my $has_link = 1;
-		my $cause;
-		my $tgt_on_level = $$self{members}{$member_ref}{on_level};
-		$tgt_on_level = '100' unless defined $tgt_on_level;
-		my $tgt_ramp_rate = $$self{members}{$member_ref}{ramp_rate};
-		$tgt_ramp_rate = '0' unless defined $tgt_ramp_rate;
-		$tgt_on_level =~ s/(\d+)%?/$1/;
-		$tgt_ramp_rate =~ s/(\d)s?/$1/;
-		my $resp_aldbkey = $member_root->_aldb->get_linkkey($insteon_object->device_id,
-								$self->group,
-								'0',
-								$member->group);
-
-		# 3. Does the responder link exist
-		if (!$member_root->has_link($insteon_object, $self->group, 0, $member->group) &&
-		($member_root->_aldb->health eq 'good' || $member_root->_aldb->health eq 'empty')){
-			my %link_req = ( member => $member, cmd => 'add', object => $insteon_object,
-				group => $self->group, is_controller => 0,
-				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
-				callback => "$self_link_name->_process_sync_queue()",
-				failure_callback => $failure_callback,
-				data3 => $member->group);
-			$link_req{cause} = "Adding responder record to $member_name from $self_link_name";
-			push @{$$self{sync_queue}}, \%link_req;
-			$has_link = 0;
-		} 
-		elsif ($member_root->_aldb->health ne 'good' && $member_root->_aldb->health ne 'empty'){
-			my %link_req = ( member => $member, cmd => 'add', object => $insteon_object,
-				group => $self->group, is_controller => 0,
-				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
-				callback => "$self_link_name->_process_sync_queue()",
-				failure_callback => $failure_callback,
-				data3 => $member->group);
-			$link_req{skip} = "Unable to add the following responder record to $member_name "
-				."from $self_link_name because the aldb of $member_name is "
-				. $member_root->_aldb->health;
-			push @{$$self{sync_queue}}, \%link_req;
-			$$self{sync_queue_failure} = 1;
-		}
-		
-		# 4. Is the responder link accurate
-		if ($member->isa('Insteon::DimmableLight') && $has_link) {
-			my $member_aldb = $member_root->_aldb;
-			my $data1 = $$member_aldb{aldb}{$resp_aldbkey}{data1};
-			my $data2 = $$member_aldb{aldb}{$resp_aldbkey}{data2};
-			my $cur_on_level = hex($data1)/2.55;
-			my $raw_cur_ramp_rate = $data2;
-			my $raw_tgt_ramp_rate = Insteon::DimmableLight::convert_ramp($tgt_ramp_rate);
-			if ($raw_cur_ramp_rate ne $raw_tgt_ramp_rate) {
-				$requires_update = 1;
-				$cause .= "Ramp rate ";
-			}
-			elsif ($cur_on_level-1 > $tgt_on_level && $cur_on_level+1 < $tgt_on_level){
-				$requires_update = 1;
-				$cause .= "On level ";
-			}
-		}
-		elsif ($has_link){
-			my $member_aldb = $member->_aldb;
-			my $data1 = $$member_aldb{aldb}{$resp_aldbkey}{data1};
-			my $data2 = $$member_aldb{aldb}{$resp_aldbkey}{data2};
-			if ($tgt_on_level >= 1 and $data1 ne 'ff') {
-				$requires_update = 1;
-				$tgt_on_level = 100;
-				$cause .= "On level ";
-			}
-			elsif ($tgt_on_level == 0 and $data1 ne '00') {
-				$requires_update = 1;
-				$cause .= "On level ";
-			}
-			if ($data2 ne '00') {
-				$requires_update = 1;
-				$tgt_ramp_rate = 0;
-				$cause .= "Ramp rate ";
-			}
-		}
-		if ($requires_update &&
-		($member_root->_aldb->health eq 'good' || $member_root->_aldb->health eq 'empty')) {
-			my %link_req = ( member => $member, cmd => 'update', object => $insteon_object,
-				group => $self->group, is_controller => 0,
-				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
-				callback => "$self_link_name->_process_sync_queue()",
-				failure_callback => $failure_callback,
-				data3 => $member->group);
-			$link_req{cause} = "Updating responder record on $member_name "
-				. "to fix $cause";
-			push @{$$self{sync_queue}}, \%link_req;
-		}
-
-		# 5. Does the controller link on this device exist
-		if (!($insteon_object->has_link($member, $self->group, 1, $self->group)) &&
-		$insteon_object_is_syncable) {
-			my %link_req = ( member => $insteon_object, cmd => 'add', object => $member,
-				group => $self->group, is_controller => 1,
-				callback => "$self_link_name->_process_sync_queue()",
-				failure_callback => $failure_callback,
-				data3 => $self->group);
-			$link_req{cause} = "Adding controller record to $self_link_name for $member_name";
-			push @{$$self{sync_queue}}, \%link_req;
-		}
-	}
-	
-	my $num_sync_queue = @{$$self{sync_queue}};
-	my $index = 0;
-	if (!($num_sync_queue))
-	{
-		&::print_log("[Insteon::BaseController] Nothing to do when syncing links for " . $self->get_object_name)
-			if $self->debuglevel(1, 'insteon');
-	}
-	foreach (@{$$self{sync_queue}}){
-		my %sync_req = %{$_};
-		my $audit_text = "(AUDIT)" if ($audit_mode);
-		my $log_text = "[Insteon::BaseController] $audit_text ";
-		if ($sync_req{skip}){
-			$log_text .= $sync_req{skip} ."\n";
-			splice @{$$self{sync_queue}}, $index, 1;
-		} else {
-			$index++;
-			$log_text .= $sync_req{cause} . "\n";
-		}
-		PRINT: for (keys %sync_req) {
-			next PRINT if (($_ eq 'cause') || ($_ eq 'callback') ||
-				($_ eq 'member') || ($_ eq 'object') || 
-				($_ eq 'skip') || ($_ eq 'failure_callback'));
-			$log_text .= "$_ = $sync_req{$_}; ";
-		}
-		::print_log($log_text);
-	}
-	if ($audit_mode) {
-		@{$$self{sync_queue}} = ();
-	}
-	
-	$self->_process_sync_queue();
-}
-
-sub _process_sync_queue {
-	my ($self) = @_;
-	# get next in queue if it exists
-	my $num_sync_queue = @{$$self{sync_queue}};
-	if ($num_sync_queue) {
-		my $link_req_ptr = shift(@{$$self{sync_queue}});
-		my %link_req = %$link_req_ptr;
-		if ($link_req{cmd} eq 'update') {
-			my $link_member = $link_req{member};
-			$link_member->update_link(%link_req);
-		} elsif ($link_req{cmd} eq 'add') {
-			my $link_member = $link_req{member};
-			$link_member->add_link(%link_req);
-		}
-	} elsif ($$self{sync_queue_callback}) {
-		my $callback = $$self{sync_queue_callback};
-		if ($$self{sync_queue_failure}){
-			$callback = $$self{sync_queue_failure_callback};
-		}
-		package main;
-		eval ($callback);
-		&::print_log("[Insteon::BaseController] error in sync links callback: " . $@)
-			if $@ and $self->debuglevel(1, 'insteon');
-		package Insteon::BaseController;
-	} else {
-		main::print_log($self->get_object_name." completed sync links");
-	}
-}
-
-=item C<set_linked_devices(state)>
-
-Checks each linked member of device.  If the linked member is a C<light_item>, 
-then sets that item to state.  If the linked member is a C<Insteon::BaseObject>
-then call C<set_receive> for the member.
-
-=cut
-
-sub set_linked_devices
-{
-	my ($self, $link_state) = @_;
-	# iterate over the members
-	if ($$self{members})
-	{
-		foreach my $member_ref (keys %{$$self{members}})
-		{
-			my $member = $$self{members}{$member_ref}{object};
-			# If controller is on, set member to stored on_level
-			# else set to controller value
-			my $local_state = $$self{members}{$member_ref}{on_level};
-			$local_state = '100' unless $local_state;
-			
-			if ($member->isa('Light_Item'))
-			{
-			# if they are Light_Items, then set their on_dim attrib to the member on level
-			#   and then "blank" them via the manual method for a tad over the ramp rate
-			#   In addition, locate the Light_Item's Insteon_Device member and do the
-			#   same as if the member were an Insteon_Device
-				my $ramp_rate = $$self{members}{$member_ref}{ramp_rate};
-				$ramp_rate = 0 unless defined $ramp_rate;
-				$ramp_rate = $ramp_rate + 2;
-				my @lights = $member->find_members('Insteon::BaseDevice');
-				if (@lights)
-				{
-					my $light = $lights[0];
-					# remember the current state to support resume
-					$$self{members}{$member_ref}{resume_state} = $light->state;
-					$member->manual($light, $ramp_rate);
-					if (lc $link_state ne 'on'){
-						$local_state = $light->$link_state;
-					}
-					$light->set_receive($local_state,$self);
-				}
-				else
-				{
-					$member->manual(1, $ramp_rate);
-				}
-				$member->set_on_state($local_state) unless $link_state eq 'off';
-			}
-			elsif ($member->isa('Insteon::BaseDevice'))
-			{
-				# remember the current state to support resume
-				$$self{members}{$member_ref}{resume_state} = $member->state;
-				# if they are Insteon_Device objects, then simply set_receive their state to
-				#   the member on level
-				if (lc $link_state ne 'on'){
- 					$local_state = $link_state;
-				}
-				$member->set_receive($local_state,$self);
-			}
-		}
-	}
-}
-
-=item C<set_with_timer(state, time, return_state, additional_return_states)>
-
-NOTE - This routine appears to be nearly identical, if not identical to the
-C<Generic_Item::set_with_timer()> routine, it is not clear why this routine is
-needed here.
-
-See full description of this routine in C<Generic_Item>
-
-=cut
-
-sub set_with_timer {
-	my ($self, $state, $time, $return_state, $additional_return_states) = @_;
-	return if &main::check_for_tied_filters($self, $state);
-
-	$self->set($state) unless $state eq '';
-
-	return unless $time;
-
-	my $state_change = ($state eq 'off') ? 'on' : 'off';
-	$state_change = $return_state if defined $return_state;
-	$state_change = $self->{state} if $return_state and lc $return_state eq 'previous';
-
-	$state_change .= ';' . $additional_return_states if $additional_return_states;
-
-	$$self{set_timer} = &Timer::new() unless $$self{set_timer};
-	my $object_name = $self->{object_name};
-	my $action = "$object_name->set('$state_change')";
-	$$self{set_timer}->set($time, $action);
-}
-
-=item C<update_members()>
-
-This appears to be a depricated routine that is no longer used.  At a cursory
-glance, it may throw an error if called.
-
-=cut
-
-sub update_members
-{
-	my ($self) = @_;
-	# iterate over the members
-	if ($$self{members}) {
-		foreach my $member_ref (keys %{$$self{members}}) {
-			my ($device);
-			my $member = $$self{members}{$member_ref}{object};
-			my $on_state = $$self{members}{$member_ref}{on_level};
-			$on_state = '100%' unless $on_state;
-			my $ramp_rate = $$self{members}{$member_ref}{ramp_rate};
-			$ramp_rate = 0 unless defined $ramp_rate;
-			if ($member->isa('Light_Item')) {
-			# if they are Light_Items, then locate the Light_Item's Insteon_Device member
-				my @lights = $member->find_members('Insteon::BaseDevice');
-				if (@lights) {
-					$device = $lights[0];
-				}
-			} elsif ($member->isa('Insteon::BaseDevice')) {
-				$device = $member;
-			}
-			if ($device) {
-				my %current_record = $device->get_link_record($self->device_id . $self->group);
-				if (%current_record) {
-					&::print_log("[Insteon::BaseController] remote record: $current_record{data1}")
-						if $self->debuglevel(1, 'insteon');
-				}
-			}
-		}
-	}
-}
-
-=item C<initiate_linking_as_controller()>
-
-Places the interface in linking mode as the controller.  To complete the process
-press the set button on the responder device until it beeps.  Alternatively,
-you may be able to complete the process with 
-C<Insteon::BaseDevice::enter_linking_mode()>.
-
-=cut
-
-sub initiate_linking_as_controller
-{
-	my ($self, $p_group, $success_callback, $failure_callback) = @_;
-	# iterate over the members
-	if ($$self{members}) {
-		foreach my $member_ref (keys %{$$self{members}}) {
-			my $member = $$self{members}{$member_ref}{object};
-			if ($member->isa('Light_Item')) {
-			# if they are Light_Items, then set them to manual to avoid automation
-			#   while manually setting light parameters
-				$member->manual(1,120,120); # 120 seconds should be enough
-			}
-		}
-	}
-	$self->interface()->initiate_linking_as_controller($p_group, $success_callback, $failure_callback);
-}
-
-=item C<find_members([type])>
-
-Returns a list of objects that are members of device.  If type is specified, only
-members of that type are returned.  Type is a package name, for example: 
-
-    $member->find_members('Insteon::BaseDevice');
-
-=cut
-
-sub find_members
-{
-	my ($self,$p_type) = @_;
-
-	my @l_found;
-	if ($$self{members})
-	{
-		foreach my $member_ref (keys %{$$self{members}})
-		{
-			my $member = $$self{members}{$member_ref}{object};
-			if ($member->isa($p_type))
-			{
-				push @l_found, $member;
-			}
-		}
-	}
-	return @l_found;
-
-}
-
-=item C<has_member(object)>
-
-Returns true if object is a member of device, else returns false.
-
-=cut
-
-sub has_member
-{
-	my ($self, $compare_object) = @_;
-	foreach my $member_ref (keys %{$$self{members}})
-	{
-		my $member = $$self{members}{$member_ref}{object};
-		if ($member eq $compare_object)
-		{
-			return 1;
-		}
-	}
-        return 0;
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-####################################
-###            #####################
-### DeviceController ###############
-###                  ###############
-####################################
-
-=head1 B<Insteon::DeviceController>
-
-=head2 DESCRIPTION
-
-Generic class implementation of an Device Controller.
-
-=head2 INHERITS
-
-L<Insteon::BaseController|Insteon::BaseInsteon/Insteon::BaseController>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::DeviceController;
-
-use strict;
-
-@Insteon::DeviceController::ISA = ('Insteon::BaseController');
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface,$p_devcat) = @_;
-
-	# note that $p_deviceid will be 00.00.00:<groupnum> if the link uses the interface as the controller
-	my $self = new Insteon::BaseController($p_deviceid,$p_interface);
-	bless $self,$class;
-	return $self;
-}
-
-=item C<request_status([requestor])>
-
-Requests the current status of the device and calls C<set()> on the response.  
-This will trigger tied_events.
-
-=cut
-
-sub request_status
-{
-	my ($self,$requestor) = @_;
-#	if ($self->group ne '01') {
-	if ($$self{members} and !($self->isa('Insteon::InterfaceController'))
-             and (!(ref $requestor) or ($requestor eq $self))) {
-		&::print_log("[Insteon::DeviceController] requesting status for members of " . $$self{object_name});
-		foreach my $member (keys %{$$self{members}}) {
-			next unless $member->isa('Insteon::BaseObject');
-			my $member_obj = $$self{members}{$member}{object};
-			next if $requestor eq $member_obj;
-                        if ($member_obj->isa('Insteon::BaseDevice')) {
-			   &::print_log("[Insteon::DeviceController] checking status of " . $member_obj->get_object_name()
-				. " for requestor " . $requestor->get_object_name());
-			   $member_obj->request_status($self);
-                        }
-		}
-	}
-        # the following has bad assumptions in that we don't always know if a device is a responder
-        #    since it could be a slave
-	if ($self->is_root && $self->is_responder) {
-		$self->Insteon::BaseDevice::request_status($requestor);
-	}
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-####################################
-###                     ############
-### InterfaceController ############
-###                     ############
-####################################
-
-=head1 B<Insteon::InterfaceController>
-
-=head2 DESCRIPTION
-
-Generic class implementation of an Interface Controller.  These are the PLM Scenes.
-
-=head2 INHERITS
-
-L<Insteon::BaseController|Insteon::BaseInsteon/Insteon::BaseController>, 
-L<Insteon::BaseObject|Insteon::BaseInsteon/Insteon::BaseObject>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::InterfaceController;
-
-use strict;
-
-@Insteon::InterfaceController::ISA = ('Insteon::BaseController','Insteon::BaseObject');
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-
-	# note that $p_deviceid will be 00.00.00:<groupnum> if the link uses the interface as the controller
-	my $self = new Insteon::BaseObject($p_deviceid,$p_interface);
-	bless $self,$class;
-	return $self;
-}
-
-
-#Otherwise BaseController will call Generic_Item::Set
-sub set
-{
-	my ($self,$p_state,$p_setby,$p_response) = @_;
-	$self->Insteon::BaseObject::set($p_state,$p_setby,$p_response);	
-}
-
-sub is_root
-{
-   return 0;
-}
-
-=item C<get_root()>
-
-Returns the root object of a device, in this case the interface.
-
-=cut
-
-sub get_root {
-	my ($self) = @_;
-	return $self->interface;
-}
-
-# For IFaceControllers, need to call set_linked_devices
-sub is_acknowledged {
-	my ($self, $p_ack) = @_;
-	if ($p_ack) {
-		$self->set_linked_devices($$self{pending_state}) if defined $$self{pending_state};	
-	}
-	return $self->Insteon::BaseObject::is_acknowledged($p_ack);
-}
-
-=item C<get_voice_cmds>
-
-Returns a hash of voice commands where the key is the voice command name and the
-value is the perl code to run when the voice command name is called.
-
-Higher classes which inherit this object may add to this list of voice commands by
-redefining this routine while inheriting this routine using the SUPER function.
-
-This routine is called by L<Insteon::generate_voice_commands> to generate the
-necessary voice commands.
-
-=cut 
-
-sub get_voice_cmds
-{
-    my ($self) = @_;
-    my $object_name = $self->get_object_name;
-    my $group = $self->group;
-    my %voice_cmds = (
-        %{$self->SUPER::get_voice_cmds},
-	'on' => "$object_name->set(\"on\")",
-	'off' => "$object_name->set(\"off\")",
-        'initiate linking as controller' => "$object_name->initiate_linking_as_controller(\"$group\")",
-        'cancel linking' => "$object_name->interface()->cancel_linking"
-    );
-    return \%voice_cmds;
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-1;
+=head1 B<Insteon::BaseObject>
+
+=head2 SYNOPSIS
+
+Usage
+
+In user code:
+
+    $ip_patio_light = new Insteon_Device($myPLM,"33.44.55");
+    $ip_patio_light->set("ON");
+
+=head2 DESCRIPTION
+
+Generic class implementation of an Insteon Device.
+
+=head2 INHERITS
+
+L<Generic_Item|Generic_Item>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::BaseObject;
+
+use strict;
+use Insteon::AllLinkDatabase;
+
+@Insteon::BaseObject::ISA = ('Generic_Item');
+
+our %message_types = (
+						on => 0x11,
+						off => 0x13
+);
+
+our %nack_messages = (
+   fb => 'illegal_value_in_cmd',
+   fc => 'pre_nak_long_db_search',
+   fd => 'bad_checksum_or_unknown_cmd',
+   fe => 'load_sense_detects_no_load',
+   ff => 'sender_id_not_in_responder_aldb',
+);
+
+=item C<derive_link_state([state])>
+
+Takes the various states available to insteon devices and returns a derived 
+state of either ON or OFF.
+
+=cut
+
+sub derive_link_state
+{
+	my ($self, $p_state) = @_;
+	$p_state = $self if !(ref $self); #Old code made direct calls
+	#Convert Relative State to Absolute State
+	if ($p_state =~ /^([+-])(\d+)/) {
+		my $rel_state = $1 . $2;
+		my $curr_state = '100';
+		$curr_state = '0' if ($self->state eq 'off');
+		$curr_state = $1 if $self->state =~ /(\d{1,3})/;
+		$p_state = $curr_state + $rel_state;
+		$p_state = 'on' if ($p_state > 0);
+		$p_state = 'off' if ($p_state <= 0);
+	}
+	
+	my $link_state = 'on';
+	if ($p_state eq 'off' or $p_state eq 'off_fast')
+	{
+		$link_state = 'off';
+	}
+	elsif ($p_state =~ /\d+%?/)
+	{
+		my ($dim_state) = $p_state =~ /(\d+)%?/;
+		$link_state = 'off' if $dim_state == 0;
+	}
+
+	return $link_state;
+}
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+	my $self={};
+	bless $self,$class;
+
+        $$self{message_types} = \%message_types;
+
+	if (defined $p_deviceid) {
+		my ($deviceid, $group) = $p_deviceid =~ /(\w\w\.\w\w\.\w\w):?(.+)?/;
+		# if a group is passed in, then assume it can be a controller
+		$$self{is_controller} = ($group) ? 1 : 0;
+		$self->device_id($deviceid);
+		$group = '01' unless $group;
+		$group = '0' . $group if length($group) == 1;
+		$self->group(uc $group);
+	}
+
+        if ($p_interface) {
+        	$self->interface($p_interface);
+        } else {
+        	$self->interface(&Insteon::active_interface());
+        }
+
+	$self->restore_data('default_hop_count', 'engine_version');
+
+	$self->initialize();
+	$$self{max_hops} = 3;
+	$$self{min_hops} = 0;
+	$$self{level} = undef;
+	$$self{flag} = "0F";
+	$$self{ackMode} = "1";
+	$$self{awaiting_ack} = 0;
+	$$self{is_acknowledged} = 0;
+	$$self{max_queue_time} = $::config_parms{'Insteon_PLM_max_queue_time'};
+	$$self{max_queue_time} = 10 unless $$self{max_queue_time}; # 10 seconds is max time allowed in command stack
+	@{$$self{command_stack}} = ();
+	$$self{_onlevel} = undef;
+	$$self{is_responder} = 1;
+        $$self{default_hop_count} = 0;
+	$$self{timeout_factor} = 1.0;
+	$$self{is_deaf} = 0;
+
+	&Insteon::add($self);
+	return $self;
+}
+
+=item C<initialize()>
+
+A former holdover from when MisterHouse used to ping devices to get their device
+category.  May not be needed anymore.
+
+=cut
+
+sub initialize
+{
+	my ($self) = @_;
+	$$self{m_write} = 1;
+	$$self{m_is_locally_set} = 0;
+	# persist local, simple attribs
+}
+
+=item C<interface([interface])>
+
+Used to store and return the associated interface of a device.
+
+If provided, stores interface as the device's interface.
+
+=cut
+
+sub interface
+{
+	my ($self,$p_interface) = @_;
+        if (defined $p_interface) {
+		$$self{interface} = $p_interface;
+        }
+        elsif (!($$self{interface}))
+        {
+        	$$self{interface} = &Insteon::active_interface;
+        }
+	return $$self{interface};
+}
+
+=item C<device_id([id])>
+
+Used to store and return the associated device_id of a device.
+
+If provided, stores id as the device's id.
+
+Returns device id without any delimiters.
+
+=cut
+
+sub device_id
+{
+	my ($self,$p_device_id) = @_;
+
+	if (defined $p_device_id)
+	{
+		$p_device_id =~ /(\w\w)\W?(\w\w)\W?(\w\w)/;
+		$$self{device_id}=$1 . $2 . $3;
+	}
+	return $$self{device_id};
+}
+
+=item C<group([group])>
+
+Used to store and return the associated group of a device.
+
+If provided, stores group as the device group.
+
+=cut
+
+sub group
+{
+	my ($self, $p_group) = @_;
+	$$self{m_group} = $p_group if $p_group;
+	return $$self{m_group};
+}
+
+=item C<timeout_factor($float)>
+
+Changes the amount of time MH will wait to receive a response from a device before
+resending the message.  The value set will be multiplied by the predefined value
+in MH.  $float can be set to any positive decimal number.  For example using 1.0
+will not change the preset values; 1.1 will increase the time MH waits by 10%; and
+0.9 will force MH to wait for only 90% of the predefined time.
+
+This value is NOT saved on reboot, as such likely should be called in a $Reload loop.
+
+=cut
+
+sub timeout_factor {
+	my ($self, $factor) = @_;
+	$$self{timeout_factor} = $factor if $factor;
+	return $$self{timeout_factor};
+}
+
+=item C<max_hops($int)>
+
+Sets the maximum number of hops that may be used in a message sent to the device.
+The default and maximum number is 3.  $int is an integer between 0-3.
+
+This value is NOT saved on reboot, as such likely should be called in a $Reload loop.
+
+=cut
+
+sub max_hops {
+	my ($self, $hops) = @_;
+	$$self{max_hops} = $hops if $hops;
+	return $$self{max_hops};
+}
+
+=item C<min_hops($int)>
+
+Sets the minimum number of hops that may be used in a message sent to the device.
+The default and minimum number is 0.  $int is an integer between 0-3.
+
+This value is NOT saved on reboot, as such likely should be called in a $Reload loop.
+
+=cut
+
+sub min_hops {
+	my ($self, $hops) = @_;
+	$$self{min_hops} = $hops if $hops;
+	return $$self{min_hops};
+}
+
+=item C<default_hop_count([hops])>
+
+Used to track the number of hops needed to reach a device.  Will store the past
+20 hop counts for the device.  Hop counts are added based on the number of hops
+needed for an incomming message to arrive.  Additionally, any time a message is
+resent, a hop count equal to the prior default_hop_count + 1 is added.
+
+If provided, stores hop as a new hop count for the device.  If more than 20 hop
+counts have been stored, will drop the oldest hop count until only 20 exist.
+
+Returns the highest hop count of the past 20 hop counts
+
+=cut
+
+sub default_hop_count
+{
+	my ($self, $hop_count) = @_;
+	if (defined($hop_count)){
+		::print_log("[Insteon::BaseObject] DEBUG3: Adding hop count of " . $hop_count . " to hop_array of "
+			. $self->get_object_name) if $self->debuglevel(3, 'insteon');
+		if (!defined(@{$$self{hop_array}})) {
+			unshift(@{$$self{hop_array}}, $$self{default_hop_count});
+			$$self{hop_sum} = $$self{default_hop_count};
+		}
+		#Calculate a simple moving average
+		unshift(@{$$self{hop_array}}, $hop_count); 
+		$$self{hop_sum} += ${$$self{hop_array}}[0];
+		$$self{hop_sum} -= pop(@{$$self{hop_array}}) if (scalar(@{$$self{hop_array}}) >10);
+		$$self{default_hop_count} = int(($$self{hop_sum} / scalar(@{$$self{hop_array}})) + 0.5);
+
+		::print_log("[Insteon::BaseObject] DEBUG4: ".$self->get_object_name
+			."->default_hop_count()=".$$self{default_hop_count}
+			." :: hop_array[]=". join("",@{$$self{hop_array}})) 
+			if $self->debuglevel(4, 'insteon');
+	}
+
+	#Allow for per-device settings
+	$$self{default_hop_count} = $$self{max_hops} if ($$self{max_hops} &&
+		$$self{default_hop_count} > $$self{max_hops});
+	$$self{default_hop_count} = $$self{min_hops} if ($$self{min_hops} &&
+		$$self{default_hop_count} < $$self{min_hops});	
+	
+        return $$self{default_hop_count};
+}
+
+=item C<engine_version([i1|i2|i2cs])>
+
+Used to store and return the associated engine version of a device.
+
+If provided, stores the engine version of the device.
+
+=cut
+
+sub engine_version
+{
+        my ($self, $p_engine_version) = @_;
+        $$self{engine_version} = $p_engine_version if $p_engine_version;
+        return $$self{engine_version};
+}
+
+=item C<equals([object])>
+
+Returns 1 if object is the same as $self, otherwise returns 0.
+
+=cut
+
+sub equals
+{
+	my ($self, $compare_object) = @_;
+        # make sure that the compare_object is legitimate
+        return 0 unless $compare_object && ref $compare_object && $compare_object->isa('Insteon::BaseObject');
+        return 1 if $compare_object eq $self;
+        # self and compare_object need to have device_ids and groups to be equal
+        return 0 unless $self->device_id && $self->group && $compare_object->device_id && $compare_object->group;
+        return 1 if (($compare_object->device_id eq $self->device_id)
+        	&& ($compare_object->group eq $self->group));
+	# default to false;
+        return 0;
+}
+
+=item C<set(state[,setby,response])>
+
+Used to set the device state.  If called by device or a device linked to device, 
+calls C<set_receive()>.  If called by something 
+else, will send the command to the device.
+
+=cut
+
+sub set
+{
+	my ($self,$p_state,$p_setby,$p_response) = @_;
+	return if &main::check_for_tied_filters($self, $p_state);
+
+	# Override any set_with_timer requests
+	if ($$self{set_timer}) {
+		&Timer::unset($$self{set_timer});
+		delete $$self{set_timer};
+	}
+
+	if ($self->_is_valid_state($p_state)) {
+		# always reset the is_locally_set property unless set_by is the device
+		$$self{m_is_locally_set} = 0 unless ref $p_setby and $p_setby eq $self;
+
+		if ($p_state eq 'toggle')
+		{
+			$p_state = ($self->state eq 'on')? 'off' : 'on';
+		}
+
+		my $setby_name = $p_setby;
+		$setby_name = $p_setby->get_object_name() if (ref $p_setby and $p_setby->can('get_object_name'));
+		if (ref $p_setby and $p_setby eq $self)
+		{ #If set by device, update MH state,
+			my $derived_state = $self->derive_link_state($p_state);
+			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
+				. "::set_receive($derived_state, $setby_name)") if $self->debuglevel(1, 'insteon');
+			$self->set_receive($derived_state,$p_setby,$p_response);
+			$self->set_linked_devices($p_state);
+		} 
+		elsif (ref $p_setby and $p_setby eq $self->interface) 
+		{ #If set by interface, this was a manual status_request response
+			&::print_log("[Insteon::BaseObject] " . $self->get_object_name()
+				. "::set_receive($p_state, $setby_name)") if $self->debuglevel(1, 'insteon');
+			$self->set_receive($p_state,$p_setby,$p_response);
+		}
+		else { # Not called by device, send set command
+			if ($self->is_responder){
+				my $message = $self->derive_message($p_state);
+				$self->_send_cmd($message);
+				&::print_log("[Insteon::BaseObject] " . $self->get_object_name() . "::set($p_state, $setby_name)")
+					if $self->debuglevel(1, 'insteon');
+				$self->is_acknowledged(0);
+				$$self{pending_state} = $p_state;
+				$$self{pending_setby} = $p_setby;
+				$$self{pending_response} = $p_response;
+			} 
+			else {
+				::print_log("[Insteon::BaseObject] " . $self->get_object_name()
+					. " is not a responder and cannot be set to a state.");	
+			}
+		}
+		$self->level($p_state) if $self->can('level'); # update the level value
+	} else {
+		&::print_log("[Insteon::BaseObject] failed state validation with state=$p_state");
+	}
+}
+
+=item C<is_acknowledged([ack])>
+
+If ack is true, calls C<set_receive()>.  If ack is false, clears awaiting_ack flag.
+
+=cut
+
+sub is_acknowledged
+{
+	my ($self, $p_ack) = @_;
+        if (defined $p_ack)
+        {
+       		if ($p_ack)
+                {
+			$self->set_receive($$self{pending_state},$$self{pending_setby}, $$self{pending_response}) if defined $$self{pending_state};
+		}
+                else
+                {
+                	# if we are not acknowledged, then clear the awaiting acknowledgement flag
+                        #   we won't do the converse as it is set in _process_command_stack
+                	$$self{awaiting_ack} = 0;
+                }
+		$$self{is_acknowledged} = $p_ack;
+		$$self{pending_state} = undef;
+		$$self{pending_setby} = undef;
+		$$self{pending_response} = undef;
+        }
+	return $$self{is_acknowledged};
+}
+
+=item C<set_receive(state[,setby,response])>
+
+Updates the device state in MisterHouse.  Triggers state_now, state_changed, and
+state_final variables to update accordingly.  Which causes tie_events to occur.
+
+If state was set to the same state within the last 1 second, then this is ignored.
+This prevents the accidental calling of state_now if duplicate messages are received.
+
+=cut
+
+sub set_receive
+{
+	my ($self, $p_state, $p_setby, $p_response) = @_;
+	my $curr_milli = sprintf('%.0f', &main::get_tickcount);
+	my $window = 1000;
+	$p_state = $self->derive_link_state($p_state);
+	if (($p_state eq $self->state || $p_state eq $self->state_final)
+		&& ($curr_milli - $$self{set_milliseconds} < $window)){
+		::print_log("[Insteon::BaseObject] Ignoring duplicate set " . $p_state .
+			" state command for " . $self->get_object_name . " received in " .
+			"less than $window milliseconds") if $self->debuglevel(1, 'insteon'); 
+	} else {
+		$$self{set_milliseconds} = $curr_milli;
+		$self->level($p_state) if $self->can('level'); # update the level value
+		$self->SUPER::set($p_state, $p_setby, $p_response);
+	}
+}
+
+=item C<set_with_timer(state, time, return_state, additional_return_states)>
+
+NOTE - This routine appears to be nearly identical, if not identical to the
+C<Generic_Item::set_with_timer()> routine, it is not clear why this routine is
+needed here.
+
+See full description of this routine in C<Generic_Item>
+
+=cut
+
+sub set_with_timer {
+	my ($self, $state, $time, $return_state, $additional_return_states) = @_;
+	return if &main::check_for_tied_filters($self, $state);
+
+	$self->set($state) unless $state eq '';
+
+	return unless $time;
+
+	my $state_change = ($state eq 'off') ? 'on' : 'off';
+	$state_change = $return_state if defined $return_state;
+	$state_change = $self->{state} if $return_state and lc $return_state eq 'previous';
+
+	$state_change .= ';' . $additional_return_states if $additional_return_states;
+
+	$$self{set_timer} = &Timer::new() unless $$self{set_timer};
+	my $object_name = $self->{object_name};
+	my $action = "$object_name->set('$state_change')";
+	$$self{set_timer}->set($time, $action);
+}
+
+sub _send_cmd
+{
+	my ($self, $message) = @_;
+#	$msg{type} = 'standard' unless $msg{type};
+
+#        my $message = $self->derive_message($msg{command},$msg{type},$msg{extra});
+
+        if ($message->command eq 'peek'
+              	or $message->command eq 'poke'
+               	or $message->command eq 'status_request'
+                or $message->command eq 'do_read_ee'
+                or $message->command eq 'set_address_msb'
+                or $message->command eq 'read_write_aldb'
+            )
+	{
+        	push(@{$$self{command_stack}}, $message);
+	}
+        else
+        {
+		unshift(@{$$self{command_stack}},$message);
+	}
+	$self->_process_command_stack();
+}
+
+=item C<derive_message([command,extra])>
+
+Generates and returns a basic on/off message from a command.
+
+=cut
+
+sub derive_message
+{
+	my ($self, $p_command, $p_extra) = @_;
+	my @args;
+	my $level;
+
+	#msg id
+	my ($command, $subcommand) = split(/:/, $p_command, 2);
+	$command=lc($command);
+#	&::print_log("XLATE:$msg:$substate:$p_state:");
+
+        my $message;
+
+        if ($self->isa("Insteon::BaseController"))
+        {
+	# only send out as all-link if the link originates from the plm
+		if ($self->isa("Insteon::InterfaceController"))
+                { # return the size of the command stack
+                        $message = new Insteon::InsteonMessage('all_link_send', $self);
+		}
+                elsif ($self->is_root)
+                { # return the size of the command stack
+			$message = new Insteon::InsteonMessage('insteon_send', $self);
+		} else {
+			# silently ignore as this is now permitted if via "surrogate"
+		}
+	} elsif ($self->isa("Insteon::BaseObject")) {
+		$message = new Insteon::InsteonMessage('insteon_send', $self);
+        }
+
+	if (!(defined $p_extra)) {
+		if ($command eq 'on')
+		{
+			if ($self->can('local_onlevel') && defined $self->local_onlevel) {
+				$level = 2.55 * $self->local_onlevel;
+				$command = 'on_fast';
+			} else {
+				$level=255;
+			}
+		} elsif ($command eq 'off')
+		{
+			$level = 0;
+		} elsif ($command=~/^([1]?[0-9]?[0-9])/)
+		{
+			if ($1 < 1) {
+				$command='off';
+				$level = 0;
+			} else {
+				$level = ($self->isa('Insteon::DimmableLight')) ? $1 * 2.55 : 255;
+				$command='on';
+			}
+		}
+	}
+
+	# confirm that the resulting $msg is legitimate
+	if (!(defined($self->message_type_code($command)))) {
+		&::print_log("[Insteon::BaseInsteon] invalid state=$command") if $self->debuglevel(1, 'insteon');
+		return undef;
+	}
+
+	if ($self->isa("Insteon::InterfaceController")) 
+	{
+		$message->extra('00') #All PLM Scenes are Cmd2=00;
+	} elsif ($p_extra)
+	{       $message->extra($p_extra);
+
+	} elsif ($subcommand) {
+		$message->extra($subcommand);
+	} else {
+		if ($command eq 'on')
+		{
+			$message->extra(sprintf("%02X",int($level+.5)));
+		} else {
+			$message->extra('00');
+		}
+	}
+
+        $message->command($command);
+	return $message;
+}
+
+=item C<message_type_code(msg)>
+
+Takes msg, a text based msg type, and returns the corresponding text version of
+the hexadecimal message type.
+
+=cut
+
+sub message_type_code
+{
+    my ($self, $msg) = @_;
+    return $$self{message_types}->{$msg};
+}
+
+=item C<message_type_hex(msg)>
+
+Takes msg, a text based msg type, and returns the corresponding message type as
+a hex.
+
+=cut
+
+sub message_type_hex
+{
+    my ($self, $msg) = @_;
+    return unpack( 'H*', pack( 'c', $self->message_type_code($msg)));
+}
+
+=item C<message_type(cmd)>
+
+Takes cmd, text based hexadecimal code, and returns the text based description
+of the message code.
+
+=cut
+
+sub message_type
+{
+    my ($self, $cmd1) = @_;
+    my $msg_type;
+    my $msg_type_ptr = $$self{message_types};
+    my %msg_types = %$msg_type_ptr;
+    for my $key (keys %msg_types){
+    	if (pack("C",$msg_types{$key}) eq pack("H*",$cmd1))
+    	{
+#    		&::print_log("[Insteon::BaseObject] found: $key");
+		$msg_type=$key;
+		last;
+	}
+    }
+    return $msg_type;
+}
+
+sub _is_info_request
+{
+	my ($self, $cmd, $ack_setby, %msg) = @_;
+	my $is_info_request = 0;
+	if ($cmd eq 'status_request') {
+		$is_info_request++;
+		my $ack_on_level = sprintf("%d", int((hex($msg{extra}) * 100 / 255)+.5));
+		&::print_log("[Insteon::BaseObject] received status for " .
+			$self->{object_name} . " with on-level: $ack_on_level%, "
+			. "hops left: $msg{hopsleft}") if $self->debuglevel(1, 'insteon');
+		$self->level($ack_on_level) if $self->can('level'); # update the level value
+		if ($ack_on_level == 0) {
+			$self->set('off', $ack_setby);
+		} elsif ($ack_on_level > 0 and !($self->isa('Insteon::DimmableLight'))) {
+			$self->set('on', $ack_setby);
+		} else {
+			$self->set($ack_on_level . '%', $ack_setby);
+		}
+		# if this were a scene controller, then also propogate the result to all members
+		my $callback;
+		if ($self->_aldb->{aldb_delta_action} eq 'set'){
+			if ($msg{cmd_code} eq "00") {
+				$self->_aldb->{_mem_activity} = 'delete';
+				$self->_aldb->{pending_aldb}{address} = $self->_aldb->get_first_empty_address();
+				if($self->_aldb->isa('Insteon::ALDB_i1')) {
+					$self->_aldb->_peek($self->_aldb->{pending_aldb}{address},0);
+				} else {
+					$self->_aldb->_write_delete($self->_aldb->{pending_aldb}{address});
+				}
+			} else {
+				$self->_aldb->aldb_delta($msg{cmd_code});
+				$self->_aldb->scandatetime(&main::get_tickcount);
+				&::print_log("[Insteon::BaseObject] The Link Table Version for "
+					. $self->{object_name} . " has been updated to version number " . $self->_aldb->aldb_delta());
+				if (defined $self->_aldb->{_success_callback}) {
+					$callback = $self->_aldb->{_success_callback};
+					$self->_aldb->{_success_callback} = undef;
+				}
+			}
+		}
+		elsif ($self->_aldb->{aldb_delta_action} eq 'check')
+		{
+			if ($self->_aldb->aldb_delta() eq $msg{cmd_code}){
+				&::print_log("[Insteon::BaseObject] The link table for "
+					. $self->{object_name} . " is in sync.");
+				#Link Table Scan Successful, Record Current Time
+				$self->_aldb->scandatetime(&main::get_tickcount);
+				if (defined $self->_aldb->{_aldb_unchanged_callback}) {
+					$callback = $self->_aldb->{_aldb_unchanged_callback};
+					$self->_aldb->{_aldb_unchanged_callback} = undef;
+				}
+			} else {
+				&::print_log("[Insteon::BaseObject] WARN The link table for "
+					. $self->{object_name} . " is out-of-sync.");
+				$self->_aldb->health('out-of-sync');
+				if (defined $self->_aldb->{_aldb_changed_callback}) {
+					$callback = $self->_aldb->{_aldb_changed_callback};
+					$self->_aldb->{_aldb_changed_callback} = undef;
+				}
+			}
+		}
+		$self->_aldb->{aldb_delta_action} = undef;
+		$self->_aldb->health('out-of-sync') if($self->_aldb->aldb_delta() ne $msg{cmd_code});
+		if ($callback){
+			package main;
+			eval ($callback);
+			&::print_log("[Insteon::BaseObject] " . $self->get_object_name . ": error during scan callback $@")
+				if $@ and $self->debuglevel(1, 'insteon');
+			package Insteon::BaseObject;                		
+		}
+	}
+	elsif ( $cmd eq 'get_engine_version' ) {
+		$is_info_request++;
+		my @engine_types = (qw/I1 I2 I2CS/);
+		my $version = $engine_types[$msg{extra}];
+		$self->engine_version($version);
+		&::print_log("[Insteon::BaseObject] received engine version for " 
+			. $self->{object_name} . " of $version. "
+			. "hops left: $msg{hopsleft}") if $self->debuglevel(1, 'insteon');
+	}
+	return $is_info_request;
+}
+
+sub _process_message
+{
+	my ($self,$p_setby,%msg) = @_;
+	my $p_state = undef;
+
+	# the current approach assumes that links from other controllers to some responder
+	# would be seen by the plm by also direct linking the controller as a responder
+	# and not putting the plm into monitor mode.  This means that updating the state
+	# of the responder based upon the link controller's request is handled
+	# by Insteon_Link.
+
+	main::print_log("[Insteon::BaseObject] WARN: Message has invalid checksum")
+		if ($self->debuglevel(1, 'insteon') && !($msg{crc_valid}) 
+		&& $msg{is_extended} && $self->engine_version() eq 'I2CS');
+
+	my $clear_message = 0;
+	$$self{m_is_locally_set} = 1 if $msg{source} eq lc $self->device_id;
+	$self->default_hop_count($msg{maxhops}-$msg{hopsleft}) if (!$self->isa('Insteon::InterfaceController'));
+	if ($msg{is_ack}) {
+		#Default to clearing message transaction for ACK
+		$clear_message = 1;
+		my $corrupt_cmd = 0;
+		my $pending_cmd = ($$self{_prior_msg}) ? $$self{_prior_msg}->command : $msg{command};
+		if ($$self{awaiting_ack})
+                {
+			my $ack_setby = (ref $$self{m_status_request_pending})
+				? $$self{m_status_request_pending} : $p_setby;
+			if ($self->_is_info_request($pending_cmd,$ack_setby,%msg))
+                        {
+				$self->is_acknowledged(1);
+				$$self{m_status_request_pending} = 0;
+				$self->_process_command_stack(%msg);
+			}
+                        elsif ($pending_cmd eq 'peek')
+                        {
+                        	if ($msg{cmd_code} eq $self->message_type_hex($pending_cmd)) {
+					$self->_aldb->_on_peek(%msg) if $self->_aldb;
+					$self->_process_command_stack(%msg);
+                        	} else {
+                        		$corrupt_cmd = 1;
+                        		$clear_message = 0;
+                        	}
+			}
+                        elsif ($pending_cmd eq 'set_address_msb')
+                        {
+                        	if ($msg{cmd_code} eq $self->message_type_hex($pending_cmd)) {
+					$self->_aldb->_on_peek(%msg) if $self->_aldb;
+					$self->_process_command_stack(%msg);
+                        	} else {
+                        		$corrupt_cmd = 1;
+                        		$clear_message = 0;
+                        	}
+			}
+                        elsif (($pending_cmd eq 'poke'))
+                        {
+                        	if ($msg{cmd_code} eq $self->message_type_hex($pending_cmd)) {
+					$self->_aldb->_on_poke(%msg) if $self->_aldb;
+					$self->_process_command_stack(%msg);
+                        	} else {
+                        		$corrupt_cmd = 1;
+                        		$clear_message = 0;
+                        	}
+			}
+			elsif ($pending_cmd eq 'read_write_aldb') {
+                        	if ($msg{cmd_code} eq $self->message_type_hex($pending_cmd)) {
+					$clear_message = $self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
+					$self->_process_command_stack(%msg) if ($clear_message);
+                        	} else {
+                        		$corrupt_cmd = 1;
+                        		$clear_message = 0;
+                        	}
+			}
+			elsif ($pending_cmd eq 'ping'){
+				$corrupt_cmd = 1 if ($msg{cmd_code} ne $self->message_type_hex($pending_cmd));
+				$corrupt_cmd = 1 if ($msg{extra} ne sprintf ("%02d", $$self{ping_count}));
+				if (!$corrupt_cmd){
+					$self->_process_command_stack(%msg);
+					&::print_log("[Insteon::BaseObject] received ping acknowledgement from " . $self->{object_name})
+						if $self->debuglevel(1, 'insteon');
+					$self->ping();
+					$clear_message = 1;
+				}
+			}
+			elsif ($pending_cmd eq 'linking_mode'){
+				$corrupt_cmd = 1 if ($msg{cmd_code} ne $self->message_type_hex($pending_cmd));
+				if (!$corrupt_cmd){
+					&::print_log("[Insteon::BaseObject] received linking mode ACK from " . $self->{object_name})
+						if $self->debuglevel(1, 'insteon');
+					$self->interface->_set_timeout('xmit', 2000);
+					$clear_message = 0;
+				}
+			}
+			else
+                        {
+				if (($pending_cmd eq 'do_read_ee') && 
+					($self->_aldb->health eq "good" || $self->_aldb->health eq "empty") &&
+					($self->isa('Insteon::KeyPadLincRelay') || $self->isa('Insteon::KeyPadLinc'))){
+					## Update_Flags ends up here, set aldb_delta to new value
+					$self->_aldb->query_aldb_delta("set");
+				}
+				$self->is_acknowledged(1);
+				# signal receipt of message to the command stack in case commands are queued
+				$self->_process_command_stack(%msg);
+				&::print_log("[Insteon::BaseObject] received command/state (awaiting) acknowledge from " . $self->{object_name}
+					. ": $pending_cmd and data: $msg{extra}") if $self->debuglevel(1, 'insteon');
+			}
+		}
+                else
+                {
+			# allow non-synchronous messages to also use the _is_info_request hook
+			$self->_is_info_request($pending_cmd,$p_setby,%msg);
+			$self->is_acknowledged(1);
+			# signal receipt of message to the command stack in case commands are queued
+			$self->_process_command_stack(%msg);
+			&::print_log("[Insteon::BaseObject] received command/state acknowledge from " . $self->{object_name}
+				. ": " . (($msg{command}) ? $msg{command} : "(unknown)")
+				. " and data: $msg{extra}") if $self->debuglevel(1, 'insteon');
+		}
+		if ($corrupt_cmd) {
+			main::print_log("[Insteon::BaseObject] WARN: received a message from "
+				. $self->get_object_name . " in response to a "
+				. $pending_cmd . " command, but the command code "
+				. $msg{cmd_code} . " is incorrect. Ignorring received message.");
+			$self->corrupt_count_log(1) if $self->can('corrupt_count_log');
+			$p_setby->active_message->no_hop_increase(1);
+		} 
+	}
+        elsif ($msg{is_nack})
+        {
+		#Default to clearing message transaction for NAK
+		$clear_message = 1;
+		if ($self->isa('Insteon::BaseLight')) {
+			&::print_log("[Insteon::BaseObject] WARN!! encountered a nack message ("
+			. $self->get_nack_msg_for( $msg{extra} ) .") for " . $self->{object_name}
+			. ".  It may be unplugged, have a burned out bulb, or this may be a new I2CS "
+			. "type device that must first be manually linked to the PLM using the set button.") 
+			if $self->debuglevel(1, 'insteon');
+		}
+		else 
+		{
+			&::print_log("[Insteon::BaseObject] WARN!! encountered a nack message ("
+			. $self->get_nack_msg_for( $msg{extra} ) .") for " . $self->{object_name}
+			. " ... skipping");
+		}
+		$p_setby->active_message->no_hop_increase(1);
+		$self->is_acknowledged(0);
+		$self->_process_command_stack(%msg);
+		if($p_setby->active_message->failure_callback)
+		{
+			main::print_log("[Insteon::BaseObject] WARN: Now calling message failure callback: "
+				. $p_setby->active_message->failure_callback) if $self->debuglevel(1, 'insteon');
+			$self->failure_reason('NAK');
+			package main;
+			eval $p_setby->active_message->failure_callback;
+			main::print_log("[Insteon::BaseObject] problem w/ retry callback: $@") if $@;
+			package Insteon::BaseObject;
+		}
+		$p_setby->active_message->no_hop_increase(1);
+		$self->is_acknowledged(0);
+		$self->_process_command_stack(%msg);
+	}
+        elsif ($msg{command} eq 'start_manual_change')
+        {
+		$$self{manual_direction} = $msg{extra};
+		$$self{manual_start} = ::get_tickcount() - (($msg{maxhops}-$msg{hopsleft})*50);
+	} elsif ($msg{command} eq 'stop_manual_change') {
+		# Determine percent change based on time interval
+		my $finish_time = &main::get_tickcount - (($msg{maxhops}-$msg{hopsleft})*50);
+		my $total_time = $finish_time - $$self{manual_start};
+		my $percent_change = int($total_time / 42);
+		if ($$self{manual_direction} eq '00') {
+			$percent_change = "-".$percent_change;
+		} else {
+			$percent_change = "+".$percent_change;
+		}
+		$self->set($percent_change, $self);
+	} elsif ($msg{command} eq 'read_write_aldb') {
+		if ($self->_aldb){
+			$clear_message = $self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
+			$self->_process_command_stack(%msg) if($clear_message);
+		}
+	} elsif ($msg{type} eq 'broadcast') {
+		$self->devcat($msg{devcat});
+		$self->firmware($msg{firmware});
+		&::print_log("[Insteon::BaseObject] device category: $msg{devcat}"
+			. " firmware: $msg{firmware} received for " . $self->{object_name});
+	} else {
+		## TO-DO: make sure that the state passed by command is something that is reasonable to set
+		$p_state = $msg{command};
+                if ($msg{type} eq 'alllink')
+                {
+			if ($msg{command} eq 'link_cleanup_report'){
+				if ($msg{extra} == 0){
+					::print_log("[Insteon::BaseObject] DEBUG Received AllLink Cleanup Success for "
+						. $self->{object_name}) if $self->debuglevel(1, 'insteon');
+				} else {
+					::print_log("[Insteon::BaseObject] WARN " . $msg{extra} . " Device(s) failed to "
+						. "acknowledge the command from " . $self->{object_name});
+				}
+			} else {
+				$self->set($p_state, $self);
+				$$self{_pending_cleanup} = 1;
+				#Wait to avoid clobbering incomming subsequent cleanup messages
+				my @links = $self->find_members('Insteon::BaseDevice');
+				#Timeout is the number of linked devices multiplied by
+				#the maximum hop length for a direct message and an ACK
+				#PLM is the +1
+				my $timeout = (scalar(@links)+1) * 300;
+				::print_log("[Insteon::BaseObject] DEBUG3 Delaying any outgoing messages ". 
+					"by $timeout milliseconds to avoid collision with subsequent cleanup ".
+					"messages from " . $self->get_object_name) if ($self->debuglevel(3, 'insteon'));
+				$self->interface->_set_timeout('xmit', $timeout);
+			}
+                }
+                elsif ($msg{type} eq 'cleanup')
+                {
+                	if (($self->state eq $p_state or $self->state_final eq $p_state)
+                		and $$self{_pending_cleanup}){
+				::print_log("[Insteon::BaseObject] Ignoring Received Direct AllLink Cleanup Message for " 
+					. $self->{object_name} . " since AllLink Broadcast Message was Received.") if $self->debuglevel(1, 'insteon');
+                	} else {
+				$self->set($p_state, $self);
+			}
+			$$self{_pending_cleanup} = 0;
+		} else {
+			main::print_log("[Insteon::BaseObject] Ignoring unsupported command from " 
+				. $self->{object_name}) if $self->debuglevel(1, 'insteon');
+			$self->corrupt_count_log(1) if $self->can('corrupt_count_log');
+                }
+	}
+	return $clear_message;
+}
+
+sub _process_command_stack
+{
+	my ($self, %ackmsg) = @_;
+	if (%ackmsg) { # which may also be something that can be interpretted as a "nack"
+		# determine whether to unset awaiting_ack
+		# for now, be "dumb" and just unset it
+		$$self{awaiting_ack} = 0;
+	}
+	if (!($$self{awaiting_ack})) {
+		my $callback = undef;
+		my $message = pop(@{$$self{command_stack}});
+		# convert ptr to cmd hash
+		if ($message)
+                {
+                        my $plm_queue_size = $self->interface->queue_message($message);
+
+			# send msg
+                        if ($message->command eq 'peek'
+                        	or $message->command eq 'poke'
+                        	or $message->command eq 'status_request'
+                                or $message->command eq 'get_engine_version'
+                                or $message->command eq 'id_request'
+                                or $message->command eq 'do_read_ee'
+                                or $message->command eq 'set_address_msb'
+                                or $message->command eq 'sensor_status'
+                                or $message->command eq 'set_operating_flags'
+                                or $message->command eq 'get_operating_flags'
+                                or $message->command eq 'read_write_aldb'
+                                or $message->command eq 'thermostat_control'
+                                or $message->command eq 'thermostat_get_zone_info'
+                                or $message->command eq 'extended_set_get'
+                                or $message->command eq 'ping'
+                                or $message->command eq 'linking_mode' 
+                                )
+                        {
+				$$self{awaiting_ack} = 1;
+			}
+                        else
+                        {
+				$$self{awaiting_ack} = 0;
+			}
+
+			$$self{_prior_msg} = $message;
+			# TO-DO: adjust timer based upon (1) type of message and (2) retry_count
+			my $queue_time = $$self{max_queue_time} + $plm_queue_size;
+			# if is_synchronous, then no other command can be sent until an insteon ack or nack is received
+			# for this command
+		} else {
+			# and, always clear awaiting_ack and _prior_msg
+			$$self{awaiting_ack} = 0;
+			$$self{_prior_msg} = undef;
+		}
+		if ($callback) {
+			package main;
+			eval ($callback);
+			&::print_log("[Insteon::BaseObject] error in queue timer callback: " . $@)
+				if $@ and $self->debuglevel(1, 'insteon');
+			package Insteon::BaseObject;
+		}
+	} else {
+#		&::print_log("[Insteon_Device] " . $self->get_object_name . " command queued but not yet sent; awaiting ack from prior command") if $self->debuglevel(1, 'insteon');
+	}
+}
+
+sub _is_valid_state
+{
+	my ($self,$state) = @_;
+	if (!(defined($state)) or $state eq '') {
+		return 0;
+	}
+
+	my ($msg, $substate) = split(/:/, $state, 2);
+	$msg=lc($msg);
+
+	if ($msg=~/^[+-]?([1]?[0-9]?[0-9])/)
+	{
+		if ($1 < 1) {
+			$msg='off';
+		} else {
+			$msg='on';
+		}
+	}
+        elsif ($msg eq 'toggle')
+        {
+        	if ($self->state eq 'on')
+                {
+                	$msg = 'off';
+                }
+                elsif ($self->state eq 'off')
+                {
+                	$msg = 'on';
+                }
+        }
+
+	# confirm that the resulting $msg is legitimate
+	if (!(defined($$self{message_types}{$msg}))) {
+		return 0;
+	} else {
+		return 1;
+	}
+}
+
+=item C<get_nack_msg_for(msg)>
+
+Takes msg, text based hexadecimal code, and returns the text based description
+of the NACK code.
+
+=cut
+
+sub get_nack_msg_for {
+   my ($self,$msg) = @_;
+   return $nack_messages{ $msg };
+}
+
+=item C<failure_reason>
+
+Stores the resaon for the most recent message failure [NAK | timeout].  Used to 
+process message callbacks after a message fails.  If called with no parameter 
+returns the saved failure reason.
+
+Parameters:
+	reason: failure reason
+
+Returns: failure reason
+
+=cut 
+
+sub failure_reason
+{
+        my ($self, $reason) = @_;
+        $$self{failure_reason} = $reason if $reason;
+        return $$self{failure_reason};
+}
+
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my %voice_cmds = (
+        #The Sync Links routine really resides in DeviceController, but that
+        #class seems a little redundant as in practice all devices are controllers
+        #in some sense.  As a result, that class will likely be folded into 
+        #BaseObject/Device at some future date.  In order to avoid a bizarre
+        #inheritance of this routine by higher classes, this command was placed
+        #here
+        'sync links' => $self->get_object_name . '->sync_links(0)'
+    );
+    return \%voice_cmds;
+}
+
+sub _aldb
+{
+   my ($self) = @_;
+   my $root_obj = $self->get_root();
+   return $$root_obj{aldb};
+}
+
+=item C<is_deaf()>
+
+Returns true if the device must be awake in order to respond to messages.  Most
+devices are not deaf, currently devices that are deaf are battery operated
+devices such as the Motion Sensor, RemoteLinc and TriggerLinc.
+
+At the BaseObject level all devices are defined as not deaf.  Objects which
+inherit BaseObject should redefine is_deaf as necessary.
+
+=cut
+
+sub is_deaf
+{
+	my ($self) = @_;
+	return $$self{is_deaf};
+}
+
+=item C<is_controller()>
+
+Returns true if the device is a controller.
+
+=cut
+
+sub is_controller
+{
+	my ($self) = @_;
+	return $$self{is_controller};
+}
+
+=item C<is_responder([1|0])>
+
+Stores and returns whether a device is a responder.
+
+=cut
+
+sub is_responder
+{
+	my ($self,$is_responder) = @_;
+	$$self{is_responder} = $is_responder if defined $is_responder;
+	if ($self->is_root || $self->isa('Insteon::InterfaceController')) {
+		return $$self{is_responder};
+	}
+        else
+        {
+		my $root_obj = $self->get_root();
+		if (ref $root_obj)
+                {
+			return $$root_obj{is_responder};
+		}
+                else
+                {
+			return 0;
+		}
+	}
+}
+
+=back
+
+=head2 INI PARAMETERS
+
+=over 
+
+=item Insteon_PLM_max_queue_time
+
+Was previously used to set the maximum amount of time
+a message could remain in the queue.  This parameter is no longer used in the code
+but it still appears in the initialization.  It may be removed at a future date.  
+This also gets set in L<Insteon::BaseDevice|Insteon::BaseInsteon/Insteon::BaseDevice>
+as well for some reason, but is not used there either.
+
+=back
+
+=head2 AUTHOR
+
+Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
+
+=head2 NOTES
+
+Special thanks to:
+	Brian Warren for significant testing and patches
+	Bruce Winter - MH
+
+=head2 SEE ALSO
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+####################################
+###            #####################
+### BaseDevice #####################
+###            #####################
+####################################
+
+=head1 B<Insteon::BaseDevice>
+
+=head2 DESCRIPTION
+
+Generic class implementation of a Base Insteon Device.
+
+=head2 INHERITS
+
+L<Insteon::BaseObject|Insteon::BaseInsteon/Insteon::BaseObject>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::BaseDevice;
+
+@Insteon::BaseDevice::ISA = ('Insteon::BaseObject');
+
+our %message_types = (
+   %Insteon::BaseObject::message_types,
+   assign_to_group => 0x01,
+   delete_from_group => 0x02,
+   link_cleanup_report => 0x06,
+   linking_mode => 0x09,
+   unlinking_mode => 0x0A,
+   get_engine_version => 0x0D,
+   ping => 0x0F,
+   id_request => 0x10,
+   on_fast => 0x12,
+   off_fast => 0x14,
+   start_manual_change => 0x17,
+   stop_manual_change => 0x18,
+   status_request => 0x19,
+   get_operating_flags => 0x1f,
+   set_operating_flags => 0x20,
+   do_read_ee => 0x24,
+   remote_set_button_tap => 0x25,
+   set_led_status => 0x27,
+   set_address_msb => 0x28,
+   poke => 0x29,
+   poke_extended => 0x2a,
+   peek => 0x2b,
+   peek_internal => 0x2c,
+   poke_internal => 0x2d,
+   extended_set_get => 0x2e,
+   read_write_aldb => 0x2f,
+);
+
+
+my %operating_flags = (
+   'program_lock_on' => '00',
+   'program_lock_off' => '01',
+   'led_on_during_tx' => '02',
+   'led_off_during_tx' => '03',
+   'resume_dim_on' => '04',
+   'beeper_enabled' => '04',
+   'resume_dim_off' => '05',
+   'beeper_off' => '05',
+   'eight_key_kpl' => '06',
+   'load_sense_on' => '06',
+   'six_key_kpl' => '07',
+   'load_sense_off' => '07',
+   'led_backlight_off' => '08',
+   'led_off' => '08',
+   'led_backlight_on' => '09',
+   'led_enabled' => '09',
+   'key_beep_enabled' => '0a',
+   'one_minute_warn_disabled' => '0a',
+   'key_beep_off' => '0b',
+   'one_minute_warn_enabled' => '0b'
+);
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+	my $self= new Insteon::BaseObject($p_deviceid,$p_interface);
+	bless $self,$class;
+
+        $$self{message_types} = \%message_types;
+        $$self{operating_flags} = \%operating_flags;
+
+        if ($self->group eq '01') {
+           $$self{aldb} = new Insteon::ALDB_i1($self);
+        }
+
+	$self->restore_data('devcat', 'firmware', 'level', 'retry_count_log', 'fail_count_log', 
+        'outgoing_count_log', 'incoming_count_log', 'corrupt_count_log',
+        'dupe_count_log', 'hops_left_count', 'max_hops_count',
+        'outgoing_hop_count');
+
+	$self->initialize();
+	$self->rate(undef);
+	$$self{level} = undef;
+	$$self{flag} = "0F";
+	$$self{ackMode} = "1";
+	$$self{awaiting_ack} = 0;
+	$$self{is_acknowledged} = 0;
+	$$self{max_queue_time} = $::config_parms{'Insteon_PLM_max_queue_time'};
+	$$self{max_queue_time} = 10 unless $$self{max_queue_time}; # 10 seconds is max time allowed in command stack
+	@{$$self{command_stack}} = ();
+	$$self{_onlevel} = undef;
+    $$self{retry_count_log} = 0;
+    $$self{fail_count_log} = 0;
+    $$self{outgoing_count_log} = 0;
+    $$self{incoming_count_log} = 0;
+    $$self{corrupt_count_log} = 0;
+    $$self{dupe_count_log} = 0;
+    $$self{hops_left_count} = 0;
+    $$self{max_hops_count} = 0;
+    $$self{outgoing_hop_count} = 0;
+
+
+	return $self;
+}
+
+=item C<initialize()>
+
+A former holdover from when MisterHouse used to ping devices to get their device
+category.  May not be needed anymore.
+
+=cut
+
+sub initialize
+{
+	my ($self) = @_;
+	$$self{m_write} = 1;
+	$$self{m_is_locally_set} = 0;
+	# persist local, simple attribs
+}
+
+=item C<rate([rate])>
+
+Used to store and return the associated ramp rate of a device.
+
+If provided, stores rate as the device's ramp rate in MisterHouse.
+
+=cut
+
+sub rate
+{
+	my ($self,$p_rate) = @_;
+	$$self{rate} = $p_rate if defined $p_rate;
+	return $$self{rate};
+}
+
+=item C<link_to_interface([group,data3])>
+
+If a controller link from the device to the interface does not exist, this will
+create that link on the device.
+
+Next, if a responder link from the device to the interface does not exist on the 
+interface, this will create that link on the interface.
+
+The group is the group on the device that is the controller, such as a button on
+a keypad link.  It will default to 01.
+
+Data3 is optional and is used to set the Data3 value in the controller link on 
+the device.
+
+=cut
+
+sub link_to_interface
+{
+	my ($self,$p_group, $p_data3, $step) = @_;
+	$p_group = $self->group unless (defined $p_group);
+	$p_data3 = $self->group unless (defined $p_data3);
+	my $success_callback_prefix = $self->get_object_name."->link_to_interface(\"$p_group\",\"$p_data3\",";
+	my $success_callback = "";
+	my $failure_callback = '::print_log("[Insteon::BaseInsteon] Error: The Link_To_Interface '.
+		'routine failed for device: '.$self->get_object_name.'")';
+	$step = 0 if ($step eq '');
+	if ($step == 0) { #If NAK on get_engine, then this is an I2CS device
+		$success_callback = $success_callback_prefix . "\"1\")";
+		$failure_callback = $self->get_object_name."->link_to_interface_i2cs(\"$p_group\",\"$p_data3\")";
+		$self->get_engine_version($success_callback, $failure_callback);	
+	}
+	elsif ($step == 1) { #Add Link from object->PLM
+		$success_callback = $success_callback_prefix . "\"2\")";
+		my %link_info = ( object => $self->interface, group => $p_group, is_controller => 1,
+			callback => "$success_callback", failure_callback=> "$failure_callback");
+		$link_info{data3} = $p_data3 if $p_data3;
+	        if ($self->_aldb) {
+		   $self->_aldb->add_link(%link_info);
+	        }
+	        else
+	        {
+	           &main::print_log("[Insteon::BaseInsteon] Error: This item, " . $self->get_object_name .
+	              ", does not have an ALDB object.  Linking is not permitted.");
+	        }
+	}
+	elsif ($step == 2){ #Add Link from PLM->object
+		$success_callback = $success_callback_prefix . "\"3\")";
+		my $link_info = "deviceid=" . lc ($self->device_id) . " group=$p_group is_controller=0 " .
+			"callback=$success_callback failure_callback=$failure_callback";	
+	        $self->interface->add_link($link_info);
+	}
+	elsif ($step == 3){ #Add surrogate link on device if surrogate exists
+		if (ref $$self{surrogate}){
+			$success_callback = $success_callback_prefix . "\"4\")";
+			my $surrogate_group = $$self{surrogate}->group;
+			my %link_info = ( object => $self->interface, 
+				group => $surrogate_group, is_controller => 0,
+				callback => "$success_callback", 
+				failure_callback=> "$failure_callback",
+				data3 => $p_group);
+			$self->_aldb->add_link(%link_info);
+		} else {
+			::print_log('[Insteon::BaseInsteon] Link_To_Interface successfully completed'.
+				' for device ' .$self->get_object_name);	
+		}
+	}
+	elsif ($step == 4){ #Add surrogate link on PLM if surrogate exists
+		$success_callback = $success_callback_prefix . "\"5\")";
+		my $surrogate_group = $$self{surrogate}->group;
+		my %link_info = ( deviceid=> lc($self->device_id), 
+			group => $surrogate_group, is_controller => 1,
+			callback => "$success_callback", 
+			failure_callback=> "$failure_callback",
+			data3 => $surrogate_group);
+		$self->interface->add_link(%link_info);
+	}
+	elsif ($step == 5){
+		::print_log('[Insteon::BaseInsteon] Link_To_Interface successfully completed'.
+			' for device ' .$self->get_object_name);			
+	}
+}
+
+=item C<link_to_interface_i2cs([group,data3])>
+
+Performs the same task as C<link_to_interface> however this routine is designed
+to perform the initial link to I2CS devices.  These devices cannot be initially
+linked to the PLM in the normal way.  This process requires more steps than the
+normal routine which will take longer to perform and therefore is more prone to
+faile.  As such, this should likely only be used if necessary.
+
+=cut
+
+sub link_to_interface_i2cs
+{
+	my ($self,$p_group, $p_data3, $step) = @_;
+	my $success_callback_prefix = $self->get_object_name."->link_to_interface_i2cs('$p_group','$p_data3',";
+	my $success_callback = "";
+	my $failure_callback = "::print_log('[Insteon::BaseInsteon] Error Link_To_Interface_I2CS ".
+		"routine failed for device: ".$self->get_object_name."')";
+	$step = 0 if ($step eq '');
+	if ($step == 0) { #Put PLM into initiate linking mode
+		$success_callback = $success_callback_prefix . "'1')";
+		$self->interface()->initiate_linking_as_controller('00', $success_callback, $failure_callback);	
+	}
+	elsif ($step == 1) { #Ask device to respond to link request
+		$success_callback = $success_callback_prefix . "'2')";
+		$self->enter_linking_mode($p_group, $success_callback, $failure_callback);	
+	}
+	elsif ($step == 2) { #Scan device to get an accurate link table
+		#return to normal link_to_interface routine if successful
+		$success_callback_prefix = $self->get_object_name."->link_to_interface('$p_group','$p_data3',";
+		$success_callback = $success_callback_prefix . "'1')";
+		$self->scan_link_table($success_callback, $failure_callback);
+	}
+}
+
+=item C<unlink_to_interface([group])>
+
+Will delete the contoller link from the device to the interface if such a link exists.
+
+Next, will delete the responder link from the device to the interface on the 
+interface, if such a link exists.
+
+The group is the group on the device that is the controller, such as a button on
+a keypad link.  It will default to 01.
+
+=cut
+
+sub unlink_to_interface
+{
+	my ($self,$p_group,$step) = @_;
+	$p_group = $self->group unless $p_group;
+	#It is possible to nest all of the callbacks in at once, but the quoting
+	#becomes very complicated and happers readability
+	my $success_callback_prefix = $self->get_object_name."->unlink_to_interface('$p_group',";
+	my $success_callback = "";
+	my $failure_callback = "::print_log('[Insteon::BaseInsteon] ERROR: Unlink_To_Interface ".
+		"failed for device: ".$self->get_object_name."')";
+	$step = 0 if ($step eq '');
+	if ($step == 0) { #Delete link on the device
+	        if ($self->_aldb) {
+	        	$success_callback = $success_callback_prefix . "'1')";
+			$self->_aldb->delete_link(object => $self->interface, 
+				group => $p_group, 
+				data3=> $p_group, is_controller => 1,
+				callback => $success_callback,
+				failure_callback=> $failure_callback);
+	        }
+	        else
+	        {
+	           &main::print_log("[BaseInsteon] This item " . $self->get_object_name .
+	              " does not have an ALDB object.  Unlinking is not permitted.");
+	        }
+	}
+	elsif ($step == 1) { #Delete link on the PLM
+		$success_callback = $success_callback_prefix . "'2')";
+		$self->interface->delete_link(
+			deviceid => lc($self->device_id), 
+			group=> $p_group, is_controller=>0,
+			callback=>$success_callback,
+			failure_callback=>$failure_callback);
+	}
+	elsif ($step == 2){ #Delete surrogate link on device if surrogate exists
+		if (ref $$self{surrogate}){
+			$success_callback = $success_callback_prefix . "'3')";
+			my $surrogate_group = $$self{surrogate}->group;
+			my %link_info = ( object => $self->interface, 
+				group => $surrogate_group, is_controller => 0,
+				callback => "$success_callback", 
+				failure_callback=> "$failure_callback",
+				data3 => $p_group);
+			$self->_aldb->delete_link(%link_info);
+		} else {
+			::print_log("[Insteon::BaseInsteon] Unlink_To_Interface".
+				" successfully completed for device "
+				. $self->get_object_name);	
+		}
+	}
+	elsif ($step == 3){ #Delete surrogate link on PLM if surrogate exists
+		$success_callback = $success_callback_prefix . "'4')";
+		my $surrogate_group = $$self{surrogate}->group;
+		my %link_info = ( deviceid=> lc($self->device_id), 
+			group => $surrogate_group, is_controller => 1,
+			callback => "$success_callback", 
+			failure_callback=> "$failure_callback",
+			data3 => $surrogate_group);
+		$self->interface->delete_link(%link_info);
+	}
+	elsif ($step == 4) {
+		::print_log("[Insteon::BaseInsteon] Unlink_To_Interface".
+			" successfully completed for device "
+			. $self->get_object_name);
+	}
+}
+
+=item C<enter_linking_mode(group, success_callback, failure_callback)>
+
+Places an i2 object into linking mode as if you had held down the set button on 
+the device.  i1 objects will not respond to this command.  This is needed to 
+link i2CS devices that will not respond without a manual link. 
+
+This process is included as part of the link_to_interface voice command and 
+should not need to be called seperately.
+
+Returns: nothing
+
+=cut 
+
+sub enter_linking_mode
+{
+	my ($self,$p_group, $success_callback, $failure_callback) = @_;
+	my $group = $p_group;
+	$group = '01' unless $group;
+	my $extra = sprintf("%02x", $group);
+	$extra .= '0' x (30 - length $extra);
+	my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'linking_mode', $extra);
+	$message->success_callback($success_callback);
+	$message->failure_callback($failure_callback);
+	$self->_send_cmd($message);
+}
+
+=item C<set_operating_flag(flag)>
+
+Sets the defined flag on the device.
+
+=cut 
+
+sub set_operating_flag {
+	my ($self, $flag) = @_;
+
+	if (!(exists($$self{operating_flags}{$flag})))
+        {
+		&::print_log("[Insteon::BaseDevice] $flag is not a support operating flag");
+		return;
+	}
+
+	if ($self->is_root and !($self->isa('Insteon::InterfaceController')))
+        {
+        	my $message;
+		if (ref $self->_aldb && $self->_aldb->isa('Insteon::ALDB_i2'))
+		{
+			$message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'set_operating_flags');
+			$message->extra($$self{operating_flags}{$flag} . "0000000000000000000000000000");
+		} else {
+			$message = new Insteon::InsteonMessage('insteon_send', $self, 'set_operating_flags');
+			$message->extra($$self{operating_flags}{$flag});
+		}
+                $self->_send_cmd($message);
+        }
+        else
+        {
+		&::print_log("[Insteon::BaseDevice] " . $self->get_object_name . " is either not a root device or is a plm controlled scene");
+		return;
+	}
+}
+
+=item C<get_operating_flag()>
+
+Requests the device's operating flag and prints it to the log.
+
+=cut 
+
+sub get_operating_flag {
+	my ($self) = @_;
+
+	if ($self->is_root and !($self->isa('Insteon::InterfaceController')))
+        {
+		# TO-DO: check devcat to determine if the action is supported by the device
+                my $message = new Insteon::InsteonMessage('insteon_send', $self, 'get_operating_flags');
+                $self->_send_cmd($message);
+#		$self->_send_cmd('command' => 'get_operating_flags');
+        }
+        else
+        {
+		&::print_log("[Insteon::BaseDevice] " . $self->get_object_name . " is either not a root device or is a plm controlled scene");
+		return;
+	}
+}
+
+=item C<writable(cmd)>
+
+Appears to set and or return the "writable" state.  Does not appear to be used
+in the Insteon code, but may be necessary for supporting other classes?
+
+=cut
+
+sub writable {
+	my ($self, $p_write) = @_;
+	if (defined $p_write)
+        {
+		if ($p_write =~ /r/i or $p_write =~/^0/)
+                {
+			$$self{m_write} = 0;
+		}
+                else
+                {
+			$$self{m_write} = 1;
+		}
+	}
+	return $$self{m_write};
+}
+
+=item C<is_locally_set(cmd)>
+
+Returns the is_locally_set variable.  Doesn't appear to be used in Insteon code.
+Likely was used to test whether setby was equal to the device itself.  May not
+always be properly updated since it appears unused.
+
+=cut
+
+sub is_locally_set {
+	my ($self) = @_;
+	return $$self{m_is_locally_set};
+}
+
+=item C<is_root()>
+
+Returns true if the object is the base object, generally group 01, on the device.
+
+=cut
+
+sub is_root {
+	my ($self) = @_;
+	return (($self->group eq '01') and !($self->isa('Insteon::InterfaceController'))) ? 1 : 0;
+}
+
+=item C<get_root()>
+
+Returns the root object of a device.
+
+=cut
+
+sub get_root {
+	my ($self) = @_;
+	if ($self->is_root)
+        {
+		return $self;
+	}
+        else
+        {
+		my $root_obj = &Insteon::get_object($self->device_id, '01');
+		::print_log ("[Insteon::BaseDevice] ERROR! Cannot find the root object for " 
+			. $self->get_object_name . ". Please check your mht file to make sure "
+			. "that device id " . $self->device_id . ":01 is defined.") 
+			if (!defined($root_obj));
+		return $root_obj;
+	}
+}
+
+=item C<has_link(link_details)>
+
+If a device has an ALDB, passes link_details onto one of the has_link() routines
+within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called as part of C<delete_orphan_links()>.
+
+=cut
+
+sub has_link
+{
+	my ($self, $insteon_object, $group, $is_controller, $subaddress) = @_;
+        my $aldb = $self->get_root()->_aldb;
+        if ($aldb)
+        {
+        	return $aldb->has_link($insteon_object, $group, $is_controller, $subaddress);
+        }
+        else
+        {
+        	return 0;
+        }
+
+}
+
+=item C<add_link(link_params)>
+
+If a device has an ALDB, passes link_details onto one of the add_link() routines
+within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called from the "sync links" or 
+"link to interface" voice commands.
+
+=cut
+
+sub add_link
+{
+	my ($self, $parms_text) = @_;
+        my $aldb = $self->get_root()->_aldb;
+        if ($aldb)
+        {
+        	my %link_parms;
+		if (@_ > 2)
+                {
+			shift @_;
+			%link_parms = @_;
+		}
+                else
+                {
+			%link_parms = &main::parse_func_parms($parms_text);
+		}
+        	$aldb->add_link(%link_parms);
+        }
+
+}
+
+=item C<update_link(link_params)>
+
+If a device has an ALDB, passes link_details onto one of the update_link() routines
+within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>. Generally called from the "sync links" 
+voice command.
+
+=cut
+
+sub update_link
+{
+	my ($self, $parms_text) = @_;
+        my $aldb = $self->get_root()->_aldb;
+        if ($aldb)
+        {
+        	my %link_parms;
+		if (@_ > 2)
+                {
+			shift @_;
+			%link_parms = @_;
+		}
+                else
+                {
+			%link_parms = &main::parse_func_parms($parms_text);
+		}
+        	$aldb->update_link(%link_parms);
+        }
+}
+
+=item C<delete_link([link details])>
+
+If a device has an ALDB, passes link_details onto one of the delete_link() routines
+within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called by C<delete_orphan_links()>.
+
+=cut
+
+sub delete_link
+{
+	my ($self, $parms_text) = @_;
+        my $aldb = $self->get_root()->_aldb;
+        if ($aldb)
+        {
+        	my %link_parms;
+		if (@_ > 2)
+                {
+			shift @_;
+			%link_parms = @_;
+		}
+                else
+                {
+			%link_parms = &main::parse_func_parms($parms_text);
+		}
+        	$aldb->delete_link(%link_parms);
+        }
+}
+
+=item C<scan_link_table()>
+
+Scans a device link table and caches a copy.
+
+=cut
+
+sub scan_link_table
+{
+	my ($self, $success_callback, $failure_callback) = @_;
+        my $aldb = $self->get_root()->_aldb;
+        if ($aldb)
+        {
+        	return $aldb->scan_link_table($success_callback, $failure_callback);
+	}
+
+}
+
+=item C<log_aldb_status()>
+
+Prints a human readable description of various settings and attributes associated 
+with a device including:
+
+Hop Count, Engine Version, ALDB Type, ALDB Health, and Last ALDB Scan Time
+
+=cut
+
+sub log_aldb_status
+{
+	my ($self) = @_;
+	main::print_log( "     Device ID: ".$self->device_id());
+	my $hop_array;
+	$hop_array = join("",@{$$self{hop_array}}) if (defined($$self{hop_array}));
+	main::print_log( "     Hop Count: ".$self->default_hop_count()." :: [$hop_array]");
+	main::print_log( "Engine Version: ".$self->engine_version());
+	my $aldb = $self->get_root()->_aldb;
+	if ($aldb)
+	{
+		main::print_log( "     ALDB Type: ".ref($aldb));
+		main::print_log( "   ALDB Health: ".$aldb->health());
+		main::print_log( "ALDB Scan Time: ".$aldb->scandatetime());
+	}
+}
+
+=item C<remote_set_button_tap([repeat])>
+
+In theory, would have the same effect as manually tapping the set button on the 
+device repeat times.
+
+WARN: Testing using the following does not produce results as expected.  Use at 
+your own risk. [GL]
+
+=cut
+
+sub remote_set_button_tap
+{
+	my ($self,$p_number_taps) = @_;
+	my $taps = ($p_number_taps =~ /2/) ? '02' : '01';
+        my $message = new Insteon::InsteonMessage('insteon_send', $self, 'remote_set_button_tap');
+        $message->extra($taps);
+        $self->_send_cmd($message);
+#	$self->_send_cmd('command' => 'remote_set_button_tap', 'extra' => $taps);
+}
+
+=item C<request_status([requestor])>
+
+Requests the current status of the device and calls C<set()> on the response.  
+This will trigger tied_events.
+
+=cut
+
+sub request_status
+{
+	my ($self, $requestor) = @_;
+	$$self{m_status_request_pending} = ($requestor) ? $requestor : 1;
+        my $message = new Insteon::InsteonMessage('insteon_send', $self, 'status_request');
+        $self->_send_cmd($message);
+#	$self->_send_cmd('command' => 'status_request', 'is_synchronous' => 1);
+}
+
+=item C<get_engine_version>
+
+Queues a get engine version insteon message using L<Insteon::BaseObject::_send_cmd> 
+and sets a message failure callback to L<Insteon::BaseDevice::_get_engine_version_failure>.  
+Message response is processed in L<Insteon::BaseObject::_is_info_request>  
+
+Returns: nothing
+
+=cut 
+
+sub get_engine_version {
+   my ($self, $success_callback, $failure_callback) = @_;
+
+   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'get_engine_version');
+   my $self_object_name = $self->get_object_name;
+   $message->failure_callback("$self_object_name->_get_engine_version_failure();$failure_callback");
+   $message->success_callback($success_callback);
+   $self->_send_cmd($message);
+}
+
+=item C<_get_engine_version_failure>
+
+Callback failure for L<Insteon::BaseDevice::get_engine_version>; called for NAK 
+and message timeout.  Will force engine_version to I2CS which will also remap 
+the aldb version if the device responds with a NAK. Does nothing for timeouts 
+except print a message. 
+
+Returns: nothing
+
+=cut 
+
+sub _get_engine_version_failure
+{
+	my ($self) = @_;
+	my $failure_reason = $self->failure_reason();
+	
+	main::print_log("[Insteon::BaseDevice::_get_engine_version_failure] DEBUG4: "
+		."failure reason: $failure_reason") if $self->debuglevel(4, 'insteon');
+	
+	if($failure_reason eq 'NAK')
+	{
+		#assume I2CS because no other device will NAK this command
+		main::print_log("[Insteon::BaseDevice] WARN: I2CS device (" . $self->get_object_name . ") is not "
+			."linked; Please use 'link to interface' voice command");
+		$self->engine_version('I2CS');
+	}
+	#Clear success callback, otherwise it will run when message is cleared
+	$self->interface->active_message->success_callback('0');
+}
+
+=item C<ping([count])>
+
+Sends the number of ping messages defined by count.  A ping message is a basic 
+message that simply asks the device to respond with an ACKnowledgement.  For
+i1 devices this will send a standard length command, for i2 and i2cs devices
+this will send an extended ping command.  In both cases, the device responds
+back with a standard length ACKnowledgement only.
+
+Much like the ping command in IP networks, this command is useful for testing the
+connectivity of a device on your network.  You likely want to use this in 
+conjunction with the C<print_message_log> routine.  For example, you can use 
+this to compare the message stats for a device when changing settings in 
+MisterHouse.
+
+Parameters:
+	count = the number of pings to send.
+
+Returns: Nothing.
+
+=cut
+
+sub ping
+{
+	my ($self, $p_count, $p_callback) = @_;
+	$$self{ping_count} = $p_count if defined($p_count);
+	$$self{ping_callback} = $p_callback if defined($p_callback);
+	if ($$self{ping_count}) {
+		$$self{ping_count}--;
+		my $message;
+		my $extra = sprintf("%02d", $$self{ping_count});
+		if (uc($self->engine_version) eq 'I1'){
+	    	$message = new Insteon::InsteonMessage('insteon_send', $self, 
+	    		'ping', $extra);
+		}
+		else {
+			my $extra = $extra . '0' x 28;
+			$message = new Insteon::InsteonMessage('insteon_ext_send', $self, 
+				'ping', $extra);
+		}
+		::print_log("[Insteon::BaseDevice] Sending ping request to " 
+			. $self->get_object_name . " " . $$self{ping_count} 
+			. " more ping requests queued.");
+		$message->failure_callback($self->get_object_name . '->ping()');
+		$self->_send_cmd($message);
+	}
+	else {
+		::print_log("[Insteon::BaseDevice] Completed ping queue for " 
+			. $self->get_object_name);
+		if (defined $$self{ping_callback}){
+			my $complete_callback = $$self{ping_callback};
+			package main;
+			eval ($complete_callback);
+			&::print_log("[Insteon::BaseDevice] error in ping callback: " . $@)
+				if $@ and $self->debuglevel(1, 'insteon');
+			package Insteon::BaseDevice;
+			delete $$self{ping_callback};
+		}
+	}
+}
+
+=item C<set_led_status()>
+
+Used to set the led staatus of SwitchLinc companion leds.
+
+=cut 
+
+sub set_led_status
+{
+	my ($self, $status_mask) = @_;
+        my $message = new Insteon::InsteonMessage('insteon_send', $self, 'set_led_status');
+        $message->extra($status_mask);
+        $self->_send_cmd($message);
+#	$self->_send_cmd('command' => 'set_led_status', 'extra' => $status_mask);
+}
+
+=item C<restore_string()>
+
+This is called by mh on exit to save the cached ALDB of a device to persistant data.
+
+=cut
+
+sub restore_string
+{
+	my ($self) = @_;
+	my $restore_string = $self->SUPER::restore_string();
+	if ($self->_aldb)
+        {
+		$restore_string .= $self->_aldb->restore_string();
+        }
+
+	return $restore_string;
+}
+
+=item C<restore_states()>
+
+Obsolete / do not use.
+
+Function should remain so that upgrading users will not have issues starting 
+MH from previous versions that referenced this function in the 
+mh_temp.saved_states file.
+
+=cut
+
+sub restore_states
+{
+	my ($self, $states) = @_;
+}
+
+=item C<restore_aldb()>
+
+Used to reload the aldb of a device on restart.
+
+=cut
+
+sub restore_aldb
+{
+	my ($self,$aldb) = @_;
+	if ($self->_aldb and $aldb)
+        {
+           $self->_aldb->restore_aldb($aldb);
+	}
+}
+
+=item C<devcat()>
+
+Sets and returns the device category of a device.  Devcat can be requested by
+calling C<get_devcat()>.
+
+=cut
+
+sub devcat
+{
+	my ($self, $devcat) = @_;
+	if ($devcat)
+        {
+		$$self{devcat} = $devcat;
+	}
+	return $$self{devcat};
+}
+
+=item C<get_devcat()>
+
+Requests the device category for the device.  The returned value can be obtained
+by calling C<devcat()>.
+
+=cut
+
+sub get_devcat
+{
+	my ($self) = @_;
+        my $message = new Insteon::InsteonMessage('insteon_send', $self, 'id_request');
+        $self->_send_cmd($message);
+}
+
+=item C<firmware()>
+
+Sets and returns the device firmware version.  Value can be obtained from the 
+device by calling C<get_devcat()>.
+
+=cut
+
+sub firmware
+{
+	my ($self, $firmware) = @_;
+	$$self{firmware} = $firmware if (defined $firmware);
+	return $$self{firmware};
+}
+
+=item C<states()>
+
+Sets and returns the available states for a device.
+
+=cut
+
+sub states
+{
+	my ($self, $states) = @_;
+	if ($states)
+        {
+		@{$$self{states}} = split(/,/,$states);
+	}
+	if ($$self{states})
+        {
+		return @{$$self{states}};
+	} else {
+		return undef;
+	}
+
+}
+
+=item C<delete_orphan_links(audit_mode)>
+
+Reviews the cached version of all of the ALDBs and based on this review removes
+links from this device which are not present in the mht file, not defined in the 
+code, or links which are only half-links.
+
+If audit_mode is true, prints the actions that would be taken to the log, but 
+does nothing.
+
+=cut
+
+sub delete_orphan_links
+{
+	my ($self, $audit_mode, $failure_callback) = @_;
+        return $self->_aldb->delete_orphan_links($audit_mode, $failure_callback) if $self->_aldb;
+}
+
+sub _process_delete_queue {
+	my ($self) = @_;
+        $self->_aldb->_process_delete_queue() if $self->_aldb;
+}
+
+=item C<log_alllink_table()>
+
+Prints a human readable form of MisterHouse's cached version of a device's ALDB
+to the print log.  Called as part of the "scan links" voice command
+or in response to the "log links" voice command.
+
+=cut
+
+sub log_alllink_table
+{
+	my ($self) = @_;
+        $self->_aldb->log_alllink_table if $self->_aldb;
+}
+
+=item C<engine_version>
+
+Sets or gets the device object engine version.  If setting the engine version, 
+will also call check_aldb_version to map the aldb correctly for I2 devices. 
+
+Parameters:
+	p_engine_version: [I1|I2|I2CS] to set engine version
+
+Returns: engine version string [I1|I2|I2CS]
+
+=cut 
+
+sub engine_version
+{
+	my ($self, $p_engine_version) = @_;
+	my $engine_version = $self->SUPER::engine_version($p_engine_version);
+	$self->check_aldb_version() if $p_engine_version;
+	return $engine_version;
+}
+
+=item C<retry_count_log([type]>
+
+Sets or gets the number of message retries that have occured for this device 
+since the last time C<reset_message_stats> was called.
+
+If type is set, to any value, will increment retry log by one.
+
+Returns: current retry count.
+
+=cut 
+
+sub retry_count_log
+{
+	my ($self, $retry_count_log) = @_;
+	$self = $self->get_root;
+	$$self{retry_count_log}++ if $retry_count_log;
+	return $$self{retry_count_log};
+} 
+
+=item C<fail_count_log([type]>
+
+Sets or gets the number of message failures that have occured for this device 
+since the last time C<reset_message_stats> was called.
+
+If type is set, to any value, will increment fail log by one.
+
+Returns: current fail count.
+
+=cut 
+
+sub fail_count_log
+{
+    my ($self, $fail_count_log) = @_;
+    $self = $self->get_root;
+	$$self{fail_count_log}++ if $fail_count_log;
+	return $$self{fail_count_log};
+} 
+
+=item C<outgoing_count_log([type]>
+
+Sets or gets the number of outgoing message that have occured for this device 
+since the last time C<reset_message_stats> was called.
+
+If type is set, to any value, will increment output count by one.
+
+Returns: current output count.
+
+=cut 
+
+sub outgoing_count_log
+{
+    my ($self, $outgoing_count_log) = @_;
+    $self = $self->get_root;
+    $$self{outgoing_count_log}++ if $outgoing_count_log;
+	return $$self{outgoing_count_log};
+}
+
+=item C<stress_test(count)>
+
+Simulates a read of a link address from the device.  Repeats this process as many
+times as defined by count.  This routine is meant to be used as a diagnostic tool.
+It is similar to scan_link_table, however, if a failure occurs, this process will
+continue with the next iteration.  Scan link table will stop as soon as a single
+failure occurs.
+
+This is also similar to the C<ping> test, however, rather than simply requesting
+an ACK, this requests a full set of data equivalent to a link entry.  Similar to
+C<ping> this should be used with C<print_message_log> to diagnose issues and try
+different settings.
+
+Note: This routine can create a lot of traffic if count is set very high.  Try
+setting it to 5 first and working your way up.
+
+=cut
+
+sub stress_test
+{
+	my ($self, $p_count, $complete_callback) = @_;
+	$$self{stress_test_count} = $p_count if (defined ($p_count));
+	$$self{stress_test_callback} = $complete_callback if (defined ($complete_callback));
+	if ($$self{stress_test_count}){
+		&::print_log("[Insteon::BaseDevice] " . $self->get_object_name 
+			. " - Stress Test " . $$self{stress_test_count} . " iterations left");
+	        my $aldb = $self->get_root()->_aldb;
+	        if ($aldb)
+	        {
+			$$aldb{_mem_activity} = 'scan';
+			$$aldb{_stress_test_act} = 1;
+			$$aldb{_failure_callback} = $self->get_object_name 
+				. '->stress_test()';
+			if($aldb->isa('Insteon::ALDB_i1')) {
+				$aldb->_peek('0FF8');
+			} else {
+				#Prevents duplicate commands in queue error
+				#Also allows for better identification of 
+				#sequential dupe incoming messages
+				my $odd = $$self{stress_test_count} % 2;
+				if ($odd){
+					$aldb->send_read_aldb('0fff');
+				} else {
+					$aldb->send_read_aldb('0ff7');
+				}
+			}
+		}
+		$$self{stress_test_count}--;
+	} else {
+		&::print_log("[Insteon::BaseDevice] Stress Test Complete for " 
+			. $self->get_object_name);	
+		if (defined $$self{stress_test_callback}){
+			$complete_callback = $$self{stress_test_callback};
+			package main;
+			eval ($complete_callback);
+			&::print_log("[Insteon::BaseDevice] error in stress_test callback: " . $@)
+				if $@ and $self->debuglevel(1, 'insteon');
+			package Insteon::BaseDevice;
+			delete $$self{stress_test_callback};
+		}
+	}
+}
+
+=item C<outgoing_hop_count([type]>
+
+Sets or gets the number of hops that have been used in all outgoing messages
+since the last time C<reset_message_stats> was called.
+
+If type is set, to any value, will increment output count by that value.
+
+Returns: current hop count.
+
+=cut 
+
+sub outgoing_hop_count
+{
+    my ($self, $outgoing_hop_count) = @_;
+    $self = $self->get_root;
+    $$self{outgoing_hop_count} += $outgoing_hop_count if $outgoing_hop_count;
+	return $$self{outgoing_hop_count};
+}
+
+=item C<incoming_count_log([type]>
+
+Sets or gets the number of incoming message that have occured for this device 
+since the last time C<reset_message_stats> was called.
+
+If type is set, to any value, will increment incoming count by one.
+
+Returns: current incoming count.
+
+=cut 
+
+sub incoming_count_log
+{
+    my ($self, $incoming_count_log) = @_;
+    $self = $self->get_root;
+    $$self{incoming_count_log}++ if $incoming_count_log;
+    return $$self{incoming_count_log};
+}
+        
+=item C<corrupt_count_log([type]>
+
+Sets or gets the number of currupt message that have arrived from this device 
+since the last time C<reset_message_stats> was called.
+
+If type is set, to any value, will increment corrupt count by one.
+
+Returns: current corrupt count.
+
+=cut 
+
+sub corrupt_count_log
+{
+    my ($self, $corrupt_count_log) = @_;
+    $self = $self->get_root;
+    $$self{corrupt_count_log}++ if $corrupt_count_log;
+    return $$self{corrupt_count_log};
+}
+
+=item C<dupe_count_log([type]>
+
+Sets or gets the number of duplicate message that have arrived from this device 
+since the last time C<reset_message_stats> was called.
+
+If type is set, to any value, will increment corrupt count by one.
+
+Returns: current duplicate count.
+
+=cut 
+
+sub dupe_count_log
+{
+    my ($self, $dupe_count_log) = @_;
+    $self = $self->get_root;
+    $$self{dupe_count_log}++ if $dupe_count_log;
+    return $$self{dupe_count_log};
+}
+
+=item C<hops_left_count([type]>
+
+Sets or gets the number of hops_left for messages that arrive from this device 
+since the last time C<reset_message_stats> was called.
+
+If type is set, to any value, will increment corrupt count by one.
+
+Returns: current hops_left count.
+
+=cut 
+
+sub hops_left_count
+{
+    my ($self, $hops_left_count) = @_;
+    $self = $self->get_root;
+    $$self{hops_left_count} += $hops_left_count if $hops_left_count;
+    return $$self{hops_left_count};
+}
+
+=item C<max_hops_count([type]>
+
+Sets or gets the number of max_hops for messages that arrive from this device 
+since the last time C<reset_message_stats> was called.
+
+If type is set, to any value, will increment corrupt count by one.
+
+Returns: current duplicate count.
+
+=cut 
+
+sub max_hops_count
+{
+    my ($self, $max_hops_count) = @_;
+    $self = $self->get_root;
+    $$self{max_hops_count} += $max_hops_count if $max_hops_count;
+    return $$self{max_hops_count};
+}
+
+
+=item C<reset_message_stats>
+
+Resets the retry, fail, outgoing, incoming, and corrupt message counters.
+
+=cut 
+
+sub reset_message_stats
+{
+    my ($self) = @_;
+    $self = $self->get_root;
+    $$self{retry_count_log} = 0;
+    $$self{fail_count_log} = 0;
+    $$self{outgoing_count_log} = 0;
+    $$self{incoming_count_log} = 0;
+    $$self{corrupt_count_log} = 0;
+    $$self{dupe_count_log} = 0;
+    $$self{hops_left_count} = 0;
+    $$self{max_hops_count} = 0;
+    $$self{outgoing_hop_count} = 0;
+}
+
+=item C<print_message_stats>
+
+Prints message statistics for this device to the print log.  The output contains:
+
+=back
+
+=over8
+
+=item * 
+
+In - The number of incoming messages received
+
+=item * 
+
+Corrupt - The number of incoming corrupt messages received
+
+=item * 
+
+%Corrpt - Of the incoming messages received, the percentage that were 
+corrupt
+
+=item *
+
+Dupe - The number of duplicate messages that have been received from this 
+device.
+
+=item *
+
+%Dupe - The percentage of duplilicate incoming messages received.
+
+=item *
+
+Hops_Left - The average hops left in the messages received from this device.
+
+=item *
+
+Max_Hops - The average maximum hops in the messages received from this device.
+
+=item *
+
+Act_Hops - Max_Hops - Hops_Left, this is the average number of hops that have
+been required for a message sent from the device to reach MisterHouse.
+
+=item * 
+
+Out - The number of unique outgoing messages, without retries, sent. 
+
+=item * 
+
+Fail - The number times that all retries were exhausted without a successful
+delivery of a message.
+
+=item * 
+
+%Fail - Of the outgoing messages sent, the percentage that failed.
+
+=item * 
+
+Retry - The number of retry attempts that have been made to deliver a message. 
+Ideally this is 0, but Sends/Msg is a better indication of this parameter.
+
+=item * 
+
+AvgSend - The average number of send attempts that must be made in order to 
+successfully deliver a message.  Ideally this would be 1.0.  
+
+NOTE: If the number of retries exceeds the value set in the configuration file 
+for Insteon_retry_count, MisterHouse will abandon sending the message.  As a 
+result, as this number approaches Insteon_retry_count it becomes a less accurate 
+representation of the number of retries needed to reach a device.
+
+=item *
+
+Avg_Hops - The average number of hops that have been used by MisterHouse when
+sending messages to this device.
+
+=item *
+
+Hop_Count - The current hop count being used by MH.  This count is dynamically
+controlled by MH and is not reset by calling C<reset_message_stats>
+
+=back
+
+=over
+
+=cut 
+
+sub print_message_stats
+{
+    my ($self) = @_;
+    $self = $self->get_root;
+    my $object_name = $self->get_object_name;
+    my $retry_average = 0; 
+    $retry_average = sprintf("%.1f", ($$self{retry_count_log} / 
+        $$self{outgoing_count_log}) + 1) if ($$self{outgoing_count_log} > 0);
+    my $fail_percentage = 0; 
+    $fail_percentage = sprintf("%.1f", ($$self{fail_count_log} / 
+        $$self{outgoing_count_log}) * 100 ) if ($$self{outgoing_count_log} > 0);
+    my $corrupt_percentage = 0; 
+    $corrupt_percentage = sprintf("%.1f", ($$self{corrupt_count_log} / 
+        $$self{incoming_count_log}) * 100 ) if ($$self{incoming_count_log} > 0);
+    my $dupe_percentage = 0; 
+    $dupe_percentage = sprintf("%.1f", ($$self{dupe_count_log} / 
+        $$self{incoming_count_log}) * 100 ) if ($$self{incoming_count_log} > 0);
+    my $avg_hops_left = 0; 
+    $avg_hops_left = sprintf("%.1f", ($$self{hops_left_count} / 
+        $$self{incoming_count_log})) if ($$self{incoming_count_log} > 0);
+    my $avg_max_hops = 0; 
+    $avg_max_hops = sprintf("%.1f", ($$self{max_hops_count} / 
+        $$self{incoming_count_log})) if ($$self{incoming_count_log} > 0);
+    my $avg_out_hops = 0;
+    $avg_out_hops = sprintf("%.1f", ($$self{outgoing_hop_count} / 
+        $$self{outgoing_count_log})) if ($$self{outgoing_count_log} > 0);
+    ::print_log(
+        "[Insteon::BaseDevice] Message statistics for $object_name:\n"
+        . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops\n"
+        . sprintf("%6s", $$self{incoming_count_log})
+        . sprintf("%8s", $$self{corrupt_count_log})
+        . sprintf("%8s", $corrupt_percentage . '%')
+        . sprintf("%6s", $$self{dupe_count_log})
+        . sprintf("%8s", $dupe_percentage . '%')
+        . sprintf("%9s", $avg_hops_left)
+        . sprintf("%9s", $avg_max_hops)
+        . sprintf("%9s", $avg_max_hops - $avg_hops_left)
+        . "\n"
+        . "   Out    Fail   %Fail Retry AvgSend Avg_Hops CurrHops\n"
+        . sprintf("%6s", $$self{outgoing_count_log})
+        . sprintf("%8s", $$self{fail_count_log})
+        . sprintf("%8s", $fail_percentage . '%')
+        . sprintf("%6s", $$self{retry_count_log})
+        . sprintf("%8s", $retry_average)
+        . sprintf("%9s", $avg_out_hops)
+        . sprintf("%9s", $self->default_hop_count)
+    );
+}
+
+
+=item C<check_aldb_version>
+
+Because of the way MH saves / restores states "after" object creation
+the aldb must be initially created before the engine_version is restored.
+It is therefore impossible to know the device is i2 before creating
+the aldb object.  The solution is to keep the existing logic which assumes
+the device is peek/poke capable (i1 or i2) and then delete/recreate the 
+aldb object if it is later determined to be an i2 device. 
+
+There is a use case where a device is initially I2 but the user replaces
+the device with an I1 device, reusing the same object name.  In this case
+the object state restore will build an I2 aldb object.  The user must 
+manually initiate the 'get engine version' voice command or stop/start
+MH so the initial poll will detect the change. 
+
+This is called anytime the engine_version is queried (initial startup poll) and
+in the Reload_post_hooks once object_states_restore completes
+
+=cut
+
+sub check_aldb_version
+{
+	my ($self) = @_;
+
+	my $engine_version = $self->SUPER::engine_version();
+	my $new_version = "";
+	if($engine_version and $engine_version ne 'I1' and $self->_aldb->aldb_version() ne 'I2') {
+		$new_version = "I2";
+	}
+	elsif($engine_version eq 'I1' and $self->_aldb->aldb_version() ne 'I1') {
+		$new_version = "I1";
+	}
+	if ($new_version) {
+		main::print_log("[Insteon::BaseDevice] DEBUG4: aldb_version is "
+			.$self->_aldb->aldb_version()." but device is ".$engine_version.
+			".  Remapping aldb version to $new_version") if $self->debuglevel(4, 'insteon');
+		my $restore_string = '';
+		if ($self->_aldb) {
+			$restore_string = $self->_aldb->restore_string();
+		}
+		undef $self->{aldb};
+
+		if ($new_version eq "I2") {
+			$self->{aldb} = new Insteon::ALDB_i2($self);
+		}
+		else {
+			$self->{aldb} = new Insteon::ALDB_i1($self);
+		} 
+		
+		package main;
+		eval ($restore_string);
+		&::print_log("[Insteon::BaseDevice] error in eval creating ALDB object: " . $@)
+			if $@ and $self->debuglevel(1, 'insteon');
+		package Insteon::BaseDevice;
+	}
+}
+
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds},
+        'link to interface' => "$object_name->link_to_interface",
+        'unlink with interface' => "$object_name->unlink_to_interface"
+    );
+    if ($self->is_root){
+        %voice_cmds = (
+            %voice_cmds,
+            'status' => "$object_name->request_status",
+            'get engine version' => "$object_name->get_engine_version",
+            'scan link table' => "$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")",
+            'print message stats' => "$object_name->print_message_stats",
+            'reset message stats' => "$object_name->reset_message_stats",
+            'run stress test' => "$object_name->stress_test(5)",
+            'run ping test' => "$object_name->ping(5)",
+            'log links' => "$object_name->log_alllink_table()"
+        )
+    }
+    return \%voice_cmds;
+}
+
+=back
+
+=head2 INI PARAMETERS
+
+=over 
+
+=item Insteon_PLM_max_queue_time
+
+Was previously used to set the maximum amount of time
+a message could remain in the queue.  This parameter is no longer used in the code
+but it still appears in the initialization.  It may be removed at a future date.  
+This also gets set in L<Insteon::BaseObject|Insteon::BaseInsteon/Insteon::BaseObject>
+as well for some reason, but is not used there either.
+
+=back
+
+=head2 AUTHOR
+
+Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+####################################
+###                  ###############
+### MultigroupDevice ###############
+###                  ###############
+####################################
+
+=head1 B<Insteon::MultigroupDevice>
+
+=head2 DESCRIPTION
+
+Contains functions which are unique to insteon devices which have more than
+one group.  This includes, KeyPadLincs, RemoteLincs, FanLincs, Thermostats 
+(i2 versions).
+
+=head2 INHERITS
+
+Nothing.
+
+This package is meant to provide supplemental support and should only be added
+as a secondary inheritance to an object.
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::MultigroupDevice;
+
+=item C<sync_all_links(audit_mode)>
+
+Syncs all links on the object, including all subgroups such as additional
+buttons.
+
+Paramter B<audit_mode> - Causes sync to walk through but not actually 
+send any commands to the devices.  Useful with the insteon:3 debug setting for 
+troubleshooting. 
+
+=cut
+
+sub sync_all_links
+{
+	my ($self, $audit_mode) = @_;
+	$self = $self->get_root();
+	@{$$self{_sync_devices}} = ();
+	@{$$self{_sync_device_failures}} = ();
+	my $device_id = $self->device_id();
+	my ($subgroup_object, $group, $dec_group);
+	
+	::print_log("[Insteon::MultigroupDevice] Sync All Links on device "
+		.$self->get_object_name . " starting ...");
+	# Find all subgroup items check groups from 02 - FF;
+	for ($dec_group = 01; $dec_group <= 255; $dec_group++) {
+		$group = sprintf("%02X", $dec_group);
+		$subgroup_object = Insteon::get_object($device_id, $group);
+		if (ref $subgroup_object){
+			my %sync_req = ('sync_object' => $subgroup_object, 
+					'audit_mode' => ($audit_mode) ? 1 : 0);
+			::print_log("[Insteon::MultigroupDevice] "
+				."Adding " . $subgroup_object->get_object_name 
+				." to sync queue.");
+			push @{$$self{_sync_devices}}, \%sync_req
+		}
+	}
+	$$self{_sync_cnt} = scalar @{$$self{_sync_devices}};
+	$self->_get_next_linksync();
+}
+
+=item C<_get_next_linksync()>
+
+Calls the sync_links() function for each device identified by sync_all_link.  
+This function will be called recursively since the callback passed to sync_links() 
+is this function again.  Will also ask sync_links() to call 
+_get_next_linksync_failure() if sync_links() fails. 
+
+=cut
+
+sub _get_next_linksync
+{
+	my ($self) = @_;
+	$self = $self->get_root();
+	my $sync_req_ptr = shift(@{$$self{_sync_devices}});
+	my %sync_req = ($sync_req_ptr) ? %$sync_req_ptr : undef;
+	my $current_sync_device;
+	if (%sync_req) {
+		$current_sync_device = $sync_req{'sync_object'};
+	}
+	else {
+		$current_sync_device = undef;
+	}
+
+	if ($current_sync_device) {
+		::print_log("[Insteon::MultigroupDevice] Now syncing: "
+			. $current_sync_device->get_object_name . " ("
+			. ($$self{_sync_cnt} - scalar @{$$self{_sync_devices}})
+			. " of ".$$self{_sync_cnt}.")");
+		$current_sync_device->sync_links($sync_req{'audit_mode'}, 
+			$self->get_object_name . '->_get_next_linksync()',
+			$self->get_object_name . '->_get_next_linksync_failure('.$current_sync_device->get_object_name.')');
+	}
+	else {
+		::print_log("[Insteon::MultigroupDevice] All links have completed syncing "
+				. "on device " . $self->get_object_name);
+		my $_sync_failure_cnt = scalar @{$$self{_sync_device_failures}};
+		if ($_sync_failure_cnt) {
+			::print_log("[Insteon::MultigroupDevice] However, some failures were noted:");
+			for my $failed_obj (@{$$self{_sync_device_failures}}) {
+				::print_log("[Insteon::MultigroupDevice] WARN: failure occurred when syncing "
+				. $failed_obj->get_object_name);
+			}
+		}
+	}
+}
+
+=item C<_get_next_linksync()>
+
+Called by the failure callback in a device's sync_links() function.  Will add
+the failed device to the module global variable @_sync_device_failures. 
+
+=cut
+
+sub _get_next_linksync_failure
+{
+	my ($self, $current_sync_device) = @_;
+	$self = $self->get_root();
+	push @{$$self{_sync_device_failures}}, $current_sync_device;
+	::print_log("[Insteon::MultigroupDevice] WARN: failure occurred when syncing "
+		. $current_sync_device->get_object_name . ".  Moving on...");
+	$self->_get_next_linksync();
+}
+
+=back
+
+=head2 AUTHOR
+
+Kevin Robert Keegan
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+####################################
+###                #################
+### BaseController #################
+###                #################
+####################################
+
+=head1 B<Insteon::BaseController>
+
+=head2 DESCRIPTION
+
+Generic class implementation of an Insteon Controller.
+
+=head2 INHERITS
+
+L<Generic_Item|Generic_Item>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::BaseController;
+
+use strict;
+
+@Insteon::BaseController::ISA = ('Generic_Item');
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface,$p_devcat) = @_;
+
+	# note that $p_deviceid will be 00.00.00:<groupnum> if the link uses the interface as the controller
+	my $self = {};
+	bless $self,$class;
+	return $self;
+}
+
+=item C<add(object[,on_level, ramp_rate])>
+
+Adds object as a responder to the device.  If on_level and ramp_rate are specified
+they will be used, otherwise 100% .1s will be used.
+
+=cut
+
+sub add
+{
+	my ($self, $obj, $on_level, $ramp_rate) = @_;
+	if (ref $obj and ($obj->isa('Light_Item') or $obj->isa('Insteon::BaseDevice')))
+        {
+		if ($$self{members} && $$self{members}{$obj})
+                {
+			print "[Insteon::BaseController] An object (" . $obj->{object_name} . ") already exists "
+				. "in this scene.  Aborting add request.\n";
+			return;
+		}
+		if ($on_level =~ /^sur/i)
+                {
+			$on_level = '100%';
+			$$obj{surrogate} = $self;
+		}
+                elsif (lc $on_level eq 'on')
+                {
+			$on_level = '100%';
+		}
+                elsif (lc $on_level eq 'off')
+                {
+			$on_level = '0%';
+		}
+		$on_level = '100%' unless $on_level;
+		$$self{members}{$obj}{on_level} = $on_level;
+		$$self{members}{$obj}{object} = $obj;
+		$ramp_rate =~ s/s$//i;
+		$$self{members}{$obj}{ramp_rate} = $ramp_rate if defined $ramp_rate;
+	} else {
+		&::print_log("[Insteon::BaseController] WARN: unable to add ".$obj->{device_id}.":".$obj->{m_group}
+			." as items of type ".ref($obj)." are not supported!");
+        }
+}
+
+=item C<sync_links(audit_mode)>
+
+Causes MisterHouse to review the list of objects that should be linked to device
+and to check to make sure these links are complete.  If any link is not complete
+MisterHouse will add the link.
+
+If audit_mode is true, MisterHouse will print the actions it would have taken to 
+the log, but will not take any actions.
+
+The process does the following 5 checks in order:
+
+ 1. Does a controller link exist for Device-> PLM
+ 2. Does a responder link exist on the PLM
+
+it then loops through all of the links defined for a device and checks:
+
+ 3. Does the responder link exist
+ 4. Is the responder link accurate
+ 5. Does the controller link on this device exist
+
+=cut
+
+sub sync_links
+{
+	my ($self, $audit_mode, $callback, $failure_callback, $skip_deaf) = @_;
+	
+	# Intialize Variables
+	@{$$self{sync_queue}} = (); # reset the work queue
+	$$self{sync_queue_callback} = ($callback) ? $callback : undef;
+	$$self{sync_queue_failure_callback} = ($failure_callback) ? $failure_callback : undef;
+	$$self{sync_queue_failure} = undef;
+	my $self_link_name = $self->get_object_name;
+	my $insteon_object = $self->interface;
+	my $interface_object = Insteon::active_interface();
+	my $interface_name = $interface_object->get_object_name;
+	$insteon_object = $self->get_root;
+	::print_log("[Insteon::BaseController] WARN!! A device w/ insteon address: " . $self->device_id . ":01 could not be found. "
+		. "Please double check your items.mht file.") if (!(defined($insteon_object)));
+
+	# Abort if $insteon_object doesn't exist
+	$self->_process_sync_queue() unless $insteon_object;
+	
+	# Warn if device is deaf or ALDB out of sync
+	my $insteon_object_is_syncable = 1;
+	if ($insteon_object->is_deaf && $skip_deaf) {
+		::print_log("[Insteon::BaseController] $self_link_name is deaf, only responder links will be added to devices "
+			."controlled by this device.  To sync links on this device, put it in awake mode and run the 'Sync Links' "
+			."command on this specific device.");
+		$insteon_object_is_syncable = 0;
+	}
+	elsif ($insteon_object->_aldb->health ne 'good' && $insteon_object->_aldb->health ne 'empty'){
+		::print_log("[Insteon::BaseController] WARN! The ALDB of $self_link_name is ".$insteon_object->_aldb->health
+			.", links will be added to devices "
+			."linked to this device, but no links will be added to $self_link_name.  Please rescan this device and attempt "
+			."sync links again.");
+		$insteon_object_is_syncable = 0;
+		$$self{sync_queue_failure} = 1;
+	}
+	
+	# 1. Does a controller link exist for Device-> PLM
+	if (!$insteon_object->isa('Insteon_PLM') && 
+	!$insteon_object->has_link($self->interface,$self->group,1,$self->group) && 
+	$insteon_object_is_syncable) {
+		my %link_req = ( member => $insteon_object, cmd => 'add', object => $self->interface,
+			group => $self->group, is_controller => 1,
+			callback => "$self_link_name->_process_sync_queue()",
+			failure_callback => $failure_callback,
+			data3 => $self->group);
+		$link_req{cause} = "Adding controller record to $self_link_name for $interface_name";
+		push @{$$self{sync_queue}}, \%link_req;
+	}
+		
+	# 2. Does a responder link exist on the PLM
+	if ((!$insteon_object->isa('Insteon_PLM') &&
+	!$self->interface->has_link($insteon_object,$self->group,0,'00'))) {
+		my %link_req = ( member => $self->interface, cmd => 'add', object => $insteon_object,
+			group => $self->group, is_controller => 0,
+			callback => "$self_link_name->_process_sync_queue()",
+			failure_callback => $failure_callback,
+			data3 => '00');
+		$link_req{cause} = "Adding responder record to $interface_name from $self_link_name";
+		push @{$$self{sync_queue}}, \%link_req;
+	}
+
+	# Loop members
+	foreach my $member_ref (keys %{$$self{members}}) {
+		my $member = $$self{members}{$member_ref}{object};
+		
+		# find real device if member is a Light_Item
+		if ($member->isa('Light_Item')) {
+			my @children = $member->find_members('Insteon::BaseDevice');
+			$member = $children[0];
+		}
+		
+		#Initialize Loop Variables
+		my $member_name = $member->get_object_name;
+		my $member_root = $member->get_root;
+		my $requires_update = 0;
+		my $has_link = 1;
+		my $cause;
+		my $tgt_on_level = $$self{members}{$member_ref}{on_level};
+		$tgt_on_level = '100' unless defined $tgt_on_level;
+		my $tgt_ramp_rate = $$self{members}{$member_ref}{ramp_rate};
+		$tgt_ramp_rate = '0' unless defined $tgt_ramp_rate;
+		$tgt_on_level =~ s/(\d+)%?/$1/;
+		$tgt_ramp_rate =~ s/(\d)s?/$1/;
+		my $resp_aldbkey = $member_root->_aldb->get_linkkey($insteon_object->device_id,
+								$self->group,
+								'0',
+								$member->group);
+
+		# 3. Does the responder link exist
+		if (!$member_root->has_link($insteon_object, $self->group, 0, $member->group) &&
+		($member_root->_aldb->health eq 'good' || $member_root->_aldb->health eq 'empty')){
+			my %link_req = ( member => $member, cmd => 'add', object => $insteon_object,
+				group => $self->group, is_controller => 0,
+				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
+				callback => "$self_link_name->_process_sync_queue()",
+				failure_callback => $failure_callback,
+				data3 => $member->group);
+			$link_req{cause} = "Adding responder record to $member_name from $self_link_name";
+			push @{$$self{sync_queue}}, \%link_req;
+			$has_link = 0;
+		} 
+		elsif ($member_root->_aldb->health ne 'good' && $member_root->_aldb->health ne 'empty'){
+			my %link_req = ( member => $member, cmd => 'add', object => $insteon_object,
+				group => $self->group, is_controller => 0,
+				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
+				callback => "$self_link_name->_process_sync_queue()",
+				failure_callback => $failure_callback,
+				data3 => $member->group);
+			$link_req{skip} = "Unable to add the following responder record to $member_name "
+				."from $self_link_name because the aldb of $member_name is "
+				. $member_root->_aldb->health;
+			push @{$$self{sync_queue}}, \%link_req;
+			$$self{sync_queue_failure} = 1;
+		}
+		
+		# 4. Is the responder link accurate
+		if ($member->isa('Insteon::DimmableLight') && $has_link) {
+			my $member_aldb = $member_root->_aldb;
+			my $data1 = $$member_aldb{aldb}{$resp_aldbkey}{data1};
+			my $data2 = $$member_aldb{aldb}{$resp_aldbkey}{data2};
+			my $cur_on_level = hex($data1)/2.55;
+			my $raw_cur_ramp_rate = $data2;
+			my $raw_tgt_ramp_rate = Insteon::DimmableLight::convert_ramp($tgt_ramp_rate);
+			if ($raw_cur_ramp_rate ne $raw_tgt_ramp_rate) {
+				$requires_update = 1;
+				$cause .= "Ramp rate ";
+			}
+			elsif ($cur_on_level-1 > $tgt_on_level && $cur_on_level+1 < $tgt_on_level){
+				$requires_update = 1;
+				$cause .= "On level ";
+			}
+		}
+		elsif ($has_link){
+			my $member_aldb = $member->_aldb;
+			my $data1 = $$member_aldb{aldb}{$resp_aldbkey}{data1};
+			my $data2 = $$member_aldb{aldb}{$resp_aldbkey}{data2};
+			if ($tgt_on_level >= 1 and $data1 ne 'ff') {
+				$requires_update = 1;
+				$tgt_on_level = 100;
+				$cause .= "On level ";
+			}
+			elsif ($tgt_on_level == 0 and $data1 ne '00') {
+				$requires_update = 1;
+				$cause .= "On level ";
+			}
+			if ($data2 ne '00') {
+				$requires_update = 1;
+				$tgt_ramp_rate = 0;
+				$cause .= "Ramp rate ";
+			}
+		}
+		if ($requires_update &&
+		($member_root->_aldb->health eq 'good' || $member_root->_aldb->health eq 'empty')) {
+			my %link_req = ( member => $member, cmd => 'update', object => $insteon_object,
+				group => $self->group, is_controller => 0,
+				on_level => $tgt_on_level, ramp_rate => $tgt_ramp_rate,
+				callback => "$self_link_name->_process_sync_queue()",
+				failure_callback => $failure_callback,
+				data3 => $member->group);
+			$link_req{cause} = "Updating responder record on $member_name "
+				. "to fix $cause";
+			push @{$$self{sync_queue}}, \%link_req;
+		}
+
+		# 5. Does the controller link on this device exist
+		if (!($insteon_object->has_link($member, $self->group, 1, $self->group)) &&
+		$insteon_object_is_syncable) {
+			my %link_req = ( member => $insteon_object, cmd => 'add', object => $member,
+				group => $self->group, is_controller => 1,
+				callback => "$self_link_name->_process_sync_queue()",
+				failure_callback => $failure_callback,
+				data3 => $self->group);
+			$link_req{cause} = "Adding controller record to $self_link_name for $member_name";
+			push @{$$self{sync_queue}}, \%link_req;
+		}
+	}
+	
+	my $num_sync_queue = @{$$self{sync_queue}};
+	my $index = 0;
+	if (!($num_sync_queue))
+	{
+		&::print_log("[Insteon::BaseController] Nothing to do when syncing links for " . $self->get_object_name)
+			if $self->debuglevel(1, 'insteon');
+	}
+	foreach (@{$$self{sync_queue}}){
+		my %sync_req = %{$_};
+		my $audit_text = "(AUDIT)" if ($audit_mode);
+		my $log_text = "[Insteon::BaseController] $audit_text ";
+		if ($sync_req{skip}){
+			$log_text .= $sync_req{skip} ."\n";
+			splice @{$$self{sync_queue}}, $index, 1;
+		} else {
+			$index++;
+			$log_text .= $sync_req{cause} . "\n";
+		}
+		PRINT: for (keys %sync_req) {
+			next PRINT if (($_ eq 'cause') || ($_ eq 'callback') ||
+				($_ eq 'member') || ($_ eq 'object') || 
+				($_ eq 'skip') || ($_ eq 'failure_callback'));
+			$log_text .= "$_ = $sync_req{$_}; ";
+		}
+		::print_log($log_text);
+	}
+	if ($audit_mode) {
+		@{$$self{sync_queue}} = ();
+	}
+	
+	$self->_process_sync_queue();
+}
+
+sub _process_sync_queue {
+	my ($self) = @_;
+	# get next in queue if it exists
+	my $num_sync_queue = @{$$self{sync_queue}};
+	if ($num_sync_queue) {
+		my $link_req_ptr = shift(@{$$self{sync_queue}});
+		my %link_req = %$link_req_ptr;
+		if ($link_req{cmd} eq 'update') {
+			my $link_member = $link_req{member};
+			$link_member->update_link(%link_req);
+		} elsif ($link_req{cmd} eq 'add') {
+			my $link_member = $link_req{member};
+			$link_member->add_link(%link_req);
+		}
+	} elsif ($$self{sync_queue_callback}) {
+		my $callback = $$self{sync_queue_callback};
+		if ($$self{sync_queue_failure}){
+			$callback = $$self{sync_queue_failure_callback};
+		}
+		package main;
+		eval ($callback);
+		&::print_log("[Insteon::BaseController] error in sync links callback: " . $@)
+			if $@ and $self->debuglevel(1, 'insteon');
+		package Insteon::BaseController;
+	} else {
+		main::print_log($self->get_object_name." completed sync links");
+	}
+}
+
+=item C<set_linked_devices(state)>
+
+Checks each linked member of device.  If the linked member is a C<light_item>, 
+then sets that item to state.  If the linked member is a C<Insteon::BaseObject>
+then call C<set_receive> for the member.
+
+=cut
+
+sub set_linked_devices
+{
+	my ($self, $link_state) = @_;
+	# iterate over the members
+	if ($$self{members})
+	{
+		foreach my $member_ref (keys %{$$self{members}})
+		{
+			my $member = $$self{members}{$member_ref}{object};
+			# If controller is on, set member to stored on_level
+			# else set to controller value
+			my $local_state = $$self{members}{$member_ref}{on_level};
+			$local_state = '100' unless $local_state;
+			
+			if ($member->isa('Light_Item'))
+			{
+			# if they are Light_Items, then set their on_dim attrib to the member on level
+			#   and then "blank" them via the manual method for a tad over the ramp rate
+			#   In addition, locate the Light_Item's Insteon_Device member and do the
+			#   same as if the member were an Insteon_Device
+				my $ramp_rate = $$self{members}{$member_ref}{ramp_rate};
+				$ramp_rate = 0 unless defined $ramp_rate;
+				$ramp_rate = $ramp_rate + 2;
+				my @lights = $member->find_members('Insteon::BaseDevice');
+				if (@lights)
+				{
+					my $light = $lights[0];
+					# remember the current state to support resume
+					$$self{members}{$member_ref}{resume_state} = $light->state;
+					$member->manual($light, $ramp_rate);
+					if (lc $link_state ne 'on'){
+						$local_state = $light->$link_state;
+					}
+					$light->set_receive($local_state,$self);
+				}
+				else
+				{
+					$member->manual(1, $ramp_rate);
+				}
+				$member->set_on_state($local_state) unless $link_state eq 'off';
+			}
+			elsif ($member->isa('Insteon::BaseDevice'))
+			{
+				# remember the current state to support resume
+				$$self{members}{$member_ref}{resume_state} = $member->state;
+				# if they are Insteon_Device objects, then simply set_receive their state to
+				#   the member on level
+				if (lc $link_state ne 'on'){
+ 					$local_state = $link_state;
+				}
+				$member->set_receive($local_state,$self);
+			}
+		}
+	}
+}
+
+=item C<set_with_timer(state, time, return_state, additional_return_states)>
+
+NOTE - This routine appears to be nearly identical, if not identical to the
+C<Generic_Item::set_with_timer()> routine, it is not clear why this routine is
+needed here.
+
+See full description of this routine in C<Generic_Item>
+
+=cut
+
+sub set_with_timer {
+	my ($self, $state, $time, $return_state, $additional_return_states) = @_;
+	return if &main::check_for_tied_filters($self, $state);
+
+	$self->set($state) unless $state eq '';
+
+	return unless $time;
+
+	my $state_change = ($state eq 'off') ? 'on' : 'off';
+	$state_change = $return_state if defined $return_state;
+	$state_change = $self->{state} if $return_state and lc $return_state eq 'previous';
+
+	$state_change .= ';' . $additional_return_states if $additional_return_states;
+
+	$$self{set_timer} = &Timer::new() unless $$self{set_timer};
+	my $object_name = $self->{object_name};
+	my $action = "$object_name->set('$state_change')";
+	$$self{set_timer}->set($time, $action);
+}
+
+=item C<update_members()>
+
+This appears to be a depricated routine that is no longer used.  At a cursory
+glance, it may throw an error if called.
+
+=cut
+
+sub update_members
+{
+	my ($self) = @_;
+	# iterate over the members
+	if ($$self{members}) {
+		foreach my $member_ref (keys %{$$self{members}}) {
+			my ($device);
+			my $member = $$self{members}{$member_ref}{object};
+			my $on_state = $$self{members}{$member_ref}{on_level};
+			$on_state = '100%' unless $on_state;
+			my $ramp_rate = $$self{members}{$member_ref}{ramp_rate};
+			$ramp_rate = 0 unless defined $ramp_rate;
+			if ($member->isa('Light_Item')) {
+			# if they are Light_Items, then locate the Light_Item's Insteon_Device member
+				my @lights = $member->find_members('Insteon::BaseDevice');
+				if (@lights) {
+					$device = $lights[0];
+				}
+			} elsif ($member->isa('Insteon::BaseDevice')) {
+				$device = $member;
+			}
+			if ($device) {
+				my %current_record = $device->get_link_record($self->device_id . $self->group);
+				if (%current_record) {
+					&::print_log("[Insteon::BaseController] remote record: $current_record{data1}")
+						if $self->debuglevel(1, 'insteon');
+				}
+			}
+		}
+	}
+}
+
+=item C<initiate_linking_as_controller()>
+
+Places the interface in linking mode as the controller.  To complete the process
+press the set button on the responder device until it beeps.  Alternatively,
+you may be able to complete the process with 
+C<Insteon::BaseDevice::enter_linking_mode()>.
+
+=cut
+
+sub initiate_linking_as_controller
+{
+	my ($self, $p_group, $success_callback, $failure_callback) = @_;
+	# iterate over the members
+	if ($$self{members}) {
+		foreach my $member_ref (keys %{$$self{members}}) {
+			my $member = $$self{members}{$member_ref}{object};
+			if ($member->isa('Light_Item')) {
+			# if they are Light_Items, then set them to manual to avoid automation
+			#   while manually setting light parameters
+				$member->manual(1,120,120); # 120 seconds should be enough
+			}
+		}
+	}
+	$self->interface()->initiate_linking_as_controller($p_group, $success_callback, $failure_callback);
+}
+
+=item C<find_members([type])>
+
+Returns a list of objects that are members of device.  If type is specified, only
+members of that type are returned.  Type is a package name, for example: 
+
+    $member->find_members('Insteon::BaseDevice');
+
+=cut
+
+sub find_members
+{
+	my ($self,$p_type) = @_;
+
+	my @l_found;
+	if ($$self{members})
+	{
+		foreach my $member_ref (keys %{$$self{members}})
+		{
+			my $member = $$self{members}{$member_ref}{object};
+			if ($member->isa($p_type))
+			{
+				push @l_found, $member;
+			}
+		}
+	}
+	return @l_found;
+
+}
+
+=item C<has_member(object)>
+
+Returns true if object is a member of device, else returns false.
+
+=cut
+
+sub has_member
+{
+	my ($self, $compare_object) = @_;
+	foreach my $member_ref (keys %{$$self{members}})
+	{
+		my $member = $$self{members}{$member_ref}{object};
+		if ($member eq $compare_object)
+		{
+			return 1;
+		}
+	}
+        return 0;
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+####################################
+###            #####################
+### DeviceController ###############
+###                  ###############
+####################################
+
+=head1 B<Insteon::DeviceController>
+
+=head2 DESCRIPTION
+
+Generic class implementation of an Device Controller.
+
+=head2 INHERITS
+
+L<Insteon::BaseController|Insteon::BaseInsteon/Insteon::BaseController>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::DeviceController;
+
+use strict;
+
+@Insteon::DeviceController::ISA = ('Insteon::BaseController');
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface,$p_devcat) = @_;
+
+	# note that $p_deviceid will be 00.00.00:<groupnum> if the link uses the interface as the controller
+	my $self = new Insteon::BaseController($p_deviceid,$p_interface);
+	bless $self,$class;
+	return $self;
+}
+
+=item C<request_status([requestor])>
+
+Requests the current status of the device and calls C<set()> on the response.  
+This will trigger tied_events.
+
+=cut
+
+sub request_status
+{
+	my ($self,$requestor) = @_;
+#	if ($self->group ne '01') {
+	if ($$self{members} and !($self->isa('Insteon::InterfaceController'))
+             and (!(ref $requestor) or ($requestor eq $self))) {
+		&::print_log("[Insteon::DeviceController] requesting status for members of " . $$self{object_name});
+		foreach my $member (keys %{$$self{members}}) {
+			next unless $member->isa('Insteon::BaseObject');
+			my $member_obj = $$self{members}{$member}{object};
+			next if $requestor eq $member_obj;
+                        if ($member_obj->isa('Insteon::BaseDevice')) {
+			   &::print_log("[Insteon::DeviceController] checking status of " . $member_obj->get_object_name()
+				. " for requestor " . $requestor->get_object_name());
+			   $member_obj->request_status($self);
+                        }
+		}
+	}
+        # the following has bad assumptions in that we don't always know if a device is a responder
+        #    since it could be a slave
+	if ($self->is_root && $self->is_responder) {
+		$self->Insteon::BaseDevice::request_status($requestor);
+	}
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+####################################
+###                     ############
+### InterfaceController ############
+###                     ############
+####################################
+
+=head1 B<Insteon::InterfaceController>
+
+=head2 DESCRIPTION
+
+Generic class implementation of an Interface Controller.  These are the PLM Scenes.
+
+=head2 INHERITS
+
+L<Insteon::BaseController|Insteon::BaseInsteon/Insteon::BaseController>, 
+L<Insteon::BaseObject|Insteon::BaseInsteon/Insteon::BaseObject>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::InterfaceController;
+
+use strict;
+
+@Insteon::InterfaceController::ISA = ('Insteon::BaseController','Insteon::BaseObject');
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+
+	# note that $p_deviceid will be 00.00.00:<groupnum> if the link uses the interface as the controller
+	my $self = new Insteon::BaseObject($p_deviceid,$p_interface);
+	bless $self,$class;
+	return $self;
+}
+
+
+#Otherwise BaseController will call Generic_Item::Set
+sub set
+{
+	my ($self,$p_state,$p_setby,$p_response) = @_;
+	$self->Insteon::BaseObject::set($p_state,$p_setby,$p_response);	
+}
+
+sub is_root
+{
+   return 0;
+}
+
+=item C<get_root()>
+
+Returns the root object of a device, in this case the interface.
+
+=cut
+
+sub get_root {
+	my ($self) = @_;
+	return $self->interface;
+}
+
+# For IFaceControllers, need to call set_linked_devices
+sub is_acknowledged {
+	my ($self, $p_ack) = @_;
+	if ($p_ack) {
+		$self->set_linked_devices($$self{pending_state}) if defined $$self{pending_state};	
+	}
+	return $self->Insteon::BaseObject::is_acknowledged($p_ack);
+}
+
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my $group = $self->group;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds},
+	'on' => "$object_name->set(\"on\")",
+	'off' => "$object_name->set(\"off\")",
+        'initiate linking as controller' => "$object_name->initiate_linking_as_controller(\"$group\")",
+        'cancel linking' => "$object_name->interface()->cancel_linking"
+    );
+    return \%voice_cmds;
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+1;
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index 93d00e589..29348b067 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -1,1021 +1,1021 @@
-=head1 B<Insteon::BaseInterface>
-
-=head2 SYNOPSIS
-
-Provides support for the Insteon Interface.
-
-=head2 INHERITS
-
-L<Class::Singleton|Class::Singleton>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::BaseInterface;
-
-use strict;
-use Insteon::Message;
-@Insteon::BaseInterface::ISA = ('Class::Singleton');
-
-=item C<check_for_data>
-
-Locates the active_interface from the main Insteon class and calls 
-C<check_for_data> on it.  Called once per loop to get data from the PLM.
-
-=cut
-
-sub check_for_data
-{
-   my $interface = &Insteon::active_interface();
-   $interface->check_for_data();
-}
-
-=item C<poll_all>
-
-Called on startup or reload.  Will always request and print the plm_info, which 
-contains the PLM revision number, to the log on startup.
-
-If Insteon_PLM_scan_at_startup is set to 1 in the ini file, this routine will poll
-all insteon devices and request their current state.  Useful for making sure that
-no devices changed their state while MisterHouse was off.  Will also call 
-L<Insteon::BaseObject::get_engine_version|Insteon::BaseInsteon/Insteon::BaseObject> on each device to ensure that
-the proper ALDB object is created for them.
-
-=cut
-
-sub poll_all
-{
-   my $scan_at_startup = $main::config_parms{Insteon_PLM_scan_at_startup};
-   $scan_at_startup = 1 unless defined $scan_at_startup;
-   $scan_at_startup = 0 unless $main::Save{mh_exit} eq 'normal';
-      my $plm = &Insteon::active_interface();
-      if (defined $plm)
-      {
-         if (!($plm->device_id) and !($$plm{_id_check}))
-         {
-		$$plm{_id_check} = 1;
-		$plm->queue_message(new Insteon::InsteonMessage('plm_info', $plm));
-         }
-         if ($scan_at_startup)
-         {
-
-         	for my $insteon_device (&Insteon::find_members('Insteon::BaseDevice'))
-                {
-            		if ($insteon_device and $insteon_device->is_root and $insteon_device->is_responder)
-            		{
-               		# don't request status for objects associated w/ other than the primary group
-               		#    as they are psuedo links
-                                $insteon_device->get_engine_version();
-               			$insteon_device->request_status();
-            		}
-         	}
-         }
-      }
-}
-
-=item C<new()>
-
-Instantiate a new object.
-
-=cut
-
-sub new
-{
-	my ($class) = @_;
-
-	my $self = {};
-	@{$$self{command_stack2}} = ();
-	@{$$self{command_history}} = ();
-	$$self{received_commands} = {};
-	bless $self, $class;
-        $self->transmit_in_progress(0);
-#   	$self->debug(0) unless $self->debug;
-	return $self;
-}
-
-=item C<equals([object])>
-
-Returns 1 if object is the same as $self, otherwise returns 0.
-
-=cut
-
-sub equals
-{
-	my ($self, $compare_object) = @_;
-        # make sure that the compare_object is legitimate
-        return 0 unless $compare_object && ref $compare_object && $compare_object->isa('Insteon::BaseInterface');
-        return 1 if $compare_object eq $self;
-        # if they don't both have device_ids then treat them as identical
-        return 1 unless $compare_object->device_id && $self->device_id;
-        if ($compare_object->device_id eq $self->device_id)
-        {
-        	return 1;
-        }
-        else
-        {
-        	return 0;
-        }
-}
-
-=item C<debuglevel([level])>
-
-Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
-
-=cut
-
-sub debuglevel
-{
-	my ($self, $debug_level, $debug_group) = @_;
-	return Generic_Item::debuglevel($self, $debug_level, $debug_group);
+=head1 B<Insteon::BaseInterface>
+
+=head2 SYNOPSIS
+
+Provides support for the Insteon Interface.
+
+=head2 INHERITS
+
+L<Class::Singleton|Class::Singleton>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::BaseInterface;
+
+use strict;
+use Insteon::Message;
+@Insteon::BaseInterface::ISA = ('Class::Singleton');
+
+=item C<check_for_data>
+
+Locates the active_interface from the main Insteon class and calls 
+C<check_for_data> on it.  Called once per loop to get data from the PLM.
+
+=cut
+
+sub check_for_data
+{
+   my $interface = &Insteon::active_interface();
+   $interface->check_for_data();
+}
+
+=item C<poll_all>
+
+Called on startup or reload.  Will always request and print the plm_info, which 
+contains the PLM revision number, to the log on startup.
+
+If Insteon_PLM_scan_at_startup is set to 1 in the ini file, this routine will poll
+all insteon devices and request their current state.  Useful for making sure that
+no devices changed their state while MisterHouse was off.  Will also call 
+L<Insteon::BaseObject::get_engine_version|Insteon::BaseInsteon/Insteon::BaseObject> on each device to ensure that
+the proper ALDB object is created for them.
+
+=cut
+
+sub poll_all
+{
+   my $scan_at_startup = $main::config_parms{Insteon_PLM_scan_at_startup};
+   $scan_at_startup = 1 unless defined $scan_at_startup;
+   $scan_at_startup = 0 unless $main::Save{mh_exit} eq 'normal';
+      my $plm = &Insteon::active_interface();
+      if (defined $plm)
+      {
+         if (!($plm->device_id) and !($$plm{_id_check}))
+         {
+		$$plm{_id_check} = 1;
+		$plm->queue_message(new Insteon::InsteonMessage('plm_info', $plm));
+         }
+         if ($scan_at_startup)
+         {
+
+         	for my $insteon_device (&Insteon::find_members('Insteon::BaseDevice'))
+                {
+            		if ($insteon_device and $insteon_device->is_root and $insteon_device->is_responder)
+            		{
+               		# don't request status for objects associated w/ other than the primary group
+               		#    as they are psuedo links
+                                $insteon_device->get_engine_version();
+               			$insteon_device->request_status();
+            		}
+         	}
+         }
+      }
+}
+
+=item C<new()>
+
+Instantiate a new object.
+
+=cut
+
+sub new
+{
+	my ($class) = @_;
+
+	my $self = {};
+	@{$$self{command_stack2}} = ();
+	@{$$self{command_history}} = ();
+	$$self{received_commands} = {};
+	bless $self, $class;
+        $self->transmit_in_progress(0);
+#   	$self->debug(0) unless $self->debug;
+	return $self;
+}
+
+=item C<equals([object])>
+
+Returns 1 if object is the same as $self, otherwise returns 0.
+
+=cut
+
+sub equals
+{
+	my ($self, $compare_object) = @_;
+        # make sure that the compare_object is legitimate
+        return 0 unless $compare_object && ref $compare_object && $compare_object->isa('Insteon::BaseInterface');
+        return 1 if $compare_object eq $self;
+        # if they don't both have device_ids then treat them as identical
+        return 1 unless $compare_object->device_id && $self->device_id;
+        if ($compare_object->device_id eq $self->device_id)
+        {
+        	return 1;
+        }
+        else
+        {
+        	return 0;
+        }
+}
+
+=item C<debuglevel([level])>
+
+Returns 1 if Insteon or this device is at least debug level 'level', otherwise returns 0.
+
+=cut
+
+sub debuglevel
+{
+	my ($self, $debug_level, $debug_group) = @_;
+	return Generic_Item::debuglevel($self, $debug_level, $debug_group);
  }
-
-=item C<_is_duplicate(cmd)>
-
-Returns true if cmd already exists in the command stack.
-
-=cut
-
-sub _is_duplicate
-{
-	my ($self, $cmd) = @_;
-        return 1 if ($self->active_message && $self->active_message->interface_data eq $cmd);
-	my $duplicate_detected = 0;
-	# check for duplicates of $cmd already in command_stack and ignore if they exist
-	foreach my $message (@{$$self{command_stack2}})
-        {
-		if ($message->interface_data eq $cmd)
-                {
-			$duplicate_detected = 1;
-			last;
-		}
-	}
-	return $duplicate_detected;
-}
-
-=item C<has_link(link_details)>
-
-If a device has an ALDB, passes link_details onto one of the has_link() routines
-within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called as part of C<delete_orphan_links()>.
-
-=cut
-
-sub has_link
-{
-	my ($self, $insteon_object, $group, $is_controller, $subaddress) = @_;
-        if ($self->_aldb)
-        {
-           return $self->_aldb->has_link($insteon_object, $group, $is_controller, $subaddress);
-        }
-	return 0;
-}
-
-=item C<add_link(link_params)>
-
-If a device has an ALDB, passes link_details onto one of the add_link() routines
-within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called from the "sync links" or 
-"link to interface" voice commands.
-
-=cut
-
-sub add_link
-{
-	my ($self, $parms_text) = @_;
-        if ($self->_aldb)
-        {
-		my %link_parms;
-		if (@_ > 2)
-                {
-			shift @_;
-			%link_parms = @_;
-		}
-                else
-                {
-			%link_parms = &main::parse_func_parms($parms_text);
-		}
-           	$self->_aldb->add_link(%link_parms);
-        }
-}
-
-=item C<delete_link([link details])>
-
-If a device has an ALDB, passes link_details onto one of the delete_link() routines
-within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called by C<delete_orphan_links()>.
-
-=cut
-
-sub delete_link
-{
-	my ($self, $parms_text) = @_;
-        if ($self->_aldb)
-        {
-		my %link_parms;
-		if (@_ > 2)
-                {
-			shift @_;
-			%link_parms = @_;
-		}
-                else
-                {
-			%link_parms = &main::parse_func_parms($parms_text);
-		}
-           	$self->_aldb->delete_link(%link_parms);
-        }
-}
-
-=item C<active_message([msg])>
-
-Optionally stores, and returns the message currently being processed by the interface.
-
-=cut
-
-sub active_message
-{
-	my ($self, $message) = @_;
-        if (defined $message)
-        {
-        	$$self{active_message} = $message;
-        }
-        return $$self{active_message};
-}
-
-=item C<clear_active_message()>
-
-Clears the message currently being processed by the interface, and sets the
-transmit in progress flag to false.
-
-=cut
-
-sub clear_active_message
-{
-	my ($self) = @_;
-        $$self{active_message} = undef;
-	$self->transmit_in_progress(0);
-}
-
-=item C<retry_active_message()>
-
-Sets the transmit in progress flag to false.
-
-=cut
-
-sub retry_active_message
-{
-	my ($self) = @_;
-	$self->transmit_in_progress(0);
-}
-
-=item C<transmit_in_progress([xmit_flag])>
-
-Sets the transmit in progress flag to xmit_flag, returns true if xmit_flag
-true or xmit timout has not elapsed.
-
-=cut
-
-sub transmit_in_progress
-{
-	my ($self, $xmit_flag) = @_;
-        if (defined $xmit_flag)
-        {
-        	$$self{xmit_in_progress} = $xmit_flag;
-        }
-        # also factor in xmit timer since this must be honored to allow
-        #   adequate time to elapse
-        return $$self{xmit_in_progress} || ($self->_check_timeout('xmit')==0);
-}
-
-=item C<queue_message([msg])>
-
-If no msg is passed, returns the queue length.
-
-Msg is optionally a message, if sent is added to the message queue.  
-C<process_queue()> is then called.
-
-=cut
-
-sub queue_message
-{
-	my ($self, $message) = @_;
-
-	my $command_queue_size = @{$$self{command_stack2}};
-	return $command_queue_size unless $message;
-
-	#queue any new command
-	if (defined $message)
-	{
-        	my $setby = $message->setby;
-		if ($self->_is_duplicate($message->interface_data) && !($message->isa('Insteon::X10Message')))
-                {
-			&main::print_log("[Insteon::BaseInterface] Attempt to queue command already in queue; skipping ...") if $self->debuglevel(1, 'insteon');
-		}
-                else
-                {
-			if ($setby and ref($setby) and $setby->can('set_retry_timeout')
-                           and $setby->get_object_name)
-                        {
-				$message->callback($setby->get_object_name . "->set_retry_timeout()");
-			}
-			unshift(@{$$self{command_stack2}}, $message);
-		}
-	}
-        # and, begin processing either this entry or the oldest one in the queue
-        $self->process_queue();
-}
-
-=item C<process_queue()>
-
-If C<transmit_in_progress()> is true returns queue size.
-
-If there is a pending message, will leave it as active_message.  If retries are 
-exceeded, will log an error, clear the message, and call the message failure_callback.
-
-Else, will pull a message from the queue and place it as the active_message.
-
-=cut
-
-sub process_queue
-{
-	my ($self) = @_;
-
-	my $command_queue_size = @{$$self{command_stack2}};
-
-	if ($self->transmit_in_progress)
-        {
-        	return $command_queue_size;
-        }
-        else
-	#we dont transmit on top of another xmit
-        { # no transmission is progress that has not already been acked or nacked by the PLM
-		# get pending command record
-       		my $pending_message = $self->active_message;
-
-		if (!($pending_message))
-        	{ # no prior message remains; so, get one from the queue
-        		$pending_message = pop(@{$$self{command_stack2}});
-        		$self->active_message($pending_message) if $pending_message;
-		}
-
-		if ($pending_message)
-		{ # a message exists to be sent (whether previously sent or queued)
-
-	                if ($self->active_message->send($self) == 0)
-                        {  # this only occurs if the retry count has been exceeded
-        	                # which also means that there wasn't a message actually sent
-                               	&::print_log("[Insteon::BaseInterface] WARN: number of retries ("
-                                       	. $self->active_message->send_attempts
-                			. ") for " . $self->active_message->to_string()
-                                        . " exceeds limit.  Now moving on...") if $self->debuglevel(1, 'insteon');
-                                # !!!!!!!!! TO-DO - handle failure timeout ???
-                                my $failed_message = $self->active_message;
-                                # make sure to let the sending object know!!!
-				if (defined($failed_message->setby) and $failed_message->setby->can('is_acknowledged'))
-				{
-                                       	$failed_message->setby->is_acknowledged(0);
-                                       	$failed_message->setby->fail_count_log(1) 
-                                       		if $failed_message->setby->can('fail_count_log');
-				}
-				else
-				{
-					&main::print_log("[Insteon::BaseInterface] WARN! Unable to clear acknowledge for "
-						. ((defined($failed_message->setby)) ? $failed_message->setby->get_object_name : "undefined"));
-				}
-
-				# Get failed message details before clearing
-				my $callback = $failed_message->failure_callback;
-				my $setby = $failed_message->setby;
-				# clear active message
-				$self->clear_active_message();
-
-				if ($callback)
-                                {
-                                       	&::print_log("[Insteon::BaseInterface] WARN: Message Timeout:  Now calling callback: " .
-                                               	$callback) if $self->debuglevel(1, 'insteon');
-					$setby->failure_reason('timeout') 
-						if (defined($setby) and $setby->can('failure_reason'));
-		       			package main;
-					eval $callback;
-					&::print_log("[Insteon::BaseInterface] problem w/ retry callback: $@") if $@;
-					package Insteon::BaseInterface;
-				}
-				
-				#Any other outgoing messages pending in the queue?
-                		$self->process_queue();
-                        }
-		}
-                else # no pending message
-                {
-               	 	# clear the timer
-                	$self->_clear_timeout('command');
-                        return 0;
-                }
-	}
-	my $command_queue_size = @{$$self{command_stack2}};
-	return $command_queue_size;
-}
-
-=item C<device_id([id])>
-
-Used to store and return the associated device_id of a device.
-
-If provided, stores id as the device's id.
-
-Returns device id without any delimiters.
-
-=cut
-
-sub device_id {
-	my ($self, $p_deviceid) = @_;
-	$$self{deviceid} = $p_deviceid if defined $p_deviceid;
-	return $$self{deviceid};
-}
-
-=item C<restore_string()>
-
-This is called by mh on exit to save the cached ALDB of a device to persistant data.
-
-=cut
-
-sub restore_string
-{
-	my ($self) = @_;
-	my $restore_string = $self->SUPER::restore_string();
-	$restore_string .= $self->_aldb->restore_string();
-	return $restore_string;
-}
-
-=item C<restore_linktable()>
-
-Used to reload the link table of a device on restart.
-
-=cut
-
-sub restore_linktable
-{
-	my ($self,$aldb) = @_;
-	if ($self->_aldb and $aldb) {
-           $self->_aldb->restore_linktable($aldb);
-	}
-}
-
-=item C<log_alllink_table()>
-
-Prints a human readable form of MisterHouse's cached version of a device's ALDB
-to the print log.  Called as part of the "scan links" voice command
-or in response to the "log links" voice command.
-
-=cut
-
-sub log_alllink_table
-{
-	my ($self) = @_;
-        $self->_aldb->log_alllink_table if $self->_aldb;
-}
-
-=item C<delete_orphan_links(audit_mode)>
-
-Reviews the cached version of all of the ALDBs and based on this review removes
-links from this device which are not present in the mht file, not defined in the 
-code, or links which are only half-links.
-
-If audit_mode is true, prints the actions that would be taken to the log, but 
-does nothing.
-
-=cut
-
-sub delete_orphan_links
-{
-	my ($self, $audit_mode) = @_;
-        return $self->_aldb->delete_orphan_links($audit_mode) if $self->_aldb;
-}
-
-######################
-### EVENT HANDLERS ###
-######################
-
-=item C<on_interface_info_received>
-
-Called to process the plm_info request sent by the C<poll_all()> command.
-Prints output to log.
-
-=cut
-
-sub on_interface_info_received
-{
-	my ($self) = @_;
-	&::print_log("[Insteon_PLM] PLM id: " . $self->device_id .
-		" firmware: " . $self->firmware)
-		if $self->debuglevel(1, 'insteon');
-        $self->clear_active_message();
-}
-
-=item C<on_standard_insteon_received>
-
-Called to process standard length insteon messages.  The routine is rather complex
-some messsages are processed right here.  The majority are passed off to the
-C<_is_info_request()> and C<_process_message()> routines for each device.
-
-=cut
-
-sub on_standard_insteon_received
-{
-        my ($self, $message_data) = @_;
-	my %msg = &Insteon::InsteonMessage::command_to_hash($message_data);
-	return if $self->_is_duplicate_received($message_data, %msg);
-	if (%msg)
-        {
-		my $wait_time;
-		my $wait_message = "[Insteon::BaseInterface] DEBUG3: Message received "
-			."with $msg{hopsleft} hops left, ";
-		if (!$msg{is_ack} && !$msg{is_nack} && $msg{type} ne 'alllink' 
-			&& $msg{type} ne 'broadcast') {
-			#Wait for ACK to be delivered
-			$wait_time = $msg{maxhops};
-			$wait_message .= "plus ACK will take $msg{maxhops} to deliver, ";
-		}
-		$wait_time += $msg{hopsleft};
-		#Standard msgs should only take 50 millis, but in practice additional 
-		#time has been required. Extra 50 millis helps prevent dupes
-		$wait_time = ($wait_time * 100) + 50;
-		$wait_message .= "delaying next transmit by $wait_time milliseconds to avoid collisions.";
-		::print_log($wait_message) if ($self->debuglevel(3, 'insteon') && $wait_time > 50);
-		$self->_set_timeout('xmit', $wait_time);			
-
-		# get the matching object
-		my $object = &Insteon::get_object($msg{source}, $msg{group});
-		if (defined $object)
-                {
-                	$object->max_hops_count($msg{maxhops}) if $object->can('max_hops_count');
-                	$object->hops_left_count($msg{hopsleft}) if $object->can('hops_left_count');
-                    $object->incoming_count_log(1) if $object->can('incoming_count_log');
-                	if ($msg{type} ne 'broadcast')
-                        {
-                		$msg{command} = $object->message_type($msg{cmd_code});
-		      		&::print_log("[Insteon::BaseInterface] Received message from: ". $object->get_object_name
-		      			."; command: $msg{command}; type: $msg{type}; group: $msg{group}")
-                        		if (!($msg{is_ack} or $msg{is_nack})) and $self->debuglevel(1, 'insteon');
-                   	}
-                   	if ($msg{is_ack} or $msg{is_nack})
-                   	{
-		      		main::print_log("[Insteon::BaseInterface] DEBUG3: PLM command:insteon_received; "
-		      			. "Device command:$msg{command}; type:$msg{type}; group: $msg{group}")
-                        		if $self->debuglevel(3, 'insteon');
-                        	# need to confirm that this message corresponds to the current active one before clearing it
-                                # TO-DO!!! This is a brute force and poor compare technique; needs to be replaced by full compare
-                                if ($self->active_message && ref $self->active_message->setby)
-                                {
-                                        if ($self->active_message->send_attempts == 0)
-                                        {
-                                                &main::print_log("[Insteon::BaseInterface] WARN: received ACK/NACK message for "
-                                                	. $object->get_object_name . " but cannot correlate to sent message "
-                                                        . "(active but send attempts = 0).  IGNORING received message!!");
-                                        }
-                                        elsif ($msg{type} eq 'direct')
-                                        {
-                                        	if (lc $self->active_message->setby->device_id eq lc $msg{source})
-                                                {
-                                                	# prevent re-processing transmit queue until after clearing occurs
-                                                        $self->transmit_in_progress(1);
-                        		       		# ask the object to process the received message and update its state
-                        		       		# Object will return true if this is the end of the send transaction
-		   					if($object->_process_message($self, %msg)) {
-								if ($self->active_message->success_callback){
-									main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
-										. $self->active_message->success_callback) if $object->debuglevel(4, 'insteon');
-									package main;
-										eval $self->active_message->success_callback;
-										::print_log("[Insteon::BaseInterface] problem w/ success callback: $@") if $@;
-									package Insteon::BaseInterface;
-								}
-								$self->clear_active_message();
-		   					}
-                                                }
-                                                else
-                                                {
-                                                	&main::print_log("[Insteon::BaseInterface] WARN: deviceid of "
-                                                		. "active message != received message source ("
-                                                        	. $object->get_object_name() . "). IGNORING received message!!");
-                                                        #These generally seem to be duplicate messages
-                                                        $object->dupe_count_log(1) if $object->can('dupe_count_log');
-                                                }
-                                        }
-                                        elsif ($msg{type} eq 'cleanup')
-                                        {
-                                        	my $setby_object = $object;
-                                                $object = &Insteon::get_object('000000', $msg{extra});
-                                                if ($object)
-                                                {
-                                                	# prevent re-processing transmit queue until after clearing occurs
-                                                	$self->transmit_in_progress(1);
-							# Don't clear active message as ACK is only one of many
-							if (($msg{extra} == $self->active_message->setby->group)){
-                                                                &main::print_log("[Insteon::BaseInterface] DEBUG3: Cleanup message received for scene "
-                                                                	. $object->get_object_name . " from " . $setby_object->get_object_name)
-                                                                	if $object->debuglevel(3, 'insteon');
-							} elsif ($self->active_message->command_type eq 'all_link_direct_cleanup' &&
-								lc($self->active_message->setby->device_id) eq $msg{source}) 
-							{
-								&::print_log("[Insteon::BaseInterface] DEBUG2: ALL-Linking Direct Completed with ". $self->active_message->setby->get_object_name) if $object->debuglevel(2, 'insteon');
-								$self->clear_active_message();
-							}
-							else {
-								&main::print_log("[Insteon::BaseInterface] DEBUG3: Cleanup message received from "
-								. $setby_object->get_object_name . " for scene "
-								. $object->get_object_name . ", but group in recent message " 
-								. $msg{extra}. " did not match group in "
-								. "prior sent message group " . $self->active_message->setby->group) 
-									if $object->debuglevel(3, 'insteon');
-                                			}
-                                			# If ACK or NACK received then PLM is still working on the ALL Link Command
-                                			# Increase the command timeout to wait for next one
-                                			$self->_set_timeout('command', 3000);
-                                                }
-                                                else
-                                                {
-                                                	&main::print_log("[Insteon::BaseInterface] ERROR: received cleanup message from "
-                                                             . $setby_object->get_object_name . " that does not correspond to a valid PLM group. Corrupted message is assumed "
-                                                             . "and will be skipped! Was group " . $msg{extra});
-                                                    $setby_object->corrupt_count_log(1) if $setby_object->can('corrupt_count_log');
-                                                }
-                                        }
-                                        else #not direct or cleanup
-                                        {
-                                                &main::print_log("[Insteon::BaseInterface] ERROR: received ACK/NACK message from "
-                                                	. $object->get_object_name . " but unable to process $msg{type} message type."
-                                                        . " IGNORING received message!!");
-                                                $self->active_message->no_hop_increase(1);
-                                                $object->corrupt_count_log(1) if $object->can('corrupt_count_log');
-                                        }
-                        	}
-                                else #does not correspond to current active message
-                                {
-                                        if ($msg{type} eq 'direct')
-                                        {
-                                        	&main::print_log("[Insteon::BaseInterface] WARN: received insteon ACK/NACK message from "
-                                        		. $object->get_object_name . " but cannot correlate to sent message! IGNORING received message!!");
-                                        }
-                                        elsif ($msg{type} eq 'cleanup')
-                                        {
-                                                # this is just going to be ignored since there is a virtual processing done
-                                                #   in the Insteon_PLM handler for cleanup messages.
-                                                #   however, if the virtual handler was not invoked due to receipt of the broadcast message
-                                                #   then, the above cleanup handler would be run
-						my $plm_group_obj = Insteon::get_object('000000', $msg{extra});
-						my $group_name = $msg{extra};
-						$group_name = $plm_group_obj->get_object_name if (ref $plm_group_obj);
-						$plm_group_obj = $self if (!ref $plm_group_obj);
-                                                &main::print_log("[Insteon::BaseInterface] DEBUG3: received cleanup message responding to "
-                                                	. "PLM controller group: $group_name. Ignoring as this has already been processed")
-                                                        if $plm_group_obj->debuglevel(3, 'insteon');
-                                        }
-                                        else
-                                        {
-                        			# ask the object to process the received message and update its state
-		   				$object->_process_message($self, %msg);
-                                        }
-                                }
-                   	}
-                        else # not ACK or NAK
-                        {
-                        	# ask the object to process the received message and update its state
-		   		$object->_process_message($self, %msg);
-                        }
-		}
-                else 
-                {
-         		&::print_log("[Insteon::BaseInterface] Warn! Unable to locate object for source: $msg{source} and group: $msg{group}");
-         		$self->corrupt_count_log(1);
-		}
-		# treat the message as legitimate even if an object match did not occur
-	}
-}
-
-=item C<on_standard_insteon_received>
-
-Called to process extended length insteon messages.  The majority of messages are 
-passed off to the C<_process_message()> routines for each device.
-
-=cut
-
-
-sub on_extended_insteon_received
-{
-        my ($self, $message_data) = @_;
-	my %msg = &Insteon::InsteonMessage::command_to_hash($message_data);
-	return if $self->_is_duplicate_received($message_data, %msg);
-	if (%msg)
-        {
-		my $wait_time;
-		my $wait_message = "[Insteon::BaseInterface] DEBUG3: Message received "
-			."with $msg{hopsleft} hops left, ";
-		if (!$msg{is_ack} && !$msg{is_nack} && $msg{type} ne 'alllink' 
-			&& $msg{type} ne 'broadcast') {
-			#Wait for ACK to be delivered
-			$wait_time = $msg{maxhops};
-			$wait_message .= "plus ACK will take $msg{maxhops} to deliver, ";
-		}
-		$wait_time += $msg{hopsleft};
-		#Standard msgs should only take 108 millis, but in practice additional 
-		#time has been required. Extra 50 millis helps prevent dupes
-		$wait_time = ($wait_time * 200) + 50;
-		$wait_message .= "delaying next transmit by $wait_time milliseconds to avoid collisions.";
-		::print_log($wait_message) if ($self->debuglevel(3, 'insteon') && $wait_time > 50);
-		$self->_set_timeout('xmit', $wait_time);
-
-		# get the matching object
-		my $object = &Insteon::get_object($msg{source}, $msg{group});
-		if (defined $object)
-                {
-                	$object->max_hops_count($msg{maxhops}) if $object->can('max_hops_count');
-                	$object->hops_left_count($msg{hopsleft}) if $object->can('hops_left_count');
-                    $object->incoming_count_log(1) if $object->can('incoming_count_log');
-                	if ($msg{type} ne 'broadcast')
-                        {
-                		$msg{command} = $object->message_type($msg{cmd_code});
-		      		main::print_log("[Insteon::BaseInterface] DEBUG: PLM command:insteon_ext_received; "
-		      			. "Device command:$msg{command}; type:$msg{type}; group: $msg{group}")
-                        		if( (!($msg{is_ack} or $msg{is_nack}) and $self->debuglevel(1, 'insteon')) 
-                        		or $self->debuglevel(3, 'insteon'));
-                   	}
-		   	&::print_log("[Insteon::BaseInterface] Processing message for " . $object->get_object_name) if $object->debuglevel(3, 'insteon');
-			if($object->_process_message($self, %msg)) {
-				if (ref $self->active_message && $self->active_message->success_callback){
-					main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
-						. $self->active_message->success_callback) if $object->debuglevel(4, 'insteon');
-					package main;
-						eval $self->active_message->success_callback;
-						::print_log("[Insteon::BaseInterface] problem w/ success callback: $@") if $@;
-					package Insteon::BaseInterface;
-				}
-				$self->clear_active_message();
-			}
-		}
-                else
-                {
-         		&::print_log("[Insteon::BaseInterface] Warn! Unable to locate object for source: $msg{source} and group: $msg{group}");
-		}
-		# treat the message as legitimate even if an object match did not occur
-	}
-
-}
-
-#################################
-### INTERNAL METHODS/FUNCTION ###
-#################################
-
-=item C<_set_timeout(timeout_name, timeout_millis)>
-
-Sets an internal variable, timeout_name, the current time plus the number of 
-milliseconds specified by timeout_millis.
-
-=cut
-
-
-sub _set_timeout
-{
-	my ($self, $timeout_name, $timeout_in_millis) = @_;
-	my $tickcount = &main::get_tickcount + $timeout_in_millis;
-	$tickcount += 2**32 if $tickcount < 0; # force a wrap; to be handleded by check timeout
-	$$self{"_timeout_$timeout_name"} = $tickcount;
-}
-
-=item C<_check_timeout(timeout_name)>
-
-Checks to see if the current number of milliseconds has exceeded the number of
-milliseconds defined in timeout_name, which was set by C<_set_timeout()>.
-
-return -1 if timeout_name does not match an existing timer
-return 0 if timer has not expired
-return 1 if timer has expired
-
-=cut
-
-sub _check_timeout
-{
-	my ($self, $timeout_name) = @_;
-	return 0 unless $timeout_name;
-	return -1 unless defined $$self{"_timeout_$timeout_name"};
-	my $current_tickcount = &main::get_tickcount;
-	return 0 if (($current_tickcount >= 2**16) and ($$self{"_timeout_$timeout_name"} < 2**16));
-	return ($current_tickcount > $$self{"_timeout_$timeout_name"}) ? 1 : 0;
-}
-
-=item C<_check_timeout(timeout_name)>
-
-Erases timeout_name, which was set by C<_set_timeout()>.
-
-=cut
-sub _clear_timeout
-{
-	my ($self, $timeout_name) = @_;
-	$$self{"_timeout_$timeout_name"} = undef;
-}
-
-=item C<_aldb()>
-
-Returns the ALDB object associated with the device.
-
-=cut
-
-sub _aldb
-{
-   my ($self) = @_;
-   return $$self{aldb};
-}
-
-=item C<_is_duplicate_received()>
-
-This function attempts to identify erroneous duplicative incoming messages 
-while still permitting identical messages to arrive in close proximity.  For 
-example, a valid identical message is the ACK of an extended aldb read which 
-is always 2F00.
-
-Messages are deemed to be identical if, excluding the max_hops and hops_left
-bits, they are otherwise the same.  Identical messages are deemed to be 
-erroneous if they are received within a calculated message window, $delay.  
-
-The message window is calculated based on the amount of time that should have
-elapsed before a subsequent identical message could have been received..
-
-Returns 1 if the received message is an erroneous duplicate message
-
-See discussion at: https://github.com/hollie/misterhouse/issues/169
-
-=cut
-
-sub _is_duplicate_received {
-	my ($self, $message_data, %msg) = @_;
-	my $is_duplicate;
-
-	my $curr_milli = sprintf('%.0f', &main::get_tickcount);
-
-	# $key will be set to $message_data with max hops and hops left set to 0
-	my $key = $message_data;
-	substr($key,13,1) = 0;
-	
-	#Standard = 50 millis; Extended = 108 millis;
-	#In practice requires 75% more
-	my $message_time = (length($message_data) > 18) ? 183 : 87;
-	
-	#Wait period before PLM can send ACK or next request
-	my $max_hops = $msg{hopsleft};
-
-	if (!$msg{is_ack} && !$msg{is_nack} && $msg{type} ne 'alllink' 
-		&& $msg{type} ne 'broadcast')
-	{
-		#ACK sent with same max hops plus 1 for initial timeslot
-		$max_hops += $msg{maxhops} + 1;
-		#Subsequent Reply, arrives in same number of hops + 1 for intial timeslot
-		$max_hops += ($msg{maxhops} - $msg{hopsleft}) + 1;
-	} else {
-		#Subsequent PLM request is sent with max hops + 1 for intial timeslot
-		$max_hops += $msg{maxhops} + 1;
-	}
-
-	my $delay = ($message_time * $max_hops);
-
-	#Clean hash of outdated entries
-	for (keys %{$$self{received_commands}}){
-		if ($$self{received_commands}{$_} < $curr_milli){
-			delete($$self{received_commands}{$_});
-		}
-	}
-
-	#Check if the message exists
-	if (exists($$self{received_commands}{$key})){
-		$is_duplicate = 1;
-		#Reset the time in case there are multiple duplicates
-		$$self{received_commands}{$key} = $curr_milli + $delay;
-		#Make a nicer name
-		my $source = $msg{source};
-		my $object = &Insteon::get_object($msg{source}, $msg{group});
-		if (defined $object) {
-			$source = $object->get_object_name();
-			$object->dupe_count_log(1) if $object->can('dupe_count_log');
-			$object->max_hops_count($msg{maxhops}) if $object->can('max_hops_count');
-        	$object->hops_left_count($msg{hopsleft}) if $object->can('hops_left_count');
-            $object->incoming_count_log(1) if $object->can('incoming_count_log');
-            #This message still provides a data point on how many hops it is 
-            #taking for messages to arrive.
-            $object->default_hop_count($msg{maxhops}-$msg{hopsleft}) if $object->can('default_hop_count');
-		::print_log("[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
-			. $message_data . ", from ". $object->get_object_name) if $object->debuglevel(1, 'insteon');
-		}
-		else {
-			::print_log("[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
-			. " from an unknown device.  Id: $msg{source} Grp: $msg{group}") if $main::Debug{'insteon'};
-		}
-	} else {
-		#Message was not in hash, so add it
-		$$self{received_commands}{$key} = $curr_milli + $delay;
-	}
-	return $is_duplicate;
-}
-
-=item C<get_voice_cmds>
-
-Returns a hash of voice commands where the key is the voice command name and the
-value is the perl code to run when the voice command name is called.
-
-Higher classes which inherit this object may add to this list of voice commands by
-redefining this routine while inheriting this routine using the SUPER function.
-
-This routine is called by L<Insteon::generate_voice_commands> to generate the
-necessary voice commands.
-
-=cut 
-
-sub get_voice_cmds
-{
-    my ($self) = @_;
-    my $object_name = $self->get_object_name;
-    my %voice_cmds = (
-        'complete linking as responder' => "$object_name->complete_linking_as_responder",
-        'initiate linking as controller' => "$object_name->initiate_linking_as_controller",
-        'initiate unlinking' => "$object_name->initiate_unlinking_as_controller",
-        'cancel linking' => "$object_name->cancel_linking",
-        'log links' => "$object_name->log_alllink_table",
-        'scan link table' => "$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")",
-        'scan changed device link tables' => "Insteon::scan_all_linktables(1)",
-        'delete orphan links' => "$object_name->delete_orphan_links",
-        'AUDIT - delete orphan links' => "$object_name->delete_orphan_links(1)",
-        'scan all device link tables' => "Insteon::scan_all_linktables",
-        'sync all links' => "Insteon::sync_all_links(0)",
-        'AUDIT - sync all links' => "Insteon::sync_all_links(1)",
-        'print all message stats' => "Insteon::print_all_message_stats",
-        'reset all message stats' => "Insteon::reset_all_message_stats",
-        'stress test ALL devices' => "Insteon::stress_test_all(5,1)",
-        'ping test ALL devices' => "Insteon::ping_all(5)",
-        'log all device ALDB status' => "Insteon::log_all_ADLB_status"
-    );
-    return \%voice_cmds;
-}
-
-=item C<is_deaf()>
-
-Returns false.
-
-=cut
-
-sub is_deaf
-{
-	return 0;
-}
-
-=item C<is_controller()>
-
-Returns true.
-
-=cut
-
-sub is_controller
-{
-	return 1;
-}
-
-=item C<is_responder()>
-
-Returns true.
-
-=cut
-
-sub is_responder
-{
-	return 1;
-}
-
-
-=back
-
-=head2 INI PARAMETERS
-
-=over
-
-=item Insteon_PLM_scan_at_startup
-
-By default, MisterHouse will scan all devices at startup.  This scan involves
-asking each device for its current state and asking each device for its engine
-version.  In a larger network this can take a few seconds to complete and it does
-send a lot of messages all at once, but polling at startup is a good way to make
-sure that MisterHouse has an accurate understanding of the network.
-
-If set to false, will disable the scan at startup.
-
-=back
-
-=head2 AUTHOR
-
-Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-1
+
+=item C<_is_duplicate(cmd)>
+
+Returns true if cmd already exists in the command stack.
+
+=cut
+
+sub _is_duplicate
+{
+	my ($self, $cmd) = @_;
+        return 1 if ($self->active_message && $self->active_message->interface_data eq $cmd);
+	my $duplicate_detected = 0;
+	# check for duplicates of $cmd already in command_stack and ignore if they exist
+	foreach my $message (@{$$self{command_stack2}})
+        {
+		if ($message->interface_data eq $cmd)
+                {
+			$duplicate_detected = 1;
+			last;
+		}
+	}
+	return $duplicate_detected;
+}
+
+=item C<has_link(link_details)>
+
+If a device has an ALDB, passes link_details onto one of the has_link() routines
+within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called as part of C<delete_orphan_links()>.
+
+=cut
+
+sub has_link
+{
+	my ($self, $insteon_object, $group, $is_controller, $subaddress) = @_;
+        if ($self->_aldb)
+        {
+           return $self->_aldb->has_link($insteon_object, $group, $is_controller, $subaddress);
+        }
+	return 0;
+}
+
+=item C<add_link(link_params)>
+
+If a device has an ALDB, passes link_details onto one of the add_link() routines
+within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called from the "sync links" or 
+"link to interface" voice commands.
+
+=cut
+
+sub add_link
+{
+	my ($self, $parms_text) = @_;
+        if ($self->_aldb)
+        {
+		my %link_parms;
+		if (@_ > 2)
+                {
+			shift @_;
+			%link_parms = @_;
+		}
+                else
+                {
+			%link_parms = &main::parse_func_parms($parms_text);
+		}
+           	$self->_aldb->add_link(%link_parms);
+        }
+}
+
+=item C<delete_link([link details])>
+
+If a device has an ALDB, passes link_details onto one of the delete_link() routines
+within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called by C<delete_orphan_links()>.
+
+=cut
+
+sub delete_link
+{
+	my ($self, $parms_text) = @_;
+        if ($self->_aldb)
+        {
+		my %link_parms;
+		if (@_ > 2)
+                {
+			shift @_;
+			%link_parms = @_;
+		}
+                else
+                {
+			%link_parms = &main::parse_func_parms($parms_text);
+		}
+           	$self->_aldb->delete_link(%link_parms);
+        }
+}
+
+=item C<active_message([msg])>
+
+Optionally stores, and returns the message currently being processed by the interface.
+
+=cut
+
+sub active_message
+{
+	my ($self, $message) = @_;
+        if (defined $message)
+        {
+        	$$self{active_message} = $message;
+        }
+        return $$self{active_message};
+}
+
+=item C<clear_active_message()>
+
+Clears the message currently being processed by the interface, and sets the
+transmit in progress flag to false.
+
+=cut
+
+sub clear_active_message
+{
+	my ($self) = @_;
+        $$self{active_message} = undef;
+	$self->transmit_in_progress(0);
+}
+
+=item C<retry_active_message()>
+
+Sets the transmit in progress flag to false.
+
+=cut
+
+sub retry_active_message
+{
+	my ($self) = @_;
+	$self->transmit_in_progress(0);
+}
+
+=item C<transmit_in_progress([xmit_flag])>
+
+Sets the transmit in progress flag to xmit_flag, returns true if xmit_flag
+true or xmit timout has not elapsed.
+
+=cut
+
+sub transmit_in_progress
+{
+	my ($self, $xmit_flag) = @_;
+        if (defined $xmit_flag)
+        {
+        	$$self{xmit_in_progress} = $xmit_flag;
+        }
+        # also factor in xmit timer since this must be honored to allow
+        #   adequate time to elapse
+        return $$self{xmit_in_progress} || ($self->_check_timeout('xmit')==0);
+}
+
+=item C<queue_message([msg])>
+
+If no msg is passed, returns the queue length.
+
+Msg is optionally a message, if sent is added to the message queue.  
+C<process_queue()> is then called.
+
+=cut
+
+sub queue_message
+{
+	my ($self, $message) = @_;
+
+	my $command_queue_size = @{$$self{command_stack2}};
+	return $command_queue_size unless $message;
+
+	#queue any new command
+	if (defined $message)
+	{
+        	my $setby = $message->setby;
+		if ($self->_is_duplicate($message->interface_data) && !($message->isa('Insteon::X10Message')))
+                {
+			&main::print_log("[Insteon::BaseInterface] Attempt to queue command already in queue; skipping ...") if $self->debuglevel(1, 'insteon');
+		}
+                else
+                {
+			if ($setby and ref($setby) and $setby->can('set_retry_timeout')
+                           and $setby->get_object_name)
+                        {
+				$message->callback($setby->get_object_name . "->set_retry_timeout()");
+			}
+			unshift(@{$$self{command_stack2}}, $message);
+		}
+	}
+        # and, begin processing either this entry or the oldest one in the queue
+        $self->process_queue();
+}
+
+=item C<process_queue()>
+
+If C<transmit_in_progress()> is true returns queue size.
+
+If there is a pending message, will leave it as active_message.  If retries are 
+exceeded, will log an error, clear the message, and call the message failure_callback.
+
+Else, will pull a message from the queue and place it as the active_message.
+
+=cut
+
+sub process_queue
+{
+	my ($self) = @_;
+
+	my $command_queue_size = @{$$self{command_stack2}};
+
+	if ($self->transmit_in_progress)
+        {
+        	return $command_queue_size;
+        }
+        else
+	#we dont transmit on top of another xmit
+        { # no transmission is progress that has not already been acked or nacked by the PLM
+		# get pending command record
+       		my $pending_message = $self->active_message;
+
+		if (!($pending_message))
+        	{ # no prior message remains; so, get one from the queue
+        		$pending_message = pop(@{$$self{command_stack2}});
+        		$self->active_message($pending_message) if $pending_message;
+		}
+
+		if ($pending_message)
+		{ # a message exists to be sent (whether previously sent or queued)
+
+	                if ($self->active_message->send($self) == 0)
+                        {  # this only occurs if the retry count has been exceeded
+        	                # which also means that there wasn't a message actually sent
+                               	&::print_log("[Insteon::BaseInterface] WARN: number of retries ("
+                                       	. $self->active_message->send_attempts
+                			. ") for " . $self->active_message->to_string()
+                                        . " exceeds limit.  Now moving on...") if $self->debuglevel(1, 'insteon');
+                                # !!!!!!!!! TO-DO - handle failure timeout ???
+                                my $failed_message = $self->active_message;
+                                # make sure to let the sending object know!!!
+				if (defined($failed_message->setby) and $failed_message->setby->can('is_acknowledged'))
+				{
+                                       	$failed_message->setby->is_acknowledged(0);
+                                       	$failed_message->setby->fail_count_log(1) 
+                                       		if $failed_message->setby->can('fail_count_log');
+				}
+				else
+				{
+					&main::print_log("[Insteon::BaseInterface] WARN! Unable to clear acknowledge for "
+						. ((defined($failed_message->setby)) ? $failed_message->setby->get_object_name : "undefined"));
+				}
+
+				# Get failed message details before clearing
+				my $callback = $failed_message->failure_callback;
+				my $setby = $failed_message->setby;
+				# clear active message
+				$self->clear_active_message();
+
+				if ($callback)
+                                {
+                                       	&::print_log("[Insteon::BaseInterface] WARN: Message Timeout:  Now calling callback: " .
+                                               	$callback) if $self->debuglevel(1, 'insteon');
+					$setby->failure_reason('timeout') 
+						if (defined($setby) and $setby->can('failure_reason'));
+		       			package main;
+					eval $callback;
+					&::print_log("[Insteon::BaseInterface] problem w/ retry callback: $@") if $@;
+					package Insteon::BaseInterface;
+				}
+				
+				#Any other outgoing messages pending in the queue?
+                		$self->process_queue();
+                        }
+		}
+                else # no pending message
+                {
+               	 	# clear the timer
+                	$self->_clear_timeout('command');
+                        return 0;
+                }
+	}
+	my $command_queue_size = @{$$self{command_stack2}};
+	return $command_queue_size;
+}
+
+=item C<device_id([id])>
+
+Used to store and return the associated device_id of a device.
+
+If provided, stores id as the device's id.
+
+Returns device id without any delimiters.
+
+=cut
+
+sub device_id {
+	my ($self, $p_deviceid) = @_;
+	$$self{deviceid} = $p_deviceid if defined $p_deviceid;
+	return $$self{deviceid};
+}
+
+=item C<restore_string()>
+
+This is called by mh on exit to save the cached ALDB of a device to persistant data.
+
+=cut
+
+sub restore_string
+{
+	my ($self) = @_;
+	my $restore_string = $self->SUPER::restore_string();
+	$restore_string .= $self->_aldb->restore_string();
+	return $restore_string;
+}
+
+=item C<restore_linktable()>
+
+Used to reload the link table of a device on restart.
+
+=cut
+
+sub restore_linktable
+{
+	my ($self,$aldb) = @_;
+	if ($self->_aldb and $aldb) {
+           $self->_aldb->restore_linktable($aldb);
+	}
+}
+
+=item C<log_alllink_table()>
+
+Prints a human readable form of MisterHouse's cached version of a device's ALDB
+to the print log.  Called as part of the "scan links" voice command
+or in response to the "log links" voice command.
+
+=cut
+
+sub log_alllink_table
+{
+	my ($self) = @_;
+        $self->_aldb->log_alllink_table if $self->_aldb;
+}
+
+=item C<delete_orphan_links(audit_mode)>
+
+Reviews the cached version of all of the ALDBs and based on this review removes
+links from this device which are not present in the mht file, not defined in the 
+code, or links which are only half-links.
+
+If audit_mode is true, prints the actions that would be taken to the log, but 
+does nothing.
+
+=cut
+
+sub delete_orphan_links
+{
+	my ($self, $audit_mode) = @_;
+        return $self->_aldb->delete_orphan_links($audit_mode) if $self->_aldb;
+}
+
+######################
+### EVENT HANDLERS ###
+######################
+
+=item C<on_interface_info_received>
+
+Called to process the plm_info request sent by the C<poll_all()> command.
+Prints output to log.
+
+=cut
+
+sub on_interface_info_received
+{
+	my ($self) = @_;
+	&::print_log("[Insteon_PLM] PLM id: " . $self->device_id .
+		" firmware: " . $self->firmware)
+		if $self->debuglevel(1, 'insteon');
+        $self->clear_active_message();
+}
+
+=item C<on_standard_insteon_received>
+
+Called to process standard length insteon messages.  The routine is rather complex
+some messsages are processed right here.  The majority are passed off to the
+C<_is_info_request()> and C<_process_message()> routines for each device.
+
+=cut
+
+sub on_standard_insteon_received
+{
+        my ($self, $message_data) = @_;
+	my %msg = &Insteon::InsteonMessage::command_to_hash($message_data);
+	return if $self->_is_duplicate_received($message_data, %msg);
+	if (%msg)
+        {
+		my $wait_time;
+		my $wait_message = "[Insteon::BaseInterface] DEBUG3: Message received "
+			."with $msg{hopsleft} hops left, ";
+		if (!$msg{is_ack} && !$msg{is_nack} && $msg{type} ne 'alllink' 
+			&& $msg{type} ne 'broadcast') {
+			#Wait for ACK to be delivered
+			$wait_time = $msg{maxhops};
+			$wait_message .= "plus ACK will take $msg{maxhops} to deliver, ";
+		}
+		$wait_time += $msg{hopsleft};
+		#Standard msgs should only take 50 millis, but in practice additional 
+		#time has been required. Extra 50 millis helps prevent dupes
+		$wait_time = ($wait_time * 100) + 50;
+		$wait_message .= "delaying next transmit by $wait_time milliseconds to avoid collisions.";
+		::print_log($wait_message) if ($self->debuglevel(3, 'insteon') && $wait_time > 50);
+		$self->_set_timeout('xmit', $wait_time);			
+
+		# get the matching object
+		my $object = &Insteon::get_object($msg{source}, $msg{group});
+		if (defined $object)
+                {
+                	$object->max_hops_count($msg{maxhops}) if $object->can('max_hops_count');
+                	$object->hops_left_count($msg{hopsleft}) if $object->can('hops_left_count');
+                    $object->incoming_count_log(1) if $object->can('incoming_count_log');
+                	if ($msg{type} ne 'broadcast')
+                        {
+                		$msg{command} = $object->message_type($msg{cmd_code});
+		      		&::print_log("[Insteon::BaseInterface] Received message from: ". $object->get_object_name
+		      			."; command: $msg{command}; type: $msg{type}; group: $msg{group}")
+                        		if (!($msg{is_ack} or $msg{is_nack})) and $self->debuglevel(1, 'insteon');
+                   	}
+                   	if ($msg{is_ack} or $msg{is_nack})
+                   	{
+		      		main::print_log("[Insteon::BaseInterface] DEBUG3: PLM command:insteon_received; "
+		      			. "Device command:$msg{command}; type:$msg{type}; group: $msg{group}")
+                        		if $self->debuglevel(3, 'insteon');
+                        	# need to confirm that this message corresponds to the current active one before clearing it
+                                # TO-DO!!! This is a brute force and poor compare technique; needs to be replaced by full compare
+                                if ($self->active_message && ref $self->active_message->setby)
+                                {
+                                        if ($self->active_message->send_attempts == 0)
+                                        {
+                                                &main::print_log("[Insteon::BaseInterface] WARN: received ACK/NACK message for "
+                                                	. $object->get_object_name . " but cannot correlate to sent message "
+                                                        . "(active but send attempts = 0).  IGNORING received message!!");
+                                        }
+                                        elsif ($msg{type} eq 'direct')
+                                        {
+                                        	if (lc $self->active_message->setby->device_id eq lc $msg{source})
+                                                {
+                                                	# prevent re-processing transmit queue until after clearing occurs
+                                                        $self->transmit_in_progress(1);
+                        		       		# ask the object to process the received message and update its state
+                        		       		# Object will return true if this is the end of the send transaction
+		   					if($object->_process_message($self, %msg)) {
+								if ($self->active_message->success_callback){
+									main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
+										. $self->active_message->success_callback) if $object->debuglevel(4, 'insteon');
+									package main;
+										eval $self->active_message->success_callback;
+										::print_log("[Insteon::BaseInterface] problem w/ success callback: $@") if $@;
+									package Insteon::BaseInterface;
+								}
+								$self->clear_active_message();
+		   					}
+                                                }
+                                                else
+                                                {
+                                                	&main::print_log("[Insteon::BaseInterface] WARN: deviceid of "
+                                                		. "active message != received message source ("
+                                                        	. $object->get_object_name() . "). IGNORING received message!!");
+                                                        #These generally seem to be duplicate messages
+                                                        $object->dupe_count_log(1) if $object->can('dupe_count_log');
+                                                }
+                                        }
+                                        elsif ($msg{type} eq 'cleanup')
+                                        {
+                                        	my $setby_object = $object;
+                                                $object = &Insteon::get_object('000000', $msg{extra});
+                                                if ($object)
+                                                {
+                                                	# prevent re-processing transmit queue until after clearing occurs
+                                                	$self->transmit_in_progress(1);
+							# Don't clear active message as ACK is only one of many
+							if (($msg{extra} == $self->active_message->setby->group)){
+                                                                &main::print_log("[Insteon::BaseInterface] DEBUG3: Cleanup message received for scene "
+                                                                	. $object->get_object_name . " from " . $setby_object->get_object_name)
+                                                                	if $object->debuglevel(3, 'insteon');
+							} elsif ($self->active_message->command_type eq 'all_link_direct_cleanup' &&
+								lc($self->active_message->setby->device_id) eq $msg{source}) 
+							{
+								&::print_log("[Insteon::BaseInterface] DEBUG2: ALL-Linking Direct Completed with ". $self->active_message->setby->get_object_name) if $object->debuglevel(2, 'insteon');
+								$self->clear_active_message();
+							}
+							else {
+								&main::print_log("[Insteon::BaseInterface] DEBUG3: Cleanup message received from "
+								. $setby_object->get_object_name . " for scene "
+								. $object->get_object_name . ", but group in recent message " 
+								. $msg{extra}. " did not match group in "
+								. "prior sent message group " . $self->active_message->setby->group) 
+									if $object->debuglevel(3, 'insteon');
+                                			}
+                                			# If ACK or NACK received then PLM is still working on the ALL Link Command
+                                			# Increase the command timeout to wait for next one
+                                			$self->_set_timeout('command', 3000);
+                                                }
+                                                else
+                                                {
+                                                	&main::print_log("[Insteon::BaseInterface] ERROR: received cleanup message from "
+                                                             . $setby_object->get_object_name . " that does not correspond to a valid PLM group. Corrupted message is assumed "
+                                                             . "and will be skipped! Was group " . $msg{extra});
+                                                    $setby_object->corrupt_count_log(1) if $setby_object->can('corrupt_count_log');
+                                                }
+                                        }
+                                        else #not direct or cleanup
+                                        {
+                                                &main::print_log("[Insteon::BaseInterface] ERROR: received ACK/NACK message from "
+                                                	. $object->get_object_name . " but unable to process $msg{type} message type."
+                                                        . " IGNORING received message!!");
+                                                $self->active_message->no_hop_increase(1);
+                                                $object->corrupt_count_log(1) if $object->can('corrupt_count_log');
+                                        }
+                        	}
+                                else #does not correspond to current active message
+                                {
+                                        if ($msg{type} eq 'direct')
+                                        {
+                                        	&main::print_log("[Insteon::BaseInterface] WARN: received insteon ACK/NACK message from "
+                                        		. $object->get_object_name . " but cannot correlate to sent message! IGNORING received message!!");
+                                        }
+                                        elsif ($msg{type} eq 'cleanup')
+                                        {
+                                                # this is just going to be ignored since there is a virtual processing done
+                                                #   in the Insteon_PLM handler for cleanup messages.
+                                                #   however, if the virtual handler was not invoked due to receipt of the broadcast message
+                                                #   then, the above cleanup handler would be run
+						my $plm_group_obj = Insteon::get_object('000000', $msg{extra});
+						my $group_name = $msg{extra};
+						$group_name = $plm_group_obj->get_object_name if (ref $plm_group_obj);
+						$plm_group_obj = $self if (!ref $plm_group_obj);
+                                                &main::print_log("[Insteon::BaseInterface] DEBUG3: received cleanup message responding to "
+                                                	. "PLM controller group: $group_name. Ignoring as this has already been processed")
+                                                        if $plm_group_obj->debuglevel(3, 'insteon');
+                                        }
+                                        else
+                                        {
+                        			# ask the object to process the received message and update its state
+		   				$object->_process_message($self, %msg);
+                                        }
+                                }
+                   	}
+                        else # not ACK or NAK
+                        {
+                        	# ask the object to process the received message and update its state
+		   		$object->_process_message($self, %msg);
+                        }
+		}
+                else 
+                {
+         		&::print_log("[Insteon::BaseInterface] Warn! Unable to locate object for source: $msg{source} and group: $msg{group}");
+         		$self->corrupt_count_log(1);
+		}
+		# treat the message as legitimate even if an object match did not occur
+	}
+}
+
+=item C<on_standard_insteon_received>
+
+Called to process extended length insteon messages.  The majority of messages are 
+passed off to the C<_process_message()> routines for each device.
+
+=cut
+
+
+sub on_extended_insteon_received
+{
+        my ($self, $message_data) = @_;
+	my %msg = &Insteon::InsteonMessage::command_to_hash($message_data);
+	return if $self->_is_duplicate_received($message_data, %msg);
+	if (%msg)
+        {
+		my $wait_time;
+		my $wait_message = "[Insteon::BaseInterface] DEBUG3: Message received "
+			."with $msg{hopsleft} hops left, ";
+		if (!$msg{is_ack} && !$msg{is_nack} && $msg{type} ne 'alllink' 
+			&& $msg{type} ne 'broadcast') {
+			#Wait for ACK to be delivered
+			$wait_time = $msg{maxhops};
+			$wait_message .= "plus ACK will take $msg{maxhops} to deliver, ";
+		}
+		$wait_time += $msg{hopsleft};
+		#Standard msgs should only take 108 millis, but in practice additional 
+		#time has been required. Extra 50 millis helps prevent dupes
+		$wait_time = ($wait_time * 200) + 50;
+		$wait_message .= "delaying next transmit by $wait_time milliseconds to avoid collisions.";
+		::print_log($wait_message) if ($self->debuglevel(3, 'insteon') && $wait_time > 50);
+		$self->_set_timeout('xmit', $wait_time);
+
+		# get the matching object
+		my $object = &Insteon::get_object($msg{source}, $msg{group});
+		if (defined $object)
+                {
+                	$object->max_hops_count($msg{maxhops}) if $object->can('max_hops_count');
+                	$object->hops_left_count($msg{hopsleft}) if $object->can('hops_left_count');
+                    $object->incoming_count_log(1) if $object->can('incoming_count_log');
+                	if ($msg{type} ne 'broadcast')
+                        {
+                		$msg{command} = $object->message_type($msg{cmd_code});
+		      		main::print_log("[Insteon::BaseInterface] DEBUG: PLM command:insteon_ext_received; "
+		      			. "Device command:$msg{command}; type:$msg{type}; group: $msg{group}")
+                        		if( (!($msg{is_ack} or $msg{is_nack}) and $self->debuglevel(1, 'insteon')) 
+                        		or $self->debuglevel(3, 'insteon'));
+                   	}
+		   	&::print_log("[Insteon::BaseInterface] Processing message for " . $object->get_object_name) if $object->debuglevel(3, 'insteon');
+			if($object->_process_message($self, %msg)) {
+				if (ref $self->active_message && $self->active_message->success_callback){
+					main::print_log("[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
+						. $self->active_message->success_callback) if $object->debuglevel(4, 'insteon');
+					package main;
+						eval $self->active_message->success_callback;
+						::print_log("[Insteon::BaseInterface] problem w/ success callback: $@") if $@;
+					package Insteon::BaseInterface;
+				}
+				$self->clear_active_message();
+			}
+		}
+                else
+                {
+         		&::print_log("[Insteon::BaseInterface] Warn! Unable to locate object for source: $msg{source} and group: $msg{group}");
+		}
+		# treat the message as legitimate even if an object match did not occur
+	}
+
+}
+
+#################################
+### INTERNAL METHODS/FUNCTION ###
+#################################
+
+=item C<_set_timeout(timeout_name, timeout_millis)>
+
+Sets an internal variable, timeout_name, the current time plus the number of 
+milliseconds specified by timeout_millis.
+
+=cut
+
+
+sub _set_timeout
+{
+	my ($self, $timeout_name, $timeout_in_millis) = @_;
+	my $tickcount = &main::get_tickcount + $timeout_in_millis;
+	$tickcount += 2**32 if $tickcount < 0; # force a wrap; to be handleded by check timeout
+	$$self{"_timeout_$timeout_name"} = $tickcount;
+}
+
+=item C<_check_timeout(timeout_name)>
+
+Checks to see if the current number of milliseconds has exceeded the number of
+milliseconds defined in timeout_name, which was set by C<_set_timeout()>.
+
+return -1 if timeout_name does not match an existing timer
+return 0 if timer has not expired
+return 1 if timer has expired
+
+=cut
+
+sub _check_timeout
+{
+	my ($self, $timeout_name) = @_;
+	return 0 unless $timeout_name;
+	return -1 unless defined $$self{"_timeout_$timeout_name"};
+	my $current_tickcount = &main::get_tickcount;
+	return 0 if (($current_tickcount >= 2**16) and ($$self{"_timeout_$timeout_name"} < 2**16));
+	return ($current_tickcount > $$self{"_timeout_$timeout_name"}) ? 1 : 0;
+}
+
+=item C<_check_timeout(timeout_name)>
+
+Erases timeout_name, which was set by C<_set_timeout()>.
+
+=cut
+sub _clear_timeout
+{
+	my ($self, $timeout_name) = @_;
+	$$self{"_timeout_$timeout_name"} = undef;
+}
+
+=item C<_aldb()>
+
+Returns the ALDB object associated with the device.
+
+=cut
+
+sub _aldb
+{
+   my ($self) = @_;
+   return $$self{aldb};
+}
+
+=item C<_is_duplicate_received()>
+
+This function attempts to identify erroneous duplicative incoming messages 
+while still permitting identical messages to arrive in close proximity.  For 
+example, a valid identical message is the ACK of an extended aldb read which 
+is always 2F00.
+
+Messages are deemed to be identical if, excluding the max_hops and hops_left
+bits, they are otherwise the same.  Identical messages are deemed to be 
+erroneous if they are received within a calculated message window, $delay.  
+
+The message window is calculated based on the amount of time that should have
+elapsed before a subsequent identical message could have been received..
+
+Returns 1 if the received message is an erroneous duplicate message
+
+See discussion at: https://github.com/hollie/misterhouse/issues/169
+
+=cut
+
+sub _is_duplicate_received {
+	my ($self, $message_data, %msg) = @_;
+	my $is_duplicate;
+
+	my $curr_milli = sprintf('%.0f', &main::get_tickcount);
+
+	# $key will be set to $message_data with max hops and hops left set to 0
+	my $key = $message_data;
+	substr($key,13,1) = 0;
+	
+	#Standard = 50 millis; Extended = 108 millis;
+	#In practice requires 75% more
+	my $message_time = (length($message_data) > 18) ? 183 : 87;
+	
+	#Wait period before PLM can send ACK or next request
+	my $max_hops = $msg{hopsleft};
+
+	if (!$msg{is_ack} && !$msg{is_nack} && $msg{type} ne 'alllink' 
+		&& $msg{type} ne 'broadcast')
+	{
+		#ACK sent with same max hops plus 1 for initial timeslot
+		$max_hops += $msg{maxhops} + 1;
+		#Subsequent Reply, arrives in same number of hops + 1 for intial timeslot
+		$max_hops += ($msg{maxhops} - $msg{hopsleft}) + 1;
+	} else {
+		#Subsequent PLM request is sent with max hops + 1 for intial timeslot
+		$max_hops += $msg{maxhops} + 1;
+	}
+
+	my $delay = ($message_time * $max_hops);
+
+	#Clean hash of outdated entries
+	for (keys %{$$self{received_commands}}){
+		if ($$self{received_commands}{$_} < $curr_milli){
+			delete($$self{received_commands}{$_});
+		}
+	}
+
+	#Check if the message exists
+	if (exists($$self{received_commands}{$key})){
+		$is_duplicate = 1;
+		#Reset the time in case there are multiple duplicates
+		$$self{received_commands}{$key} = $curr_milli + $delay;
+		#Make a nicer name
+		my $source = $msg{source};
+		my $object = &Insteon::get_object($msg{source}, $msg{group});
+		if (defined $object) {
+			$source = $object->get_object_name();
+			$object->dupe_count_log(1) if $object->can('dupe_count_log');
+			$object->max_hops_count($msg{maxhops}) if $object->can('max_hops_count');
+        	$object->hops_left_count($msg{hopsleft}) if $object->can('hops_left_count');
+            $object->incoming_count_log(1) if $object->can('incoming_count_log');
+            #This message still provides a data point on how many hops it is 
+            #taking for messages to arrive.
+            $object->default_hop_count($msg{maxhops}-$msg{hopsleft}) if $object->can('default_hop_count');
+		::print_log("[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
+			. $message_data . ", from ". $object->get_object_name) if $object->debuglevel(1, 'insteon');
+		}
+		else {
+			::print_log("[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
+			. " from an unknown device.  Id: $msg{source} Grp: $msg{group}") if $main::Debug{'insteon'};
+		}
+	} else {
+		#Message was not in hash, so add it
+		$$self{received_commands}{$key} = $curr_milli + $delay;
+	}
+	return $is_duplicate;
+}
+
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        'complete linking as responder' => "$object_name->complete_linking_as_responder",
+        'initiate linking as controller' => "$object_name->initiate_linking_as_controller",
+        'initiate unlinking' => "$object_name->initiate_unlinking_as_controller",
+        'cancel linking' => "$object_name->cancel_linking",
+        'log links' => "$object_name->log_alllink_table",
+        'scan link table' => "$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")",
+        'scan changed device link tables' => "Insteon::scan_all_linktables(1)",
+        'delete orphan links' => "$object_name->delete_orphan_links",
+        'AUDIT - delete orphan links' => "$object_name->delete_orphan_links(1)",
+        'scan all device link tables' => "Insteon::scan_all_linktables",
+        'sync all links' => "Insteon::sync_all_links(0)",
+        'AUDIT - sync all links' => "Insteon::sync_all_links(1)",
+        'print all message stats' => "Insteon::print_all_message_stats",
+        'reset all message stats' => "Insteon::reset_all_message_stats",
+        'stress test ALL devices' => "Insteon::stress_test_all(5,1)",
+        'ping test ALL devices' => "Insteon::ping_all(5)",
+        'log all device ALDB status' => "Insteon::log_all_ADLB_status"
+    );
+    return \%voice_cmds;
+}
+
+=item C<is_deaf()>
+
+Returns false.
+
+=cut
+
+sub is_deaf
+{
+	return 0;
+}
+
+=item C<is_controller()>
+
+Returns true.
+
+=cut
+
+sub is_controller
+{
+	return 1;
+}
+
+=item C<is_responder()>
+
+Returns true.
+
+=cut
+
+sub is_responder
+{
+	return 1;
+}
+
+
+=back
+
+=head2 INI PARAMETERS
+
+=over
+
+=item Insteon_PLM_scan_at_startup
+
+By default, MisterHouse will scan all devices at startup.  This scan involves
+asking each device for its current state and asking each device for its engine
+version.  In a larger network this can take a few seconds to complete and it does
+send a lot of messages all at once, but polling at startup is a good way to make
+sure that MisterHouse has an accurate understanding of the network.
+
+If set to false, will disable the scan at startup.
+
+=back
+
+=head2 AUTHOR
+
+Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+1
diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index 4956549b1..f1ca08f7a 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -1,376 +1,376 @@
-=head1 B<Insteon::RemoteLinc>
-
-=head2 SYNOPSIS
-
-Configuration:
-
-Depending on your device and your settings, your remote may offer 1, 4, or 8
-groups.  Your configuration should vary depeninding on you remote style.
-
-In user code:
-
-   use Insteon::RemoteLinc;
-   $remote_1 = new Insteon::RemoteLinc('12.34.56:01',$myPLM);
-   $remote_2 = new Insteon::RemoteLinc('12.34.56:02',$myPLM);
-   $remote_3 = new Insteon::RemoteLinc('12.34.56:03',$myPLM);
-   $remote_4 = new Insteon::RemoteLinc('12.34.56:04',$myPLM);
-
-In items.mht:
-
-   INSTEON_REMOTELINC, 12.34.56:01, remote_1, remote_group
-   INSTEON_REMOTELINC, 12.34.56:02, remote_2, remote_group
-   INSTEON_REMOTELINC, 12.34.56:03, remote_3, remote_group
-   INSTEON_REMOTELINC, 12.34.56:04, remote_4, remote_group
-
-=head2 DESCRIPTION
-
-Provides basic support for Insteon RemoteLinc models 1 and 2.  Basic support
-includes, linking and receiving set commands from the device.  More advanced
-support is offered for RemoteLinc 2 in the form of battery level notifications.
-
-MisterHouse is only able to communicate with a RemoteLinc when it is in "awake
-mode."  The device is in "awake mode" while in its linking state.  To put the 
-RemoteLinc into "awake mode", follow the instructions for placing the device into
-linking mode.  In short, the instructions are to hold down the set button for 4-10
-seconds until you hear a beep and see the light flash.  The RemoteLinc will now
-remain in "awake mode" for approximately 4 minutes.
-
-To scan the link table, sync links, or set settings on the device, the RemoteLinc
-must first be put into "awake mode."
-
-=head2 INHERITS
-
-L<Insteon::BaseDevice|Insteon::BaseInsteon/Insteon::BaseDevice>, 
-L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>, 
-L<Insteon::Insteon::MultigroupDevice|Insteon::BaseInsteon/Insteon::Insteon::MultigroupDevice>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::RemoteLinc;
-
-use strict;
-use Insteon::BaseInsteon;
-
-@Insteon::RemoteLinc::ISA = ('Insteon::BaseDevice','Insteon::DeviceController', 'Insteon::MultigroupDevice');
-
-my %message_types = (
-	%Insteon::BaseDevice::message_types,
-	bright => 0x15,
-	dim => 0x16
-);
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-
-	my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
-        $$self{message_types} = \%message_types;
-	if ($self->is_root){
-		$self->restore_data('battery_timer', 'last_battery_time');
-		$$self{queue_timer} = new Timer;
-	}
-	bless $self,$class;
-	$$self{is_responder} = 0;
-	$$self{is_deaf} = 1;
-	return $self;
-}
-
-=item C<set_awake_time([0-255 seconds])>
-
-Only available for RemoteLinc 2 models.
-
-Sets the amount of time, in seconds, that the RemoteLinc will remain "awake" 
-after sending a command.  MH uses the awake time to send battery level requests
-to the device.  If the device is not responding to the battery level requests,
-consider increasing this value.  However, keep in mind that a longer awake time
-will result in more battery usage.
-
-The factory setting is 4 seconds, 10 seconds seems to work well with MisterHouse 
-without causing adverse battery drain.
-
-=cut
-
-sub set_awake_time {
-	my ($self, $awake) = @_;
-	$awake = sprintf("%02x", $awake);
-	my $root = $self->get_root();
-	my $extra = '000102' . $awake . '0000000000000000000000';
-	$$root{_ext_set_get_action} = "set";
-	my $message = new Insteon::InsteonMessage('insteon_ext_send', $root, 'extended_set_get', $extra);
-	$root->_send_cmd($message);
-	return;
-}
-
-=item C<get_extended_info()>
-
-Only available for RemoteLinc 2 models.
-
-Requests the status of various settings on the device.  Currently this is only
-used to obtain the battery level.  If the device is awake, the battery level 
-will be printed to the log.
-
-You likely do not need to directly call this message, rather MisterHouse will issue
-this request when it sees activity from the device and the C<set_battery_timer()> has 
-expired.
-
-=cut
-
-sub get_extended_info {
-	my ($self,$no_retry) = @_;
-	my $root = $self->get_root();
-	my $extra = '000100000000000000000000000000';
-	$$root{_ext_set_get_action} = "get";
-	my $message = new Insteon::InsteonMessage('insteon_ext_send', $root, 'extended_set_get', $extra);
-	if ($no_retry){
-		$message->retry_count(1);
-	}
-	$root->_send_cmd($message);
-	return;
-}
-
-=item C<set_battery_timer([minutes])>
-
-Only available for RemoteLinc 2 models.
-
-Sets the minimum amount of time between battery level requests.  When this time
-expires, Misterhouse will request the battery level from the device the next time
-MisterHouse sees activity from the device.  Misterhouse will continue to request
-the battery level until it gets a response from the device.
-
-Setting to 0 will disable automatic battery level requests.  1440 equals a day.
-
-This setting will be saved between MisterHouse reboots.
-
-=cut
-
-sub set_battery_timer {
-	my ($self, $minutes) = @_;
-	my $root = $self->get_root();
-	$$root{battery_timer} = sprintf("%u", $minutes);
-	::print_log("[Insteon::RemoteLinc] Set battery timer to ".
-		$$root{battery_timer}." minutes");
-	return;
-}
-
-=item C<_is_battery_time_expired()>
-
-Returns true if the battery timer has expired, else returns false.
-
-=cut
-
-sub _is_battery_time_expired {
-	my ($self) = @_;
-	my $root = $self->get_root();
-	if ($$root{battery_timer} > 0 && 
-		(time - $$root{last_battery_time}) > ($$root{battery_timer} * 60)) {
-		return 1;
-	}
-	return 0;
-}
-
-=item C<_process_message()>
-
-Checks for and handles unique RemoteLinc messages such as battery voltage messages. 
-All other messages are transferred to L<Insteon::BaseObject::_process_message()|Insteon::BaseInsteon/Insteon::BaseObject>.
-
-Also checks the battery timer and sends a battery request if needed.
-
-=cut
-
-sub _process_message {
-	my ($self,$p_setby,%msg) = @_;
-	my $clear_message = 0;
-	my $root = $self->get_root();
-	if ($root->_is_battery_time_expired){
-		#Queue an get_extended_info request
-		if ($$root{queue_timer}->active){
-			$$root{queue_timer}->restart();
-		}
-		else {
-			$$root{queue_timer}->set(3, '$root->get_extended_info(1)');
-		}
-	}
-	my $pending_cmd = ($$self{_prior_msg}) ? $$self{_prior_msg}->command : $msg{command};
-	my $ack_setby = (ref $$self{m_status_request_pending}) ? $$self{m_status_request_pending} : $p_setby;
-	if ($msg{is_ack} && $self->_is_info_request($pending_cmd,$ack_setby,%msg)) {
-		$clear_message = 1;
-		$$self{m_status_request_pending} = 0;
-		$self->_process_command_stack(%msg);
-	}
-	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
-		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-		#If this was a get request don't clear until data packet received
-		main::print_log("[Insteon::RemoteLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel(1, 'insteon');
-		if ($$self{_ext_set_get_action} eq 'set'){
-			main::print_log("[Insteon::RemoteLinc] Clearing active message") if $self->debuglevel(1, 'insteon');
-			$clear_message = 1;
-			$$self{_ext_set_get_action} = undef;
-			$self->_process_command_stack(%msg);	
-		}
-	}
-	elsif ($msg{command} eq "extended_set_get" && $msg{is_extended}) {
-		if (substr($msg{extra},0,6) eq "000001") {
-			$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
-			#D10 = Battery;
-			my $voltage = (hex(substr($msg{extra}, 20, 2))/50);
-			main::print_log("[Insteon::RemoteLinc] The battery level ".
-				"for device ". $self->get_object_name . " is: ".
-				$voltage . " of 3.70 volts.");
-			$$root{last_battery_time} = time;
-			if (ref $$root{battery_object} && $$root{battery_object}->can('set_receive'))
-			{
-				$$root{battery_object}->set_receive($voltage, $root);
-			}
-			$clear_message = 1;
-			$self->_process_command_stack(%msg);
-		} else {
-			main::print_log("[Insteon::RemoteLinc] WARN: Corrupt Extended "
-				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel(1, 'insteon');
-		}
-	}
-	else {
-		$clear_message = $self->SUPER::_process_message($p_setby,%msg);
-	}
-	return $clear_message;
-}
-
-=item C<get_voice_cmds>
-
-Returns a hash of voice commands where the key is the voice command name and the
-value is the perl code to run when the voice command name is called.
-
-Higher classes which inherit this object may add to this list of voice commands by
-redefining this routine while inheriting this routine using the SUPER function.
-
-This routine is called by L<Insteon::generate_voice_commands> to generate the
-necessary voice commands.
-
-=cut 
-
-sub get_voice_cmds
-{
-    my ($self) = @_;
-    my $object_name = $self->get_object_name;
-    my %voice_cmds = (
-        %{$self->SUPER::get_voice_cmds}
-    );
-    if ($self->is_root){
-        %voice_cmds = (
-            %voice_cmds,
-            'sync all device links' => "$object_name->sync_all_links()",
-            'AUDIT sync all device links' => "$object_name->sync_all_links(1)"
-        );
-    }
-    return \%voice_cmds;
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Liming / gregg@limings.net, Kevin Robert Keegan
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=head1 B<Insteon::RemoteLinc_Battery>
-
-=head2 SYNOPSIS
-
-Configuration:
-
-Currently the object can only be defined in the user code.
-
-In user code:
-
-   use Insteon::RemoteLinc_Battery;
-   $remote_battery = new Insteon::RemoteLinc_Battery($remote);
-
-Where $remote is the RemoteLinc device you wish to monitor.
-
-=head2 DESCRIPTION
-
-This basic class creates a simple object that displays the current battery voltage
-as its state.  This is helpful if you want to be able to view the battery level
-through a web page.  Battery level tracking is likely only available on RemoteLinc 2
-devices.
-
-This object's state will be updated based on interval defined for C<set_battery_timer()>
-in the parent B<Insteon::RemoteLinc> object.
-
-Once created, you can tie_events directly to this object, for example to alert
-you when the battery is low.
-
-=head2 INHERITS
-
-L<Generic_Item|Generic_Item>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::RemoteLinc_Battery;
-use strict;
-
-@Insteon::RemoteLinc_Battery::ISA = ('Generic_Item');
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new {
-	my ($class, $parent) = @_;
-	my $self = new Generic_Item();
-	my $root = $parent->get_root();
-	bless $self, $class;
-	$$root{battery_object} = $self;
-	return $self;
-}
-
-=item C<set_receive()>
-
-Receives voltage messages from the parent object and sets the state of this 
-device accordingly.
-
-=cut
-
-sub set_receive {
-	my ($self, $p_state) = @_;
-	$self->SUPER::set($p_state);
-}
-
-=back
-
-=head2 AUTHOR
-
-Kevin Robert Keegan
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
+=head1 B<Insteon::RemoteLinc>
+
+=head2 SYNOPSIS
+
+Configuration:
+
+Depending on your device and your settings, your remote may offer 1, 4, or 8
+groups.  Your configuration should vary depeninding on you remote style.
+
+In user code:
+
+   use Insteon::RemoteLinc;
+   $remote_1 = new Insteon::RemoteLinc('12.34.56:01',$myPLM);
+   $remote_2 = new Insteon::RemoteLinc('12.34.56:02',$myPLM);
+   $remote_3 = new Insteon::RemoteLinc('12.34.56:03',$myPLM);
+   $remote_4 = new Insteon::RemoteLinc('12.34.56:04',$myPLM);
+
+In items.mht:
+
+   INSTEON_REMOTELINC, 12.34.56:01, remote_1, remote_group
+   INSTEON_REMOTELINC, 12.34.56:02, remote_2, remote_group
+   INSTEON_REMOTELINC, 12.34.56:03, remote_3, remote_group
+   INSTEON_REMOTELINC, 12.34.56:04, remote_4, remote_group
+
+=head2 DESCRIPTION
+
+Provides basic support for Insteon RemoteLinc models 1 and 2.  Basic support
+includes, linking and receiving set commands from the device.  More advanced
+support is offered for RemoteLinc 2 in the form of battery level notifications.
+
+MisterHouse is only able to communicate with a RemoteLinc when it is in "awake
+mode."  The device is in "awake mode" while in its linking state.  To put the 
+RemoteLinc into "awake mode", follow the instructions for placing the device into
+linking mode.  In short, the instructions are to hold down the set button for 4-10
+seconds until you hear a beep and see the light flash.  The RemoteLinc will now
+remain in "awake mode" for approximately 4 minutes.
+
+To scan the link table, sync links, or set settings on the device, the RemoteLinc
+must first be put into "awake mode."
+
+=head2 INHERITS
+
+L<Insteon::BaseDevice|Insteon::BaseInsteon/Insteon::BaseDevice>, 
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>, 
+L<Insteon::Insteon::MultigroupDevice|Insteon::BaseInsteon/Insteon::Insteon::MultigroupDevice>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::RemoteLinc;
+
+use strict;
+use Insteon::BaseInsteon;
+
+@Insteon::RemoteLinc::ISA = ('Insteon::BaseDevice','Insteon::DeviceController', 'Insteon::MultigroupDevice');
+
+my %message_types = (
+	%Insteon::BaseDevice::message_types,
+	bright => 0x15,
+	dim => 0x16
+);
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+
+	my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
+        $$self{message_types} = \%message_types;
+	if ($self->is_root){
+		$self->restore_data('battery_timer', 'last_battery_time');
+		$$self{queue_timer} = new Timer;
+	}
+	bless $self,$class;
+	$$self{is_responder} = 0;
+	$$self{is_deaf} = 1;
+	return $self;
+}
+
+=item C<set_awake_time([0-255 seconds])>
+
+Only available for RemoteLinc 2 models.
+
+Sets the amount of time, in seconds, that the RemoteLinc will remain "awake" 
+after sending a command.  MH uses the awake time to send battery level requests
+to the device.  If the device is not responding to the battery level requests,
+consider increasing this value.  However, keep in mind that a longer awake time
+will result in more battery usage.
+
+The factory setting is 4 seconds, 10 seconds seems to work well with MisterHouse 
+without causing adverse battery drain.
+
+=cut
+
+sub set_awake_time {
+	my ($self, $awake) = @_;
+	$awake = sprintf("%02x", $awake);
+	my $root = $self->get_root();
+	my $extra = '000102' . $awake . '0000000000000000000000';
+	$$root{_ext_set_get_action} = "set";
+	my $message = new Insteon::InsteonMessage('insteon_ext_send', $root, 'extended_set_get', $extra);
+	$root->_send_cmd($message);
+	return;
+}
+
+=item C<get_extended_info()>
+
+Only available for RemoteLinc 2 models.
+
+Requests the status of various settings on the device.  Currently this is only
+used to obtain the battery level.  If the device is awake, the battery level 
+will be printed to the log.
+
+You likely do not need to directly call this message, rather MisterHouse will issue
+this request when it sees activity from the device and the C<set_battery_timer()> has 
+expired.
+
+=cut
+
+sub get_extended_info {
+	my ($self,$no_retry) = @_;
+	my $root = $self->get_root();
+	my $extra = '000100000000000000000000000000';
+	$$root{_ext_set_get_action} = "get";
+	my $message = new Insteon::InsteonMessage('insteon_ext_send', $root, 'extended_set_get', $extra);
+	if ($no_retry){
+		$message->retry_count(1);
+	}
+	$root->_send_cmd($message);
+	return;
+}
+
+=item C<set_battery_timer([minutes])>
+
+Only available for RemoteLinc 2 models.
+
+Sets the minimum amount of time between battery level requests.  When this time
+expires, Misterhouse will request the battery level from the device the next time
+MisterHouse sees activity from the device.  Misterhouse will continue to request
+the battery level until it gets a response from the device.
+
+Setting to 0 will disable automatic battery level requests.  1440 equals a day.
+
+This setting will be saved between MisterHouse reboots.
+
+=cut
+
+sub set_battery_timer {
+	my ($self, $minutes) = @_;
+	my $root = $self->get_root();
+	$$root{battery_timer} = sprintf("%u", $minutes);
+	::print_log("[Insteon::RemoteLinc] Set battery timer to ".
+		$$root{battery_timer}." minutes");
+	return;
+}
+
+=item C<_is_battery_time_expired()>
+
+Returns true if the battery timer has expired, else returns false.
+
+=cut
+
+sub _is_battery_time_expired {
+	my ($self) = @_;
+	my $root = $self->get_root();
+	if ($$root{battery_timer} > 0 && 
+		(time - $$root{last_battery_time}) > ($$root{battery_timer} * 60)) {
+		return 1;
+	}
+	return 0;
+}
+
+=item C<_process_message()>
+
+Checks for and handles unique RemoteLinc messages such as battery voltage messages. 
+All other messages are transferred to L<Insteon::BaseObject::_process_message()|Insteon::BaseInsteon/Insteon::BaseObject>.
+
+Also checks the battery timer and sends a battery request if needed.
+
+=cut
+
+sub _process_message {
+	my ($self,$p_setby,%msg) = @_;
+	my $clear_message = 0;
+	my $root = $self->get_root();
+	if ($root->_is_battery_time_expired){
+		#Queue an get_extended_info request
+		if ($$root{queue_timer}->active){
+			$$root{queue_timer}->restart();
+		}
+		else {
+			$$root{queue_timer}->set(3, '$root->get_extended_info(1)');
+		}
+	}
+	my $pending_cmd = ($$self{_prior_msg}) ? $$self{_prior_msg}->command : $msg{command};
+	my $ack_setby = (ref $$self{m_status_request_pending}) ? $$self{m_status_request_pending} : $p_setby;
+	if ($msg{is_ack} && $self->_is_info_request($pending_cmd,$ack_setby,%msg)) {
+		$clear_message = 1;
+		$$self{m_status_request_pending} = 0;
+		$self->_process_command_stack(%msg);
+	}
+	elsif ($msg{command} eq "extended_set_get" && $msg{is_ack}){
+		$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
+		#If this was a get request don't clear until data packet received
+		main::print_log("[Insteon::RemoteLinc] Extended Set/Get ACK Received for " . $self->get_object_name) if $self->debuglevel(1, 'insteon');
+		if ($$self{_ext_set_get_action} eq 'set'){
+			main::print_log("[Insteon::RemoteLinc] Clearing active message") if $self->debuglevel(1, 'insteon');
+			$clear_message = 1;
+			$$self{_ext_set_get_action} = undef;
+			$self->_process_command_stack(%msg);	
+		}
+	}
+	elsif ($msg{command} eq "extended_set_get" && $msg{is_extended}) {
+		if (substr($msg{extra},0,6) eq "000001") {
+			$self->default_hop_count($msg{maxhops}-$msg{hopsleft});
+			#D10 = Battery;
+			my $voltage = (hex(substr($msg{extra}, 20, 2))/50);
+			main::print_log("[Insteon::RemoteLinc] The battery level ".
+				"for device ". $self->get_object_name . " is: ".
+				$voltage . " of 3.70 volts.");
+			$$root{last_battery_time} = time;
+			if (ref $$root{battery_object} && $$root{battery_object}->can('set_receive'))
+			{
+				$$root{battery_object}->set_receive($voltage, $root);
+			}
+			$clear_message = 1;
+			$self->_process_command_stack(%msg);
+		} else {
+			main::print_log("[Insteon::RemoteLinc] WARN: Corrupt Extended "
+				."Set/Get Data Received for ". $self->get_object_name) if $self->debuglevel(1, 'insteon');
+		}
+	}
+	else {
+		$clear_message = $self->SUPER::_process_message($p_setby,%msg);
+	}
+	return $clear_message;
+}
+
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds}
+    );
+    if ($self->is_root){
+        %voice_cmds = (
+            %voice_cmds,
+            'sync all device links' => "$object_name->sync_all_links()",
+            'AUDIT sync all device links' => "$object_name->sync_all_links(1)"
+        );
+    }
+    return \%voice_cmds;
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Liming / gregg@limings.net, Kevin Robert Keegan
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=head1 B<Insteon::RemoteLinc_Battery>
+
+=head2 SYNOPSIS
+
+Configuration:
+
+Currently the object can only be defined in the user code.
+
+In user code:
+
+   use Insteon::RemoteLinc_Battery;
+   $remote_battery = new Insteon::RemoteLinc_Battery($remote);
+
+Where $remote is the RemoteLinc device you wish to monitor.
+
+=head2 DESCRIPTION
+
+This basic class creates a simple object that displays the current battery voltage
+as its state.  This is helpful if you want to be able to view the battery level
+through a web page.  Battery level tracking is likely only available on RemoteLinc 2
+devices.
+
+This object's state will be updated based on interval defined for C<set_battery_timer()>
+in the parent B<Insteon::RemoteLinc> object.
+
+Once created, you can tie_events directly to this object, for example to alert
+you when the battery is low.
+
+=head2 INHERITS
+
+L<Generic_Item|Generic_Item>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::RemoteLinc_Battery;
+use strict;
+
+@Insteon::RemoteLinc_Battery::ISA = ('Generic_Item');
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new {
+	my ($class, $parent) = @_;
+	my $self = new Generic_Item();
+	my $root = $parent->get_root();
+	bless $self, $class;
+	$$root{battery_object} = $self;
+	return $self;
+}
+
+=item C<set_receive()>
+
+Receives voltage messages from the parent object and sets the state of this 
+device accordingly.
+
+=cut
+
+sub set_receive {
+	my ($self, $p_state) = @_;
+	$self->SUPER::set($p_state);
+}
+
+=back
+
+=head2 AUTHOR
+
+Kevin Robert Keegan
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
 1
diff --git a/lib/Insteon/Irrigation.pm b/lib/Insteon/Irrigation.pm
index 686586780..fe7ca00d5 100755
--- a/lib/Insteon/Irrigation.pm
+++ b/lib/Insteon/Irrigation.pm
@@ -1,312 +1,312 @@
-=head1 B<Insteon::Irrigation>
-
-=head2 SYNOPSIS
-
-In user code:
-
-   use Insteon::Irrigation;
-   $irrigation = new Insteon::Irrigation('12.34.56', $myPLM);
-
-In items.mht:
-
-    INSTEON_IRRIGATION, 12.34.56, irrigation, Irrigation
-
-Creating the object:
-	
-    use Insteon::Irrigation;
-    $irrigation = new Insteon::Irrigation('12.34.56', $myPLM);
-
-Turning on a valve:
-	
-    $v_valve_on = new Voice_Cmd "Turn on valve [1,2,3,4,5,6,7,8]";
-    if (my $valve = state_now $v_valve_on) {
-    	$valve--;
-    	set_valve $irrigation "0$valve", "on";
-    }
-
-Turning off a valve:
-	
-    $v_valve_off = new Voice_Cmd "Turn off valve [1,2,3,4,5,6,7,8]";
-    if (my $valve = state_now $v_valve_off) {
-    	$valve--;
-    	set_valve $irrigation "0$valve", "off";
-    }
-
-Requesting valve status:
-	
-    $v_valve_status = new Voice_Cmd "Request valve status";
-    if (state_now $v_valve_status) {
-    	poll_valve_status $irrigation;
-    }
-
-=head2 DESCRIPTION
-
-Provides basic support for the EzFlora (aka EzRain) sprinkler controller.
-
-=head2 INHERITS
-
-L<Insteon::BaseDevice|Insteon::BaseInsteon/Insteon::BaseDevice>, 
-L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-use strict;
-use Insteon::BaseInsteon;
-
-package Insteon::Irrigation;
-
-@Insteon::Irrigation::ISA = ('Insteon::BaseDevice','Insteon::DeviceController');
-
-our %message_types = (
-	%Insteon::BaseDevice::message_types,
-	sprinkler_control => 0x44,
-	sprinkler_valve_on => 0x40,
-	sprinkler_valve_off => 0x41,
-	sprinkler_program_on => 0x42,
-	sprinkler_program_off => 0x43,
-	sprinkler_timers_request => 0x45
-);
-
-# -------------------- START OF SUBROUTINES --------------------
-# --------------------------------------------------------------
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new {
-   my ($class, $p_deviceid, $p_interface) = @_;
-
-   my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
-   bless $self, $class;
-   $$self{active_valve_id} = undef;
-   $$self{active_program_number} = undef;
-   $$self{program_is_running} = undef;
-   $$self{pump_enabled} = undef;
-   $$self{valve_is_running} = undef;
-   $self->restore_data('active_valve_id', 'active_program_number', 'program_is_running', 'pump_enabled', 'valve_is_running');
-   $$self{message_types} = \%message_types;
-   return $self;
-}
-
-=item C<poll_valve_status()>
-
-Sends a message to the device requesting the valve status.  The response from the
-device is printed to the log and stores the result in memory. 
-
-=cut
-
-sub poll_valve_status {
-   my ($self) = @_;
-   my $subcmd = '02';
-   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'sprinkler_control', $subcmd);
-   $self->_send_cmd($message);
-   return;
-}
-
-=item C<set_valve(valve_id, valve_state)>
-
-Used to directly control valves.  Valve_id is a two digit number 00-07, 
-valve_state may be on or off.
-
-=cut
-
-sub set_valve {
-   my ($self, $valve_id, $state) = @_;
-   my $subcmd = $valve_id;
-   my $cmd = undef;
-   if ($state eq 'on') {
-      $cmd = 'sprinkler_valve_on';
-   } elsif ($state eq 'off') {
-      $cmd = 'sprinkler_valve_off';
-   }
-   unless ($cmd and $subcmd) {
-      &::print_log("Insteon::Irrigation] ERROR: You must specify a valve number and a valid state (ON or OFF)")
-          if $self->debuglevel(1, 'insteon');
-      return;
-   }
-   my $message = new Insteon::InsteonMessage('insteon_send', $self, $cmd, $subcmd);
-   $self->_send_cmd($message);
-   return;
-}
-
-=item C<set_program(program_id, proggram_state)>
-
-Used to directly control programs.  Program_id is a two digit number 00-03, 
-valve_state may be on or off.
-
-=cut
-
-sub set_program {
-   my ($self, $program_id, $state) = @_;
-   my $subcmd = $program_id;
-   my $cmd = undef;
-   if ($state eq 'on') {
-      $cmd = 'sprinkler_program_on';
-   } elsif ($state eq 'off') {
-      $cmd = 'sprinkler_program_off';
-   }
-   unless ($cmd and $subcmd) {
-      &::print_log("Insteon::Irrigation] ERROR: You must specify a program number and a valid state (ON or OFF)")
-          if $self->debuglevel(1, 'insteon');
-      return;
-   }
-   my $message = new Insteon::InsteonMessage('insteon_send', $self, $cmd, $subcmd);
-   $self->_send_cmd($message);
-   return;
-}
-
-=item C<get_active_valve_id()>
-
-Returns the active valve number identified by the device in response to the last 
-C<poll_valve_status()> request.
-
-=cut
-
-sub get_active_valve_id() {
-   my ($self) = @_;
-   return $$self{'active_valve_id'};
-}
-
-=item C<get_valve_is_running()>
-
-Returns true if the active valve identified by the device in response to the last 
-C<poll_valve_status()> request is running.
-
-=cut
-
-sub get_valve_is_running() {
-   my ($self) = @_;
-   return $$self{'valve_is_running'};
-}
-
-=item C<get_active_program_number()>
-
-Returns the active program number identified by the device in response to the last 
-C<poll_valve_status()> request.
-
-=cut
-
-sub get_active_program_number() {
-   my ($self) = @_;
-   return $$self{'active_program_number'};
-}
-
-=item C<get_program_is_running()>
-
-Returns true if the active program identified by the device in response to the last 
-C<poll_valve_status()> request is running.
-
-=cut
-
-sub get_program_is_running() {
-   my ($self) = @_;
-   return $$self{'program_is_running'};
-}
-
-=item C<get_pump_enabled()>
-
-Returns true if valve 8 is set to be a pump.  In this setup, valve 8 will also 
-turn on when any other valve is enabled.  Generally used if you have some sort
-of water pump that runs to provide water to your sprinklers.
-
-=cut
-
-sub get_pump_enabled() {
-   my ($self) = @_;
-   return $$self{'pump_enabled'};
-}
-
-=item C<get_timers()>
-
-Sends a request to the device asking for it to respond with the current timers. 
-It does not appear that there is code to interpret the response provided by the 
-device.
-
-=cut
-
-sub get_timers() {
-   my ($self) = @_;
-   my $cmd = 'sprinkler_timers_request';
-   my $subcmd = 0x1;
-   my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, $cmd, $subcmd);
-   $self->_send_cmd($message);
-   return;
-}
-
-=item C<_is_info_request()>
-
-Used to intercept and handle unique EZFlora messages, all others are passed on
-to C<Insteon::BaseObject::_is_info_request()|Insteon::BaseInsteon/Insteon::BaseObject>.
-
-=cut
-
-sub _is_info_request {
-   my ($self, $cmd, $ack_setby, %msg) = @_;
-   my $is_info_request = 0;
-   if ($cmd eq 'sprinkler_control'
-        or $cmd eq 'sprinkler_valve_on'
-        or $cmd eq 'sprinkler_valve_off'
-        or $cmd eq 'sprinkler_program_on'
-        or $cmd eq 'sprinkler_program_off') {
-      $is_info_request = 1;
-      my $val = hex($msg{extra});
-      &::print_log("[Insteon::Irrigation] Processing data for $cmd with value: $val") if $self->debuglevel(1, 'insteon');
-      $$self{'active_valve_id'} = ($val & 7) + 1;
-      $$self{'active_program_number'} = (($val >> 3) & 3) + 1;
-      $$self{'program_is_running'} = ($val >> 5) & 1;
-      $$self{'pump_enabled'} = ($val >> 6) & 1;
-      $$self{'valve_is_running'} = ($val >> 7) & 1;
-      &::print_log("[Insteon::Irrigation] active_valve_id: $$self{'active_valve_id'},"
-        . " valve_is_running: $$self{'valve_is_running'}, active_program: $$self{'active_program_number'},"
-        . " program_is_running: $$self{'program_is_running'}, pump_enabled: $$self{'pump_enabled'}") if $self->debuglevel(1, 'insteon');
-   }
-   else {
-      #Check if this was a generic info_request
-      $is_info_request = $self->SUPER::_is_info_request($cmd, $ack_setby, %msg);
-   }
-   return $is_info_request;
-
-}
-
-=item C<request_status()>
-
-This does nothing and returns 0, it prevents a request_status message, which the
-device does not support, from being sent to the device.
-
-=cut
-
-# Overload methods we don't use, but would otherwise cause Insteon traffic.
-sub request_status { return 0 }
-
-=back
-
-=head2 AUTHOR
-
-Gregg Liming <gregg@limings.net>
-David Norwood <dnorwood2@yahoo.com>
-Evan P. Hall <evan@netmagic.net>
-Kevin Robert Keegan
-
-=head2 SEE ALSO
-
-L<http://www.simplehomenet.com/Downloads/EZRain%20Command%20Set.pdf>,
-L<http://www.simplehomenet.com/Downloads/EZFlora%20Command%20Set.pdf>
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
+=head1 B<Insteon::Irrigation>
+
+=head2 SYNOPSIS
+
+In user code:
+
+   use Insteon::Irrigation;
+   $irrigation = new Insteon::Irrigation('12.34.56', $myPLM);
+
+In items.mht:
+
+    INSTEON_IRRIGATION, 12.34.56, irrigation, Irrigation
+
+Creating the object:
+	
+    use Insteon::Irrigation;
+    $irrigation = new Insteon::Irrigation('12.34.56', $myPLM);
+
+Turning on a valve:
+	
+    $v_valve_on = new Voice_Cmd "Turn on valve [1,2,3,4,5,6,7,8]";
+    if (my $valve = state_now $v_valve_on) {
+    	$valve--;
+    	set_valve $irrigation "0$valve", "on";
+    }
+
+Turning off a valve:
+	
+    $v_valve_off = new Voice_Cmd "Turn off valve [1,2,3,4,5,6,7,8]";
+    if (my $valve = state_now $v_valve_off) {
+    	$valve--;
+    	set_valve $irrigation "0$valve", "off";
+    }
+
+Requesting valve status:
+	
+    $v_valve_status = new Voice_Cmd "Request valve status";
+    if (state_now $v_valve_status) {
+    	poll_valve_status $irrigation;
+    }
+
+=head2 DESCRIPTION
+
+Provides basic support for the EzFlora (aka EzRain) sprinkler controller.
+
+=head2 INHERITS
+
+L<Insteon::BaseDevice|Insteon::BaseInsteon/Insteon::BaseDevice>, 
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+use strict;
+use Insteon::BaseInsteon;
+
+package Insteon::Irrigation;
+
+@Insteon::Irrigation::ISA = ('Insteon::BaseDevice','Insteon::DeviceController');
+
+our %message_types = (
+	%Insteon::BaseDevice::message_types,
+	sprinkler_control => 0x44,
+	sprinkler_valve_on => 0x40,
+	sprinkler_valve_off => 0x41,
+	sprinkler_program_on => 0x42,
+	sprinkler_program_off => 0x43,
+	sprinkler_timers_request => 0x45
+);
+
+# -------------------- START OF SUBROUTINES --------------------
+# --------------------------------------------------------------
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new {
+   my ($class, $p_deviceid, $p_interface) = @_;
+
+   my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
+   bless $self, $class;
+   $$self{active_valve_id} = undef;
+   $$self{active_program_number} = undef;
+   $$self{program_is_running} = undef;
+   $$self{pump_enabled} = undef;
+   $$self{valve_is_running} = undef;
+   $self->restore_data('active_valve_id', 'active_program_number', 'program_is_running', 'pump_enabled', 'valve_is_running');
+   $$self{message_types} = \%message_types;
+   return $self;
+}
+
+=item C<poll_valve_status()>
+
+Sends a message to the device requesting the valve status.  The response from the
+device is printed to the log and stores the result in memory. 
+
+=cut
+
+sub poll_valve_status {
+   my ($self) = @_;
+   my $subcmd = '02';
+   my $message = new Insteon::InsteonMessage('insteon_send', $self, 'sprinkler_control', $subcmd);
+   $self->_send_cmd($message);
+   return;
+}
+
+=item C<set_valve(valve_id, valve_state)>
+
+Used to directly control valves.  Valve_id is a two digit number 00-07, 
+valve_state may be on or off.
+
+=cut
+
+sub set_valve {
+   my ($self, $valve_id, $state) = @_;
+   my $subcmd = $valve_id;
+   my $cmd = undef;
+   if ($state eq 'on') {
+      $cmd = 'sprinkler_valve_on';
+   } elsif ($state eq 'off') {
+      $cmd = 'sprinkler_valve_off';
+   }
+   unless ($cmd and $subcmd) {
+      &::print_log("Insteon::Irrigation] ERROR: You must specify a valve number and a valid state (ON or OFF)")
+          if $self->debuglevel(1, 'insteon');
+      return;
+   }
+   my $message = new Insteon::InsteonMessage('insteon_send', $self, $cmd, $subcmd);
+   $self->_send_cmd($message);
+   return;
+}
+
+=item C<set_program(program_id, proggram_state)>
+
+Used to directly control programs.  Program_id is a two digit number 00-03, 
+valve_state may be on or off.
+
+=cut
+
+sub set_program {
+   my ($self, $program_id, $state) = @_;
+   my $subcmd = $program_id;
+   my $cmd = undef;
+   if ($state eq 'on') {
+      $cmd = 'sprinkler_program_on';
+   } elsif ($state eq 'off') {
+      $cmd = 'sprinkler_program_off';
+   }
+   unless ($cmd and $subcmd) {
+      &::print_log("Insteon::Irrigation] ERROR: You must specify a program number and a valid state (ON or OFF)")
+          if $self->debuglevel(1, 'insteon');
+      return;
+   }
+   my $message = new Insteon::InsteonMessage('insteon_send', $self, $cmd, $subcmd);
+   $self->_send_cmd($message);
+   return;
+}
+
+=item C<get_active_valve_id()>
+
+Returns the active valve number identified by the device in response to the last 
+C<poll_valve_status()> request.
+
+=cut
+
+sub get_active_valve_id() {
+   my ($self) = @_;
+   return $$self{'active_valve_id'};
+}
+
+=item C<get_valve_is_running()>
+
+Returns true if the active valve identified by the device in response to the last 
+C<poll_valve_status()> request is running.
+
+=cut
+
+sub get_valve_is_running() {
+   my ($self) = @_;
+   return $$self{'valve_is_running'};
+}
+
+=item C<get_active_program_number()>
+
+Returns the active program number identified by the device in response to the last 
+C<poll_valve_status()> request.
+
+=cut
+
+sub get_active_program_number() {
+   my ($self) = @_;
+   return $$self{'active_program_number'};
+}
+
+=item C<get_program_is_running()>
+
+Returns true if the active program identified by the device in response to the last 
+C<poll_valve_status()> request is running.
+
+=cut
+
+sub get_program_is_running() {
+   my ($self) = @_;
+   return $$self{'program_is_running'};
+}
+
+=item C<get_pump_enabled()>
+
+Returns true if valve 8 is set to be a pump.  In this setup, valve 8 will also 
+turn on when any other valve is enabled.  Generally used if you have some sort
+of water pump that runs to provide water to your sprinklers.
+
+=cut
+
+sub get_pump_enabled() {
+   my ($self) = @_;
+   return $$self{'pump_enabled'};
+}
+
+=item C<get_timers()>
+
+Sends a request to the device asking for it to respond with the current timers. 
+It does not appear that there is code to interpret the response provided by the 
+device.
+
+=cut
+
+sub get_timers() {
+   my ($self) = @_;
+   my $cmd = 'sprinkler_timers_request';
+   my $subcmd = 0x1;
+   my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, $cmd, $subcmd);
+   $self->_send_cmd($message);
+   return;
+}
+
+=item C<_is_info_request()>
+
+Used to intercept and handle unique EZFlora messages, all others are passed on
+to C<Insteon::BaseObject::_is_info_request()|Insteon::BaseInsteon/Insteon::BaseObject>.
+
+=cut
+
+sub _is_info_request {
+   my ($self, $cmd, $ack_setby, %msg) = @_;
+   my $is_info_request = 0;
+   if ($cmd eq 'sprinkler_control'
+        or $cmd eq 'sprinkler_valve_on'
+        or $cmd eq 'sprinkler_valve_off'
+        or $cmd eq 'sprinkler_program_on'
+        or $cmd eq 'sprinkler_program_off') {
+      $is_info_request = 1;
+      my $val = hex($msg{extra});
+      &::print_log("[Insteon::Irrigation] Processing data for $cmd with value: $val") if $self->debuglevel(1, 'insteon');
+      $$self{'active_valve_id'} = ($val & 7) + 1;
+      $$self{'active_program_number'} = (($val >> 3) & 3) + 1;
+      $$self{'program_is_running'} = ($val >> 5) & 1;
+      $$self{'pump_enabled'} = ($val >> 6) & 1;
+      $$self{'valve_is_running'} = ($val >> 7) & 1;
+      &::print_log("[Insteon::Irrigation] active_valve_id: $$self{'active_valve_id'},"
+        . " valve_is_running: $$self{'valve_is_running'}, active_program: $$self{'active_program_number'},"
+        . " program_is_running: $$self{'program_is_running'}, pump_enabled: $$self{'pump_enabled'}") if $self->debuglevel(1, 'insteon');
+   }
+   else {
+      #Check if this was a generic info_request
+      $is_info_request = $self->SUPER::_is_info_request($cmd, $ack_setby, %msg);
+   }
+   return $is_info_request;
+
+}
+
+=item C<request_status()>
+
+This does nothing and returns 0, it prevents a request_status message, which the
+device does not support, from being sent to the device.
+
+=cut
+
+# Overload methods we don't use, but would otherwise cause Insteon traffic.
+sub request_status { return 0 }
+
+=back
+
+=head2 AUTHOR
+
+Gregg Liming <gregg@limings.net>
+David Norwood <dnorwood2@yahoo.com>
+Evan P. Hall <evan@netmagic.net>
+Kevin Robert Keegan
+
+=head2 SEE ALSO
+
+L<http://www.simplehomenet.com/Downloads/EZRain%20Command%20Set.pdf>,
+L<http://www.simplehomenet.com/Downloads/EZFlora%20Command%20Set.pdf>
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
 1;
\ No newline at end of file
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index 4483f212c..72452196b 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -1,1230 +1,1230 @@
-=head1 B<Insteon::BaseLight>
-
-=head2 DESCRIPTION
-
-A generic base class for all Insteon lighting objects.
-
-=head2 INHERITS
-
-L<Insteon::BaseDevice|Insteon::BaseInsteon/Insteon::BaseDevice>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::BaseLight;
-
-use strict;
-use Insteon::BaseInsteon;
-
-@Insteon::BaseLight::ISA = ('Insteon::BaseDevice');
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-
-	my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
-	bless $self,$class;
-        # include very basic states; off first so web interface up/down works
-        $self->set_states('off','on');
-
-	return $self;
-}
-
-=item C<level(p_level)>
-
-Takes the p_level, and stores it as a numeric level in memory.
-
-=cut
-
-sub level
-{
-	my ($self, $p_level) = @_;
-	if (defined $p_level) {
-		my $level = 100;
-		if ($p_level eq 'off')
-		{
-			$level = 0;
-		}
-		$$self{level} = $level;
-	}
-	return $$self{level};
-
-}
-
-=item C<get_voice_cmds>
-
-Returns a hash of voice commands where the key is the voice command name and the
-value is the perl code to run when the voice command name is called.
-
-Higher classes which inherit this object may add to this list of voice commands by
-redefining this routine while inheriting this routine using the SUPER function.
-
-This routine is called by L<Insteon::generate_voice_commands> to generate the
-necessary voice commands.
-
-=cut 
-
-sub get_voice_cmds
-{
-    my ($self) = @_;
-    my $object_name = $self->get_object_name;
-    my %voice_cmds = (
-        %{$self->SUPER::get_voice_cmds},
-        'on' => "$object_name->set(\"on\")",
-        'off' => "$object_name->set(\"off\")"
-    );
-    return \%voice_cmds;
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Limming 
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-=head1 B<Insteon::DimmableLight>
-
-=head2 DESCRIPTION
-
-A generic base class for all dimmable Insteon lighting objects.
-
-=head2 INHERITS
-
-L<Insteon::BaseLight|Insteon::Lighting/Insteon::BaseLight>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::DimmableLight;
-
-use strict;
-use Insteon::BaseInsteon;
-
-@Insteon::DimmableLight::ISA = ('Insteon::BaseLight');
-
-my %message_types = (
-	%SUPER::message_types,
-	bright => 0x15,
-	dim => 0x16
-);
-
-my %ramp_h2n = (
-						'00' => 540,
-						'01' => 480,
-						'02' => 420,
-						'03' => 360,
-						'04' => 300,
-						'05' => 270,
-						'06' => 240,
-						'07' => 210,
-						'08' => 180,
-						'09' => 150,
-						'0a' => 120,
-						'0b' =>  90,
-						'0c' =>  60,
-						'0d' =>  47,
-						'0e' =>  43,
-						'0f' =>  39,
-						'10' =>  34,
-						'11' =>  32,
-						'12' =>  30,
-						'13' =>  28,
-						'14' =>  26,
-						'15' =>  23.5,
-						'16' =>  21.5,
-						'17' =>  19,
-						'18' =>   8.5,
-						'19' =>   6.5,
-						'1a' =>   4.5,
-						'1b' =>   2,
-						'1c' =>    .5,
-						'1d' =>    .3,
-						'1e' =>    .2,
-						'1f' =>    .1
-);
-
-=item C<derive_link_state([state])>
-
-Overrides routine in BaseObject. Takes the various states available to insteon 
-devices and returns a derived state of on, off, or 0%-100%.
-
-=cut
-
-sub derive_link_state
-{
-	my ($self, $p_state) = @_;
-	#Convert Relative State to Absolute State
-	if ($p_state =~ /^([+-])(\d+)/) {
-		my $rel_state = $1 . $2;
-		my $curr_state = '100';
-		$curr_state = '0' if ($self->state eq 'off');
-		$curr_state = $1 if $self->state =~ /(\d{1,3})/;
-		$p_state = $curr_state + $rel_state;
-		$p_state = 100 if ($p_state > 100);
-		$p_state = 0 if ($p_state < 0);
-	}
-	
-	my $link_state = 'on';
-	if (grep(/$p_state/i, @{['on_fast', 'off', 'off_fast']})) {
-		$link_state = $p_state;
-	}
-	elsif ($p_state =~ /\d+%?/)
-	{
-		$p_state =~ /(\d+)%?/;
-		$link_state = $1 . '%';
-	}
-	return $link_state;
-}
-
-=item C<convert_ramp(ramp_seconds)>
-
-Takes ramp_seconds in numeric seconds and returns the hexadecimal value of that 
-ramp rate or the next lowest value if the passed value doesn't exist.  Possible
-ramp rates are:
-
-540, 480, 420, 360, 300, 270, 240, 210, 180, 150, 120, 90, 60, 47, 43, 39, 34, 
-32, 30, 28, 26, 23.5, 21.5, 19, 8.5, 6.5, 4.5, 2, .5, .3, .2, and  .1
-
-=cut
-
-sub convert_ramp
-{
-	my ($ramp_in_seconds) = @_;
-	if ($ramp_in_seconds) {
-		foreach my $rampkey (sort keys %ramp_h2n) {
-			return $rampkey if $ramp_in_seconds >= $ramp_h2n{$rampkey};
-		}
-	} else {
-		return '1f';
-	}
-}
-
-=item C<get_ramp_from_code(ramp_code)>
-
-Takes ramp_code as a hexadecimal representation of the device's ramp rate and
-returns the equivalent ramp rate in decimal seconds.
-
-=cut
-
-sub get_ramp_from_code
-{
-	my ($ramp_code) = @_;
-	if ($ramp_code) {
-		return $ramp_h2n{$ramp_code};
-	} else {
-		return 0;
-	}
-}
-
-=item C<convert_level(on_level)>
-
-Takes on_level as an integer percentage and converts it to a hexadecimal 
-representation of that on_level that is used by a device.
-
-=cut
-
-sub convert_level
-{
-	my ($on_level) = @_;
-	my $level = 'ff';
-	if (defined ($on_level)) {
-		$on_level =~ s/(\d+)%?/$1/;
-		$level = sprintf('%02X',int(($on_level * 2.55) + .5));
-	}
-	return $level;
-}
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-
-	my $self = new Insteon::BaseLight($p_deviceid,$p_interface);
-	bless $self,$class;
-	
-	if( $main::config_parms{insteon_menu_states}) {
-		$self->set_states(split( ',', $main::config_parms{insteon_menu_states}));
-	}
-	
-	return $self;
-}
-
-=item C<local_onlevel(level)>
-
-Sets and returns the local onlevel for the device in MH only. Level is a 
-percentage from 0%-100%.
-
-This setting can be pushed to the device using C<update_local_properties>.
-
-Parameters: level [0-100]
-
-Returns: [0-100]
-
-=cut
-
-sub local_onlevel
-{
-	my ($self, $p_onlevel) = @_;
-	if (defined $p_onlevel)
-        {
-		my ($onlevel) = $p_onlevel =~ /(\d+)%?/;
-		$$self{_onlevel} = $onlevel;
-	}
-	return $$self{_onlevel};
-}
-
-=item C<local_ramprate(rate)>
-
-Sets and returns the local ramp rate for the device in MH only. Rate is a time
-between .1 and 540 seconds.  Only 32 rate steps exist, to MH will pick a time
-equal to of the closest below this time.
-
-This setting can be pushed to the device using C<update_local_properties>.
-
-Parameters: rate = ramp rate [.1s - 540s] see C<convert_ramp> for valid values
-
-Returns: hexadecimal representation of the ramprate.
-
-=cut
-
-sub local_ramprate
-{
-	my ($self, $p_ramprate) = @_;
-	if (defined $p_ramprate) {
-		$$self{_ramprate} = &Insteon::DimmableLight::convert_ramp($p_ramprate);
-	}
-	return $$self{_ramprate};
-
-}
-
-=item C<update_local_properties()>
-
-Pushes the values set in C<local_onlevel()> and C<local_ramprate()> to the device.
-
-I1 Devices:
-
-The device will only reread these values when it is power-cycled.  This can be
-done by pulling the air-gap for 4 seconds or unplugging the device.
-
-I2 & I2CS Devices
-
-The device will immediately read and update the values.
-
-=cut
-
-sub update_local_properties
-{
-	my ($self) = @_;
-	if ($self->engine_version eq 'I1'){
-       		$self->_aldb->update_local_properties() if $self->_aldb;
-	}
-	else {
-		#Queue Ramp Rate First
-		my $extra = '000005' . $self->local_ramprate();
-		$extra .= '0' x (30 - length $extra);
-		my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
-		$self->_send_cmd($message);
-		
-		#Now queue on level
-		$extra = '000006' . ::Insteon::DimmableLight::convert_level($self->local_onlevel());
-		$extra .= '0' x (30 - length $extra);
-		$message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
-		$self->_send_cmd($message);
-	}
-}
-
-=item C<level(p_level)>
-
-Stores and returns the objects current on_level as a percentage. If p_level 
-is ON and the device has a defined local_onlevel, the local_onlevel is stored 
-as the numeric level in memory.
-
-Returns [0-100]
-
-=cut
-
-sub level
-{
-	my ($self, $p_level) = @_;
-	if (defined $p_level) {
-		my $level = undef;
-		if ($p_level eq 'on')
-		{
-			# set the level based on any locally defined on level
-			$level = $self->local_onlevel if $self->can('local_onlevel');
-			# set to 100 if a local on level is not defined
-			$level=100 unless defined($level);
-		} elsif ($p_level eq 'off')
-		{
-			$level = 0;
-		} elsif ($p_level =~ /^([1]?[0-9]?[0-9])%?$/)
-		{
-			if ($1 < 1) {
-				$level = 0;
-			} else {
-				$level = $1;
-			}
-		}
-		$$self{level} = $level if defined $level;
-	}
-	return $$self{level};
-
-}
-
-=item C<get_voice_cmds>
-
-Returns a hash of voice commands where the key is the voice command name and the
-value is the perl code to run when the voice command name is called.
-
-Higher classes which inherit this object may add to this list of voice commands by
-redefining this routine while inheriting this routine using the SUPER function.
-
-This routine is called by L<Insteon::generate_voice_commands> to generate the
-necessary voice commands.
-
-=cut 
-
-sub get_voice_cmds
-{
-    my ($self) = @_;
-    my $object_name = $self->get_object_name;
-    my $insteon_menu_states = $main::config_parms{insteon_menu_states} if $main::config_parms{insteon_menu_states};
-    my %voice_cmds = (
-        %{$self->SUPER::get_voice_cmds},
-        'update onlevel/ramprate' => "$object_name->update_local_properties"
-    );
-    if ($insteon_menu_states){
-        foreach my $state (split(/,/,$insteon_menu_states)) {
-            $voice_cmds{$state} = "$object_name->set(\"$state\")";
-        }
-    }
-    return \%voice_cmds;
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Limming 
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-=head1 B<Insteon::ApplianceLinc>
-
-=head2 SYNOPSIS
-
-User code:
-
-    use Insteon::ApplianceLinc;
-    $appliance_device = new Insteon::ApplianceLinc('12.34.56',$myPLM);
-
-In mht file:
-
-    INSTEON_APPLIANCELINC, 12.34.56, appliance_device, appliance_group
-
-=head2 DESCRIPTION
-
-Provides support for the Insteon ApplianceLinc.
-
-=head2 INHERITS
-
-L<Insteon::BaseLight|Insteon::Lighting/Insteon::BaseLight>
-L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::ApplianceLinc;
-
-use strict;
-use Insteon::BaseInsteon;
-
-@Insteon::ApplianceLinc::ISA = ('Insteon::BaseLight','Insteon::DeviceController');
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-
-	my $self = new Insteon::BaseLight($p_deviceid,$p_interface);
-	bless $self,$class;
-	return $self;
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Limming 
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-=head1 B<Insteon::LampLinc>
-
-=head2 SYNOPSIS
-
-User code:
-
-    use Insteon::LampLinc;
-    $lamp_device = new Insteon::LampLinc('12.34.56',$myPLM);
-
-In mht file:
-
-    INSTEON_LAMPLINC, 12.34.56, lamp_device, All_Lights
-
-=head2 DESCRIPTION
-
-Provides support for the Insteon LampLinc.
-
-=head2 INHERITS
-
-L<Insteon::DimmableLight|Insteon::Lighting/Insteon::DimmableLight>, 
-L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::LampLinc;
-
-use strict;
-use Insteon::BaseInsteon;
-
-@Insteon::LampLinc::ISA = ('Insteon::DimmableLight','Insteon::DeviceController');
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-
-	my $self = new Insteon::DimmableLight($p_deviceid,$p_interface);
-	bless $self,$class;
-	return $self;
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Limming 
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-=head1 B<Insteon::SwitchLincRelay>
-
-=head2 SYNOPSIS
-
-User code:
-
-    use Insteon::SwitchLincRelay;
-    $light_device = new Insteon::SwitchLincRelay('12.34.56',$myPLM);
-
-In mht file:
-
-    INSTEON_SWITCHLINCRELAY, 12.34.56, light_device, All_Lights
-
-=head2 DESCRIPTION
-
-Provides support for the Insteon SwitchLinc Relay.
-
-=head2 INHERITS
-
-L<Insteon::BaseLight|Insteon::Lighting/Insteon::BaseLight>,
-L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::SwitchLincRelay;
-
-use strict;
-use Insteon::BaseInsteon;
-
-@Insteon::SwitchLincRelay::ISA = ('Insteon::BaseLight','Insteon::DeviceController');
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-
-	my $self = new Insteon::BaseLight($p_deviceid,$p_interface);
-	bless $self,$class;
-	return $self;
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Limming 
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-=head1 B<Insteon::SwitchLinc>
-
-=head2 SYNOPSIS
-
-User code:
-
-    use Insteon::SwitchLinc;
-    $light_device = new Insteon::SwitchLinc('12.34.56',$myPLM);
-
-In mht file:
-
-    INSTEON_SWITCHLINC, 12.34.56, light_device, All_Lights
-
-=head2 DESCRIPTION
-
-Provides support for the Insteon SwitchLinc.
-
-=head2 INHERITS
-
-L<Insteon::DimmableLight|Insteon::Lighting/Insteon::DimmableLight>, 
-L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::SwitchLinc;
-
-use strict;
-use Insteon::BaseInsteon;
-
-@Insteon::SwitchLinc::ISA = ('Insteon::DimmableLight','Insteon::DeviceController');
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-
-	my $self = new Insteon::DimmableLight($p_deviceid,$p_interface);
-	bless $self,$class;
-	return $self;
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Limming 
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-=head1 B<Insteon::KeyPadLincRelay>
-
-=head2 SYNOPSIS
-
-User code:
-
-    use Insteon::KeyPadLincRelay;
-    $light_device = new Insteon::KeyPadLincRelay('12.34.56:01',$myPLM);
-    $button1_device = new Insteon::KeyPadLincRelay('12.34.56:02',$myPLM);
-    $button2_device = new Insteon::KeyPadLincRelay('12.34.56:03',$myPLM);
-
-In mht file:
-
-    INSTEON_KEYPADLINCRELAY, 12.34.56:01, light_device, All_Lights
-    INSTEON_KEYPADLINCRELAY, 12.34.56:02, button1_device, All_Buttons
-    INSTEON_KEYPADLINCRELAY, 12.34.56:03, button2_device, All_Buttons
-
-=head2 DESCRIPTION
-
-Provides support for the Insteon KeypadLinc Relay.
-
-=head2 INHERITS
-
-L<Insteon::BaseLight|Insteon::Lighting/Insteon::BaseLight>, 
-L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>,
-L<Insteon::Insteon::MultigroupDevice|Insteon::BaseInsteon/Insteon::Insteon::MultigroupDevice>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::KeyPadLincRelay;
-
-use strict;
-use Insteon::BaseInsteon;
-
-@Insteon::KeyPadLincRelay::ISA = ('Insteon::BaseLight','Insteon::DeviceController', 'Insteon::MultigroupDevice');
-
-our %operating_flags = (
-   'program_lock_on' => '00',
-   'program_lock_off' => '01',
-   'led_on_during_tx' => '02',
-   'led_off_during_tx' => '03',
-   'resume_dim_on' => '04',
-   'resume_dim_off' => '05',
-   '8_key_mode' => '06',
-   '6_key_mode' => '07',
-   'led_off' => '08',
-   'led_enabled' => '09',
-   'key_beep_enabled' => '0a',
-   'key_beep_off' => '0b'
-);
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-	my $self = new Insteon::BaseLight($p_deviceid,$p_interface);
-	$$self{operating_flags} = \%operating_flags;
-	bless $self,$class;
-	return $self;
-}
-
-=item C<set(state[,setby,response])>
-
-Handles setting and receiving states from the device and specifically its 
-subordinate buttons.
-
-=cut
-
-sub set
-{
-	my ($self, $p_state, $p_setby, $p_respond) = @_;
-	if (!($self->is_root) and !(ref $p_setby && $p_setby eq $self))
-	{
-		if (ref $$self{surrogate} && ($$self{surrogate}->isa('Insteon::InterfaceController'))) {
-			$$self{surrogate}->set($p_state, $p_setby, $p_respond);
-		}
-		else {
-			::print_log("[Insteon::KeyPadLinc] You may not directly attempt to set a keypadlinc's button "
-				."unless you have defined a reverse link with the \"surrogate\" keyword");
-		}
-	}
-	else
-	{
-		return $self->SUPER::set($p_state, $p_setby, $p_respond);
-	}
-}
-
-=item C<update_flags(flags)>
-
-Can be used to set the button layout and light level on a keypadlinc.  Flag 
-options include:
-
-    '0a' - 8 button; backlighting dim
-    '06' - 8 button; backlighting off
-    '02' - 8 button; backlighting normal
-
-    '08' - 6 button; backlighting dim
-    '04' - 6 button; backlighting off
-    '00' - 6 button; backlighting normal
-
-=cut
-
-sub update_flags
-{
-	my ($self, $flags) = @_;
-	return unless defined $flags;
-	if ($self->engine_version eq 'I1') {
-		$self->_aldb->update_flags($flags) if $self->_aldb;
-	}
-	else {
-		if ($flags & 0x02) {
-			$self->set_operating_flag('8_key_mode');
-		} 
-		else {
-			$self->set_operating_flag('6_key_mode');	
-		}
-		if ($flags & 0x04) {
-			$self->set_operating_flag('led_off');
-		}
-		else {
-			$self->set_operating_flag('led_enabled');	
-		}
-		if ($flags & 0x08) {
-			$self->set_operating_flag('resume_dim_on');
-		}
-		else {
-			$self->set_operating_flag('resume_dim_off');
-		}
-	}
-}
-
-=item C<get_voice_cmds>
-
-Returns a hash of voice commands where the key is the voice command name and the
-value is the perl code to run when the voice command name is called.
-
-Higher classes which inherit this object may add to this list of voice commands by
-redefining this routine while inheriting this routine using the SUPER function.
-
-This routine is called by L<Insteon::generate_voice_commands> to generate the
-necessary voice commands.
-
-=cut 
-
-sub get_voice_cmds
-{
-    my ($self) = @_;
-    my $object_name = $self->get_object_name;
-    my %voice_cmds = (
-        %{$self->SUPER::get_voice_cmds}
-    );
-    if ($self->is_root){
-        %voice_cmds = (
-            %voice_cmds,
-            'set 8 button - backlight dim' => "$object_name->update_flags(\"0a\")",
-            'set 8 button - backlight off' => "$object_name->update_flags(\"06\")",
-            'set 8 button - backlight normal' => "$object_name->update_flags(\"02\")",
-            'set 6 button - backlight dim' => "$object_name->update_flags(\"08\")",
-            'set 6 button - backlight off' => "$object_name->update_flags(\"04\")",
-            'set 6 button - backlight normal' => "$object_name->update_flags(\"00\")",
-            'sync all device links' => "$object_name->sync_all_links()",
-            'AUDIT sync all device links' => "$object_name->sync_all_links(1)"
-        );
-    }
-    return \%voice_cmds;
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Limming 
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-=head1 B<Insteon::KeyPadLinc>
-
-=head2 SYNOPSIS
-
-User code:
-
-    use Insteon::KeyPadLinc;
-    $light_device = new Insteon::KeyPadLinc('12.34.56:01',$myPLM);
-    $button1_device = new Insteon::KeyPadLinc('12.34.56:02',$myPLM);
-    $button2_device = new Insteon::KeyPadLinc('12.34.56:03',$myPLM);
-
-In mht file:
-
-    INSTEON_KEYPADLINC, 12.34.56:01, light_device, All_Lights
-    INSTEON_KEYPADLINC, 12.34.56:02, button1_device, All_Buttons
-    INSTEON_KEYPADLINC, 12.34.56:03, button2_device, All_Buttons
-
-=head2 DESCRIPTION
-
-Provides support for the Insteon KeypadLinc.
-
-=head2 INHERITS
-
-L<Insteon::DimmableLight|Insteon::Lighting/Insteon::DimmableLight>, 
-L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::KeyPadLinc;
-
-use strict;
-use Insteon::BaseInsteon;
-
-@Insteon::KeyPadLinc::ISA = ('Insteon::KeyPadLincRelay', 'Insteon::DimmableLight','Insteon::DeviceController');
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-	my $self = new Insteon::DimmableLight($p_deviceid,$p_interface);
-	$$self{operating_flags} = \%Insteon::KeyPadLincRelay::operating_flags;
-	bless $self,$class;
-	return $self;
-}
-
-=item C<get_voice_cmds>
-
-Returns a hash of voice commands where the key is the voice command name and the
-value is the perl code to run when the voice command name is called.
-
-Higher classes which inherit this object may add to this list of voice commands by
-redefining this routine while inheriting this routine using the SUPER function.
-
-This routine is called by L<Insteon::generate_voice_commands> to generate the
-necessary voice commands.
-
-=cut 
-
-sub get_voice_cmds
-{
-    my ($self) = @_;
-    my $object_name = $self->get_object_name;
-    my %voice_cmds = (
-        %{$self->SUPER::get_voice_cmds}
-    );
-    if ($self->is_root){
-        %voice_cmds = (
-            %voice_cmds,
-            'set 8 button - backlight dim' => "$object_name->update_flags(\"0a\")",
-            'set 8 button - backlight off' => "$object_name->update_flags(\"06\")",
-            'set 8 button - backlight normal' => "$object_name->update_flags(\"02\")",
-            'set 6 button - backlight dim' => "$object_name->update_flags(\"08\")",
-            'set 6 button - backlight off' => "$object_name->update_flags(\"04\")",
-            'set 6 button - backlight normal' => "$object_name->update_flags(\"00\")"
-        );
-    }
-    return \%voice_cmds;
-}
-
-# The subgroup items are not dimmable, so call BaseInsteon for them
-
-sub derive_link_state
-{
-	my ($self, $p_state) = @_;
-	if ($self->group eq '01'){
-		return $self->SUPER::derive_link_state($p_state);
-	} else {
-		return $self->Insteon::BaseObject::derive_link_state($p_state);
-	}
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Limming 
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-=head1 B<Insteon::FanLinc>
-
-=head2 SYNOPSIS
-
-User code:
-
-    use Insteon::FanLinc;
-    $light_device = new Insteon::FanLinc('12.34.56:01',$myPLM);
-    $fan_device = new Insteon::FanLinc('12.34.56:02',$myPLM);
-
-In mht file:
-
-    INSTEON_FANLINC, 12.34.56:01, light_device, All_Lights
-    INSTEON_FANLINC, 12.34.56:02, fan_device, All_Fans
-
-=head2 DESCRIPTION
-
-Provides support for the Insteon FanLinc.
-
-=head2 INHERITS
-
-L<Insteon::DimmableLight|Insteon::Lighting/Insteon::DimmableLight>, 
-L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>,
-L<Insteon::Insteon::MultigroupDevice|Insteon::BaseInsteon/Insteon::Insteon::MultigroupDevice>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::FanLinc;
-
-use strict;
-use Insteon::BaseInsteon;
-
-@Insteon::FanLinc::ISA = ('Insteon::DimmableLight','Insteon::DeviceController', 'Insteon::MultigroupDevice');
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class,$p_deviceid,$p_interface) = @_;
-	my $self = new Insteon::DimmableLight($p_deviceid,$p_interface);
-	bless $self,$class;
-	return $self;
-}
-
-=item C<derive_message([command,extra])>
-
-Generates set commands for the fan, light requests are passed to BaseObject
-
-=cut
-
-sub derive_message
-{
-	my ($self, $p_command, $p_extra) = @_;
-	if ($self->is_root){
-		$self->SUPER::derive_message($self, $p_command, $p_extra);
-	} 
-	else {
-		my $level;
-	
-		#msg id
-		my ($command, $subcommand) = split(/:/, $p_command, 2);
-		$command=lc($command);
-		
-		if ($command eq 'on')
-		{
-			$command='100';
-		} 
-		elsif ($command eq 'off'){
-			$command = '00';
-		}
-		$command = ::Insteon::DimmableLight::convert_level($command);
-		my $extra = $command ."0200000000000000000000000000";
-		my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'on', $extra);
-		return $message;
-	}
-}
-
-=item C<request_status()>
-
-Will request the status of the device.  For the light device, the process is 
-handed off to the L<Insteon::BaseObject::request_status()|Insteon::BaseInsteon/Insteon::BaseObject> routine.  This routine
-specifically handles the fan request.
-
-=cut
-
-sub request_status
-{
-	my ($self,$requestor) = @_;
-	if ($self->is_root()){
-		return $self->SUPER::request_status($requestor);
-	} else {
-		# Setting Fan Level
-		my $parent = $self->get_root();
-		$$parent{child_status_request_pending} = $self->group;
-		$$self{m_status_request_pending} = ($requestor) ? $requestor : 1;
-		my $message = new Insteon::InsteonMessage('insteon_send', $parent, 'status_request', '03');
-		$parent->_send_cmd($message);
-	}
-}
-
-=item C<_is_info_request()>
-
-Handles incoming messages from the device which are unique to the FanLinc, 
-specifically this handles the C<request_status()> response for the Fan device, 
-all other responses are handed off to the C<Insteon::BaseObject::request_status()>.
-
-=cut
-
-sub _is_info_request
-{
-	my ($self, $cmd, $ack_setby, %msg) = @_;
-	my $is_info_request = 0;
-	my $parent = $self->get_root();
-	if ($$parent{child_status_request_pending}) {
-		$is_info_request++;
-		my $child_obj = Insteon::get_object($self->device_id, '02');
-		my $child_state = $child_obj->derive_link_state(hex($msg{extra}));
-		&::print_log("[Insteon::FanLinc] received status for " .
-			$child_obj->{object_name} . " of: $child_state "
-			. "hops left: $msg{hopsleft}") if $self->debuglevel(1, 'insteon');
-		$ack_setby = $$child_obj{m_status_request_pending} if ref $$child_obj{m_status_request_pending};
-		$child_obj->SUPER::set($child_state, $ack_setby);
-		delete($$parent{child_status_request_pending});
-	} else {
-		$is_info_request = $self->SUPER::_is_info_request($cmd, $ack_setby, %msg);
-	}
-	return $is_info_request;
-}
-
-=item C<is_acknowledged()>
-
-Handles command acknowledgement messages received from the device that are 
-unique to the FanLinc, specifically the acknowledgement of commands sent to the
-fan device.  All other instances are handed off to the C<Insteon::BaseObject>.
-
-=cut
-
-sub is_acknowledged
-{
-	my ($self, $p_ack) = @_;
-	my $parent = $self->get_root();
-        if ($p_ack && $$parent{child_pending_state})
-        {
-        	my $child_obj = Insteon::get_object($self->device_id, '02');
-		$child_obj->set_receive($$child_obj{pending_state},$$child_obj{pending_setby}, $$child_obj{pending_response}) if defined $$child_obj{pending_state};
-		$$child_obj{is_acknowledged} = $p_ack;
-		$$child_obj{pending_state} = undef;
-		$$child_obj{pending_setby} = undef;
-		$$child_obj{pending_response} = undef;
-		$$parent{child_pending_state} = undef;
-		&::print_log("[Insteon::FanLinc] received command/state acknowledge from " . $child_obj->{object_name}) if $self->debuglevel(1, 'insteon');
-		return $$self{is_acknowledged};
-	} else {
-		return $self->SUPER::is_acknowledged($p_ack);
-	}
-}
-
-=item C<get_voice_cmds>
-
-Returns a hash of voice commands where the key is the voice command name and the
-value is the perl code to run when the voice command name is called.
-
-Higher classes which inherit this object may add to this list of voice commands by
-redefining this routine while inheriting this routine using the SUPER function.
-
-This routine is called by L<Insteon::generate_voice_commands> to generate the
-necessary voice commands.
-
-=cut 
-
-sub get_voice_cmds
-{
-    my ($self) = @_;
-    my $object_name = $self->get_object_name;
-    my %voice_cmds = (
-        %{$self->SUPER::get_voice_cmds}
-    );
-    if ($self->is_root){
-        %voice_cmds = (
-            %voice_cmds,
-            'sync all device links' => "$object_name->sync_all_links()",
-            'AUDIT sync all device links' => "$object_name->sync_all_links(1)"
-        );
-    }
-    return \%voice_cmds;
-}
-
-=back
-
-=head2 AUTHOR 
-
-Kevin Robert Keegan 
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-1
+=head1 B<Insteon::BaseLight>
+
+=head2 DESCRIPTION
+
+A generic base class for all Insteon lighting objects.
+
+=head2 INHERITS
+
+L<Insteon::BaseDevice|Insteon::BaseInsteon/Insteon::BaseDevice>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::BaseLight;
+
+use strict;
+use Insteon::BaseInsteon;
+
+@Insteon::BaseLight::ISA = ('Insteon::BaseDevice');
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+
+	my $self = new Insteon::BaseDevice($p_deviceid,$p_interface);
+	bless $self,$class;
+        # include very basic states; off first so web interface up/down works
+        $self->set_states('off','on');
+
+	return $self;
+}
+
+=item C<level(p_level)>
+
+Takes the p_level, and stores it as a numeric level in memory.
+
+=cut
+
+sub level
+{
+	my ($self, $p_level) = @_;
+	if (defined $p_level) {
+		my $level = 100;
+		if ($p_level eq 'off')
+		{
+			$level = 0;
+		}
+		$$self{level} = $level;
+	}
+	return $$self{level};
+
+}
+
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds},
+        'on' => "$object_name->set(\"on\")",
+        'off' => "$object_name->set(\"off\")"
+    );
+    return \%voice_cmds;
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Limming 
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+=head1 B<Insteon::DimmableLight>
+
+=head2 DESCRIPTION
+
+A generic base class for all dimmable Insteon lighting objects.
+
+=head2 INHERITS
+
+L<Insteon::BaseLight|Insteon::Lighting/Insteon::BaseLight>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::DimmableLight;
+
+use strict;
+use Insteon::BaseInsteon;
+
+@Insteon::DimmableLight::ISA = ('Insteon::BaseLight');
+
+my %message_types = (
+	%SUPER::message_types,
+	bright => 0x15,
+	dim => 0x16
+);
+
+my %ramp_h2n = (
+						'00' => 540,
+						'01' => 480,
+						'02' => 420,
+						'03' => 360,
+						'04' => 300,
+						'05' => 270,
+						'06' => 240,
+						'07' => 210,
+						'08' => 180,
+						'09' => 150,
+						'0a' => 120,
+						'0b' =>  90,
+						'0c' =>  60,
+						'0d' =>  47,
+						'0e' =>  43,
+						'0f' =>  39,
+						'10' =>  34,
+						'11' =>  32,
+						'12' =>  30,
+						'13' =>  28,
+						'14' =>  26,
+						'15' =>  23.5,
+						'16' =>  21.5,
+						'17' =>  19,
+						'18' =>   8.5,
+						'19' =>   6.5,
+						'1a' =>   4.5,
+						'1b' =>   2,
+						'1c' =>    .5,
+						'1d' =>    .3,
+						'1e' =>    .2,
+						'1f' =>    .1
+);
+
+=item C<derive_link_state([state])>
+
+Overrides routine in BaseObject. Takes the various states available to insteon 
+devices and returns a derived state of on, off, or 0%-100%.
+
+=cut
+
+sub derive_link_state
+{
+	my ($self, $p_state) = @_;
+	#Convert Relative State to Absolute State
+	if ($p_state =~ /^([+-])(\d+)/) {
+		my $rel_state = $1 . $2;
+		my $curr_state = '100';
+		$curr_state = '0' if ($self->state eq 'off');
+		$curr_state = $1 if $self->state =~ /(\d{1,3})/;
+		$p_state = $curr_state + $rel_state;
+		$p_state = 100 if ($p_state > 100);
+		$p_state = 0 if ($p_state < 0);
+	}
+	
+	my $link_state = 'on';
+	if (grep(/$p_state/i, @{['on_fast', 'off', 'off_fast']})) {
+		$link_state = $p_state;
+	}
+	elsif ($p_state =~ /\d+%?/)
+	{
+		$p_state =~ /(\d+)%?/;
+		$link_state = $1 . '%';
+	}
+	return $link_state;
+}
+
+=item C<convert_ramp(ramp_seconds)>
+
+Takes ramp_seconds in numeric seconds and returns the hexadecimal value of that 
+ramp rate or the next lowest value if the passed value doesn't exist.  Possible
+ramp rates are:
+
+540, 480, 420, 360, 300, 270, 240, 210, 180, 150, 120, 90, 60, 47, 43, 39, 34, 
+32, 30, 28, 26, 23.5, 21.5, 19, 8.5, 6.5, 4.5, 2, .5, .3, .2, and  .1
+
+=cut
+
+sub convert_ramp
+{
+	my ($ramp_in_seconds) = @_;
+	if ($ramp_in_seconds) {
+		foreach my $rampkey (sort keys %ramp_h2n) {
+			return $rampkey if $ramp_in_seconds >= $ramp_h2n{$rampkey};
+		}
+	} else {
+		return '1f';
+	}
+}
+
+=item C<get_ramp_from_code(ramp_code)>
+
+Takes ramp_code as a hexadecimal representation of the device's ramp rate and
+returns the equivalent ramp rate in decimal seconds.
+
+=cut
+
+sub get_ramp_from_code
+{
+	my ($ramp_code) = @_;
+	if ($ramp_code) {
+		return $ramp_h2n{$ramp_code};
+	} else {
+		return 0;
+	}
+}
+
+=item C<convert_level(on_level)>
+
+Takes on_level as an integer percentage and converts it to a hexadecimal 
+representation of that on_level that is used by a device.
+
+=cut
+
+sub convert_level
+{
+	my ($on_level) = @_;
+	my $level = 'ff';
+	if (defined ($on_level)) {
+		$on_level =~ s/(\d+)%?/$1/;
+		$level = sprintf('%02X',int(($on_level * 2.55) + .5));
+	}
+	return $level;
+}
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+
+	my $self = new Insteon::BaseLight($p_deviceid,$p_interface);
+	bless $self,$class;
+	
+	if( $main::config_parms{insteon_menu_states}) {
+		$self->set_states(split( ',', $main::config_parms{insteon_menu_states}));
+	}
+	
+	return $self;
+}
+
+=item C<local_onlevel(level)>
+
+Sets and returns the local onlevel for the device in MH only. Level is a 
+percentage from 0%-100%.
+
+This setting can be pushed to the device using C<update_local_properties>.
+
+Parameters: level [0-100]
+
+Returns: [0-100]
+
+=cut
+
+sub local_onlevel
+{
+	my ($self, $p_onlevel) = @_;
+	if (defined $p_onlevel)
+        {
+		my ($onlevel) = $p_onlevel =~ /(\d+)%?/;
+		$$self{_onlevel} = $onlevel;
+	}
+	return $$self{_onlevel};
+}
+
+=item C<local_ramprate(rate)>
+
+Sets and returns the local ramp rate for the device in MH only. Rate is a time
+between .1 and 540 seconds.  Only 32 rate steps exist, to MH will pick a time
+equal to of the closest below this time.
+
+This setting can be pushed to the device using C<update_local_properties>.
+
+Parameters: rate = ramp rate [.1s - 540s] see C<convert_ramp> for valid values
+
+Returns: hexadecimal representation of the ramprate.
+
+=cut
+
+sub local_ramprate
+{
+	my ($self, $p_ramprate) = @_;
+	if (defined $p_ramprate) {
+		$$self{_ramprate} = &Insteon::DimmableLight::convert_ramp($p_ramprate);
+	}
+	return $$self{_ramprate};
+
+}
+
+=item C<update_local_properties()>
+
+Pushes the values set in C<local_onlevel()> and C<local_ramprate()> to the device.
+
+I1 Devices:
+
+The device will only reread these values when it is power-cycled.  This can be
+done by pulling the air-gap for 4 seconds or unplugging the device.
+
+I2 & I2CS Devices
+
+The device will immediately read and update the values.
+
+=cut
+
+sub update_local_properties
+{
+	my ($self) = @_;
+	if ($self->engine_version eq 'I1'){
+       		$self->_aldb->update_local_properties() if $self->_aldb;
+	}
+	else {
+		#Queue Ramp Rate First
+		my $extra = '000005' . $self->local_ramprate();
+		$extra .= '0' x (30 - length $extra);
+		my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+		$self->_send_cmd($message);
+		
+		#Now queue on level
+		$extra = '000006' . ::Insteon::DimmableLight::convert_level($self->local_onlevel());
+		$extra .= '0' x (30 - length $extra);
+		$message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'extended_set_get', $extra);
+		$self->_send_cmd($message);
+	}
+}
+
+=item C<level(p_level)>
+
+Stores and returns the objects current on_level as a percentage. If p_level 
+is ON and the device has a defined local_onlevel, the local_onlevel is stored 
+as the numeric level in memory.
+
+Returns [0-100]
+
+=cut
+
+sub level
+{
+	my ($self, $p_level) = @_;
+	if (defined $p_level) {
+		my $level = undef;
+		if ($p_level eq 'on')
+		{
+			# set the level based on any locally defined on level
+			$level = $self->local_onlevel if $self->can('local_onlevel');
+			# set to 100 if a local on level is not defined
+			$level=100 unless defined($level);
+		} elsif ($p_level eq 'off')
+		{
+			$level = 0;
+		} elsif ($p_level =~ /^([1]?[0-9]?[0-9])%?$/)
+		{
+			if ($1 < 1) {
+				$level = 0;
+			} else {
+				$level = $1;
+			}
+		}
+		$$self{level} = $level if defined $level;
+	}
+	return $$self{level};
+
+}
+
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my $insteon_menu_states = $main::config_parms{insteon_menu_states} if $main::config_parms{insteon_menu_states};
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds},
+        'update onlevel/ramprate' => "$object_name->update_local_properties"
+    );
+    if ($insteon_menu_states){
+        foreach my $state (split(/,/,$insteon_menu_states)) {
+            $voice_cmds{$state} = "$object_name->set(\"$state\")";
+        }
+    }
+    return \%voice_cmds;
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Limming 
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+=head1 B<Insteon::ApplianceLinc>
+
+=head2 SYNOPSIS
+
+User code:
+
+    use Insteon::ApplianceLinc;
+    $appliance_device = new Insteon::ApplianceLinc('12.34.56',$myPLM);
+
+In mht file:
+
+    INSTEON_APPLIANCELINC, 12.34.56, appliance_device, appliance_group
+
+=head2 DESCRIPTION
+
+Provides support for the Insteon ApplianceLinc.
+
+=head2 INHERITS
+
+L<Insteon::BaseLight|Insteon::Lighting/Insteon::BaseLight>
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::ApplianceLinc;
+
+use strict;
+use Insteon::BaseInsteon;
+
+@Insteon::ApplianceLinc::ISA = ('Insteon::BaseLight','Insteon::DeviceController');
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+
+	my $self = new Insteon::BaseLight($p_deviceid,$p_interface);
+	bless $self,$class;
+	return $self;
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Limming 
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+=head1 B<Insteon::LampLinc>
+
+=head2 SYNOPSIS
+
+User code:
+
+    use Insteon::LampLinc;
+    $lamp_device = new Insteon::LampLinc('12.34.56',$myPLM);
+
+In mht file:
+
+    INSTEON_LAMPLINC, 12.34.56, lamp_device, All_Lights
+
+=head2 DESCRIPTION
+
+Provides support for the Insteon LampLinc.
+
+=head2 INHERITS
+
+L<Insteon::DimmableLight|Insteon::Lighting/Insteon::DimmableLight>, 
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::LampLinc;
+
+use strict;
+use Insteon::BaseInsteon;
+
+@Insteon::LampLinc::ISA = ('Insteon::DimmableLight','Insteon::DeviceController');
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+
+	my $self = new Insteon::DimmableLight($p_deviceid,$p_interface);
+	bless $self,$class;
+	return $self;
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Limming 
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+=head1 B<Insteon::SwitchLincRelay>
+
+=head2 SYNOPSIS
+
+User code:
+
+    use Insteon::SwitchLincRelay;
+    $light_device = new Insteon::SwitchLincRelay('12.34.56',$myPLM);
+
+In mht file:
+
+    INSTEON_SWITCHLINCRELAY, 12.34.56, light_device, All_Lights
+
+=head2 DESCRIPTION
+
+Provides support for the Insteon SwitchLinc Relay.
+
+=head2 INHERITS
+
+L<Insteon::BaseLight|Insteon::Lighting/Insteon::BaseLight>,
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::SwitchLincRelay;
+
+use strict;
+use Insteon::BaseInsteon;
+
+@Insteon::SwitchLincRelay::ISA = ('Insteon::BaseLight','Insteon::DeviceController');
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+
+	my $self = new Insteon::BaseLight($p_deviceid,$p_interface);
+	bless $self,$class;
+	return $self;
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Limming 
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+=head1 B<Insteon::SwitchLinc>
+
+=head2 SYNOPSIS
+
+User code:
+
+    use Insteon::SwitchLinc;
+    $light_device = new Insteon::SwitchLinc('12.34.56',$myPLM);
+
+In mht file:
+
+    INSTEON_SWITCHLINC, 12.34.56, light_device, All_Lights
+
+=head2 DESCRIPTION
+
+Provides support for the Insteon SwitchLinc.
+
+=head2 INHERITS
+
+L<Insteon::DimmableLight|Insteon::Lighting/Insteon::DimmableLight>, 
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::SwitchLinc;
+
+use strict;
+use Insteon::BaseInsteon;
+
+@Insteon::SwitchLinc::ISA = ('Insteon::DimmableLight','Insteon::DeviceController');
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+
+	my $self = new Insteon::DimmableLight($p_deviceid,$p_interface);
+	bless $self,$class;
+	return $self;
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Limming 
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+=head1 B<Insteon::KeyPadLincRelay>
+
+=head2 SYNOPSIS
+
+User code:
+
+    use Insteon::KeyPadLincRelay;
+    $light_device = new Insteon::KeyPadLincRelay('12.34.56:01',$myPLM);
+    $button1_device = new Insteon::KeyPadLincRelay('12.34.56:02',$myPLM);
+    $button2_device = new Insteon::KeyPadLincRelay('12.34.56:03',$myPLM);
+
+In mht file:
+
+    INSTEON_KEYPADLINCRELAY, 12.34.56:01, light_device, All_Lights
+    INSTEON_KEYPADLINCRELAY, 12.34.56:02, button1_device, All_Buttons
+    INSTEON_KEYPADLINCRELAY, 12.34.56:03, button2_device, All_Buttons
+
+=head2 DESCRIPTION
+
+Provides support for the Insteon KeypadLinc Relay.
+
+=head2 INHERITS
+
+L<Insteon::BaseLight|Insteon::Lighting/Insteon::BaseLight>, 
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>,
+L<Insteon::Insteon::MultigroupDevice|Insteon::BaseInsteon/Insteon::Insteon::MultigroupDevice>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::KeyPadLincRelay;
+
+use strict;
+use Insteon::BaseInsteon;
+
+@Insteon::KeyPadLincRelay::ISA = ('Insteon::BaseLight','Insteon::DeviceController', 'Insteon::MultigroupDevice');
+
+our %operating_flags = (
+   'program_lock_on' => '00',
+   'program_lock_off' => '01',
+   'led_on_during_tx' => '02',
+   'led_off_during_tx' => '03',
+   'resume_dim_on' => '04',
+   'resume_dim_off' => '05',
+   '8_key_mode' => '06',
+   '6_key_mode' => '07',
+   'led_off' => '08',
+   'led_enabled' => '09',
+   'key_beep_enabled' => '0a',
+   'key_beep_off' => '0b'
+);
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+	my $self = new Insteon::BaseLight($p_deviceid,$p_interface);
+	$$self{operating_flags} = \%operating_flags;
+	bless $self,$class;
+	return $self;
+}
+
+=item C<set(state[,setby,response])>
+
+Handles setting and receiving states from the device and specifically its 
+subordinate buttons.
+
+=cut
+
+sub set
+{
+	my ($self, $p_state, $p_setby, $p_respond) = @_;
+	if (!($self->is_root) and !(ref $p_setby && $p_setby eq $self))
+	{
+		if (ref $$self{surrogate} && ($$self{surrogate}->isa('Insteon::InterfaceController'))) {
+			$$self{surrogate}->set($p_state, $p_setby, $p_respond);
+		}
+		else {
+			::print_log("[Insteon::KeyPadLinc] You may not directly attempt to set a keypadlinc's button "
+				."unless you have defined a reverse link with the \"surrogate\" keyword");
+		}
+	}
+	else
+	{
+		return $self->SUPER::set($p_state, $p_setby, $p_respond);
+	}
+}
+
+=item C<update_flags(flags)>
+
+Can be used to set the button layout and light level on a keypadlinc.  Flag 
+options include:
+
+    '0a' - 8 button; backlighting dim
+    '06' - 8 button; backlighting off
+    '02' - 8 button; backlighting normal
+
+    '08' - 6 button; backlighting dim
+    '04' - 6 button; backlighting off
+    '00' - 6 button; backlighting normal
+
+=cut
+
+sub update_flags
+{
+	my ($self, $flags) = @_;
+	return unless defined $flags;
+	if ($self->engine_version eq 'I1') {
+		$self->_aldb->update_flags($flags) if $self->_aldb;
+	}
+	else {
+		if ($flags & 0x02) {
+			$self->set_operating_flag('8_key_mode');
+		} 
+		else {
+			$self->set_operating_flag('6_key_mode');	
+		}
+		if ($flags & 0x04) {
+			$self->set_operating_flag('led_off');
+		}
+		else {
+			$self->set_operating_flag('led_enabled');	
+		}
+		if ($flags & 0x08) {
+			$self->set_operating_flag('resume_dim_on');
+		}
+		else {
+			$self->set_operating_flag('resume_dim_off');
+		}
+	}
+}
+
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds}
+    );
+    if ($self->is_root){
+        %voice_cmds = (
+            %voice_cmds,
+            'set 8 button - backlight dim' => "$object_name->update_flags(\"0a\")",
+            'set 8 button - backlight off' => "$object_name->update_flags(\"06\")",
+            'set 8 button - backlight normal' => "$object_name->update_flags(\"02\")",
+            'set 6 button - backlight dim' => "$object_name->update_flags(\"08\")",
+            'set 6 button - backlight off' => "$object_name->update_flags(\"04\")",
+            'set 6 button - backlight normal' => "$object_name->update_flags(\"00\")",
+            'sync all device links' => "$object_name->sync_all_links()",
+            'AUDIT sync all device links' => "$object_name->sync_all_links(1)"
+        );
+    }
+    return \%voice_cmds;
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Limming 
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+=head1 B<Insteon::KeyPadLinc>
+
+=head2 SYNOPSIS
+
+User code:
+
+    use Insteon::KeyPadLinc;
+    $light_device = new Insteon::KeyPadLinc('12.34.56:01',$myPLM);
+    $button1_device = new Insteon::KeyPadLinc('12.34.56:02',$myPLM);
+    $button2_device = new Insteon::KeyPadLinc('12.34.56:03',$myPLM);
+
+In mht file:
+
+    INSTEON_KEYPADLINC, 12.34.56:01, light_device, All_Lights
+    INSTEON_KEYPADLINC, 12.34.56:02, button1_device, All_Buttons
+    INSTEON_KEYPADLINC, 12.34.56:03, button2_device, All_Buttons
+
+=head2 DESCRIPTION
+
+Provides support for the Insteon KeypadLinc.
+
+=head2 INHERITS
+
+L<Insteon::DimmableLight|Insteon::Lighting/Insteon::DimmableLight>, 
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::KeyPadLinc;
+
+use strict;
+use Insteon::BaseInsteon;
+
+@Insteon::KeyPadLinc::ISA = ('Insteon::KeyPadLincRelay', 'Insteon::DimmableLight','Insteon::DeviceController');
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+	my $self = new Insteon::DimmableLight($p_deviceid,$p_interface);
+	$$self{operating_flags} = \%Insteon::KeyPadLincRelay::operating_flags;
+	bless $self,$class;
+	return $self;
+}
+
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds}
+    );
+    if ($self->is_root){
+        %voice_cmds = (
+            %voice_cmds,
+            'set 8 button - backlight dim' => "$object_name->update_flags(\"0a\")",
+            'set 8 button - backlight off' => "$object_name->update_flags(\"06\")",
+            'set 8 button - backlight normal' => "$object_name->update_flags(\"02\")",
+            'set 6 button - backlight dim' => "$object_name->update_flags(\"08\")",
+            'set 6 button - backlight off' => "$object_name->update_flags(\"04\")",
+            'set 6 button - backlight normal' => "$object_name->update_flags(\"00\")"
+        );
+    }
+    return \%voice_cmds;
+}
+
+# The subgroup items are not dimmable, so call BaseInsteon for them
+
+sub derive_link_state
+{
+	my ($self, $p_state) = @_;
+	if ($self->group eq '01'){
+		return $self->SUPER::derive_link_state($p_state);
+	} else {
+		return $self->Insteon::BaseObject::derive_link_state($p_state);
+	}
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Limming 
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+=head1 B<Insteon::FanLinc>
+
+=head2 SYNOPSIS
+
+User code:
+
+    use Insteon::FanLinc;
+    $light_device = new Insteon::FanLinc('12.34.56:01',$myPLM);
+    $fan_device = new Insteon::FanLinc('12.34.56:02',$myPLM);
+
+In mht file:
+
+    INSTEON_FANLINC, 12.34.56:01, light_device, All_Lights
+    INSTEON_FANLINC, 12.34.56:02, fan_device, All_Fans
+
+=head2 DESCRIPTION
+
+Provides support for the Insteon FanLinc.
+
+=head2 INHERITS
+
+L<Insteon::DimmableLight|Insteon::Lighting/Insteon::DimmableLight>, 
+L<Insteon::DeviceController|Insteon::BaseInsteon/Insteon::DeviceController>,
+L<Insteon::Insteon::MultigroupDevice|Insteon::BaseInsteon/Insteon::Insteon::MultigroupDevice>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::FanLinc;
+
+use strict;
+use Insteon::BaseInsteon;
+
+@Insteon::FanLinc::ISA = ('Insteon::DimmableLight','Insteon::DeviceController', 'Insteon::MultigroupDevice');
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class,$p_deviceid,$p_interface) = @_;
+	my $self = new Insteon::DimmableLight($p_deviceid,$p_interface);
+	bless $self,$class;
+	return $self;
+}
+
+=item C<derive_message([command,extra])>
+
+Generates set commands for the fan, light requests are passed to BaseObject
+
+=cut
+
+sub derive_message
+{
+	my ($self, $p_command, $p_extra) = @_;
+	if ($self->is_root){
+		$self->SUPER::derive_message($self, $p_command, $p_extra);
+	} 
+	else {
+		my $level;
+	
+		#msg id
+		my ($command, $subcommand) = split(/:/, $p_command, 2);
+		$command=lc($command);
+		
+		if ($command eq 'on')
+		{
+			$command='100';
+		} 
+		elsif ($command eq 'off'){
+			$command = '00';
+		}
+		$command = ::Insteon::DimmableLight::convert_level($command);
+		my $extra = $command ."0200000000000000000000000000";
+		my $message = new Insteon::InsteonMessage('insteon_ext_send', $self, 'on', $extra);
+		return $message;
+	}
+}
+
+=item C<request_status()>
+
+Will request the status of the device.  For the light device, the process is 
+handed off to the L<Insteon::BaseObject::request_status()|Insteon::BaseInsteon/Insteon::BaseObject> routine.  This routine
+specifically handles the fan request.
+
+=cut
+
+sub request_status
+{
+	my ($self,$requestor) = @_;
+	if ($self->is_root()){
+		return $self->SUPER::request_status($requestor);
+	} else {
+		# Setting Fan Level
+		my $parent = $self->get_root();
+		$$parent{child_status_request_pending} = $self->group;
+		$$self{m_status_request_pending} = ($requestor) ? $requestor : 1;
+		my $message = new Insteon::InsteonMessage('insteon_send', $parent, 'status_request', '03');
+		$parent->_send_cmd($message);
+	}
+}
+
+=item C<_is_info_request()>
+
+Handles incoming messages from the device which are unique to the FanLinc, 
+specifically this handles the C<request_status()> response for the Fan device, 
+all other responses are handed off to the C<Insteon::BaseObject::request_status()>.
+
+=cut
+
+sub _is_info_request
+{
+	my ($self, $cmd, $ack_setby, %msg) = @_;
+	my $is_info_request = 0;
+	my $parent = $self->get_root();
+	if ($$parent{child_status_request_pending}) {
+		$is_info_request++;
+		my $child_obj = Insteon::get_object($self->device_id, '02');
+		my $child_state = $child_obj->derive_link_state(hex($msg{extra}));
+		&::print_log("[Insteon::FanLinc] received status for " .
+			$child_obj->{object_name} . " of: $child_state "
+			. "hops left: $msg{hopsleft}") if $self->debuglevel(1, 'insteon');
+		$ack_setby = $$child_obj{m_status_request_pending} if ref $$child_obj{m_status_request_pending};
+		$child_obj->SUPER::set($child_state, $ack_setby);
+		delete($$parent{child_status_request_pending});
+	} else {
+		$is_info_request = $self->SUPER::_is_info_request($cmd, $ack_setby, %msg);
+	}
+	return $is_info_request;
+}
+
+=item C<is_acknowledged()>
+
+Handles command acknowledgement messages received from the device that are 
+unique to the FanLinc, specifically the acknowledgement of commands sent to the
+fan device.  All other instances are handed off to the C<Insteon::BaseObject>.
+
+=cut
+
+sub is_acknowledged
+{
+	my ($self, $p_ack) = @_;
+	my $parent = $self->get_root();
+        if ($p_ack && $$parent{child_pending_state})
+        {
+        	my $child_obj = Insteon::get_object($self->device_id, '02');
+		$child_obj->set_receive($$child_obj{pending_state},$$child_obj{pending_setby}, $$child_obj{pending_response}) if defined $$child_obj{pending_state};
+		$$child_obj{is_acknowledged} = $p_ack;
+		$$child_obj{pending_state} = undef;
+		$$child_obj{pending_setby} = undef;
+		$$child_obj{pending_response} = undef;
+		$$parent{child_pending_state} = undef;
+		&::print_log("[Insteon::FanLinc] received command/state acknowledge from " . $child_obj->{object_name}) if $self->debuglevel(1, 'insteon');
+		return $$self{is_acknowledged};
+	} else {
+		return $self->SUPER::is_acknowledged($p_ack);
+	}
+}
+
+=item C<get_voice_cmds>
+
+Returns a hash of voice commands where the key is the voice command name and the
+value is the perl code to run when the voice command name is called.
+
+Higher classes which inherit this object may add to this list of voice commands by
+redefining this routine while inheriting this routine using the SUPER function.
+
+This routine is called by L<Insteon::generate_voice_commands> to generate the
+necessary voice commands.
+
+=cut 
+
+sub get_voice_cmds
+{
+    my ($self) = @_;
+    my $object_name = $self->get_object_name;
+    my %voice_cmds = (
+        %{$self->SUPER::get_voice_cmds}
+    );
+    if ($self->is_root){
+        %voice_cmds = (
+            %voice_cmds,
+            'sync all device links' => "$object_name->sync_all_links()",
+            'AUDIT sync all device links' => "$object_name->sync_all_links(1)"
+        );
+    }
+    return \%voice_cmds;
+}
+
+=back
+
+=head2 AUTHOR 
+
+Kevin Robert Keegan 
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+1
diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index 843547980..3274fe885 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -1,1151 +1,1151 @@
-=head1 B<Insteon::BaseMessage>
-
-=head2 DESCRIPTION
-
-Generic base class for L<Insteon|Insteon> object messages, including 
-L<Insteon::X10Message|Insteon::Message/Insteon::X10Message>.  Primarily just 
-stores variables for the object.
-
-=head2 INHERITS
-
-Nothing
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::BaseMessage;
-
-use strict;
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class) = @_;
-	my $self={};
-	bless $self,$class;
-
-        $$self{queue_time} = &main::get_tickcount;
-        $$self{send_attempts} = 0;
-
-        return $self;
-}
-
-=item C<interface_data(data)>
-
-Save and retrieve the interface data defined by C<interface_data()>.
-
-=cut
-
-sub interface_data
-{
-	my ($self, $interface_data) = @_;
-        if ($interface_data)
-        {
-        	$$self{interface_data} = $interface_data;
-        }
-        return $$self{interface_data};
-}
-
-=item C<queue_time(data)>
-
-Stores the time at which a message was added to the queue.  Used for calculating
-how long a message was delayed.
-
-=cut
-
-sub queue_time
-{
-	my ($self, $queue_time) = @_;
-        if ($queue_time)
-        {
-        	$$self{queue_time} = $queue_time;
-        }
-        return $$self{queue_time};
-}
-
-=item C<callback(data)>
-
-Data will be evaluated each time the message is sent.
-
-=cut
-
-sub callback
-{
-	my ($self, $callback) = @_;
-        if ($callback)
-        {
-        	$$self{callback} = $callback;
-        }
-        return $$self{callback};
-}
-
-=item C<failure_callback(data)>
-
-Data will be evaluated if the maximum number of retry attempts has been made 
-and the message is not acknowledged.
-
-=cut
-
-sub failure_callback
-{
-	my ($self, $callback) = @_;
-        if ($callback)
-        {
-        	$$self{failure_callback} = $callback;
-        }
-        return $$self{failure_callback};
-}
-
-=item C<success_callback(data)>
-
-Data will be evaluated after the receipt of an ACK from the device for this command.
-
-=cut
-
-sub success_callback
-{
-	my ($self, $callback) = @_;
-        if (defined $callback)
-        {
-        	$$self{success_callback} = $callback;
-        }
-        return $$self{success_callback};
-}
-
-=item C<send_attempts(data)>
-
-Stores and retrieves the number of times Misterhouse has tried to send the message.
-
-=cut
-
-sub send_attempts
-{
-	my ($self, $send_attempts) = @_;
-        if ($send_attempts)
-        {
-        	$$self{send_attempts} = $send_attempts;
-        }
-        return $$self{send_attempts};
-}
-
-=item C<setby(data)>
-
-Stores and retrieves what the source of this message was.
-
-=cut
-
-sub setby
-{
-	my ($self, $setby) = @_;
-        if ($setby)
-        {
-        	$$self{setby} = $setby;
-        }
-        return $$self{setby};
-}
-
-=item C<respond(data)>
-
-Stores and retrieves respond variable.
-
-=cut
-
-sub respond
-{
-	my ($self, $respond) = @_;
-        if ($respond)
-        {
-        	$$self{respond} = $respond;
-        }
-        return $$self{respond};
-}
-
-
-=item C<no_hop_increase(data)>
-
-Stores and retrieves no_hop_increase variable, if set to true, when the message
-is retried, no additional hops will be added.  Typically used where the failure 
-to deliver the last message attempt was not caused by a failure of the object 
-to receive the message such as when the PLM is too busy to even attempt sending
-the message.
-
-=cut
-
-sub no_hop_increase
-{
-	my ($self, $no_hop_increase) = @_;
-        if ($no_hop_increase)
-        {
-        	$$self{no_hop_increase} = $no_hop_increase;
-        }
-        return $$self{no_hop_increase};
-}
-
-=item C<retry_count(data)>
-
-Stores and retrieves the number of times MisterHouse should try to deliver this 
-message.  If B<Insteon_retry_count> is set in the ini parameters will default 
-to that value, otherwise defaults to 5.  Some messages types have specific 
-retry counts, such as L<Insteon::RemoteLinc|Insteon::Controller/Insteon::RemoteLinc>
-battery level requests which are only sent once.
-
-=cut
-
-sub retry_count {
-	my ($self, $retry_count) = @_;
-	if ($retry_count)
-	{
-		$$self{retry_count} = $retry_count;
-	}
-	my $result_retry = 5;
-	$result_retry = $::config_parms{'Insteon_retry_count'} if ($::config_parms{'Insteon_retry_count'});
-	$result_retry = $$self{retry_count} if ($$self{retry_count});
-	return $result_retry;
-}
-
-=item C<send(p_interface)>
-
-Sends this message using the interface p_interface.  If C<send_attempts> is 
-greater than 0 then 
-L<Insteon::BaseObject::default_hop_count|Insteon::BaseInsteon/Insteon::BaseObject> 
-is increase by one.  Calls C<callback()>
-when the message is sent.  
-
-Returns 1 if message sent or 0 if message retry count exceeds C<retry_count()>.
-
-=cut
-
-sub send
-{
-        my ($self, $interface) = @_;
-        if ($self->send_attempts < $self->retry_count)
-        {
-
-        	if ($self->send_attempts > 0)
-                {
-                	&::print_log("[Insteon::BaseMessage] WARN: now resending "
-                        	. $self->to_string() . " after " . $self->send_attempts
-                        	. " attempts.") if $self->setby->debuglevel(1, 'insteon');
-                        # revise default hop count to reflect retries
-                        if (ref $self->setby && $self->setby->isa('Insteon::BaseObject') 
-                        	&& !defined($$self{no_hop_increase}))
-                        {
-                        	$self->setby->retry_count_log(1) if $self->setby->can('retry_count_log');
-                        	if ($self->setby->default_hop_count < 3)
-                                {
-                                	$self->setby->default_hop_count($self->setby->default_hop_count + 1);
-                                }
-                        }
-                        elsif (defined($$self{no_hop_increase}) && ref $self->setby
-                        	&& $self->setby->isa('Insteon::BaseObject')){
-                        	&main::print_log("[Insteon::BaseMessage] Hop count not increased for "
-                        		. $self->setby->get_object_name . " because no_hop_increase flag was set.")
-                        		if $self->setby->debuglevel(1, 'insteon');
-                        	$$self{no_hop_increase} = undef;
-                        }
-                }
-
-                # need to set timeout as a function of retries; also need to alter hop count
-                if ($self->send_attempts <= 0 && ref $self->setby) {
-                    $self->setby->outgoing_count_log(1) if $self->setby->can('outgoing_count_log');
-                    $self->setby->outgoing_hop_count($self->setby->default_hop_count)
-                    	if $self->setby->can('outgoing_hop_count');
-                }
-                $self->send_attempts($self->send_attempts + 1);
-		$interface->_send_cmd($self, $self->send_timeout);
-		if ($self->callback)
-                {
-			package main;
-			eval $self->callback;
-			&::print_log("[Insteon::BaseMessage] problem w/ retry callback: $@") if $@;
-			package Insteon::Message;
-		}
-                return 1;
-        }
-        else
-        {
-                return 0;
-        }
-
-}
-
-=item C<seconds_delayed()>
-
-Returns the number of seconds that elapsed between time set in C<queue_time>
-and when this routine was called.
-
-=cut
-
-sub seconds_delayed
-{
-	my ($self) = @_;
-	my $current_tickcount = &main::get_tickcount;
-        my $delay_time = $current_tickcount - $self->queue_time;
-       	if ($self->queue_time > $current_tickcount)
-       	{
-        	return 'unknown';
-       	}
-
-        $delay_time = $delay_time / 1000;
-        return $delay_time;
-}
-
-=item C<send_timeout(p_timeout)>
-
-Stores and returns the number of milliseconds, p_timeout, that MisterHouse
-should wait before retrying this message again.
-
-=cut
-
-sub send_timeout
-{
-	my ($self, $timeout) = @_;
-        $$self{send_timeout} = $timeout if defined $timeout;
-        return $$self{send_timeout};
-}
-
-=item C<to_string()>
-
-Returns the hexadecimal representation of the message.
-
-=cut
-
-sub to_string
-{
-	my ($self) = @_;
-        return $self->interface_data;
-}
-
-=back
-
-=head2 INI PARAMETERS
-
-=over
-
-=item Insteon_retry_count
-
-Sets the number of times MisterHouse will attempt to resend a message that has
-not been acknowledged.  The default setting is 5.
-
-=back
-
-=head2 AUTHOR
-
-Gregg Limming, Kevin Robert Keegan
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-=head1 B<Insteon::InsteonMessage>
-
-=head2 DESCRIPTION
-
-Main class for all L<Insteon|Insteon> messages.
-
-=head2 INHERITS
-
-L<Insteon::BaseMessage|Insteon::Message/Insteon::BaseMessage>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::InsteonMessage;
-use strict;
-
-@Insteon::InsteonMessage::ISA = ('Insteon::BaseMessage');
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class, $command_type, $setby, $command, $extra) = @_;
-	my $self= new Insteon::BaseMessage();
-	bless $self,$class;
-
-        $self->command_type($command_type);
-        $self->setby($setby);
-        $self->command($command);
-        $self->extra($extra);
-        $self->send_timeout(2000);
-
-        return $self;
-}
-
-=item C<command_to_hash(msg)>
-
-Takes msg, a hexadecimal message, and returns a hash of the message details.
-
-=cut
-
-sub command_to_hash
-{
-	my ($p_state) = @_;
-	my %msg = ();
-	my $hopflag = hex(uc substr($p_state,13,1));
-	$msg{maxhops} = $hopflag&0b0011;
-	$msg{hopsleft} = $hopflag >> 2;
-	my $msgflag = hex(uc substr($p_state,12,1));
-	$msg{is_extended} = (0x01 & $msgflag) ? 1 : 0;
-	$msg{cmd_code} = substr($p_state,14,2);
-	$msg{crc_valid} = 1;
-	if ($msg{is_extended})
-        {
-		$msg{type} = 'direct';
-		$msg{source} = substr($p_state,0,6);
-		$msg{destination} = substr($p_state,6,6);
-		$msg{extra} = substr($p_state,16,length($p_state)-16);
-		$msg{crc_valid} = (calculate_checksum($msg{cmd_code}.$msg{extra}) eq '00');
-	}
-        else
-        {
-		$msg{source} = substr($p_state,0,6);
-		$msgflag = $msgflag >> 1;
-		if ($msgflag == 4)
-                {
-			$msg{type} = 'broadcast';
-			$msg{devcat} = substr($p_state,6,4);
-			$msg{firmware} = substr($p_state,10,2);
-			$msg{is_master} = substr($p_state,16,2);
-			$msg{dev_attribs} = substr($p_state,18,2);
-		}
-                elsif ($msgflag ==6)
-                {
-			$msg{type} = 'alllink';
-			$msg{group} = substr($p_state,10,2);
-			$msg{extra} = substr($p_state,16,2) 
-				if (length($p_state) >= 18);
-		}
-                else
-                {
-			$msg{destination} = substr($p_state,6,6);
-			if ($msgflag == 2)
-                        {
-				$msg{type} = 'cleanup';
-				$msg{group} = substr($p_state,16,2);
-			}
-                        elsif ($msgflag == 3)
-                        {
-				$msg{type} = 'cleanup';
-				$msg{is_ack} = 1;
-                                # the "extra" value will contain the controller's group ID
-				$msg{extra} = substr($p_state,16,2);
-			}
-                        elsif ($msgflag == 7)
-                        {
-				$msg{type} = 'cleanup';
-				$msg{is_nack} = 1;
-				$msg{extra} = substr($p_state,16,2);
-			}
-                        elsif ($msgflag == 0)
-                        {
-				$msg{type} = 'direct';
-				$msg{extra} = substr($p_state,16,2);
-			}
-                        elsif ($msgflag == 1)
-                        {
-				$msg{type} = 'direct';
-				$msg{is_ack} = 1;
-				$msg{extra} = substr($p_state,16,2);
-			}
-                        elsif ($msgflag == 5)
-                        {
-				$msg{type} = 'direct';
-				$msg{is_nack} = 1;
-				$msg{extra} = substr($p_state,16,2);
-			}
-		}
-	}
-
-	return %msg;
-}
-
-=item C<command(data)>
-
-Stores and retrieves the Cmd1 value for this message.
-
-=cut
-
-sub command
-{
-      my ($self, $command) = @_;
-      $$self{command} = $command if $command;
-      return $$self{command};
-}
-
-=item C<command_type(data)>
-
-Stores and retrieves the Command Type value for this message.
-
-=cut
-
-sub command_type
-{
-      my ($self, $command_type) = @_;
-      $$self{command_type} = $command_type if $command_type;
-      return $$self{command_type};
-}
-
-=item C<extra(data)>
-
-Stores and retrieves the extra value for this message.  For standard messages
-extra is Cmd2.  For extended messages extra is Cmd2 + D1-D14.
-
-=cut
-
-sub extra
-{
-      my ($self, $extra) = @_;
-      $$self{extra} = $extra if $extra;
-      return $$self{extra};
-}
-
-=item C<send_timeout()>
-
-Calculates and returns the number of milliseconds that MisterHouse should wait
-for this message to be delivered.  The time is based on message type, command type, 
-and hop count.
-
-    Peek Related Messages = 4000
-    PLM Scene Commands    = 3000
-          Ext   /  Std
-    0 Hop 2220    1400
-    1 Hop 2690    1700
-    2 Hop 3000    1900
-    3 Hop 3170    2000
-
-These times were intially calculated by Gregg Limming and appear to have been 
-calculated based on experience.  In reality each hop of a standard message 
-should take 50 ms and 108 for extended messages.  Each time needs to be at least
-doubled to compensate for the return hops as well.
-
-In reality, the PLM and even some Insteon devices appear to react much slower
-than the spec defines.  These settings generally appear to work without causing 
-errors or too much undue delay.
-
-=cut
-
-sub send_timeout
-{
-	my ($self, $ignore) = @_;
-        my $hop_count = (ref $self->setby and $self->setby->isa('Insteon::BaseObject')) ?
-        			$self->setby->default_hop_count : $self->send_attempts;
-        my $timeout = 1400;
-	if($self->command eq 'peek' || $self->command eq 'set_address_msb')
-	{
-		$timeout = 4000;
-	}
-        elsif ($self->command_type eq 'all_link_send')
-        {
-        	# note, the following was set to 2000 and that was insufficient
-        	$timeout = 3000;
-        }
-        elsif ($self->command_type eq 'insteon_ext_send')
-        {
-        	if ($hop_count == 0)
-                {
-                	$timeout = 2220;
-                }
-                elsif ($hop_count == 1)
-                {
-                	$timeout = 2690;
-                }
-                elsif ($hop_count == 2)
-                {
-                	$timeout = 3000;
-                }
-                elsif ($hop_count >= 3)
-                {
-                	$timeout = 3170;
-                }
-        }
-        else
-        {
-        	if ($hop_count == 0)
-                {
-                	$timeout = 1400;
-                }
-                elsif ($hop_count == 1)
-                {
-                	$timeout = 1700;
-                }
-                elsif ($hop_count == 2)
-                {
-                	$timeout = 1900;
-                }
-                elsif ($hop_count >= 3)
-                {
-                	$timeout = 2000;
-                }
-        }
-        if (ref $self->setby and $self->setby->isa('Insteon::BaseObject')){
-        	$timeout = int($timeout * $self->setby->timeout_factor);
-        }
-        return $timeout;
-}
-
-=item C<to_string()>
-
-Returns text based human readable representation of the message.
-
-=cut
-
-sub to_string
-{
-	my ($self) = @_;
-        my $result = '';
-        if ($self->setby)
-        {
-        	$result .= 'obj=' . $self->setby->get_object_name;
-        }
-        if ($result)
-        {
-        	$result .= '; ';
-        }
-        if ($self->command)
-        {
-        	$result .= 'command=' . $self->command;
-        }
-        else
-        {
-        	$result .= 'interface_data=' . $self->interface_data;
-        }
-        if ($self->extra)
-        {
-        	$result .= '; extra=' . $self->extra;
-        }
-
-        return $result;
-}
-
-=item C<interface_data(data)>
-
-Stores data as the hexadecimal message, or if data is not specified, then derives
-the hexadecimal message and returns it.
-
-=cut
-
-sub interface_data
-{
-	my ($self, $interface_data) = @_;
-        my $result = $self->SUPER::interface_data($interface_data);
-        if (!($result) &&
-        	(($self->command_type eq 'insteon_send')
-                or ($self->command_type eq 'insteon_ext_send')
-                or ($self->command_type eq 'all_link_send')
-                or ($self->command_type eq 'all_link_direct_cleanup')))
-        {
-        	return $self->_derive_interface_data();
-        }
-        else
-        {
-        	return $result;
-        }
-}
-
-=item C<_derive_interface_data()>
-
-Converts all of the attributes set for this message into a hexadecimal message
-that can be sent to the PLM.  Will add checksums and crcs when necessary.
-
-=cut
-
-sub _derive_interface_data
-{
-
-	my ($self) = @_;
-	my $cmd = '';
-	my $level;
-        if ($self->command_type =~ /all_link_send/i)
-        {
-		$cmd.=$self->setby->group;
-	}
-        else
-        {
-       		my $hop_count = $self->setby->default_hop_count;
-		$cmd.=$self->setby->device_id();
-		if ($self->command_type =~ /insteon_ext_send/i)
-                {
-                        if ($hop_count == 0)
-			{
-				$cmd.='10';
-			}
-			elsif ($hop_count == 1)
-                        {
-				$cmd.='15';
-                        }
-                        elsif ($hop_count == 2)
-                        {
-				$cmd.='1A';
-                        }
-                        elsif ($hop_count >= 3)
-                        {
-				$cmd.='1F';
-                        }
-		} elsif ($self->command_type =~ /all_link_direct_cleanup/i){
-			if ($hop_count == 0)
-			{
-				$cmd.='40';
-			}
-			elsif ($hop_count == 1)
-                        {
-				$cmd.='45';
-                        }
-                        elsif ($hop_count == 2)
-                        {
-				$cmd.='4A';
-                        }
-                        elsif ($hop_count >= 3)
-                        {
-				$cmd.='4F';
-                        }
-		}
-                else
-                {
-                        if ($hop_count == 0)
-			{
-				$cmd.='00';
-			}
-			elsif ($hop_count == 1)
-                        {
-				$cmd.='05';
-                        }
-                        elsif ($hop_count == 2)
-                        {
-				$cmd.='0A';
-                        }
-                        elsif ($hop_count >= 3)
-                        {
-				$cmd.='0F';
-                        }
-		}
-	}
-	$cmd.= unpack("H*",pack("C",$self->setby->message_type_code($self->command)));
-	if ($self->extra)
-	{
-		$cmd.= $self->extra;
-	}
-        elsif ($self->command_type eq 'insteon_send')
-        { # auto append '00' if no extra defined for a standard insteon send
-        	$cmd .= '00';
-        }
-
-	if( $self->command_type eq 'insteon_ext_send' and $$self{add_crc16}){
-		if( length($cmd) < 40) {
-			main::print_log("[Insteon::InsteonMessage] WARN: insert_crc16 "
-				. "failed; cmd to short: $cmd");
-		} else {
-			$cmd = substr($cmd,0,36).calculate_crc16(substr($cmd,8,28));
-		}
-	}
-	elsif( $self->command_type eq 'insteon_ext_send' and $self->setby->engine_version eq 'I2CS') {
-	        #$message is the entire insteon command (no 0262 PLM command)
-	        # i.e. '02622042d31f2e000107110000000000000000000000'
-	        #                     111111111122222222223333333333
-	        #           0123456789012345678901234567890123456789
-	        #          '2042d31f2e000107110000000000000000000000'
-		if( length($cmd) < 40) {
-			main::print_log("[Insteon::InsteonMessage] WARN: insert_checksum "
-				. "failed; cmd to short: $cmd");
-		} else {
-			$cmd = substr($cmd,0,38).calculate_checksum(substr($cmd,8,30));
-		}
-	}
-
-	return $cmd;
-
-}
-
-=item C<calculate_checksum( string )>
-
-Calculates a checksum of all hex bytes in the string.  Returns two hex nibbles
-that represent the checksum in hex.  One useful characteristic of the checksum
-is that summing over all the bytes "including" the checksum will always equal 00. 
-This makes it very easy to validate a checksum.
-
-=cut
-
-sub calculate_checksum {
-	my ($string) = @_;
-
-	#returns 2 characters as hex nibbles (e.g. AA)
-	my $sum = 0;
-	$sum += hex($_) for (unpack('(A2)*', $string));
-	return unpack( 'H2', chr((~$sum + 1) & 0xff));
-}
-
-=item C<calculate_crc16( string )>
-
-Calculates a two byte CRC value of string.  This two byte CRC differs from the 
-one byte checksum used in other extended commands. This CRC calculation is known
-to be used by the 2441TH Insteon Thermostat as well as the iMeter INSTEON device. 
-It may be used by other devices in the future.
- 
-The calculation if the crc value involves data bytes from command 1 to the data 12 
-byte. This function will return two bytes, which are generally added to the 
-data 13 & 14 bytes in an extended message.
-
-To add a crc16 to a message set the $$message{add_crc16} flag to true.
-
-=cut
-
-sub calculate_crc16
-{
-	#This function is nearly identical to the C++ sample provided by 
-	#smartlabs, with only minor modifications to make it work in perl
-	my ($string) = @_;
-	my $crc = 0;
-	for(unpack('(A2)*', $string))
-	{
-		my $byte = hex($_);
-	
-		for(my $bit = 0;$bit < 8;$bit++)
-		{ 
-			my $fb = $byte & 1;
-			$fb = ($crc & 0x8000) ? $fb ^ 1 : $fb;
-			$fb = ($crc & 0x4000) ? $fb ^ 1 : $fb;
-			$fb = ($crc & 0x1000) ? $fb ^ 1 : $fb;
-			$fb = ($crc & 0x0008) ? $fb ^ 1 : $fb;
-			$crc = (($crc << 1) & 0xFFFF) | $fb;
-			$byte = $byte >> 1;
-		}
-	}
-	return uc(sprintf("%x", $crc));
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Limming, Kevin Robert Keegan, Michael Stovenour
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-=head1 B<Insteon::X10Message>
-
-=head2 DESCRIPTION
-
-Main class for all L<Insteon|Insteon> X10 messages.
-
-=head2 INHERITS
-
-L<Insteon::BaseMessage|Insteon::Message/Insteon::BaseMessage>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon::X10Message;
-use strict;
-
-@Insteon::X10Message::ISA = ('Insteon::BaseMessage');
-
-my %x10_house_codes = (
-						a => 0x6,
-						b => 0xE,
-						c => 0x2,
-						d => 0xA,
-						e => 0x1,
-						f => 0x9,
-						g => 0x5,
-						h => 0xD,
-						i => 0x7,
-						j => 0xF,
-						k => 0x3,
-						l => 0xB,
-						m => 0x0,
-						n => 0x8,
-						o => 0x4,
-						p => 0xC
-);
-
-my %mh_house_codes = (
-						'6' => 'a',
-						'e' => 'b',
-						'2' => 'c',
-						'a' => 'd',
-						'1' => 'e',
-						'9' => 'f',
-						'5' => 'g',
-						'd' => 'h',
-						'7' => 'i',
-						'f' => 'j',
-						'3' => 'k',
-						'b' => 'l',
-						'0' => 'm',
-						'8' => 'n',
-						'4' => 'o',
-						'c' => 'p'
-);
-
-my %x10_unit_codes = (
-						1 => 0x6,
-						2 => 0xE,
-						3 => 0x2,
-						4 => 0xA,
-						5 => 0x1,
-						6 => 0x9,
-						7 => 0x5,
-						8 => 0xD,
-						9 => 0x7,
-						10 => 0xF,
-						a => 0xF,
-						11 => 0x3,
-						b => 0x3,
-						12 => 0xB,
-						c => 0xB,
-						13 => 0x0,
-						d => 0x0,
-						14 => 0x8,
-						e => 0x8,
-						15 => 0x4,
-						f => 0x4,
-						16 => 0xC,
-						g => 0xC
-
-);
-
-my %mh_unit_codes = (
-						'6' => '1',
-						'e' => '2',
-						'2' => '3',
-						'a' => '4',
-						'1' => '5',
-						'9' => '6',
-						'5' => '7',
-						'd' => '8',
-						'7' => '9',
-						'f' => 'a',
-						'3' => 'b',
-						'b' => 'c',
-						'0' => 'd',
-						'8' => 'e',
-						'4' => 'f',
-						'c' => 'g'
-);
-
-my %x10_commands = (
-						on => 0x2,
-						j => 0x2,
-						off => 0x3,
-						k => 0x3,
-						bright => 0x5,
-						l => 0x5,
-						dim => 0x4,
-						m => 0x4,
-						preset_dim1 => 0xA,
-						preset_dim2 => 0xB,
-						all_off => 0x0,
-                                                p => 0x0,
-						all_lights_on => 0x1,
-                                                o => 0x1,
-						all_lights_off => 0x6,
-						status => 0xF,
-						status_on => 0xD,
-						status_off => 0xE,
-						hail_ack => 0x9,
-						ext_code => 0x7,
-						ext_data => 0xC,
-						hail_request => 0x8
-);
-
-my %mh_commands = (
-						'2' => 'J',
-						'3' => 'K',
-						'5' => 'L',
-						'4' => 'M',
-						'a' => 'preset_dim1',
-						'b' => 'preset_dim2',
-#						'0' => 'all_off',
-                                                '0' => 'P',
-#						'1' => 'all_lights_on',
-                                                '1' => 'O',
-						'6' => 'all_lights_off',
-						'f' => 'status',
-						'd' => 'status_on',
-						'e' => 'status_off',
-						'9' => 'hail_ack',
-						'7' => 'ext_code',
-						'c' => 'ext_data',
-						'8' => 'hail_request'
-);
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new
-{
-	my ($class, $interface_data) = @_;
-	my $self= new Insteon::BaseMessage();
-	bless $self,$class;
-
-        $self->interface_data($interface_data);
-        $self->send_timeout(2000);
-
-        return $self;
-}
-
-=item C<get_formatted_data()>
-
-Converts an X10 message from the interface into the generic humand readable X10 
-message format.
-
-=cut
-
-sub get_formatted_data
-{
-	my ($self) = @_;
-
-        my $data = $self->interface_data;
-
-	my $msg=undef;
-	if (uc(substr($data,length($data)-2,2)) eq '00')
-	{
-		$msg = "X";
-		$msg.= uc($mh_house_codes{substr($data,4,1)});
-		$msg.= uc($mh_unit_codes{substr($data,5,1)});
-		for (my $index =6; $index<length($data)-2; $index+=2)
-		{
-   	        $msg.= uc($mh_house_codes{substr($data,$index,1)});
-		    $msg.= uc($mh_commands{substr($data,$index+1,1)});
-		}
-	} elsif (uc(substr($data,length($data)-2,2)) eq '80')
-	{
-		$msg = "X";
-		$msg.= uc($mh_house_codes{substr($data,4,1)});
-		$msg.= uc($mh_commands{substr($data,5,1)});
-		for (my $index =6; $index<length($data)-2; $index+=2)
-		{
-   	        $msg.= uc($mh_house_codes{substr($data,$index,1)});
-		    $msg.= uc($mh_commands{substr($data,$index+1,1)});
-		}
-	}
-
-	return $msg;
-}
-
-=item C<generate_commands()>
-
-Generates and returns the X10 hexadecimal message for sending to the PLM.
-
-=cut
-
-sub generate_commands
-{
-	my ($p_state, $p_setby) = @_;
-
-        my @data = ();
-
-        my $cmd=$p_state;
-        $cmd=~ s/\:.*$//;
-        $cmd=lc($cmd);
-        my $msg;
-
-	my $id=lc($p_setby->{id_by_state}{$cmd});
-
-	my $hc = lc(substr($p_setby->{x10_id},1,1));
-	my $uc = lc(substr($p_setby->{x10_id},2,1));
-
-	if ($hc eq undef) {
-	    &main::print_log("[Insteon::Message] Object:$p_setby Doesnt have an x10 id (yet)");
-		return undef;
-	}
-
-	if ($uc eq undef) {
-	    &main::print_log("[Insteon::Message] Message is for entire HC") if (ref $p_setby && $p_setby->debuglevel(1,'insteon'));
-	}
-	else {
-
-	    #Every X10 message starts with the House and unit code
-	    $msg = substr(unpack("H*",pack("C",$x10_house_codes{substr($id,1,1)})),1,1);
-	    $msg.= substr(unpack("H*",pack("C",$x10_unit_codes{substr($id,2,1)})),1,1);
-	    $msg.= "00";
-	    &main::print_log("[Insteon_PLM] x10 sending code: " . uc($hc . $uc) . " as insteon msg: "
-			     . $msg) if (ref $p_setby && $p_setby->debuglevel(1,'insteon'));
-
-            push @data, $msg;
-	}
-
-	my $ecmd;
-	#Iterate through the rest of the pairs of nibbles
-	my $spos = 3;
-	if ($uc eq undef) {$spos=1;}
-#	&::print_log("PLM:PAIR:$id:$spos:$ecmd:");
-	for (my $pos = $spos; $pos<length($id); $pos++) {
-	    $msg = substr(unpack("H*",pack("C",$x10_house_codes{substr($id,$pos,1)})),1,1);
-	    $pos++;
-
-	    #look for an explicit command
-	    $ecmd = substr($id,$pos,length($id)-$pos);
-	    my $x10_arg = $ecmd;
-	    if (defined $x10_commands{$ecmd} )
-	    {
-		$msg.= substr(unpack("H*",pack("C",$x10_commands{$ecmd})),1,1);
-		$pos+=length($id)-$pos-1;
-	    } else {
-		$x10_arg = $x10_commands{substr($id,$pos,1)};
-		$msg.= substr(unpack("H*",pack("C",$x10_commands{substr($id,$pos,1)})),1,1);
-	    }
-	    $msg.= "80";
-
-     	    &main::print_log("[Insteon_PLM] x10 sending code: " . uc($hc . $x10_arg) . " as insteon msg: "
-			     . $msg) if (ref $p_setby && $p_setby->debuglevel(1,'insteon'));
-
-            push @data, $msg;
-
-	}
-
-        return @data;
-}
-
-=back
-
-=head2 AUTHOR
-
-Gregg Limming
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-1;
+=head1 B<Insteon::BaseMessage>
+
+=head2 DESCRIPTION
+
+Generic base class for L<Insteon|Insteon> object messages, including 
+L<Insteon::X10Message|Insteon::Message/Insteon::X10Message>.  Primarily just 
+stores variables for the object.
+
+=head2 INHERITS
+
+Nothing
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::BaseMessage;
+
+use strict;
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class) = @_;
+	my $self={};
+	bless $self,$class;
+
+        $$self{queue_time} = &main::get_tickcount;
+        $$self{send_attempts} = 0;
+
+        return $self;
+}
+
+=item C<interface_data(data)>
+
+Save and retrieve the interface data defined by C<interface_data()>.
+
+=cut
+
+sub interface_data
+{
+	my ($self, $interface_data) = @_;
+        if ($interface_data)
+        {
+        	$$self{interface_data} = $interface_data;
+        }
+        return $$self{interface_data};
+}
+
+=item C<queue_time(data)>
+
+Stores the time at which a message was added to the queue.  Used for calculating
+how long a message was delayed.
+
+=cut
+
+sub queue_time
+{
+	my ($self, $queue_time) = @_;
+        if ($queue_time)
+        {
+        	$$self{queue_time} = $queue_time;
+        }
+        return $$self{queue_time};
+}
+
+=item C<callback(data)>
+
+Data will be evaluated each time the message is sent.
+
+=cut
+
+sub callback
+{
+	my ($self, $callback) = @_;
+        if ($callback)
+        {
+        	$$self{callback} = $callback;
+        }
+        return $$self{callback};
+}
+
+=item C<failure_callback(data)>
+
+Data will be evaluated if the maximum number of retry attempts has been made 
+and the message is not acknowledged.
+
+=cut
+
+sub failure_callback
+{
+	my ($self, $callback) = @_;
+        if ($callback)
+        {
+        	$$self{failure_callback} = $callback;
+        }
+        return $$self{failure_callback};
+}
+
+=item C<success_callback(data)>
+
+Data will be evaluated after the receipt of an ACK from the device for this command.
+
+=cut
+
+sub success_callback
+{
+	my ($self, $callback) = @_;
+        if (defined $callback)
+        {
+        	$$self{success_callback} = $callback;
+        }
+        return $$self{success_callback};
+}
+
+=item C<send_attempts(data)>
+
+Stores and retrieves the number of times Misterhouse has tried to send the message.
+
+=cut
+
+sub send_attempts
+{
+	my ($self, $send_attempts) = @_;
+        if ($send_attempts)
+        {
+        	$$self{send_attempts} = $send_attempts;
+        }
+        return $$self{send_attempts};
+}
+
+=item C<setby(data)>
+
+Stores and retrieves what the source of this message was.
+
+=cut
+
+sub setby
+{
+	my ($self, $setby) = @_;
+        if ($setby)
+        {
+        	$$self{setby} = $setby;
+        }
+        return $$self{setby};
+}
+
+=item C<respond(data)>
+
+Stores and retrieves respond variable.
+
+=cut
+
+sub respond
+{
+	my ($self, $respond) = @_;
+        if ($respond)
+        {
+        	$$self{respond} = $respond;
+        }
+        return $$self{respond};
+}
+
+
+=item C<no_hop_increase(data)>
+
+Stores and retrieves no_hop_increase variable, if set to true, when the message
+is retried, no additional hops will be added.  Typically used where the failure 
+to deliver the last message attempt was not caused by a failure of the object 
+to receive the message such as when the PLM is too busy to even attempt sending
+the message.
+
+=cut
+
+sub no_hop_increase
+{
+	my ($self, $no_hop_increase) = @_;
+        if ($no_hop_increase)
+        {
+        	$$self{no_hop_increase} = $no_hop_increase;
+        }
+        return $$self{no_hop_increase};
+}
+
+=item C<retry_count(data)>
+
+Stores and retrieves the number of times MisterHouse should try to deliver this 
+message.  If B<Insteon_retry_count> is set in the ini parameters will default 
+to that value, otherwise defaults to 5.  Some messages types have specific 
+retry counts, such as L<Insteon::RemoteLinc|Insteon::Controller/Insteon::RemoteLinc>
+battery level requests which are only sent once.
+
+=cut
+
+sub retry_count {
+	my ($self, $retry_count) = @_;
+	if ($retry_count)
+	{
+		$$self{retry_count} = $retry_count;
+	}
+	my $result_retry = 5;
+	$result_retry = $::config_parms{'Insteon_retry_count'} if ($::config_parms{'Insteon_retry_count'});
+	$result_retry = $$self{retry_count} if ($$self{retry_count});
+	return $result_retry;
+}
+
+=item C<send(p_interface)>
+
+Sends this message using the interface p_interface.  If C<send_attempts> is 
+greater than 0 then 
+L<Insteon::BaseObject::default_hop_count|Insteon::BaseInsteon/Insteon::BaseObject> 
+is increase by one.  Calls C<callback()>
+when the message is sent.  
+
+Returns 1 if message sent or 0 if message retry count exceeds C<retry_count()>.
+
+=cut
+
+sub send
+{
+        my ($self, $interface) = @_;
+        if ($self->send_attempts < $self->retry_count)
+        {
+
+        	if ($self->send_attempts > 0)
+                {
+                	&::print_log("[Insteon::BaseMessage] WARN: now resending "
+                        	. $self->to_string() . " after " . $self->send_attempts
+                        	. " attempts.") if $self->setby->debuglevel(1, 'insteon');
+                        # revise default hop count to reflect retries
+                        if (ref $self->setby && $self->setby->isa('Insteon::BaseObject') 
+                        	&& !defined($$self{no_hop_increase}))
+                        {
+                        	$self->setby->retry_count_log(1) if $self->setby->can('retry_count_log');
+                        	if ($self->setby->default_hop_count < 3)
+                                {
+                                	$self->setby->default_hop_count($self->setby->default_hop_count + 1);
+                                }
+                        }
+                        elsif (defined($$self{no_hop_increase}) && ref $self->setby
+                        	&& $self->setby->isa('Insteon::BaseObject')){
+                        	&main::print_log("[Insteon::BaseMessage] Hop count not increased for "
+                        		. $self->setby->get_object_name . " because no_hop_increase flag was set.")
+                        		if $self->setby->debuglevel(1, 'insteon');
+                        	$$self{no_hop_increase} = undef;
+                        }
+                }
+
+                # need to set timeout as a function of retries; also need to alter hop count
+                if ($self->send_attempts <= 0 && ref $self->setby) {
+                    $self->setby->outgoing_count_log(1) if $self->setby->can('outgoing_count_log');
+                    $self->setby->outgoing_hop_count($self->setby->default_hop_count)
+                    	if $self->setby->can('outgoing_hop_count');
+                }
+                $self->send_attempts($self->send_attempts + 1);
+		$interface->_send_cmd($self, $self->send_timeout);
+		if ($self->callback)
+                {
+			package main;
+			eval $self->callback;
+			&::print_log("[Insteon::BaseMessage] problem w/ retry callback: $@") if $@;
+			package Insteon::Message;
+		}
+                return 1;
+        }
+        else
+        {
+                return 0;
+        }
+
+}
+
+=item C<seconds_delayed()>
+
+Returns the number of seconds that elapsed between time set in C<queue_time>
+and when this routine was called.
+
+=cut
+
+sub seconds_delayed
+{
+	my ($self) = @_;
+	my $current_tickcount = &main::get_tickcount;
+        my $delay_time = $current_tickcount - $self->queue_time;
+       	if ($self->queue_time > $current_tickcount)
+       	{
+        	return 'unknown';
+       	}
+
+        $delay_time = $delay_time / 1000;
+        return $delay_time;
+}
+
+=item C<send_timeout(p_timeout)>
+
+Stores and returns the number of milliseconds, p_timeout, that MisterHouse
+should wait before retrying this message again.
+
+=cut
+
+sub send_timeout
+{
+	my ($self, $timeout) = @_;
+        $$self{send_timeout} = $timeout if defined $timeout;
+        return $$self{send_timeout};
+}
+
+=item C<to_string()>
+
+Returns the hexadecimal representation of the message.
+
+=cut
+
+sub to_string
+{
+	my ($self) = @_;
+        return $self->interface_data;
+}
+
+=back
+
+=head2 INI PARAMETERS
+
+=over
+
+=item Insteon_retry_count
+
+Sets the number of times MisterHouse will attempt to resend a message that has
+not been acknowledged.  The default setting is 5.
+
+=back
+
+=head2 AUTHOR
+
+Gregg Limming, Kevin Robert Keegan
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+=head1 B<Insteon::InsteonMessage>
+
+=head2 DESCRIPTION
+
+Main class for all L<Insteon|Insteon> messages.
+
+=head2 INHERITS
+
+L<Insteon::BaseMessage|Insteon::Message/Insteon::BaseMessage>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::InsteonMessage;
+use strict;
+
+@Insteon::InsteonMessage::ISA = ('Insteon::BaseMessage');
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class, $command_type, $setby, $command, $extra) = @_;
+	my $self= new Insteon::BaseMessage();
+	bless $self,$class;
+
+        $self->command_type($command_type);
+        $self->setby($setby);
+        $self->command($command);
+        $self->extra($extra);
+        $self->send_timeout(2000);
+
+        return $self;
+}
+
+=item C<command_to_hash(msg)>
+
+Takes msg, a hexadecimal message, and returns a hash of the message details.
+
+=cut
+
+sub command_to_hash
+{
+	my ($p_state) = @_;
+	my %msg = ();
+	my $hopflag = hex(uc substr($p_state,13,1));
+	$msg{maxhops} = $hopflag&0b0011;
+	$msg{hopsleft} = $hopflag >> 2;
+	my $msgflag = hex(uc substr($p_state,12,1));
+	$msg{is_extended} = (0x01 & $msgflag) ? 1 : 0;
+	$msg{cmd_code} = substr($p_state,14,2);
+	$msg{crc_valid} = 1;
+	if ($msg{is_extended})
+        {
+		$msg{type} = 'direct';
+		$msg{source} = substr($p_state,0,6);
+		$msg{destination} = substr($p_state,6,6);
+		$msg{extra} = substr($p_state,16,length($p_state)-16);
+		$msg{crc_valid} = (calculate_checksum($msg{cmd_code}.$msg{extra}) eq '00');
+	}
+        else
+        {
+		$msg{source} = substr($p_state,0,6);
+		$msgflag = $msgflag >> 1;
+		if ($msgflag == 4)
+                {
+			$msg{type} = 'broadcast';
+			$msg{devcat} = substr($p_state,6,4);
+			$msg{firmware} = substr($p_state,10,2);
+			$msg{is_master} = substr($p_state,16,2);
+			$msg{dev_attribs} = substr($p_state,18,2);
+		}
+                elsif ($msgflag ==6)
+                {
+			$msg{type} = 'alllink';
+			$msg{group} = substr($p_state,10,2);
+			$msg{extra} = substr($p_state,16,2) 
+				if (length($p_state) >= 18);
+		}
+                else
+                {
+			$msg{destination} = substr($p_state,6,6);
+			if ($msgflag == 2)
+                        {
+				$msg{type} = 'cleanup';
+				$msg{group} = substr($p_state,16,2);
+			}
+                        elsif ($msgflag == 3)
+                        {
+				$msg{type} = 'cleanup';
+				$msg{is_ack} = 1;
+                                # the "extra" value will contain the controller's group ID
+				$msg{extra} = substr($p_state,16,2);
+			}
+                        elsif ($msgflag == 7)
+                        {
+				$msg{type} = 'cleanup';
+				$msg{is_nack} = 1;
+				$msg{extra} = substr($p_state,16,2);
+			}
+                        elsif ($msgflag == 0)
+                        {
+				$msg{type} = 'direct';
+				$msg{extra} = substr($p_state,16,2);
+			}
+                        elsif ($msgflag == 1)
+                        {
+				$msg{type} = 'direct';
+				$msg{is_ack} = 1;
+				$msg{extra} = substr($p_state,16,2);
+			}
+                        elsif ($msgflag == 5)
+                        {
+				$msg{type} = 'direct';
+				$msg{is_nack} = 1;
+				$msg{extra} = substr($p_state,16,2);
+			}
+		}
+	}
+
+	return %msg;
+}
+
+=item C<command(data)>
+
+Stores and retrieves the Cmd1 value for this message.
+
+=cut
+
+sub command
+{
+      my ($self, $command) = @_;
+      $$self{command} = $command if $command;
+      return $$self{command};
+}
+
+=item C<command_type(data)>
+
+Stores and retrieves the Command Type value for this message.
+
+=cut
+
+sub command_type
+{
+      my ($self, $command_type) = @_;
+      $$self{command_type} = $command_type if $command_type;
+      return $$self{command_type};
+}
+
+=item C<extra(data)>
+
+Stores and retrieves the extra value for this message.  For standard messages
+extra is Cmd2.  For extended messages extra is Cmd2 + D1-D14.
+
+=cut
+
+sub extra
+{
+      my ($self, $extra) = @_;
+      $$self{extra} = $extra if $extra;
+      return $$self{extra};
+}
+
+=item C<send_timeout()>
+
+Calculates and returns the number of milliseconds that MisterHouse should wait
+for this message to be delivered.  The time is based on message type, command type, 
+and hop count.
+
+    Peek Related Messages = 4000
+    PLM Scene Commands    = 3000
+          Ext   /  Std
+    0 Hop 2220    1400
+    1 Hop 2690    1700
+    2 Hop 3000    1900
+    3 Hop 3170    2000
+
+These times were intially calculated by Gregg Limming and appear to have been 
+calculated based on experience.  In reality each hop of a standard message 
+should take 50 ms and 108 for extended messages.  Each time needs to be at least
+doubled to compensate for the return hops as well.
+
+In reality, the PLM and even some Insteon devices appear to react much slower
+than the spec defines.  These settings generally appear to work without causing 
+errors or too much undue delay.
+
+=cut
+
+sub send_timeout
+{
+	my ($self, $ignore) = @_;
+        my $hop_count = (ref $self->setby and $self->setby->isa('Insteon::BaseObject')) ?
+        			$self->setby->default_hop_count : $self->send_attempts;
+        my $timeout = 1400;
+	if($self->command eq 'peek' || $self->command eq 'set_address_msb')
+	{
+		$timeout = 4000;
+	}
+        elsif ($self->command_type eq 'all_link_send')
+        {
+        	# note, the following was set to 2000 and that was insufficient
+        	$timeout = 3000;
+        }
+        elsif ($self->command_type eq 'insteon_ext_send')
+        {
+        	if ($hop_count == 0)
+                {
+                	$timeout = 2220;
+                }
+                elsif ($hop_count == 1)
+                {
+                	$timeout = 2690;
+                }
+                elsif ($hop_count == 2)
+                {
+                	$timeout = 3000;
+                }
+                elsif ($hop_count >= 3)
+                {
+                	$timeout = 3170;
+                }
+        }
+        else
+        {
+        	if ($hop_count == 0)
+                {
+                	$timeout = 1400;
+                }
+                elsif ($hop_count == 1)
+                {
+                	$timeout = 1700;
+                }
+                elsif ($hop_count == 2)
+                {
+                	$timeout = 1900;
+                }
+                elsif ($hop_count >= 3)
+                {
+                	$timeout = 2000;
+                }
+        }
+        if (ref $self->setby and $self->setby->isa('Insteon::BaseObject')){
+        	$timeout = int($timeout * $self->setby->timeout_factor);
+        }
+        return $timeout;
+}
+
+=item C<to_string()>
+
+Returns text based human readable representation of the message.
+
+=cut
+
+sub to_string
+{
+	my ($self) = @_;
+        my $result = '';
+        if ($self->setby)
+        {
+        	$result .= 'obj=' . $self->setby->get_object_name;
+        }
+        if ($result)
+        {
+        	$result .= '; ';
+        }
+        if ($self->command)
+        {
+        	$result .= 'command=' . $self->command;
+        }
+        else
+        {
+        	$result .= 'interface_data=' . $self->interface_data;
+        }
+        if ($self->extra)
+        {
+        	$result .= '; extra=' . $self->extra;
+        }
+
+        return $result;
+}
+
+=item C<interface_data(data)>
+
+Stores data as the hexadecimal message, or if data is not specified, then derives
+the hexadecimal message and returns it.
+
+=cut
+
+sub interface_data
+{
+	my ($self, $interface_data) = @_;
+        my $result = $self->SUPER::interface_data($interface_data);
+        if (!($result) &&
+        	(($self->command_type eq 'insteon_send')
+                or ($self->command_type eq 'insteon_ext_send')
+                or ($self->command_type eq 'all_link_send')
+                or ($self->command_type eq 'all_link_direct_cleanup')))
+        {
+        	return $self->_derive_interface_data();
+        }
+        else
+        {
+        	return $result;
+        }
+}
+
+=item C<_derive_interface_data()>
+
+Converts all of the attributes set for this message into a hexadecimal message
+that can be sent to the PLM.  Will add checksums and crcs when necessary.
+
+=cut
+
+sub _derive_interface_data
+{
+
+	my ($self) = @_;
+	my $cmd = '';
+	my $level;
+        if ($self->command_type =~ /all_link_send/i)
+        {
+		$cmd.=$self->setby->group;
+	}
+        else
+        {
+       		my $hop_count = $self->setby->default_hop_count;
+		$cmd.=$self->setby->device_id();
+		if ($self->command_type =~ /insteon_ext_send/i)
+                {
+                        if ($hop_count == 0)
+			{
+				$cmd.='10';
+			}
+			elsif ($hop_count == 1)
+                        {
+				$cmd.='15';
+                        }
+                        elsif ($hop_count == 2)
+                        {
+				$cmd.='1A';
+                        }
+                        elsif ($hop_count >= 3)
+                        {
+				$cmd.='1F';
+                        }
+		} elsif ($self->command_type =~ /all_link_direct_cleanup/i){
+			if ($hop_count == 0)
+			{
+				$cmd.='40';
+			}
+			elsif ($hop_count == 1)
+                        {
+				$cmd.='45';
+                        }
+                        elsif ($hop_count == 2)
+                        {
+				$cmd.='4A';
+                        }
+                        elsif ($hop_count >= 3)
+                        {
+				$cmd.='4F';
+                        }
+		}
+                else
+                {
+                        if ($hop_count == 0)
+			{
+				$cmd.='00';
+			}
+			elsif ($hop_count == 1)
+                        {
+				$cmd.='05';
+                        }
+                        elsif ($hop_count == 2)
+                        {
+				$cmd.='0A';
+                        }
+                        elsif ($hop_count >= 3)
+                        {
+				$cmd.='0F';
+                        }
+		}
+	}
+	$cmd.= unpack("H*",pack("C",$self->setby->message_type_code($self->command)));
+	if ($self->extra)
+	{
+		$cmd.= $self->extra;
+	}
+        elsif ($self->command_type eq 'insteon_send')
+        { # auto append '00' if no extra defined for a standard insteon send
+        	$cmd .= '00';
+        }
+
+	if( $self->command_type eq 'insteon_ext_send' and $$self{add_crc16}){
+		if( length($cmd) < 40) {
+			main::print_log("[Insteon::InsteonMessage] WARN: insert_crc16 "
+				. "failed; cmd to short: $cmd");
+		} else {
+			$cmd = substr($cmd,0,36).calculate_crc16(substr($cmd,8,28));
+		}
+	}
+	elsif( $self->command_type eq 'insteon_ext_send' and $self->setby->engine_version eq 'I2CS') {
+	        #$message is the entire insteon command (no 0262 PLM command)
+	        # i.e. '02622042d31f2e000107110000000000000000000000'
+	        #                     111111111122222222223333333333
+	        #           0123456789012345678901234567890123456789
+	        #          '2042d31f2e000107110000000000000000000000'
+		if( length($cmd) < 40) {
+			main::print_log("[Insteon::InsteonMessage] WARN: insert_checksum "
+				. "failed; cmd to short: $cmd");
+		} else {
+			$cmd = substr($cmd,0,38).calculate_checksum(substr($cmd,8,30));
+		}
+	}
+
+	return $cmd;
+
+}
+
+=item C<calculate_checksum( string )>
+
+Calculates a checksum of all hex bytes in the string.  Returns two hex nibbles
+that represent the checksum in hex.  One useful characteristic of the checksum
+is that summing over all the bytes "including" the checksum will always equal 00. 
+This makes it very easy to validate a checksum.
+
+=cut
+
+sub calculate_checksum {
+	my ($string) = @_;
+
+	#returns 2 characters as hex nibbles (e.g. AA)
+	my $sum = 0;
+	$sum += hex($_) for (unpack('(A2)*', $string));
+	return unpack( 'H2', chr((~$sum + 1) & 0xff));
+}
+
+=item C<calculate_crc16( string )>
+
+Calculates a two byte CRC value of string.  This two byte CRC differs from the 
+one byte checksum used in other extended commands. This CRC calculation is known
+to be used by the 2441TH Insteon Thermostat as well as the iMeter INSTEON device. 
+It may be used by other devices in the future.
+ 
+The calculation if the crc value involves data bytes from command 1 to the data 12 
+byte. This function will return two bytes, which are generally added to the 
+data 13 & 14 bytes in an extended message.
+
+To add a crc16 to a message set the $$message{add_crc16} flag to true.
+
+=cut
+
+sub calculate_crc16
+{
+	#This function is nearly identical to the C++ sample provided by 
+	#smartlabs, with only minor modifications to make it work in perl
+	my ($string) = @_;
+	my $crc = 0;
+	for(unpack('(A2)*', $string))
+	{
+		my $byte = hex($_);
+	
+		for(my $bit = 0;$bit < 8;$bit++)
+		{ 
+			my $fb = $byte & 1;
+			$fb = ($crc & 0x8000) ? $fb ^ 1 : $fb;
+			$fb = ($crc & 0x4000) ? $fb ^ 1 : $fb;
+			$fb = ($crc & 0x1000) ? $fb ^ 1 : $fb;
+			$fb = ($crc & 0x0008) ? $fb ^ 1 : $fb;
+			$crc = (($crc << 1) & 0xFFFF) | $fb;
+			$byte = $byte >> 1;
+		}
+	}
+	return uc(sprintf("%x", $crc));
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Limming, Kevin Robert Keegan, Michael Stovenour
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+=head1 B<Insteon::X10Message>
+
+=head2 DESCRIPTION
+
+Main class for all L<Insteon|Insteon> X10 messages.
+
+=head2 INHERITS
+
+L<Insteon::BaseMessage|Insteon::Message/Insteon::BaseMessage>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon::X10Message;
+use strict;
+
+@Insteon::X10Message::ISA = ('Insteon::BaseMessage');
+
+my %x10_house_codes = (
+						a => 0x6,
+						b => 0xE,
+						c => 0x2,
+						d => 0xA,
+						e => 0x1,
+						f => 0x9,
+						g => 0x5,
+						h => 0xD,
+						i => 0x7,
+						j => 0xF,
+						k => 0x3,
+						l => 0xB,
+						m => 0x0,
+						n => 0x8,
+						o => 0x4,
+						p => 0xC
+);
+
+my %mh_house_codes = (
+						'6' => 'a',
+						'e' => 'b',
+						'2' => 'c',
+						'a' => 'd',
+						'1' => 'e',
+						'9' => 'f',
+						'5' => 'g',
+						'd' => 'h',
+						'7' => 'i',
+						'f' => 'j',
+						'3' => 'k',
+						'b' => 'l',
+						'0' => 'm',
+						'8' => 'n',
+						'4' => 'o',
+						'c' => 'p'
+);
+
+my %x10_unit_codes = (
+						1 => 0x6,
+						2 => 0xE,
+						3 => 0x2,
+						4 => 0xA,
+						5 => 0x1,
+						6 => 0x9,
+						7 => 0x5,
+						8 => 0xD,
+						9 => 0x7,
+						10 => 0xF,
+						a => 0xF,
+						11 => 0x3,
+						b => 0x3,
+						12 => 0xB,
+						c => 0xB,
+						13 => 0x0,
+						d => 0x0,
+						14 => 0x8,
+						e => 0x8,
+						15 => 0x4,
+						f => 0x4,
+						16 => 0xC,
+						g => 0xC
+
+);
+
+my %mh_unit_codes = (
+						'6' => '1',
+						'e' => '2',
+						'2' => '3',
+						'a' => '4',
+						'1' => '5',
+						'9' => '6',
+						'5' => '7',
+						'd' => '8',
+						'7' => '9',
+						'f' => 'a',
+						'3' => 'b',
+						'b' => 'c',
+						'0' => 'd',
+						'8' => 'e',
+						'4' => 'f',
+						'c' => 'g'
+);
+
+my %x10_commands = (
+						on => 0x2,
+						j => 0x2,
+						off => 0x3,
+						k => 0x3,
+						bright => 0x5,
+						l => 0x5,
+						dim => 0x4,
+						m => 0x4,
+						preset_dim1 => 0xA,
+						preset_dim2 => 0xB,
+						all_off => 0x0,
+                                                p => 0x0,
+						all_lights_on => 0x1,
+                                                o => 0x1,
+						all_lights_off => 0x6,
+						status => 0xF,
+						status_on => 0xD,
+						status_off => 0xE,
+						hail_ack => 0x9,
+						ext_code => 0x7,
+						ext_data => 0xC,
+						hail_request => 0x8
+);
+
+my %mh_commands = (
+						'2' => 'J',
+						'3' => 'K',
+						'5' => 'L',
+						'4' => 'M',
+						'a' => 'preset_dim1',
+						'b' => 'preset_dim2',
+#						'0' => 'all_off',
+                                                '0' => 'P',
+#						'1' => 'all_lights_on',
+                                                '1' => 'O',
+						'6' => 'all_lights_off',
+						'f' => 'status',
+						'd' => 'status_on',
+						'e' => 'status_off',
+						'9' => 'hail_ack',
+						'7' => 'ext_code',
+						'c' => 'ext_data',
+						'8' => 'hail_request'
+);
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new
+{
+	my ($class, $interface_data) = @_;
+	my $self= new Insteon::BaseMessage();
+	bless $self,$class;
+
+        $self->interface_data($interface_data);
+        $self->send_timeout(2000);
+
+        return $self;
+}
+
+=item C<get_formatted_data()>
+
+Converts an X10 message from the interface into the generic humand readable X10 
+message format.
+
+=cut
+
+sub get_formatted_data
+{
+	my ($self) = @_;
+
+        my $data = $self->interface_data;
+
+	my $msg=undef;
+	if (uc(substr($data,length($data)-2,2)) eq '00')
+	{
+		$msg = "X";
+		$msg.= uc($mh_house_codes{substr($data,4,1)});
+		$msg.= uc($mh_unit_codes{substr($data,5,1)});
+		for (my $index =6; $index<length($data)-2; $index+=2)
+		{
+   	        $msg.= uc($mh_house_codes{substr($data,$index,1)});
+		    $msg.= uc($mh_commands{substr($data,$index+1,1)});
+		}
+	} elsif (uc(substr($data,length($data)-2,2)) eq '80')
+	{
+		$msg = "X";
+		$msg.= uc($mh_house_codes{substr($data,4,1)});
+		$msg.= uc($mh_commands{substr($data,5,1)});
+		for (my $index =6; $index<length($data)-2; $index+=2)
+		{
+   	        $msg.= uc($mh_house_codes{substr($data,$index,1)});
+		    $msg.= uc($mh_commands{substr($data,$index+1,1)});
+		}
+	}
+
+	return $msg;
+}
+
+=item C<generate_commands()>
+
+Generates and returns the X10 hexadecimal message for sending to the PLM.
+
+=cut
+
+sub generate_commands
+{
+	my ($p_state, $p_setby) = @_;
+
+        my @data = ();
+
+        my $cmd=$p_state;
+        $cmd=~ s/\:.*$//;
+        $cmd=lc($cmd);
+        my $msg;
+
+	my $id=lc($p_setby->{id_by_state}{$cmd});
+
+	my $hc = lc(substr($p_setby->{x10_id},1,1));
+	my $uc = lc(substr($p_setby->{x10_id},2,1));
+
+	if ($hc eq undef) {
+	    &main::print_log("[Insteon::Message] Object:$p_setby Doesnt have an x10 id (yet)");
+		return undef;
+	}
+
+	if ($uc eq undef) {
+	    &main::print_log("[Insteon::Message] Message is for entire HC") if (ref $p_setby && $p_setby->debuglevel(1,'insteon'));
+	}
+	else {
+
+	    #Every X10 message starts with the House and unit code
+	    $msg = substr(unpack("H*",pack("C",$x10_house_codes{substr($id,1,1)})),1,1);
+	    $msg.= substr(unpack("H*",pack("C",$x10_unit_codes{substr($id,2,1)})),1,1);
+	    $msg.= "00";
+	    &main::print_log("[Insteon_PLM] x10 sending code: " . uc($hc . $uc) . " as insteon msg: "
+			     . $msg) if (ref $p_setby && $p_setby->debuglevel(1,'insteon'));
+
+            push @data, $msg;
+	}
+
+	my $ecmd;
+	#Iterate through the rest of the pairs of nibbles
+	my $spos = 3;
+	if ($uc eq undef) {$spos=1;}
+#	&::print_log("PLM:PAIR:$id:$spos:$ecmd:");
+	for (my $pos = $spos; $pos<length($id); $pos++) {
+	    $msg = substr(unpack("H*",pack("C",$x10_house_codes{substr($id,$pos,1)})),1,1);
+	    $pos++;
+
+	    #look for an explicit command
+	    $ecmd = substr($id,$pos,length($id)-$pos);
+	    my $x10_arg = $ecmd;
+	    if (defined $x10_commands{$ecmd} )
+	    {
+		$msg.= substr(unpack("H*",pack("C",$x10_commands{$ecmd})),1,1);
+		$pos+=length($id)-$pos-1;
+	    } else {
+		$x10_arg = $x10_commands{substr($id,$pos,1)};
+		$msg.= substr(unpack("H*",pack("C",$x10_commands{substr($id,$pos,1)})),1,1);
+	    }
+	    $msg.= "80";
+
+     	    &main::print_log("[Insteon_PLM] x10 sending code: " . uc($hc . $x10_arg) . " as insteon msg: "
+			     . $msg) if (ref $p_setby && $p_setby->debuglevel(1,'insteon'));
+
+            push @data, $msg;
+
+	}
+
+        return @data;
+}
+
+=back
+
+=head2 AUTHOR
+
+Gregg Limming
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+1;
diff --git a/lib/Insteon/MessageDecoder.pm b/lib/Insteon/MessageDecoder.pm
index a456dbc25..ee1c2a70b 100644
--- a/lib/Insteon/MessageDecoder.pm
+++ b/lib/Insteon/MessageDecoder.pm
@@ -1,953 +1,953 @@
-package Insteon::MessageDecoder;
-
-use strict;
-
-=head1 NAME
-
-B<Insteon::MessageDecoder> - Static class for decoding Insteon PLM messages
-
-=head1 SYNOPSIS
-
-    use Insteon::MessageDecoder;
-    my $decodedMessage = Insteon::MessageDecoder::plm_decode($plm_string);
-
-=head1 DESCRIPTION
-
-Insteon::MessageDecoder will decode Insteon PLM messages. Functions are 
-provided to decode the PLM envelope, X10 commands, Insteon flags, and 
-Insteon Cmd1/Cmd2 bytes.  User data (D1-D14) of extended messages is not 
-decoded but will be displayed.
-
-=head1 EXAMPLE
-
-    use Insteon::MessageDecoder;
-    my $plm_string;
-    
-    $plm_string = '02621f058c1f2e000100000000000000000000000000';
-    print( "PLM Message: $plm_string\n");
-    print( Insteon::MessageDecoder::plm_decode($plm_string)."\n");
-    
-    $plm_string = '02511f058c1edc30112e000101000020201cfe3f0001000000';
-    print( "PLM Message: $plm_string\n");
-    print( Insteon::MessageDecoder::plm_decode($plm_string)."\n");
-
-=head1 LIMITATIONS
-
-The message decoder is not perfect.  It does not keep message state and 
-several of the Insteon ACK message formats can "only" be decoded relative
-to the most recent command sent to the ACKing device.  Some ACK messages 
-will be incorrectly decoded as part of another Insteon message. For 
-example in the ACK for a "Light Status Request", cmd1 is the ALDB serial 
-number.  This serial number will be interpreted as another Insteon message
-where the serial number matches the cmd1 value.  Be aware of this and you 
-should still be able to intrepret the decided messages.
-
-Extended messages are not decoded and only display the D1-D14 hex data.  
-You will need to manually decode the extended data.  Patches for decoding 
-one or more extended messages are welcome.
-
-=head1 BUGS
-
-There are probably many bugs.  The decoder was designed by transcribing 
-Insteon documentation, Jonathan Dale's excellent command reference, and 
-reviewing many message board discussions.  The decoder has not been 
-tested with all devices (of all firmware revs) or all PLM combinations 
-(of all firmware revs).  There are bugs; please report them in the 
-misterhouse GitHub issues list.
-
-=head1 METHODS
-
-=over
-
-=cut
-
-#These constants are intentionally copied here from other Insteon modules
-#This is so any changes to those structures do not introduce errors
-#in the decoders.  These constants should only be modified to extend 
-#the decoders or correct defects in the decoders.
-
-#PLM Serial Commands
-my %plmcmd = (
-	insteon_received 	=> '0250',
-	insteon_ext_received 	=> '0251',
-	x10_received 		=> '0252',
-	all_link_complete 	=> '0253',
-	plm_button_event 	=> '0254',
-	user_plm_reset 		=> '0255',
-	all_link_clean_failed 	=> '0256',
-	all_link_record 	=> '0257',
-	all_link_clean_status 	=> '0258',
-	plm_info 		=> '0260',
-	all_link_send 		=> '0261',
-	insteon_send 		=> '0262',
-#	insteon_ext_send	=> '0262',
-	x10_send 		=> '0263',
-	all_link_start 		=> '0264',
-	all_link_cancel		=> '0265',
-	set_host_device_cat     => '0266',
-	plm_reset 		=> '0267',
-	set_insteon_ack_cmd2    => '0268',
-	all_link_first_rec	=> '0269',
-	all_link_next_rec	=> '026a',
-	plm_set_config 		=> '026b',
-	get_sender_all_link_rec => '026c',
-	plm_led_on 		=> '026d',
-	plm_led_off 		=> '026e',
-	all_link_manage_rec	=> '026f',
-	insteon_nak 		=> '0270',
-	insteon_ack 		=> '0271',
-	rf_sleep 		=> '0272',
-	plm_get_config 		=> '0273'
-);
-
-#create a backwards lookup on hex code
-my %plmcmd2string = reverse %plmcmd;
-
-my %plmcmdlen = (
-	'0250' => [11, 11],
-	'0251' => [25, 25],
-	'0252' => [4, 4],
-	'0253' => [10, 10],
-	'0254' => [3, 3],
-	'0255' => [2, 2],
-	'0256' => [6, 6],
-	'0257' => [10, 10],
-	'0258' => [3, 3],
-	'0260' => [2, 9],
-	'0261' => [5, 6],
-	'0262' => [8, 9, 22, 23], # could get 9 or 23 (Standard or Extended Message received)
-	'0263' => [4, 5],
-	'0264' => [4, 5],
-	'0265' => [2, 3],
-	'0266' => [5, 6],
-	'0267' => [2, 3],
-	'0268' => [3, 4],
-	'0269' => [2, 3],
-	'026A' => [2, 3],
-	'026B' => [3, 4],
-	'026C' => [2, 3],
-	'026D' => [2, 3],
-	'026E' => [2, 3],
-	'026F' => [11, 12],
-	'0270' => [3, 4],
-	'0271' => [4, 5],
-	'0272' => [2, 3],
-	'0273' => [5, 6],
-	);	
-
-
-#Mapping from message type bit field to acronyms used in
-#  the INSTEON Command Tables documentation
-#100 4 - SB: Standard Broadcast
-
-#000 0 - SD or ED: Standard/Extended Direct
-#001 1 - SDA or EDA: Standard/Extended Direct ACK
-#101 5 - SDN or EDN: Standard/Extended Direct NACK
-
-#110 6 - SA: Standard All-Link Broadcast
-#010 2 - SC: Standard Cleanup Direct
-#011 3 - SCA: Standard Cleanup Direct ACK
-#111 7 - SCN: Standard Cleanup Direct NACK
-
-#List below is maintained in an Excel spreadsheet.  Make 
-#changes there and cut-n-paste list to here
-#You should understand the parsing logic before attempting
-#to modify this table!
-my %insteonCmd = (
-'SD01' => {Cmd1Name=>'Assign to All-Link Group',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SB01' => {Cmd1Name=>'SET Button Pressed Respond',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SD02' => {Cmd1Name=>'Delete from All-Link Group',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SB02' => {Cmd1Name=>'SET Button Pressed Controller',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SD03' => {Cmd1Name=>'Device Request',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD0300' => {Cmd1Name=>'Device Request',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Product Data Request'},
-'SD0301' => {Cmd1Name=>'Device Request',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'FxName Request'},
-'SD0302' => {Cmd1Name=>'Device Request',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Device Text String Request'},
-'ED03' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'ED0300' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Product Data Response'},
-'ED0301' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'FX Username Response'},
-'ED0302' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Device Text String Response'},
-'ED0303' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Set Device Text String'},
-'ED0304' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Set ALL-Link Command Alias'},
-'ED0305' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Set ALL-Link Command Alias ED'},
-'SB03' => {Cmd1Name=>'Test Powerline Phase',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SB0300' => {Cmd1Name=>'Test Powerline Phase',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Phase A'},
-'SB0301' => {Cmd1Name=>'Test Powerline Phase',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Phase B'},
-'SB04' => {Cmd1Name=>'Heartbeat',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Battery Level'},
-'SA06' => {Cmd1Name=>'All-Link Cleanup Report',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Fail Count'},
-'SD09' => {Cmd1Name=>'Enter Linking Mode',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SD0a' => {Cmd1Name=>'Enter Unlinking Mode',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SD0d' => {Cmd1Name=>'Get INSTEON Engine Version',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SDA0d' => {Cmd1Name=>'Get INSTEON Engine Version',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SDA0d00' => {Cmd1Name=>'Get INSTEON Engine Version',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'i1'},
-'SDA0d01' => {Cmd1Name=>'Get INSTEON Engine Version',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'i2'},
-'SDA0d02' => {Cmd1Name=>'Get INSTEON Engine Version',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'i2CS'},
-'SD0f' => {Cmd1Name=>'Ping',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SD10' => {Cmd1Name=>'ID Request',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SD11' => {Cmd1Name=>'Light ON',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Level'},
-'SA11' => {Cmd1Name=>'ALL-Link Recall',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SC11' => {Cmd1Name=>'ALL-Link Recall',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SD12' => {Cmd1Name=>'Light ON Fast',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Level'},
-'SA12' => {Cmd1Name=>'ALL-Link Alias 2 High',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SC12' => {Cmd1Name=>'ALL-Link Alias 2 High',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SD13' => {Cmd1Name=>'Light OFF',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SA13' => {Cmd1Name=>'ALL-Link Alias 1 Low',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SC13' => {Cmd1Name=>'ALL-Link Alias 1 Low',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SD14' => {Cmd1Name=>'Light OFF Fast',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SA14' => {Cmd1Name=>'ALL-Link Alias 2 Low',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SC14' => {Cmd1Name=>'ALL-Link Alias 2 Low',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SD15' => {Cmd1Name=>'Light Brighten One Step',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SA15' => {Cmd1Name=>'ALL-Link Alias 3 High',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SC15' => {Cmd1Name=>'ALL-Link Alias 3 High',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SD16' => {Cmd1Name=>'Light Dim One Step',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SA16' => {Cmd1Name=>'ALL-Link Alias 3 Low',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SC16' => {Cmd1Name=>'ALL-Link Alias 3 Low',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SD17' => {Cmd1Name=>'Light Start Manual Change',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD1700' => {Cmd1Name=>'Light Start Manual Change',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Down'},
-'SD1701' => {Cmd1Name=>'Light Start Manual Change',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Up'},
-'SA17' => {Cmd1Name=>'ALL-Link Alias 4 High',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SC17' => {Cmd1Name=>'ALL-Link Alias 4 High',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SD18' => {Cmd1Name=>'Light Stop Manual Change',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SA18' => {Cmd1Name=>'ALL-Link Alias 4 Low',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SC18' => {Cmd1Name=>'ALL-Link Alias 4 Low',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SD19' => {Cmd1Name=>'Light Status Request',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD1900' => {Cmd1Name=>'Light Status Request',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'On Level'},
-'SD1901' => {Cmd1Name=>'Light Status Request',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'LED Bit Flags'},
-'SD1f' => {Cmd1Name=>'Get Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD1f00' => {Cmd1Name=>'Get Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Request Flags'},
-'SD1f01' => {Cmd1Name=>'Get Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'All-Link Database Delta Number'},
-'SD1f02' => {Cmd1Name=>'Get Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Signal-to-Noise'},
-'SDA1f' => {Cmd1Name=>'Get Operating Flags',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Config Flags'},
-'SD20' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD2000' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Program Lock On'},
-'SD2001' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Program Lock Off'},
-'SD2002' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Deveice Dependent'},
-'SD2003' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Deveice Dependent'},
-'SD2004' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Deveice Dependent'},
-'SD2005' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Deveice Dependent'},
-'SD2006' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x06',Cmd2Name=>'Deveice Dependent'},
-'SD2007' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x07',Cmd2Name=>'Deveice Dependent'},
-'SD2008' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x08',Cmd2Name=>'Deveice Dependent'},
-'SD2009' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x09',Cmd2Name=>'Deveice Dependent'},
-'SD200a' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x0a',Cmd2Name=>'Deveice Dependent'},
-'SD200b' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x0b',Cmd2Name=>'Deveice Dependent'},
-'SD21' => {Cmd1Name=>'Light Instant Change',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'On Level'},
-'SA21' => {Cmd1Name=>'ALL-Link Alias 5',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SC21' => {Cmd1Name=>'ALL-Link Alias 5',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
-'SD22' => {Cmd1Name=>'Light Manually Turned Off',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SD23' => {Cmd1Name=>'Light Manually Turned On',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SD24' => {Cmd1Name=>'Reread Init Values(Deprecated)',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SD25' => {Cmd1Name=>'Remote SET Button Tap',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD2501' => {Cmd1Name=>'Remote SET Button Tap',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'1 Tap'},
-'SD2502' => {Cmd1Name=>'Remote SET Button Tap',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'2 Taps'},
-'SD27' => {Cmd1Name=>'Light Set Status',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'On Level'},
-'SB27' => {Cmd1Name=>'Status Change',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Data'},
-'SD28' => {Cmd1Name=>'Set Address MSB(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'MSB'},
-'SD29' => {Cmd1Name=>'Poke One Byte(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Data'},
-'ED2a' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'ED2a00' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Transfer Failure'},
-'ED2a01' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Complete (1 byte)'},
-'ED2a02' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Complete (2 bytes)'},
-'ED2a03' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Complete (3 bytes)'},
-'ED2a04' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Complete (4 bytes)'},
-'ED2a05' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Complete (5 bytes)'},
-'ED2a06' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x06',Cmd2Name=>'Complete (6 bytes)'},
-'ED2a07' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x07',Cmd2Name=>'Complete (7 bytes)'},
-'ED2a08' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x08',Cmd2Name=>'Complete (8 bytes)'},
-'ED2a09' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x09',Cmd2Name=>'Complete (9 bytes)'},
-'ED2a0a' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x0a',Cmd2Name=>'Complete (10 bytes)'},
-'ED2a0b' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x0b',Cmd2Name=>'Complete (11 bytes)'},
-'ED2a0c' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x0c',Cmd2Name=>'Complete (12 bytes)'},
-'ED2a0d' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x0d',Cmd2Name=>'Complete (13 bytes)'},
-'ED2aff' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0xff',Cmd2Name=>'Request Block Data Transfer'},
-'SD2b' => {Cmd1Name=>'Peek One Byte(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'LSB of Address'},
-'SDA2b' => {Cmd1Name=>'Peek One Byte(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Peeked Byte'},
-'SD2c' => {Cmd1Name=>'Peek One Byte Internal(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'LSB of Address'},
-'SDA2c' => {Cmd1Name=>'Peek One Byte Internal(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Peeked Byte'},
-'SD2d' => {Cmd1Name=>'Poke One Byte Internal(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Data'},
-'SD2e' => {Cmd1Name=>'Light ON at Ramp Rate',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Level and Rate'},
-'ED2e' => {Cmd1Name=>'Extended Set/Get',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'ED2e00' => {Cmd1Name=>'Extended Set/Get',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Command in D2'},
-'SD2f' => {Cmd1Name=>'Light OFF at Ramp Rate',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Ramp Rate'},
-'ED2f' => {Cmd1Name=>'Read/Write ALL-Link Database',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'ED2f00' => {Cmd1Name=>'Read/Write ALL-Link Database',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Command in D2'},
-'SD30' => {Cmd1Name=>'Beep',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Duration'},
-'ED30' => {Cmd1Name=>'Trigger ALL-Link Command',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'ED3000' => {Cmd1Name=>'Trigger ALL-Link Command',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Trigger Command'},
-'SD40' => {Cmd1Name=>'Sprinkler Valve On',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Valve Number'},
-'ED40' => {Cmd1Name=>'Set Sprinkler Program',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Program Number'},
-'SD41' => {Cmd1Name=>'Sprinkler Valve Off',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Valve Number'},
-'ED41' => {Cmd1Name=>'Sprinkler Get Program Response',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Program Number'},
-'SD42' => {Cmd1Name=>'Sprinkler Program ON',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Program Number'},
-'SD43' => {Cmd1Name=>'Sprinkler Program OFF',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Program Number'},
-'SD44' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD4400' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Load Initialization Values'},
-'SD4401' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Load EEPROM From RAM'},
-'SD4402' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Get Valve Status'},
-'SD4403' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Inhibit Command Acceptance'},
-'SD4404' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Resume Command Acceptance'},
-'SD4405' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Skip Forward'},
-'SD4406' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x06',Cmd2Name=>'Skip Backwards'},
-'SD4407' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x07',Cmd2Name=>'Enable Pump on V8'},
-'SD4408' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x08',Cmd2Name=>'Disable Pump on V8'},
-'SD4409' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x09',Cmd2Name=>'Broadcast ON'},
-'SD440a' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0a',Cmd2Name=>'Broadcast OFF'},
-'SD440b' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0b',Cmd2Name=>'Load RAM from EEPROM'},
-'SD440c' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0c',Cmd2Name=>'Sensor ON'},
-'SD440d' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0d',Cmd2Name=>'Sensor OFF'},
-'SD440e' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0e',Cmd2Name=>'Diagnostics ON'},
-'SD440f' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0f',Cmd2Name=>'Diagnostics OFF'},
-'SD45' => {Cmd1Name=>'I/O Output ON',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Output Number'},
-'SD46' => {Cmd1Name=>'I/O Output OFF',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Output Number'},
-'SD47' => {Cmd1Name=>'I/O Alarm Data Request',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SD48' => {Cmd1Name=>'I/O Write Output Port',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Data'},
-'SDA48' => {Cmd1Name=>'I/O Write Output Port',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Data Written'},
-'SD49' => {Cmd1Name=>'I/O Read Input Port',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SDA49' => {Cmd1Name=>'I/O Read Input Port',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Data Read'},
-'SD4a' => {Cmd1Name=>'Get Sensor Value',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Sensor Number'},
-'SDA4a' => {Cmd1Name=>'Get Sensor Value',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Sensor Value'},
-'SD4b' => {Cmd1Name=>'Set Sensor 1 Alarm Trigger OFF->ON',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Nominal Value'},
-'ED4b' => {Cmd1Name=>'I/O Set Sensor Nominal',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Sensor Number'},
-'SD4c' => {Cmd1Name=>'I/O Get Sensor Alarm Delta',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Bit Field'},
-'ED4c' => {Cmd1Name=>'I/O Alarm Data Response',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'ED4c00' => {Cmd1Name=>'I/O Alarm Data Response',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Response'},
-'SD4d' => {Cmd1Name=>'I/O Write Configuration Port',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Bit Field'},
-'SD4e' => {Cmd1Name=>'I/O Read Configuration Port',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'SD4e' => {Cmd1Name=>'I/O Read Configuration Port',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'I/O Port Config'},
-'SD4f' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD4f00' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Load Initialization Values'},
-'SD4f01' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Load EEPROM from RAM'},
-'SD4f02' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Status Request'},
-'SD4f03' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Read Analog once'},
-'SD4f04' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Read Analog Always'},
-'SD4f09' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x09',Cmd2Name=>'Enable status change message'},
-'SD4f0a' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0a',Cmd2Name=>'Disable status change message'},
-'SD4f0b' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0b',Cmd2Name=>'Load RAM from EEPROM'},
-'SD4f0c' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0c',Cmd2Name=>'Sensor On'},
-'SD4f0d' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0d',Cmd2Name=>'Sensor Off'},
-'SD4f0e' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0e',Cmd2Name=>'Diagnostics On'},
-'SD4f0f' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0f',Cmd2Name=>'Diagnostics Off'},
-'SD50' => {Cmd1Name=>'Pool Device ON',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Device Number'},
-'ED50' => {Cmd1Name=>'Pool Set Device Temperature',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'ED5000' => {Cmd1Name=>'Pool Set Device Temperature',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Set Temperature'},
-'ED5001' => {Cmd1Name=>'Pool Set Device Temperature',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Set Hysteresis'},
-'SD51' => {Cmd1Name=>'Pool Device OFF',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Device Number'},
-'SD52' => {Cmd1Name=>'Pool Temperature Up',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Increment Count'},
-'SD53' => {Cmd1Name=>'Pool Temperature Down',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Decrement Count'},
-'SD54' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD5400' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Load Initialization Values'},
-'SD5401' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Load EEPROM From RAM'},
-'SD5402' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Get Pool Mode'},
-'SD5403' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Get Ambient Temp'},
-'SD5404' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Get Water Temp'},
-'SD5405' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Get pH'},
-'SD58' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD5800' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Raise Door'},
-'SD5801' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Lower Door'},
-'SD5802' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Open Door'},
-'SD5803' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Close Door'},
-'SD5804' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Stop Door'},
-'SD5805' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Single Door Open'},
-'SD5806' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x06',Cmd2Name=>'Single Door Close'},
-'SD59' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD5900' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Raise Door'},
-'SD5901' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Lower Door'},
-'SD5902' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Open Door'},
-'SD5903' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Close Door'},
-'SD5904' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Stop Door'},
-'SD5905' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Single Door Open'},
-'SD5906' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x06',Cmd2Name=>'Single Door Close'},
-'SD60' => {Cmd1Name=>'Window Covering',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD6000' => {Cmd1Name=>'Window Covering',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Open'},
-'SD6001' => {Cmd1Name=>'Window Covering',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Close'},
-'SD6002' => {Cmd1Name=>'Window Covering',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Stop'},
-'SD6003' => {Cmd1Name=>'Window Covering',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Program'},
-'SD61' => {Cmd1Name=>'Window Covering Position',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Position'},
-'SD68' => {Cmd1Name=>'Thermostat Temp Up',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Increment Count'},
-'ED68' => {Cmd1Name=>'Thermostat Zone Temp Up',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Zone Number'},
-'SD69' => {Cmd1Name=>'Thermostat Temp Down',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Decrement Count'},
-'ED69' => {Cmd1Name=>'Thermostat Zone Temp Down',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Zone Number'},
-'SD6a' => {Cmd1Name=>'Thermostat Get Zone Info',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Bit Field'},
-'SDA6a' => {Cmd1Name=>'Thermostat Get Zone Info',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Requested Data'},
-'SD6b' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD6b00' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Load Initialization Values'},
-'SD6b01' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Load EEPROM from RAM'},
-'SD6b02' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Get Thermostat Mode'},
-'SD6b03' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Get ambient temperature'},
-'SD6b04' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'ON Heat'},
-'SD6b05' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'ON Cool'},
-'SD6b06' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x06',Cmd2Name=>'ON Auto'},
-'SD6b07' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x07',Cmd2Name=>'ON Fan'},
-'SD6b08' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x08',Cmd2Name=>'OFF Fan'},
-'SD6b09' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x09',Cmd2Name=>'OFF All'},
-'SD6b0a' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0a',Cmd2Name=>'Program Heat'},
-'SD6b0b' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0b',Cmd2Name=>'Program Cool'},
-'SD6b0c' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0c',Cmd2Name=>'Program Auto'},
-'SD6b0d' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0d',Cmd2Name=>'Get Equipment State'},
-'SD6b0e' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0e',Cmd2Name=>'Set Equipment State'},
-'SD6b0f' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0f',Cmd2Name=>'Get Temperature Units'},
-'SD6b10' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x10',Cmd2Name=>'Set Fahrenheit'},
-'SD6b11' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x11',Cmd2Name=>'Set Celsius'},
-'SD6b12' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x12',Cmd2Name=>'Get Fan-On Speed'},
-'SD6b13' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x13',Cmd2Name=>'Set Fan-On Speed Low'},
-'SD6b14' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x14',Cmd2Name=>'Set Fan-On Speed Medium'},
-'SD6b15' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x15',Cmd2Name=>'Set Fan-On Speed High'},
-'SD6b16' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x16',Cmd2Name=>'Enable status change message'},
-'SD6b17' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x17',Cmd2Name=>'Disable status change message'},
-'SD6c' => {Cmd1Name=>'Thermostat Set Cool Setpoint',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Setpoint Value'},
-'ED6c' => {Cmd1Name=>'Thermostat Set Zone Cool Setpoint',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Zone Number'},
-'SD6d' => {Cmd1Name=>'Thermostat Set Heat Setpoint',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Setpoint Value'},
-'ED6d' => {Cmd1Name=>'Thermostat Set Zone Heat Setpoint',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Zone Number'},
-'SD6e' => {Cmd1Name=>'Thermostat Set or Read Mode',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Bit Field'},
-'SD70' => {Cmd1Name=>'Leak Detector Announce',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SD7000' => {Cmd1Name=>'Leak Detector Announce',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Leak Detected'},
-'SD7001' => {Cmd1Name=>'Leak Detector Announce',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'No Leak Detected'},
-'SD7002' => {Cmd1Name=>'Leak Detector Announce',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Battery Low'},
-'SD7003' => {Cmd1Name=>'Leak Detector Announce',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Battery OK'},
-'SD81' => {Cmd1Name=>'Assign to Companion Group(Deprecated)',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
-'EDf0' => {Cmd1Name=>'Read or Write Registers',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Bit Field'},
-'SDf0' => {Cmd1Name=>'EZSnsRF Control',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
-'SDf000' => {Cmd1Name=>'EZSnsRF Control',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Load Initialization Values'},
-'SDf001' => {Cmd1Name=>'EZSnsRF Control',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Write a Code Record'},
-'SDf002' => {Cmd1Name=>'EZSnsRF Control',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Read a Code Record'},
-'SDf003' => {Cmd1Name=>'EZSnsRF Control',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Get a Code Record'},
-'SDf1' => {Cmd1Name=>'Specific Code Record Read',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Record Number'},
-'EDf1' => {Cmd1Name=>'Response to Read Registers',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Bit Field'},
-'EDf1' => {Cmd1Name=>'Code Record Request Respon',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Record Number'},
-'EDf2' => {Cmd1Name=>'Specific Code Record Write',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Record Number'},
-);
-
-
-#X10 PLM codes
-my %x10_house_codes = (
-	'6' => 'a',
-	'e' => 'b',
-	'2' => 'c',
-	'a' => 'd',
-	'1' => 'e',
-	'9' => 'f',
-	'5' => 'g',
-	'd' => 'h',
-	'7' => 'i',
-	'f' => 'j',
-	'3' => 'k',
-	'b' => 'l',
-	'0' => 'm',
-	'8' => 'n',
-	'4' => 'o',
-	'c' => 'p'
-);
-
-my %x10_unit_codes = (
-	'6' => '1',
-	'e' => '2',
-	'2' => '3',
-	'a' => '4',
-	'1' => '5',
-	'9' => '6',
-	'5' => '7',
-	'd' => '8',
-	'7' => '9',
-	'f' => 'a',
-	'3' => 'b',
-	'b' => 'c',
-	'0' => 'd',
-	'8' => 'e',
-	'4' => 'f',
-	'c' => 'g'
-);
-
-my %x10_commands = (
-	'2' => 'On(J)',
-	'3' => 'Off(K)',
-	'5' => 'Bright(L)',
-	'4' => 'Dim(M)',
-	'a' => 'preset_dim1',
-	'b' => 'preset_dim2',
-	'0' => 'all_units_off(P)',
-	'1' => 'all_lights_on(O)',
-	'6' => 'all_lights_off',
-	'f' => 'status',
-	'd' => 'status_on',
-	'e' => 'status_off',
-	'9' => 'hail_ack',
-	'7' => 'ext_code',
-	'c' => 'ext_data',
-	'8' => 'hail_request'
-);
-
-
-=item plm_decode(plm_string)
-
-Returns a string containing a decoded PLM data packet
-
-=cut
-
-sub plm_decode {
-	my ($plm_string) = @_;
-	$plm_string = lc($plm_string);
-
-#0262 1e5d8e 0f 0d00
-#0262 1e5d8e 0f 0d00 06
-
-#FSM:0 - Look for PLM STX
-#FSM:1 - Parse PLM command category
-#FSM:2 - Parse command from PLM (50-58)
-#FSM:3 - Parse command to PLM (60-73) and response 
-
-	my $plm_message = '';
-	my $plm_cmd_id;
-
-	my $FSM = 0;
-	my $abort = 0;
-	my $finished = 0;
-	while(!$abort and !$finished) {
-		if($FSM==0) {
-			#FSM:0 - Look for PLM STX
-			#Must start with STX or it is garbage
-			if(substr($plm_string,0,2) ne '02') {
-				$plm_message .= "Missing (02)STX: Invalid message\n";
-				$abort++;
-			} else {
-				$FSM++;
-			}
-		} elsif($FSM==1) {
-			#FSM:1 - Parse PLM command category
-			#Must be at least 2 bytes (4 nibbles) or it is garbage
-			if(length($plm_string) < 4) {
-				$abort++;
-			} else {
-				#include the STX for historical reasons
-				$plm_cmd_id = substr($plm_string,0,4);
-				$plm_message .= sprintf("%20s: (","PLM Command").$plm_cmd_id.") ".$plmcmd2string{$plm_cmd_id}."\n";
-				if(length($plm_string) < $plmcmdlen{uc($plm_cmd_id)}->[0] * 2) {
-					$plm_message .= "        Message length too short for PLM command.  Not parsed\n";
-					$abort++;
-				} elsif(length($plm_string) > $plmcmdlen{uc($plm_cmd_id)}->[0] * 2 
-						and length($plm_string) < $plmcmdlen{uc($plm_cmd_id)}->[1] * 2) {
-					$plm_message .= "        Message length too short for PLM command.  Not parsed\n";
-					$abort++;
-				} elsif(substr($plm_string,2,1) == '5') {
-					#commands from PLM are 50-58
-					$FSM = 2;
-				} else {
-					$FSM = 3;
-				}
-			}
-		} elsif($FSM==2) {
-			#FSM:2 - Parse command from PLM (50-58)
-			if($plm_cmd_id eq '0250') {
-				$plm_message .= sprintf("%24s: ",'From Address').substr($plm_string,4,2).":".substr($plm_string,6,2).":".substr($plm_string,8,2)."\n";
-				$plm_message .= sprintf("%24s: ",'To Address').substr($plm_string,10,2).":".substr($plm_string,12,2).":".substr($plm_string,14,2)."\n";
-                                $plm_message .= sprintf("%24s: ",'Message Flags').substr($plm_string,16,2)."\n";
-                                $plm_message .= insteon_message_flags_decode(substr($plm_string,16,2));
-				my $flag_ext = hex(substr($plm_string,16,1))&0b0001;
-                                $plm_message .= sprintf("%24s: ",'Insteon Message').substr($plm_string,18,($flag_ext ? 32 : 4))."\n";
-				$plm_message .= insteon_decode(substr($plm_string,16));
-			} elsif($plm_cmd_id eq '0251'){
-				$plm_message .= sprintf("%24s: ",'From Address').substr($plm_string,4,2).":".substr($plm_string,6,2).":".substr($plm_string,8,2)."\n";
-				$plm_message .= sprintf("%24s: ",'To Address').substr($plm_string,10,2).":".substr($plm_string,12,2).":".substr($plm_string,14,2)."\n";
-                                $plm_message .= sprintf("%24s: ",'Message Flags').substr($plm_string,16,2)."\n";
-                                $plm_message .= insteon_message_flags_decode(substr($plm_string,16,2));
-				my $flag_ext = hex(substr($plm_string,16,1))&0b0001;
-                                $plm_message .= sprintf("%24s: ",'Insteon Message').substr($plm_string,18,($flag_ext ? 32 : 4))."\n";
-				$plm_message .= insteon_decode(substr($plm_string,16));
-			} elsif($plm_cmd_id eq '0252'){
-                                $plm_message .= sprintf("%20s: ",'X10 Message').substr($plm_string,4,4)."\n";
-                                $plm_message .= plm_x10_decode(substr($plm_string,4,4));
-			} elsif($plm_cmd_id eq '0253'){
-				my @link_string = ('PLM is Responder', 'PLM is Controller', 'All-Link deleted');
-				$plm_message .= sprintf("%20s: (",'Link Code').substr($plm_string,4,2).") ".$link_string[substr($plm_string,4,2)]."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Group').substr($plm_string,6,2)."\n";
-				$plm_message .= sprintf("%20s: ",'Linked Device').substr($plm_string,8,2).":".substr($plm_string,10,2).":".substr($plm_string,12,2)."\n";
-				$plm_message .= sprintf("%20s: ",'Device Category').substr($plm_string,14,2).":".substr($plm_string,16,2)."\n";
-				$plm_message .= sprintf("%20s: ",'Firmware').substr($plm_string,18,2)."\n";
-			} elsif($plm_cmd_id eq '0254'){
-				my @buttons = ('SET Button ','Button 2 ','Button 3 ');
-				my @button_event = ('','','Tapped','Held 3 seconds','Released');
-				$plm_message .= sprintf("%20s: (",'Button Event').substr($plm_string,4,2).") ".$buttons[substr($plm_string,4,1)].$button_event[substr($plm_string,5,1)]."\n";
-			} elsif($plm_cmd_id eq '0255'){
-				#Nothing else to do
-			} elsif($plm_cmd_id eq '0256'){
-				$plm_message .= sprintf("%20s: ",'All-Link Group').substr($plm_string,4,2)."\n";
-				$plm_message .= sprintf("%20s: ",'Device').substr($plm_string,6,2).":".substr($plm_string,8,2).":".substr($plm_string,10,2)."\n";
-			} elsif($plm_cmd_id eq '0257'){
-				$plm_message .= sprintf("%20s: ",'All-Link Flags').substr($plm_string,4,2)."\n";
-				my $flags = hex(substr($plm_string,4,2));
-				$plm_message .= sprintf("%20s: Record is ",'Bit 7').($flags&0b10000000?'in use':'available')."\n";
-				$plm_message .= sprintf("%20s: PLM is ",'Bit 6').($flags&0b01000000?'controller':'responder')."\n";
-				$plm_message .= sprintf("%20s: ACK is ",'Bit 5').($flags&0b00100000?'required':'not required')."\n";
-				$plm_message .= sprintf("%20s: Record has ",'Bit 1').($flags&0b00000001?'been used before':'not been used before')."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Group').substr($plm_string,6,2)."\n";
-				$plm_message .= sprintf("%20s: ",'Linked Device').substr($plm_string,8,2).":".substr($plm_string,10,2).":".substr($plm_string,12,2)."\n";
-#XXXX				$plm_message .= sprintf("%20s: ",'Link Data').substr($plm_string,14,6)."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Command1').substr($plm_string,14,2)."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Command2').substr($plm_string,16,2)."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Data').substr($plm_string,18,2)."\n";
-				#TODO:  Find insteon information for link data decode
-			} elsif($plm_cmd_id eq '0258'){
-				$plm_message .= sprintf("%20s: (",'Status Byte').substr($plm_string,4,2).") ".(substr($plm_string,4,2) eq '06' ? "ACK" : "NACK")."\n";
-			} else {
-				$plm_message .= sprintf("%20s: (",'Undefined Cmd Data').substr($plm_string,4).")\n";
-			}
-			$finished++;
-		} elsif($FSM==3) {
-			#FSM:3 - Parse command to PLM (60-73) and response
-			my $plm_ack_pos;
-			if($plm_cmd_id eq '0260') {
-				if(length($plm_string)>4) {
-					$plm_message .= sprintf("%20s: ",'PLM Device ID').substr($plm_string,4,2).":".substr($plm_string,6,2).":".substr($plm_string,8,2)."\n";
-					$plm_message .= sprintf("%20s: ",'Device Category').substr($plm_string,10,2).":".substr($plm_string,12,2)."\n";
-					$plm_message .= sprintf("%20s: ",'Firmware').substr($plm_string,14,2)."\n";
-				}
-				$plm_ack_pos = 16;
-			} elsif($plm_cmd_id eq '0261'){
-				$plm_message .= sprintf("%20s: ",'All-Link Group').substr($plm_string,4,2)."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Command1').substr($plm_string,6,2)."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Command2').substr($plm_string,8,2)."\n";
-				$plm_ack_pos = 10;
-				#TODO:  look up insteon information for all-link command1 / command2 decode
-			} elsif($plm_cmd_id eq '0262'){
-				$plm_message .= sprintf("%24s: ",'To Address').substr($plm_string,4,2).":".substr($plm_string,6,2).":".substr($plm_string,8,2)."\n";
-                                $plm_message .= sprintf("%24s: ",'Message Flags').substr($plm_string,10,2)."\n";
-                                $plm_message .= insteon_message_flags_decode(substr($plm_string,10,2));
-				my $flag_ext = hex(substr($plm_string,10,1))&0b0001;
-                                $plm_message .= sprintf("%24s: ",'Insteon Message').substr($plm_string,12,($flag_ext ? 32 : 4))."\n";
-				$plm_message .= insteon_decode(substr($plm_string,10));
-                                $plm_ack_pos = $flag_ext ? 44 : 16;
-			} elsif($plm_cmd_id eq '0263'){
-                                $plm_message .= sprintf("%20s: ",'X10 Message').substr($plm_string,4,4)."\n";
-                                $plm_message .= plm_x10_decode(substr($plm_string,4,4));
-                                $plm_ack_pos = 8;
-			} elsif($plm_cmd_id eq '0264'){
-				my %link_string = ('00'=>'PLM is Responder',
-						   '01'=>'PLM is Controller',
-						   '03'=>'PLM is either Responder or Controller',
-						   'ff'=>'Delete All-Link');
-				$plm_message .= sprintf("%20s: (",'Link Code').substr($plm_string,4,2).") ".$link_string{substr($plm_string,4,2)}."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Group').substr($plm_string,6,2)."\n";
-				$plm_ack_pos = 8;
-			} elsif($plm_cmd_id eq '0265'){
-				$plm_ack_pos = 4;
-			} elsif($plm_cmd_id eq '0266'){
-				$plm_message .= sprintf("%20s: ",'Device Category').substr($plm_string,4,2).":".substr($plm_string,6,2)."\n";
-				$plm_message .= sprintf("%20s: ",'Firmware').substr($plm_string,8,2)."\n";
-				$plm_ack_pos = 10;
-			} elsif($plm_cmd_id eq '0267'){
-				$plm_ack_pos = 4;
-			} elsif($plm_cmd_id eq '0268'){
-				$plm_message .= sprintf("%20s: ",'Command2 Data').substr($plm_string,4,2)."\n";
-				$plm_ack_pos = 6;
-			} elsif($plm_cmd_id eq '0269'){
-				$plm_ack_pos = 4;
-			} elsif($plm_cmd_id eq '026a'){
-				$plm_ack_pos = 4;
-			} elsif($plm_cmd_id eq '026b'){
-				$plm_message .= sprintf("%20s: (",'PLM Config Flags').substr($plm_string,4,2).")\n";
-				my $flags = hex(substr($plm_string,4,2));
-				$plm_message .= sprintf("%20s: Automatic Linking ",'Bit 7').($flags&0b10000000?'Disabled':'Enabled')."\n";
-				$plm_message .= sprintf("%20s: Monitor Mode ",'Bit 6').($flags&0b01000000?'Enabled':'Disabled')."\n";
-				$plm_message .= sprintf("%20s: Automatic LED ",'Bit 5').($flags&0b00100000?'Disabled':'Enabled')."\n";
-				$plm_message .= sprintf("%20s: Deadman Feature ",'Bit 4').($flags&0b00010000?'Disabled':'Enabled')."\n";
-				$plm_ack_pos = 6;
-			} elsif($plm_cmd_id eq '026c'){
-				$plm_ack_pos = 4;
-			} elsif($plm_cmd_id eq '026d'){
-				$plm_ack_pos = 4;
-			} elsif($plm_cmd_id eq '026e'){
-				$plm_ack_pos = 4;
-			} elsif($plm_cmd_id eq '026f'){
-				my %control_string = ('00'=>'Find All-Link Record',
-						      '01'=>'Find Next All-Link Record',
-						      '20'=>'Update/Add All-Link Record',
-						      '40'=>'Update/Add Controller All-Link Record',
-						      '41'=>'Update/Add Responder All-Link Record',
-						      '80'=>'Delete All-Link Record');
-				$plm_message .= sprintf("%20s: (",'Control code').substr($plm_string,4,2).") ".$control_string{substr($plm_string,4,2)}."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Flags').substr($plm_string,6,2)."\n";
-				my $flags = hex(substr($plm_string,6,2));
-				$plm_message .= sprintf("%20s: Record is ",'Bit 7').($flags&0b10000000?'in use':'available')."\n";
-				$plm_message .= sprintf("%20s: PLM is ",'Bit 6').($flags&0b01000000?'controller':'responder')."\n";
-				$plm_message .= sprintf("%20s: ACK is ",'Bit 5').($flags&0b00100000?'required':'not required')."\n";
-				$plm_message .= sprintf("%20s: Record has ",'Bit 1').($flags&0b00000001?'been used before':'not been used before')."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Group').substr($plm_string,8,2)."\n";
-				$plm_message .= sprintf("%20s: ",'Linked Device').substr($plm_string,10,2).":".substr($plm_string,12,2).":".substr($plm_string,14,2)."\n";
-#				$plm_message .= sprintf("%20s: ",'Link Data').substr($plm_string,16,6)."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Command1').substr($plm_string,16,2)."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Command2').substr($plm_string,18,2)."\n";
-				$plm_message .= sprintf("%20s: ",'All-Link Data').substr($plm_string,20,2)."\n";
-				$plm_ack_pos = 22;
-				#TODO:  Find insteon information for link data decode
-			} elsif($plm_cmd_id eq '0270'){
-				$plm_message .= sprintf("%20s: ",'Command2 Data').substr($plm_string,4,2)."\n";
-				$plm_ack_pos = 6;
-			} elsif($plm_cmd_id eq '0271'){
-				$plm_message .= sprintf("%20s: ",'Command1 Data').substr($plm_string,4,2)."\n";
-				$plm_message .= sprintf("%20s: ",'Command2 Data').substr($plm_string,6,2)."\n";
-				$plm_ack_pos = 8;
-			} elsif($plm_cmd_id eq '0272'){
-				$plm_ack_pos = 4;
-			} elsif($plm_cmd_id eq '0273'){
-				if(length($plm_string)>4) {
-					$plm_message .= sprintf("%20s: (",'PLM Config Flags').substr($plm_string,4,2).")\n";
-					my $flags = hex(substr($plm_string,4,2));
-					$plm_message .= sprintf("%20s: Automatic Linking ",'Bit 7').($flags&0b10000000?'Disabled':'Enabled')."\n";
-					$plm_message .= sprintf("%20s: Monitor Mode ",'Bit 6').($flags&0b01000000?'Enabled':'Disabled')."\n";
-					$plm_message .= sprintf("%20s: Automatic LED ",'Bit 5').($flags&0b00100000?'Disabled':'Enabled')."\n";
-					$plm_message .= sprintf("%20s: Deadman Feature ",'Bit 4').($flags&0b00010000?'Disabled':'Enabled')."\n";
-					$plm_message .= sprintf("%20s: ",'Spare 1').substr($plm_string,6,2)."\n";
-					$plm_message .= sprintf("%20s: ",'Spare 2').substr($plm_string,8,2)."\n";
-				}
-				$plm_ack_pos = 10;
-			} else {
-				$plm_message .= sprintf("%20s: (",'Undefined Cmd Data').substr($plm_string,4).")\n";
-				$plm_ack_pos = 255;
-			}
-
-			if(length($plm_string)>$plm_ack_pos) {
-				$plm_message .= sprintf("%20s: (",'PLM Response').substr($plm_string,$plm_ack_pos,2).") ".(substr($plm_string,$plm_ack_pos,2) eq '06' ? "ACK" : "NACK")."\n";
-			}
-			$finished++;
-		} #if($FSM==)
-	} #while(!$abort)
-	return $plm_message;
-}
-
-
-=item plm_x10_decode(x10_string)
-
-Returns a string containing a decoded PLM X10 data packet
-
-=cut
-
-sub plm_x10_decode {
-	my ($x10_string) = @_;
-	$x10_string = lc($x10_string);
-
-	my $x10_message = '';
-	$x10_message .= sprintf("%24s: (",'X10 House Code').substr($x10_string,0,1).") ".uc($x10_house_codes{substr($x10_string,0,1)})."\n";
-	if(substr($x10_string,2,1) == '8') {
-		$x10_message .= sprintf("%24s: (",'X10 Command').substr($x10_string,1,1).") ".$x10_commands{substr($x10_string,1,1)}."\n";
-	} else {
-		$x10_message .= sprintf("%24s: (",'X10 Unit Code').substr($x10_string,1,1).") ".uc($x10_unit_codes{substr($x10_string,1,1)})."\n";
-	}
-	return($x10_message);
-}
-
-=item insteon_message_flags_decode(flags_string)
-
-Returns a string containing decoded Insteon message flags
-
-=cut
-
-sub insteon_message_flags_decode {
-        my ($flags_string) = @_;
-        $flags_string = lc($flags_string);
-
-        my $flags_message = '';
-	my %message_string = (	'4'=>'Broadcast Message',
-				'0'=>'Direct Message',
-				'1'=>'ACK of Direct Message',
-				'5'=>'NAK of Direct Message',
-				'6'=>'All-Link Broadcast Message',
-				'2'=>'All-Link Cleanup Direct Message',
-				'3'=>'ACK of All-Link Cleanup Direct Message',
-				'7'=>'NAK of All-Link Cleanup Direct Message');
-
-	my $flag_msg = hex(substr($flags_string,0,1))>>1;
-	my $flag_ext = hex(substr($flags_string,0,1))&0b0001;
-	$flags_message .= sprintf("%28s: (%03b) ",'Message Type',$flag_msg).$message_string{$flag_msg}."\n";
-	$flags_message .= sprintf("%28s: (%01b) ",'Message Length',$flag_ext).($flag_ext?'Extended Length':'Standard Length')."\n";
-	$flags_message .= sprintf("%28s: %d\n",'Hops Left',hex(substr($flags_string,1,1))>>2);
-	$flags_message .= sprintf("%28s: %d\n",'Max Hops',hex(substr($flags_string,1,1))&0b0011);
-        return($flags_message);
-}
-
-=item insteon_decode(command_string)
-
-Returns a string containing a decoded Insteon message. Input
-string should be the Insteon message starting with the 
-message flag byte.
-
-=cut
-
-sub insteon_decode {
-	my ($command_string) = @_;
-#Mapping from message type bit field to acronyms used in
-#  the INSTEON Command Tables documentation
-#100 4 - SB: Standard Broadcast
-
-#000 0 - SD or ED: Standard/Extended Direct
-#001 1 - SDA or EDA: Standard/Extended Direct ACK
-#101 5 - SDN or EDN: Standard/Extended Direct NACK
-
-#110 6 - SA: Standard All-Link Broadcast
-#010 2 - SC: Standard Cleanup Direct
-#011 3 - SCA: Standard Cleanup Direct ACK
-#111 7 - SCN: Standard Cleanup Direct NACK
-
-#For SDA parsing 1st look for SDA command entry, if not found
-#then lookup SD command entry for parsing information.
-
-#For SDN, EDN, SCN NACK responses, lookup coorespnding
-#SD, ED, or SC entry for parsing, but always use the 
-#common NACK decoding for Cmd2
-
-#Lookup SB, SD, ED, SA, and SC messages with just the 
-#Cmd1 entry appended at the key.  If Cmd2 Flag == "Command" 
-#then repeat lookup appending both Cmd1 and Cmd2 for 
-#the key.  If Cmd2 Flag != "Command" then use flag value
-#to control how Cmd2 is displayed.  If second lookup fails,
-#simply print Cmd2 and indicate "not decoded".
-
-	my $extended = hex(substr($command_string,0,1))&0b0001;
-	my $msg_type = (hex(substr($command_string,0,1))&0b1110)>>1;
-	my $cmd1 = substr($command_string,2,2);
-	my $cmd2 = substr($command_string,4,2);
-	my $data = '';
-	$data = substr($command_string,6) if($extended);
-
-	#Truncate $command_string to remove PLM ACK byte
-	$command_string = substr($command_string,0, ($extended ? 34 : 8));
-	my $insteon_message='';
-	if( $msg_type == 0) {
-		#SD/ED: Standard/Extended Direct
-		$insteon_message .= insteon_decode_cmd(($extended ? 'ED' : 'SD'), $cmd1, $cmd2, $extended, $data);
-	} elsif( $msg_type == 1 or $msg_type == 5) {
-		#SDA/EDA: Standard/Extended Direct ACK/NACK
-		$insteon_message .= insteon_decode_cmd(($extended ? 'EDA' : 'SDA'), $cmd1, $cmd2, $extended, $data);
-	} elsif( $msg_type == 6) {
-		#SA: Standard All-Link Broadcast
-		$insteon_message .= insteon_decode_cmd('SA', $cmd1, $cmd2, $extended, $data);
-	} elsif( $msg_type == 2) {
-		#SC: Standard Direct Cleanup
-		$insteon_message .= insteon_decode_cmd('SC', $cmd1, $cmd2, $extended, $data);
-	} elsif( $msg_type == 3 or $msg_type == 7) {
-		#SCA: Standard Direct Cleanup ACK/NACK
-		$insteon_message .= insteon_decode_cmd('SCA', $cmd1, $cmd2, $extended, $data);
-	} else {
-		$insteon_message .= sprintf("%28s: ",'')."Insteon message type not decoded\n";
-	}
-
-	return $insteon_message
-}
-
-
-sub insteon_decode_cmd {
-	my ($cmdLookup, $cmd1, $cmd2, $extended, $Data) = @_;
-	my $insteon_message='';
-	my ($cmdDecoder1, $cmdDecoder2);
-
-	#lookup 1st without using Cmd2
-	$cmdDecoder1 = $insteonCmd{$cmdLookup.$cmd1};
-
-	if(!defined($cmdDecoder1)) {
-		#lookup failed, if this is an ACK/NACK retry w/ direct version
-		if( $cmdLookup eq 'SDA') {
-			$cmdDecoder1 = $insteonCmd{'SD'.$cmd1};
-		} elsif( $cmdLookup eq 'EDA') {
-			$cmdDecoder1 = $insteonCmd{'ED'.$cmd1};
-		} elsif( $cmdLookup eq 'SCA') {
-			$cmdDecoder1 = $insteonCmd{'SC'.$cmd1};
-		}
-		if(!defined($cmdDecoder1)) {
-			#still not found so quit trying to decode
-			$insteon_message .= sprintf("%28s: ",'Cmd 1').$cmd1." Insteon command not decoded\n";
-			$insteon_message .= sprintf("%28s: ",'Cmd 2').$cmd2."\n";
-			$insteon_message .= sprintf("%28s: ",'D1-D14').$Data."\n" if( $extended);
-			return $insteon_message;
-		}
-	}
-
-	if($cmdDecoder1->{'Cmd2Flag'} eq 'Command') {
-		#2nd lookup with Cmd2
-		$cmdDecoder2 = $insteonCmd{$cmdLookup.$cmd1.$cmd2};
-		if(!defined($cmdDecoder2)) {
-			#lookup failed, if this is an ACK/NACK retry w/ direct version
-			if( $cmdLookup eq 'SDA') {
-				$cmdDecoder2 = $insteonCmd{'SD'.$cmd1};
-			} elsif( $cmdLookup eq 'EDA') {
-				$cmdDecoder2 = $insteonCmd{'ED'.$cmd1};
-			} elsif( $cmdLookup eq 'SCA') {
-				$cmdDecoder2 = $insteonCmd{'SC'.$cmd1};
-			}
-		}
-		if(!defined($cmdDecoder2)) {
-			#still not found so don't decode
-			$insteon_message .= sprintf("%28s: ",'Cmd 1').$cmd1." Insteon command not decoded\n";
-			$insteon_message .= sprintf("%28s: ",'Cmd 2').$cmd2."\n";
-			$insteon_message .= sprintf("%28s: ",'D1-D14').$Data."\n" if( $extended);
-		} else {
-			$insteon_message .= sprintf("%28s: (",'Cmd 1').$cmd1.") ".$cmdDecoder2->{'Cmd1Name'}."\n";
-			$insteon_message .= sprintf("%28s: (",'Cmd 2').$cmd2.") ".$cmdDecoder2->{'Cmd2Name'}."\n";
-			$insteon_message .= sprintf("%28s: ",'D1-D14').$Data."\n" if( $extended);
-		}
-	} elsif( $cmdDecoder1->{'Cmd2Flag'} eq 'Value') {
-		$insteon_message .= sprintf("%28s: (",'Cmd 1').$cmd1.") ".$cmdDecoder1->{'Cmd1Name'}."\n";
-		$insteon_message .= sprintf("%28s: (",'Cmd 2').$cmd2.") ".$cmdDecoder1->{'Cmd2Name'}."\n";
-		$insteon_message .= sprintf("%28s: ",'D1-D14').$Data."\n" if( $extended);
-	} elsif( $cmdDecoder1->{'Cmd2Flag'} eq 'NA') {
-		$insteon_message .= sprintf("%28s: (",'Cmd 1').$cmd1.") ".$cmdDecoder1->{'Cmd1Name'}."\n";
-		$insteon_message .= sprintf("%28s: ",'Cmd 2').$cmd2."\n";
-		$insteon_message .= sprintf("%28s: ",'D1-D14').$Data."\n" if( $extended);
-	} else {
-		$insteon_message .= "Parse database has undefined Cmd2Flag: ".$cmdDecoder1->{'Cmd2Flag'};
-	}
-
-	return $insteon_message;
-}
-
-
-#$plm_cmd is 2 byte hex cmd; $send_rec is 0 for send, 1, for rec; $is_extended is 1 if extended send
-#returns expected byte length
-sub insteon_cmd_len{
-	my ($plm_cmd, $send_rec, $is_extended) = @_;
-	if ($is_extended && $plmcmdlen{uc($plm_cmd)} > 2) {
-		return $plmcmdlen{uc($plm_cmd)}->[($send_rec+2)];
-	} else {
-		return $plmcmdlen{uc($plm_cmd)}->[$send_rec];
-	}
-}
-
-
-=back
-
-=head1 SUPPORT
-
-You can find documentation for this module with the perldoc command.
-
-    perldoc Insteon::MessageDecoder
-
-=head1 SEE ALSO
-
-L<Insteon Command Tables 20070925a|www.insteon.net/pdf/INSTEON_Command_Tables_20070925a.pdf>
-
-PLM command details can be found in the 2412S Developers Guide.  This 
-document is not supplied by SmartHome but may be available through an 
-internet search.
-
-=head1 AUTHOR
-
-Michael Stovenour
-
-=head1 LICENSE AND COPYRIGHT
-
-Copyright 2012 Michael Stovenour
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-MA  02110-1301, USA.
-
-=cut
-
-1;
+package Insteon::MessageDecoder;
+
+use strict;
+
+=head1 NAME
+
+B<Insteon::MessageDecoder> - Static class for decoding Insteon PLM messages
+
+=head1 SYNOPSIS
+
+    use Insteon::MessageDecoder;
+    my $decodedMessage = Insteon::MessageDecoder::plm_decode($plm_string);
+
+=head1 DESCRIPTION
+
+Insteon::MessageDecoder will decode Insteon PLM messages. Functions are 
+provided to decode the PLM envelope, X10 commands, Insteon flags, and 
+Insteon Cmd1/Cmd2 bytes.  User data (D1-D14) of extended messages is not 
+decoded but will be displayed.
+
+=head1 EXAMPLE
+
+    use Insteon::MessageDecoder;
+    my $plm_string;
+    
+    $plm_string = '02621f058c1f2e000100000000000000000000000000';
+    print( "PLM Message: $plm_string\n");
+    print( Insteon::MessageDecoder::plm_decode($plm_string)."\n");
+    
+    $plm_string = '02511f058c1edc30112e000101000020201cfe3f0001000000';
+    print( "PLM Message: $plm_string\n");
+    print( Insteon::MessageDecoder::plm_decode($plm_string)."\n");
+
+=head1 LIMITATIONS
+
+The message decoder is not perfect.  It does not keep message state and 
+several of the Insteon ACK message formats can "only" be decoded relative
+to the most recent command sent to the ACKing device.  Some ACK messages 
+will be incorrectly decoded as part of another Insteon message. For 
+example in the ACK for a "Light Status Request", cmd1 is the ALDB serial 
+number.  This serial number will be interpreted as another Insteon message
+where the serial number matches the cmd1 value.  Be aware of this and you 
+should still be able to intrepret the decided messages.
+
+Extended messages are not decoded and only display the D1-D14 hex data.  
+You will need to manually decode the extended data.  Patches for decoding 
+one or more extended messages are welcome.
+
+=head1 BUGS
+
+There are probably many bugs.  The decoder was designed by transcribing 
+Insteon documentation, Jonathan Dale's excellent command reference, and 
+reviewing many message board discussions.  The decoder has not been 
+tested with all devices (of all firmware revs) or all PLM combinations 
+(of all firmware revs).  There are bugs; please report them in the 
+misterhouse GitHub issues list.
+
+=head1 METHODS
+
+=over
+
+=cut
+
+#These constants are intentionally copied here from other Insteon modules
+#This is so any changes to those structures do not introduce errors
+#in the decoders.  These constants should only be modified to extend 
+#the decoders or correct defects in the decoders.
+
+#PLM Serial Commands
+my %plmcmd = (
+	insteon_received 	=> '0250',
+	insteon_ext_received 	=> '0251',
+	x10_received 		=> '0252',
+	all_link_complete 	=> '0253',
+	plm_button_event 	=> '0254',
+	user_plm_reset 		=> '0255',
+	all_link_clean_failed 	=> '0256',
+	all_link_record 	=> '0257',
+	all_link_clean_status 	=> '0258',
+	plm_info 		=> '0260',
+	all_link_send 		=> '0261',
+	insteon_send 		=> '0262',
+#	insteon_ext_send	=> '0262',
+	x10_send 		=> '0263',
+	all_link_start 		=> '0264',
+	all_link_cancel		=> '0265',
+	set_host_device_cat     => '0266',
+	plm_reset 		=> '0267',
+	set_insteon_ack_cmd2    => '0268',
+	all_link_first_rec	=> '0269',
+	all_link_next_rec	=> '026a',
+	plm_set_config 		=> '026b',
+	get_sender_all_link_rec => '026c',
+	plm_led_on 		=> '026d',
+	plm_led_off 		=> '026e',
+	all_link_manage_rec	=> '026f',
+	insteon_nak 		=> '0270',
+	insteon_ack 		=> '0271',
+	rf_sleep 		=> '0272',
+	plm_get_config 		=> '0273'
+);
+
+#create a backwards lookup on hex code
+my %plmcmd2string = reverse %plmcmd;
+
+my %plmcmdlen = (
+	'0250' => [11, 11],
+	'0251' => [25, 25],
+	'0252' => [4, 4],
+	'0253' => [10, 10],
+	'0254' => [3, 3],
+	'0255' => [2, 2],
+	'0256' => [6, 6],
+	'0257' => [10, 10],
+	'0258' => [3, 3],
+	'0260' => [2, 9],
+	'0261' => [5, 6],
+	'0262' => [8, 9, 22, 23], # could get 9 or 23 (Standard or Extended Message received)
+	'0263' => [4, 5],
+	'0264' => [4, 5],
+	'0265' => [2, 3],
+	'0266' => [5, 6],
+	'0267' => [2, 3],
+	'0268' => [3, 4],
+	'0269' => [2, 3],
+	'026A' => [2, 3],
+	'026B' => [3, 4],
+	'026C' => [2, 3],
+	'026D' => [2, 3],
+	'026E' => [2, 3],
+	'026F' => [11, 12],
+	'0270' => [3, 4],
+	'0271' => [4, 5],
+	'0272' => [2, 3],
+	'0273' => [5, 6],
+	);	
+
+
+#Mapping from message type bit field to acronyms used in
+#  the INSTEON Command Tables documentation
+#100 4 - SB: Standard Broadcast
+
+#000 0 - SD or ED: Standard/Extended Direct
+#001 1 - SDA or EDA: Standard/Extended Direct ACK
+#101 5 - SDN or EDN: Standard/Extended Direct NACK
+
+#110 6 - SA: Standard All-Link Broadcast
+#010 2 - SC: Standard Cleanup Direct
+#011 3 - SCA: Standard Cleanup Direct ACK
+#111 7 - SCN: Standard Cleanup Direct NACK
+
+#List below is maintained in an Excel spreadsheet.  Make 
+#changes there and cut-n-paste list to here
+#You should understand the parsing logic before attempting
+#to modify this table!
+my %insteonCmd = (
+'SD01' => {Cmd1Name=>'Assign to All-Link Group',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SB01' => {Cmd1Name=>'SET Button Pressed Respond',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SD02' => {Cmd1Name=>'Delete from All-Link Group',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SB02' => {Cmd1Name=>'SET Button Pressed Controller',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SD03' => {Cmd1Name=>'Device Request',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD0300' => {Cmd1Name=>'Device Request',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Product Data Request'},
+'SD0301' => {Cmd1Name=>'Device Request',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'FxName Request'},
+'SD0302' => {Cmd1Name=>'Device Request',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Device Text String Request'},
+'ED03' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'ED0300' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Product Data Response'},
+'ED0301' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'FX Username Response'},
+'ED0302' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Device Text String Response'},
+'ED0303' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Set Device Text String'},
+'ED0304' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Set ALL-Link Command Alias'},
+'ED0305' => {Cmd1Name=>'Device Response',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Set ALL-Link Command Alias ED'},
+'SB03' => {Cmd1Name=>'Test Powerline Phase',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SB0300' => {Cmd1Name=>'Test Powerline Phase',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Phase A'},
+'SB0301' => {Cmd1Name=>'Test Powerline Phase',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Phase B'},
+'SB04' => {Cmd1Name=>'Heartbeat',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Battery Level'},
+'SA06' => {Cmd1Name=>'All-Link Cleanup Report',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Fail Count'},
+'SD09' => {Cmd1Name=>'Enter Linking Mode',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SD0a' => {Cmd1Name=>'Enter Unlinking Mode',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SD0d' => {Cmd1Name=>'Get INSTEON Engine Version',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SDA0d' => {Cmd1Name=>'Get INSTEON Engine Version',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SDA0d00' => {Cmd1Name=>'Get INSTEON Engine Version',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'i1'},
+'SDA0d01' => {Cmd1Name=>'Get INSTEON Engine Version',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'i2'},
+'SDA0d02' => {Cmd1Name=>'Get INSTEON Engine Version',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'i2CS'},
+'SD0f' => {Cmd1Name=>'Ping',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SD10' => {Cmd1Name=>'ID Request',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SD11' => {Cmd1Name=>'Light ON',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Level'},
+'SA11' => {Cmd1Name=>'ALL-Link Recall',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SC11' => {Cmd1Name=>'ALL-Link Recall',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SD12' => {Cmd1Name=>'Light ON Fast',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Level'},
+'SA12' => {Cmd1Name=>'ALL-Link Alias 2 High',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SC12' => {Cmd1Name=>'ALL-Link Alias 2 High',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SD13' => {Cmd1Name=>'Light OFF',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SA13' => {Cmd1Name=>'ALL-Link Alias 1 Low',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SC13' => {Cmd1Name=>'ALL-Link Alias 1 Low',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SD14' => {Cmd1Name=>'Light OFF Fast',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SA14' => {Cmd1Name=>'ALL-Link Alias 2 Low',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SC14' => {Cmd1Name=>'ALL-Link Alias 2 Low',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SD15' => {Cmd1Name=>'Light Brighten One Step',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SA15' => {Cmd1Name=>'ALL-Link Alias 3 High',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SC15' => {Cmd1Name=>'ALL-Link Alias 3 High',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SD16' => {Cmd1Name=>'Light Dim One Step',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SA16' => {Cmd1Name=>'ALL-Link Alias 3 Low',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SC16' => {Cmd1Name=>'ALL-Link Alias 3 Low',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SD17' => {Cmd1Name=>'Light Start Manual Change',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD1700' => {Cmd1Name=>'Light Start Manual Change',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Down'},
+'SD1701' => {Cmd1Name=>'Light Start Manual Change',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Up'},
+'SA17' => {Cmd1Name=>'ALL-Link Alias 4 High',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SC17' => {Cmd1Name=>'ALL-Link Alias 4 High',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SD18' => {Cmd1Name=>'Light Stop Manual Change',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SA18' => {Cmd1Name=>'ALL-Link Alias 4 Low',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SC18' => {Cmd1Name=>'ALL-Link Alias 4 Low',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SD19' => {Cmd1Name=>'Light Status Request',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD1900' => {Cmd1Name=>'Light Status Request',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'On Level'},
+'SD1901' => {Cmd1Name=>'Light Status Request',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'LED Bit Flags'},
+'SD1f' => {Cmd1Name=>'Get Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD1f00' => {Cmd1Name=>'Get Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Request Flags'},
+'SD1f01' => {Cmd1Name=>'Get Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'All-Link Database Delta Number'},
+'SD1f02' => {Cmd1Name=>'Get Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Signal-to-Noise'},
+'SDA1f' => {Cmd1Name=>'Get Operating Flags',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Config Flags'},
+'SD20' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD2000' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Program Lock On'},
+'SD2001' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Program Lock Off'},
+'SD2002' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Deveice Dependent'},
+'SD2003' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Deveice Dependent'},
+'SD2004' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Deveice Dependent'},
+'SD2005' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Deveice Dependent'},
+'SD2006' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x06',Cmd2Name=>'Deveice Dependent'},
+'SD2007' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x07',Cmd2Name=>'Deveice Dependent'},
+'SD2008' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x08',Cmd2Name=>'Deveice Dependent'},
+'SD2009' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x09',Cmd2Name=>'Deveice Dependent'},
+'SD200a' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x0a',Cmd2Name=>'Deveice Dependent'},
+'SD200b' => {Cmd1Name=>'Set Operating Flags',Cmd2Flag=>'Command',Cmd2Value=>'0x0b',Cmd2Name=>'Deveice Dependent'},
+'SD21' => {Cmd1Name=>'Light Instant Change',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'On Level'},
+'SA21' => {Cmd1Name=>'ALL-Link Alias 5',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SC21' => {Cmd1Name=>'ALL-Link Alias 5',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Group'},
+'SD22' => {Cmd1Name=>'Light Manually Turned Off',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SD23' => {Cmd1Name=>'Light Manually Turned On',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SD24' => {Cmd1Name=>'Reread Init Values(Deprecated)',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SD25' => {Cmd1Name=>'Remote SET Button Tap',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD2501' => {Cmd1Name=>'Remote SET Button Tap',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'1 Tap'},
+'SD2502' => {Cmd1Name=>'Remote SET Button Tap',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'2 Taps'},
+'SD27' => {Cmd1Name=>'Light Set Status',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'On Level'},
+'SB27' => {Cmd1Name=>'Status Change',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Data'},
+'SD28' => {Cmd1Name=>'Set Address MSB(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'MSB'},
+'SD29' => {Cmd1Name=>'Poke One Byte(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Data'},
+'ED2a' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'ED2a00' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Transfer Failure'},
+'ED2a01' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Complete (1 byte)'},
+'ED2a02' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Complete (2 bytes)'},
+'ED2a03' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Complete (3 bytes)'},
+'ED2a04' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Complete (4 bytes)'},
+'ED2a05' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Complete (5 bytes)'},
+'ED2a06' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x06',Cmd2Name=>'Complete (6 bytes)'},
+'ED2a07' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x07',Cmd2Name=>'Complete (7 bytes)'},
+'ED2a08' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x08',Cmd2Name=>'Complete (8 bytes)'},
+'ED2a09' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x09',Cmd2Name=>'Complete (9 bytes)'},
+'ED2a0a' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x0a',Cmd2Name=>'Complete (10 bytes)'},
+'ED2a0b' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x0b',Cmd2Name=>'Complete (11 bytes)'},
+'ED2a0c' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x0c',Cmd2Name=>'Complete (12 bytes)'},
+'ED2a0d' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0x0d',Cmd2Name=>'Complete (13 bytes)'},
+'ED2aff' => {Cmd1Name=>'Block Data Transfer',Cmd2Flag=>'Command',Cmd2Value=>'0xff',Cmd2Name=>'Request Block Data Transfer'},
+'SD2b' => {Cmd1Name=>'Peek One Byte(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'LSB of Address'},
+'SDA2b' => {Cmd1Name=>'Peek One Byte(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Peeked Byte'},
+'SD2c' => {Cmd1Name=>'Peek One Byte Internal(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'LSB of Address'},
+'SDA2c' => {Cmd1Name=>'Peek One Byte Internal(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Peeked Byte'},
+'SD2d' => {Cmd1Name=>'Poke One Byte Internal(Deprecated)',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Data'},
+'SD2e' => {Cmd1Name=>'Light ON at Ramp Rate',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Level and Rate'},
+'ED2e' => {Cmd1Name=>'Extended Set/Get',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'ED2e00' => {Cmd1Name=>'Extended Set/Get',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Command in D2'},
+'SD2f' => {Cmd1Name=>'Light OFF at Ramp Rate',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Ramp Rate'},
+'ED2f' => {Cmd1Name=>'Read/Write ALL-Link Database',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'ED2f00' => {Cmd1Name=>'Read/Write ALL-Link Database',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Command in D2'},
+'SD30' => {Cmd1Name=>'Beep',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Duration'},
+'ED30' => {Cmd1Name=>'Trigger ALL-Link Command',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'ED3000' => {Cmd1Name=>'Trigger ALL-Link Command',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Trigger Command'},
+'SD40' => {Cmd1Name=>'Sprinkler Valve On',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Valve Number'},
+'ED40' => {Cmd1Name=>'Set Sprinkler Program',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Program Number'},
+'SD41' => {Cmd1Name=>'Sprinkler Valve Off',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Valve Number'},
+'ED41' => {Cmd1Name=>'Sprinkler Get Program Response',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Program Number'},
+'SD42' => {Cmd1Name=>'Sprinkler Program ON',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Program Number'},
+'SD43' => {Cmd1Name=>'Sprinkler Program OFF',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Program Number'},
+'SD44' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD4400' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Load Initialization Values'},
+'SD4401' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Load EEPROM From RAM'},
+'SD4402' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Get Valve Status'},
+'SD4403' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Inhibit Command Acceptance'},
+'SD4404' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Resume Command Acceptance'},
+'SD4405' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Skip Forward'},
+'SD4406' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x06',Cmd2Name=>'Skip Backwards'},
+'SD4407' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x07',Cmd2Name=>'Enable Pump on V8'},
+'SD4408' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x08',Cmd2Name=>'Disable Pump on V8'},
+'SD4409' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x09',Cmd2Name=>'Broadcast ON'},
+'SD440a' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0a',Cmd2Name=>'Broadcast OFF'},
+'SD440b' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0b',Cmd2Name=>'Load RAM from EEPROM'},
+'SD440c' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0c',Cmd2Name=>'Sensor ON'},
+'SD440d' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0d',Cmd2Name=>'Sensor OFF'},
+'SD440e' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0e',Cmd2Name=>'Diagnostics ON'},
+'SD440f' => {Cmd1Name=>'Sprinkler Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0f',Cmd2Name=>'Diagnostics OFF'},
+'SD45' => {Cmd1Name=>'I/O Output ON',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Output Number'},
+'SD46' => {Cmd1Name=>'I/O Output OFF',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Output Number'},
+'SD47' => {Cmd1Name=>'I/O Alarm Data Request',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SD48' => {Cmd1Name=>'I/O Write Output Port',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Data'},
+'SDA48' => {Cmd1Name=>'I/O Write Output Port',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Data Written'},
+'SD49' => {Cmd1Name=>'I/O Read Input Port',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SDA49' => {Cmd1Name=>'I/O Read Input Port',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Data Read'},
+'SD4a' => {Cmd1Name=>'Get Sensor Value',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Sensor Number'},
+'SDA4a' => {Cmd1Name=>'Get Sensor Value',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Sensor Value'},
+'SD4b' => {Cmd1Name=>'Set Sensor 1 Alarm Trigger OFF->ON',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Nominal Value'},
+'ED4b' => {Cmd1Name=>'I/O Set Sensor Nominal',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Sensor Number'},
+'SD4c' => {Cmd1Name=>'I/O Get Sensor Alarm Delta',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Bit Field'},
+'ED4c' => {Cmd1Name=>'I/O Alarm Data Response',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'ED4c00' => {Cmd1Name=>'I/O Alarm Data Response',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Response'},
+'SD4d' => {Cmd1Name=>'I/O Write Configuration Port',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Bit Field'},
+'SD4e' => {Cmd1Name=>'I/O Read Configuration Port',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'SD4e' => {Cmd1Name=>'I/O Read Configuration Port',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'I/O Port Config'},
+'SD4f' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD4f00' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Load Initialization Values'},
+'SD4f01' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Load EEPROM from RAM'},
+'SD4f02' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Status Request'},
+'SD4f03' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Read Analog once'},
+'SD4f04' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Read Analog Always'},
+'SD4f09' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x09',Cmd2Name=>'Enable status change message'},
+'SD4f0a' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0a',Cmd2Name=>'Disable status change message'},
+'SD4f0b' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0b',Cmd2Name=>'Load RAM from EEPROM'},
+'SD4f0c' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0c',Cmd2Name=>'Sensor On'},
+'SD4f0d' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0d',Cmd2Name=>'Sensor Off'},
+'SD4f0e' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0e',Cmd2Name=>'Diagnostics On'},
+'SD4f0f' => {Cmd1Name=>'I/O Module Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0f',Cmd2Name=>'Diagnostics Off'},
+'SD50' => {Cmd1Name=>'Pool Device ON',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Device Number'},
+'ED50' => {Cmd1Name=>'Pool Set Device Temperature',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'ED5000' => {Cmd1Name=>'Pool Set Device Temperature',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Set Temperature'},
+'ED5001' => {Cmd1Name=>'Pool Set Device Temperature',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Set Hysteresis'},
+'SD51' => {Cmd1Name=>'Pool Device OFF',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Device Number'},
+'SD52' => {Cmd1Name=>'Pool Temperature Up',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Increment Count'},
+'SD53' => {Cmd1Name=>'Pool Temperature Down',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Decrement Count'},
+'SD54' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD5400' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Load Initialization Values'},
+'SD5401' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Load EEPROM From RAM'},
+'SD5402' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Get Pool Mode'},
+'SD5403' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Get Ambient Temp'},
+'SD5404' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Get Water Temp'},
+'SD5405' => {Cmd1Name=>'Pool Control',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Get pH'},
+'SD58' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD5800' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Raise Door'},
+'SD5801' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Lower Door'},
+'SD5802' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Open Door'},
+'SD5803' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Close Door'},
+'SD5804' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Stop Door'},
+'SD5805' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Single Door Open'},
+'SD5806' => {Cmd1Name=>'Door Move',Cmd2Flag=>'Command',Cmd2Value=>'0x06',Cmd2Name=>'Single Door Close'},
+'SD59' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD5900' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Raise Door'},
+'SD5901' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Lower Door'},
+'SD5902' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Open Door'},
+'SD5903' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Close Door'},
+'SD5904' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'Stop Door'},
+'SD5905' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'Single Door Open'},
+'SD5906' => {Cmd1Name=>'Door Status Report',Cmd2Flag=>'Command',Cmd2Value=>'0x06',Cmd2Name=>'Single Door Close'},
+'SD60' => {Cmd1Name=>'Window Covering',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD6000' => {Cmd1Name=>'Window Covering',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Open'},
+'SD6001' => {Cmd1Name=>'Window Covering',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Close'},
+'SD6002' => {Cmd1Name=>'Window Covering',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Stop'},
+'SD6003' => {Cmd1Name=>'Window Covering',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Program'},
+'SD61' => {Cmd1Name=>'Window Covering Position',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Position'},
+'SD68' => {Cmd1Name=>'Thermostat Temp Up',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Increment Count'},
+'ED68' => {Cmd1Name=>'Thermostat Zone Temp Up',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Zone Number'},
+'SD69' => {Cmd1Name=>'Thermostat Temp Down',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Decrement Count'},
+'ED69' => {Cmd1Name=>'Thermostat Zone Temp Down',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Zone Number'},
+'SD6a' => {Cmd1Name=>'Thermostat Get Zone Info',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Bit Field'},
+'SDA6a' => {Cmd1Name=>'Thermostat Get Zone Info',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Requested Data'},
+'SD6b' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD6b00' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Load Initialization Values'},
+'SD6b01' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Load EEPROM from RAM'},
+'SD6b02' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Get Thermostat Mode'},
+'SD6b03' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Get ambient temperature'},
+'SD6b04' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x04',Cmd2Name=>'ON Heat'},
+'SD6b05' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x05',Cmd2Name=>'ON Cool'},
+'SD6b06' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x06',Cmd2Name=>'ON Auto'},
+'SD6b07' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x07',Cmd2Name=>'ON Fan'},
+'SD6b08' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x08',Cmd2Name=>'OFF Fan'},
+'SD6b09' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x09',Cmd2Name=>'OFF All'},
+'SD6b0a' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0a',Cmd2Name=>'Program Heat'},
+'SD6b0b' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0b',Cmd2Name=>'Program Cool'},
+'SD6b0c' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0c',Cmd2Name=>'Program Auto'},
+'SD6b0d' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0d',Cmd2Name=>'Get Equipment State'},
+'SD6b0e' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0e',Cmd2Name=>'Set Equipment State'},
+'SD6b0f' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x0f',Cmd2Name=>'Get Temperature Units'},
+'SD6b10' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x10',Cmd2Name=>'Set Fahrenheit'},
+'SD6b11' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x11',Cmd2Name=>'Set Celsius'},
+'SD6b12' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x12',Cmd2Name=>'Get Fan-On Speed'},
+'SD6b13' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x13',Cmd2Name=>'Set Fan-On Speed Low'},
+'SD6b14' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x14',Cmd2Name=>'Set Fan-On Speed Medium'},
+'SD6b15' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x15',Cmd2Name=>'Set Fan-On Speed High'},
+'SD6b16' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x16',Cmd2Name=>'Enable status change message'},
+'SD6b17' => {Cmd1Name=>'Thermostat Control',Cmd2Flag=>'Command',Cmd2Value=>'0x17',Cmd2Name=>'Disable status change message'},
+'SD6c' => {Cmd1Name=>'Thermostat Set Cool Setpoint',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Setpoint Value'},
+'ED6c' => {Cmd1Name=>'Thermostat Set Zone Cool Setpoint',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Zone Number'},
+'SD6d' => {Cmd1Name=>'Thermostat Set Heat Setpoint',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Setpoint Value'},
+'ED6d' => {Cmd1Name=>'Thermostat Set Zone Heat Setpoint',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Zone Number'},
+'SD6e' => {Cmd1Name=>'Thermostat Set or Read Mode',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Bit Field'},
+'SD70' => {Cmd1Name=>'Leak Detector Announce',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SD7000' => {Cmd1Name=>'Leak Detector Announce',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Leak Detected'},
+'SD7001' => {Cmd1Name=>'Leak Detector Announce',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'No Leak Detected'},
+'SD7002' => {Cmd1Name=>'Leak Detector Announce',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Battery Low'},
+'SD7003' => {Cmd1Name=>'Leak Detector Announce',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Battery OK'},
+'SD81' => {Cmd1Name=>'Assign to Companion Group(Deprecated)',Cmd2Flag=>'NA',Cmd2Value=>'',Cmd2Name=>''},
+'EDf0' => {Cmd1Name=>'Read or Write Registers',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Bit Field'},
+'SDf0' => {Cmd1Name=>'EZSnsRF Control',Cmd2Flag=>'Command',Cmd2Value=>'',Cmd2Name=>''},
+'SDf000' => {Cmd1Name=>'EZSnsRF Control',Cmd2Flag=>'Command',Cmd2Value=>'0x00',Cmd2Name=>'Load Initialization Values'},
+'SDf001' => {Cmd1Name=>'EZSnsRF Control',Cmd2Flag=>'Command',Cmd2Value=>'0x01',Cmd2Name=>'Write a Code Record'},
+'SDf002' => {Cmd1Name=>'EZSnsRF Control',Cmd2Flag=>'Command',Cmd2Value=>'0x02',Cmd2Name=>'Read a Code Record'},
+'SDf003' => {Cmd1Name=>'EZSnsRF Control',Cmd2Flag=>'Command',Cmd2Value=>'0x03',Cmd2Name=>'Get a Code Record'},
+'SDf1' => {Cmd1Name=>'Specific Code Record Read',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Record Number'},
+'EDf1' => {Cmd1Name=>'Response to Read Registers',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Bit Field'},
+'EDf1' => {Cmd1Name=>'Code Record Request Respon',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Record Number'},
+'EDf2' => {Cmd1Name=>'Specific Code Record Write',Cmd2Flag=>'Value',Cmd2Value=>'',Cmd2Name=>'Record Number'},
+);
+
+
+#X10 PLM codes
+my %x10_house_codes = (
+	'6' => 'a',
+	'e' => 'b',
+	'2' => 'c',
+	'a' => 'd',
+	'1' => 'e',
+	'9' => 'f',
+	'5' => 'g',
+	'd' => 'h',
+	'7' => 'i',
+	'f' => 'j',
+	'3' => 'k',
+	'b' => 'l',
+	'0' => 'm',
+	'8' => 'n',
+	'4' => 'o',
+	'c' => 'p'
+);
+
+my %x10_unit_codes = (
+	'6' => '1',
+	'e' => '2',
+	'2' => '3',
+	'a' => '4',
+	'1' => '5',
+	'9' => '6',
+	'5' => '7',
+	'd' => '8',
+	'7' => '9',
+	'f' => 'a',
+	'3' => 'b',
+	'b' => 'c',
+	'0' => 'd',
+	'8' => 'e',
+	'4' => 'f',
+	'c' => 'g'
+);
+
+my %x10_commands = (
+	'2' => 'On(J)',
+	'3' => 'Off(K)',
+	'5' => 'Bright(L)',
+	'4' => 'Dim(M)',
+	'a' => 'preset_dim1',
+	'b' => 'preset_dim2',
+	'0' => 'all_units_off(P)',
+	'1' => 'all_lights_on(O)',
+	'6' => 'all_lights_off',
+	'f' => 'status',
+	'd' => 'status_on',
+	'e' => 'status_off',
+	'9' => 'hail_ack',
+	'7' => 'ext_code',
+	'c' => 'ext_data',
+	'8' => 'hail_request'
+);
+
+
+=item plm_decode(plm_string)
+
+Returns a string containing a decoded PLM data packet
+
+=cut
+
+sub plm_decode {
+	my ($plm_string) = @_;
+	$plm_string = lc($plm_string);
+
+#0262 1e5d8e 0f 0d00
+#0262 1e5d8e 0f 0d00 06
+
+#FSM:0 - Look for PLM STX
+#FSM:1 - Parse PLM command category
+#FSM:2 - Parse command from PLM (50-58)
+#FSM:3 - Parse command to PLM (60-73) and response 
+
+	my $plm_message = '';
+	my $plm_cmd_id;
+
+	my $FSM = 0;
+	my $abort = 0;
+	my $finished = 0;
+	while(!$abort and !$finished) {
+		if($FSM==0) {
+			#FSM:0 - Look for PLM STX
+			#Must start with STX or it is garbage
+			if(substr($plm_string,0,2) ne '02') {
+				$plm_message .= "Missing (02)STX: Invalid message\n";
+				$abort++;
+			} else {
+				$FSM++;
+			}
+		} elsif($FSM==1) {
+			#FSM:1 - Parse PLM command category
+			#Must be at least 2 bytes (4 nibbles) or it is garbage
+			if(length($plm_string) < 4) {
+				$abort++;
+			} else {
+				#include the STX for historical reasons
+				$plm_cmd_id = substr($plm_string,0,4);
+				$plm_message .= sprintf("%20s: (","PLM Command").$plm_cmd_id.") ".$plmcmd2string{$plm_cmd_id}."\n";
+				if(length($plm_string) < $plmcmdlen{uc($plm_cmd_id)}->[0] * 2) {
+					$plm_message .= "        Message length too short for PLM command.  Not parsed\n";
+					$abort++;
+				} elsif(length($plm_string) > $plmcmdlen{uc($plm_cmd_id)}->[0] * 2 
+						and length($plm_string) < $plmcmdlen{uc($plm_cmd_id)}->[1] * 2) {
+					$plm_message .= "        Message length too short for PLM command.  Not parsed\n";
+					$abort++;
+				} elsif(substr($plm_string,2,1) == '5') {
+					#commands from PLM are 50-58
+					$FSM = 2;
+				} else {
+					$FSM = 3;
+				}
+			}
+		} elsif($FSM==2) {
+			#FSM:2 - Parse command from PLM (50-58)
+			if($plm_cmd_id eq '0250') {
+				$plm_message .= sprintf("%24s: ",'From Address').substr($plm_string,4,2).":".substr($plm_string,6,2).":".substr($plm_string,8,2)."\n";
+				$plm_message .= sprintf("%24s: ",'To Address').substr($plm_string,10,2).":".substr($plm_string,12,2).":".substr($plm_string,14,2)."\n";
+                                $plm_message .= sprintf("%24s: ",'Message Flags').substr($plm_string,16,2)."\n";
+                                $plm_message .= insteon_message_flags_decode(substr($plm_string,16,2));
+				my $flag_ext = hex(substr($plm_string,16,1))&0b0001;
+                                $plm_message .= sprintf("%24s: ",'Insteon Message').substr($plm_string,18,($flag_ext ? 32 : 4))."\n";
+				$plm_message .= insteon_decode(substr($plm_string,16));
+			} elsif($plm_cmd_id eq '0251'){
+				$plm_message .= sprintf("%24s: ",'From Address').substr($plm_string,4,2).":".substr($plm_string,6,2).":".substr($plm_string,8,2)."\n";
+				$plm_message .= sprintf("%24s: ",'To Address').substr($plm_string,10,2).":".substr($plm_string,12,2).":".substr($plm_string,14,2)."\n";
+                                $plm_message .= sprintf("%24s: ",'Message Flags').substr($plm_string,16,2)."\n";
+                                $plm_message .= insteon_message_flags_decode(substr($plm_string,16,2));
+				my $flag_ext = hex(substr($plm_string,16,1))&0b0001;
+                                $plm_message .= sprintf("%24s: ",'Insteon Message').substr($plm_string,18,($flag_ext ? 32 : 4))."\n";
+				$plm_message .= insteon_decode(substr($plm_string,16));
+			} elsif($plm_cmd_id eq '0252'){
+                                $plm_message .= sprintf("%20s: ",'X10 Message').substr($plm_string,4,4)."\n";
+                                $plm_message .= plm_x10_decode(substr($plm_string,4,4));
+			} elsif($plm_cmd_id eq '0253'){
+				my @link_string = ('PLM is Responder', 'PLM is Controller', 'All-Link deleted');
+				$plm_message .= sprintf("%20s: (",'Link Code').substr($plm_string,4,2).") ".$link_string[substr($plm_string,4,2)]."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Group').substr($plm_string,6,2)."\n";
+				$plm_message .= sprintf("%20s: ",'Linked Device').substr($plm_string,8,2).":".substr($plm_string,10,2).":".substr($plm_string,12,2)."\n";
+				$plm_message .= sprintf("%20s: ",'Device Category').substr($plm_string,14,2).":".substr($plm_string,16,2)."\n";
+				$plm_message .= sprintf("%20s: ",'Firmware').substr($plm_string,18,2)."\n";
+			} elsif($plm_cmd_id eq '0254'){
+				my @buttons = ('SET Button ','Button 2 ','Button 3 ');
+				my @button_event = ('','','Tapped','Held 3 seconds','Released');
+				$plm_message .= sprintf("%20s: (",'Button Event').substr($plm_string,4,2).") ".$buttons[substr($plm_string,4,1)].$button_event[substr($plm_string,5,1)]."\n";
+			} elsif($plm_cmd_id eq '0255'){
+				#Nothing else to do
+			} elsif($plm_cmd_id eq '0256'){
+				$plm_message .= sprintf("%20s: ",'All-Link Group').substr($plm_string,4,2)."\n";
+				$plm_message .= sprintf("%20s: ",'Device').substr($plm_string,6,2).":".substr($plm_string,8,2).":".substr($plm_string,10,2)."\n";
+			} elsif($plm_cmd_id eq '0257'){
+				$plm_message .= sprintf("%20s: ",'All-Link Flags').substr($plm_string,4,2)."\n";
+				my $flags = hex(substr($plm_string,4,2));
+				$plm_message .= sprintf("%20s: Record is ",'Bit 7').($flags&0b10000000?'in use':'available')."\n";
+				$plm_message .= sprintf("%20s: PLM is ",'Bit 6').($flags&0b01000000?'controller':'responder')."\n";
+				$plm_message .= sprintf("%20s: ACK is ",'Bit 5').($flags&0b00100000?'required':'not required')."\n";
+				$plm_message .= sprintf("%20s: Record has ",'Bit 1').($flags&0b00000001?'been used before':'not been used before')."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Group').substr($plm_string,6,2)."\n";
+				$plm_message .= sprintf("%20s: ",'Linked Device').substr($plm_string,8,2).":".substr($plm_string,10,2).":".substr($plm_string,12,2)."\n";
+#XXXX				$plm_message .= sprintf("%20s: ",'Link Data').substr($plm_string,14,6)."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Command1').substr($plm_string,14,2)."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Command2').substr($plm_string,16,2)."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Data').substr($plm_string,18,2)."\n";
+				#TODO:  Find insteon information for link data decode
+			} elsif($plm_cmd_id eq '0258'){
+				$plm_message .= sprintf("%20s: (",'Status Byte').substr($plm_string,4,2).") ".(substr($plm_string,4,2) eq '06' ? "ACK" : "NACK")."\n";
+			} else {
+				$plm_message .= sprintf("%20s: (",'Undefined Cmd Data').substr($plm_string,4).")\n";
+			}
+			$finished++;
+		} elsif($FSM==3) {
+			#FSM:3 - Parse command to PLM (60-73) and response
+			my $plm_ack_pos;
+			if($plm_cmd_id eq '0260') {
+				if(length($plm_string)>4) {
+					$plm_message .= sprintf("%20s: ",'PLM Device ID').substr($plm_string,4,2).":".substr($plm_string,6,2).":".substr($plm_string,8,2)."\n";
+					$plm_message .= sprintf("%20s: ",'Device Category').substr($plm_string,10,2).":".substr($plm_string,12,2)."\n";
+					$plm_message .= sprintf("%20s: ",'Firmware').substr($plm_string,14,2)."\n";
+				}
+				$plm_ack_pos = 16;
+			} elsif($plm_cmd_id eq '0261'){
+				$plm_message .= sprintf("%20s: ",'All-Link Group').substr($plm_string,4,2)."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Command1').substr($plm_string,6,2)."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Command2').substr($plm_string,8,2)."\n";
+				$plm_ack_pos = 10;
+				#TODO:  look up insteon information for all-link command1 / command2 decode
+			} elsif($plm_cmd_id eq '0262'){
+				$plm_message .= sprintf("%24s: ",'To Address').substr($plm_string,4,2).":".substr($plm_string,6,2).":".substr($plm_string,8,2)."\n";
+                                $plm_message .= sprintf("%24s: ",'Message Flags').substr($plm_string,10,2)."\n";
+                                $plm_message .= insteon_message_flags_decode(substr($plm_string,10,2));
+				my $flag_ext = hex(substr($plm_string,10,1))&0b0001;
+                                $plm_message .= sprintf("%24s: ",'Insteon Message').substr($plm_string,12,($flag_ext ? 32 : 4))."\n";
+				$plm_message .= insteon_decode(substr($plm_string,10));
+                                $plm_ack_pos = $flag_ext ? 44 : 16;
+			} elsif($plm_cmd_id eq '0263'){
+                                $plm_message .= sprintf("%20s: ",'X10 Message').substr($plm_string,4,4)."\n";
+                                $plm_message .= plm_x10_decode(substr($plm_string,4,4));
+                                $plm_ack_pos = 8;
+			} elsif($plm_cmd_id eq '0264'){
+				my %link_string = ('00'=>'PLM is Responder',
+						   '01'=>'PLM is Controller',
+						   '03'=>'PLM is either Responder or Controller',
+						   'ff'=>'Delete All-Link');
+				$plm_message .= sprintf("%20s: (",'Link Code').substr($plm_string,4,2).") ".$link_string{substr($plm_string,4,2)}."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Group').substr($plm_string,6,2)."\n";
+				$plm_ack_pos = 8;
+			} elsif($plm_cmd_id eq '0265'){
+				$plm_ack_pos = 4;
+			} elsif($plm_cmd_id eq '0266'){
+				$plm_message .= sprintf("%20s: ",'Device Category').substr($plm_string,4,2).":".substr($plm_string,6,2)."\n";
+				$plm_message .= sprintf("%20s: ",'Firmware').substr($plm_string,8,2)."\n";
+				$plm_ack_pos = 10;
+			} elsif($plm_cmd_id eq '0267'){
+				$plm_ack_pos = 4;
+			} elsif($plm_cmd_id eq '0268'){
+				$plm_message .= sprintf("%20s: ",'Command2 Data').substr($plm_string,4,2)."\n";
+				$plm_ack_pos = 6;
+			} elsif($plm_cmd_id eq '0269'){
+				$plm_ack_pos = 4;
+			} elsif($plm_cmd_id eq '026a'){
+				$plm_ack_pos = 4;
+			} elsif($plm_cmd_id eq '026b'){
+				$plm_message .= sprintf("%20s: (",'PLM Config Flags').substr($plm_string,4,2).")\n";
+				my $flags = hex(substr($plm_string,4,2));
+				$plm_message .= sprintf("%20s: Automatic Linking ",'Bit 7').($flags&0b10000000?'Disabled':'Enabled')."\n";
+				$plm_message .= sprintf("%20s: Monitor Mode ",'Bit 6').($flags&0b01000000?'Enabled':'Disabled')."\n";
+				$plm_message .= sprintf("%20s: Automatic LED ",'Bit 5').($flags&0b00100000?'Disabled':'Enabled')."\n";
+				$plm_message .= sprintf("%20s: Deadman Feature ",'Bit 4').($flags&0b00010000?'Disabled':'Enabled')."\n";
+				$plm_ack_pos = 6;
+			} elsif($plm_cmd_id eq '026c'){
+				$plm_ack_pos = 4;
+			} elsif($plm_cmd_id eq '026d'){
+				$plm_ack_pos = 4;
+			} elsif($plm_cmd_id eq '026e'){
+				$plm_ack_pos = 4;
+			} elsif($plm_cmd_id eq '026f'){
+				my %control_string = ('00'=>'Find All-Link Record',
+						      '01'=>'Find Next All-Link Record',
+						      '20'=>'Update/Add All-Link Record',
+						      '40'=>'Update/Add Controller All-Link Record',
+						      '41'=>'Update/Add Responder All-Link Record',
+						      '80'=>'Delete All-Link Record');
+				$plm_message .= sprintf("%20s: (",'Control code').substr($plm_string,4,2).") ".$control_string{substr($plm_string,4,2)}."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Flags').substr($plm_string,6,2)."\n";
+				my $flags = hex(substr($plm_string,6,2));
+				$plm_message .= sprintf("%20s: Record is ",'Bit 7').($flags&0b10000000?'in use':'available')."\n";
+				$plm_message .= sprintf("%20s: PLM is ",'Bit 6').($flags&0b01000000?'controller':'responder')."\n";
+				$plm_message .= sprintf("%20s: ACK is ",'Bit 5').($flags&0b00100000?'required':'not required')."\n";
+				$plm_message .= sprintf("%20s: Record has ",'Bit 1').($flags&0b00000001?'been used before':'not been used before')."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Group').substr($plm_string,8,2)."\n";
+				$plm_message .= sprintf("%20s: ",'Linked Device').substr($plm_string,10,2).":".substr($plm_string,12,2).":".substr($plm_string,14,2)."\n";
+#				$plm_message .= sprintf("%20s: ",'Link Data').substr($plm_string,16,6)."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Command1').substr($plm_string,16,2)."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Command2').substr($plm_string,18,2)."\n";
+				$plm_message .= sprintf("%20s: ",'All-Link Data').substr($plm_string,20,2)."\n";
+				$plm_ack_pos = 22;
+				#TODO:  Find insteon information for link data decode
+			} elsif($plm_cmd_id eq '0270'){
+				$plm_message .= sprintf("%20s: ",'Command2 Data').substr($plm_string,4,2)."\n";
+				$plm_ack_pos = 6;
+			} elsif($plm_cmd_id eq '0271'){
+				$plm_message .= sprintf("%20s: ",'Command1 Data').substr($plm_string,4,2)."\n";
+				$plm_message .= sprintf("%20s: ",'Command2 Data').substr($plm_string,6,2)."\n";
+				$plm_ack_pos = 8;
+			} elsif($plm_cmd_id eq '0272'){
+				$plm_ack_pos = 4;
+			} elsif($plm_cmd_id eq '0273'){
+				if(length($plm_string)>4) {
+					$plm_message .= sprintf("%20s: (",'PLM Config Flags').substr($plm_string,4,2).")\n";
+					my $flags = hex(substr($plm_string,4,2));
+					$plm_message .= sprintf("%20s: Automatic Linking ",'Bit 7').($flags&0b10000000?'Disabled':'Enabled')."\n";
+					$plm_message .= sprintf("%20s: Monitor Mode ",'Bit 6').($flags&0b01000000?'Enabled':'Disabled')."\n";
+					$plm_message .= sprintf("%20s: Automatic LED ",'Bit 5').($flags&0b00100000?'Disabled':'Enabled')."\n";
+					$plm_message .= sprintf("%20s: Deadman Feature ",'Bit 4').($flags&0b00010000?'Disabled':'Enabled')."\n";
+					$plm_message .= sprintf("%20s: ",'Spare 1').substr($plm_string,6,2)."\n";
+					$plm_message .= sprintf("%20s: ",'Spare 2').substr($plm_string,8,2)."\n";
+				}
+				$plm_ack_pos = 10;
+			} else {
+				$plm_message .= sprintf("%20s: (",'Undefined Cmd Data').substr($plm_string,4).")\n";
+				$plm_ack_pos = 255;
+			}
+
+			if(length($plm_string)>$plm_ack_pos) {
+				$plm_message .= sprintf("%20s: (",'PLM Response').substr($plm_string,$plm_ack_pos,2).") ".(substr($plm_string,$plm_ack_pos,2) eq '06' ? "ACK" : "NACK")."\n";
+			}
+			$finished++;
+		} #if($FSM==)
+	} #while(!$abort)
+	return $plm_message;
+}
+
+
+=item plm_x10_decode(x10_string)
+
+Returns a string containing a decoded PLM X10 data packet
+
+=cut
+
+sub plm_x10_decode {
+	my ($x10_string) = @_;
+	$x10_string = lc($x10_string);
+
+	my $x10_message = '';
+	$x10_message .= sprintf("%24s: (",'X10 House Code').substr($x10_string,0,1).") ".uc($x10_house_codes{substr($x10_string,0,1)})."\n";
+	if(substr($x10_string,2,1) == '8') {
+		$x10_message .= sprintf("%24s: (",'X10 Command').substr($x10_string,1,1).") ".$x10_commands{substr($x10_string,1,1)}."\n";
+	} else {
+		$x10_message .= sprintf("%24s: (",'X10 Unit Code').substr($x10_string,1,1).") ".uc($x10_unit_codes{substr($x10_string,1,1)})."\n";
+	}
+	return($x10_message);
+}
+
+=item insteon_message_flags_decode(flags_string)
+
+Returns a string containing decoded Insteon message flags
+
+=cut
+
+sub insteon_message_flags_decode {
+        my ($flags_string) = @_;
+        $flags_string = lc($flags_string);
+
+        my $flags_message = '';
+	my %message_string = (	'4'=>'Broadcast Message',
+				'0'=>'Direct Message',
+				'1'=>'ACK of Direct Message',
+				'5'=>'NAK of Direct Message',
+				'6'=>'All-Link Broadcast Message',
+				'2'=>'All-Link Cleanup Direct Message',
+				'3'=>'ACK of All-Link Cleanup Direct Message',
+				'7'=>'NAK of All-Link Cleanup Direct Message');
+
+	my $flag_msg = hex(substr($flags_string,0,1))>>1;
+	my $flag_ext = hex(substr($flags_string,0,1))&0b0001;
+	$flags_message .= sprintf("%28s: (%03b) ",'Message Type',$flag_msg).$message_string{$flag_msg}."\n";
+	$flags_message .= sprintf("%28s: (%01b) ",'Message Length',$flag_ext).($flag_ext?'Extended Length':'Standard Length')."\n";
+	$flags_message .= sprintf("%28s: %d\n",'Hops Left',hex(substr($flags_string,1,1))>>2);
+	$flags_message .= sprintf("%28s: %d\n",'Max Hops',hex(substr($flags_string,1,1))&0b0011);
+        return($flags_message);
+}
+
+=item insteon_decode(command_string)
+
+Returns a string containing a decoded Insteon message. Input
+string should be the Insteon message starting with the 
+message flag byte.
+
+=cut
+
+sub insteon_decode {
+	my ($command_string) = @_;
+#Mapping from message type bit field to acronyms used in
+#  the INSTEON Command Tables documentation
+#100 4 - SB: Standard Broadcast
+
+#000 0 - SD or ED: Standard/Extended Direct
+#001 1 - SDA or EDA: Standard/Extended Direct ACK
+#101 5 - SDN or EDN: Standard/Extended Direct NACK
+
+#110 6 - SA: Standard All-Link Broadcast
+#010 2 - SC: Standard Cleanup Direct
+#011 3 - SCA: Standard Cleanup Direct ACK
+#111 7 - SCN: Standard Cleanup Direct NACK
+
+#For SDA parsing 1st look for SDA command entry, if not found
+#then lookup SD command entry for parsing information.
+
+#For SDN, EDN, SCN NACK responses, lookup coorespnding
+#SD, ED, or SC entry for parsing, but always use the 
+#common NACK decoding for Cmd2
+
+#Lookup SB, SD, ED, SA, and SC messages with just the 
+#Cmd1 entry appended at the key.  If Cmd2 Flag == "Command" 
+#then repeat lookup appending both Cmd1 and Cmd2 for 
+#the key.  If Cmd2 Flag != "Command" then use flag value
+#to control how Cmd2 is displayed.  If second lookup fails,
+#simply print Cmd2 and indicate "not decoded".
+
+	my $extended = hex(substr($command_string,0,1))&0b0001;
+	my $msg_type = (hex(substr($command_string,0,1))&0b1110)>>1;
+	my $cmd1 = substr($command_string,2,2);
+	my $cmd2 = substr($command_string,4,2);
+	my $data = '';
+	$data = substr($command_string,6) if($extended);
+
+	#Truncate $command_string to remove PLM ACK byte
+	$command_string = substr($command_string,0, ($extended ? 34 : 8));
+	my $insteon_message='';
+	if( $msg_type == 0) {
+		#SD/ED: Standard/Extended Direct
+		$insteon_message .= insteon_decode_cmd(($extended ? 'ED' : 'SD'), $cmd1, $cmd2, $extended, $data);
+	} elsif( $msg_type == 1 or $msg_type == 5) {
+		#SDA/EDA: Standard/Extended Direct ACK/NACK
+		$insteon_message .= insteon_decode_cmd(($extended ? 'EDA' : 'SDA'), $cmd1, $cmd2, $extended, $data);
+	} elsif( $msg_type == 6) {
+		#SA: Standard All-Link Broadcast
+		$insteon_message .= insteon_decode_cmd('SA', $cmd1, $cmd2, $extended, $data);
+	} elsif( $msg_type == 2) {
+		#SC: Standard Direct Cleanup
+		$insteon_message .= insteon_decode_cmd('SC', $cmd1, $cmd2, $extended, $data);
+	} elsif( $msg_type == 3 or $msg_type == 7) {
+		#SCA: Standard Direct Cleanup ACK/NACK
+		$insteon_message .= insteon_decode_cmd('SCA', $cmd1, $cmd2, $extended, $data);
+	} else {
+		$insteon_message .= sprintf("%28s: ",'')."Insteon message type not decoded\n";
+	}
+
+	return $insteon_message
+}
+
+
+sub insteon_decode_cmd {
+	my ($cmdLookup, $cmd1, $cmd2, $extended, $Data) = @_;
+	my $insteon_message='';
+	my ($cmdDecoder1, $cmdDecoder2);
+
+	#lookup 1st without using Cmd2
+	$cmdDecoder1 = $insteonCmd{$cmdLookup.$cmd1};
+
+	if(!defined($cmdDecoder1)) {
+		#lookup failed, if this is an ACK/NACK retry w/ direct version
+		if( $cmdLookup eq 'SDA') {
+			$cmdDecoder1 = $insteonCmd{'SD'.$cmd1};
+		} elsif( $cmdLookup eq 'EDA') {
+			$cmdDecoder1 = $insteonCmd{'ED'.$cmd1};
+		} elsif( $cmdLookup eq 'SCA') {
+			$cmdDecoder1 = $insteonCmd{'SC'.$cmd1};
+		}
+		if(!defined($cmdDecoder1)) {
+			#still not found so quit trying to decode
+			$insteon_message .= sprintf("%28s: ",'Cmd 1').$cmd1." Insteon command not decoded\n";
+			$insteon_message .= sprintf("%28s: ",'Cmd 2').$cmd2."\n";
+			$insteon_message .= sprintf("%28s: ",'D1-D14').$Data."\n" if( $extended);
+			return $insteon_message;
+		}
+	}
+
+	if($cmdDecoder1->{'Cmd2Flag'} eq 'Command') {
+		#2nd lookup with Cmd2
+		$cmdDecoder2 = $insteonCmd{$cmdLookup.$cmd1.$cmd2};
+		if(!defined($cmdDecoder2)) {
+			#lookup failed, if this is an ACK/NACK retry w/ direct version
+			if( $cmdLookup eq 'SDA') {
+				$cmdDecoder2 = $insteonCmd{'SD'.$cmd1};
+			} elsif( $cmdLookup eq 'EDA') {
+				$cmdDecoder2 = $insteonCmd{'ED'.$cmd1};
+			} elsif( $cmdLookup eq 'SCA') {
+				$cmdDecoder2 = $insteonCmd{'SC'.$cmd1};
+			}
+		}
+		if(!defined($cmdDecoder2)) {
+			#still not found so don't decode
+			$insteon_message .= sprintf("%28s: ",'Cmd 1').$cmd1." Insteon command not decoded\n";
+			$insteon_message .= sprintf("%28s: ",'Cmd 2').$cmd2."\n";
+			$insteon_message .= sprintf("%28s: ",'D1-D14').$Data."\n" if( $extended);
+		} else {
+			$insteon_message .= sprintf("%28s: (",'Cmd 1').$cmd1.") ".$cmdDecoder2->{'Cmd1Name'}."\n";
+			$insteon_message .= sprintf("%28s: (",'Cmd 2').$cmd2.") ".$cmdDecoder2->{'Cmd2Name'}."\n";
+			$insteon_message .= sprintf("%28s: ",'D1-D14').$Data."\n" if( $extended);
+		}
+	} elsif( $cmdDecoder1->{'Cmd2Flag'} eq 'Value') {
+		$insteon_message .= sprintf("%28s: (",'Cmd 1').$cmd1.") ".$cmdDecoder1->{'Cmd1Name'}."\n";
+		$insteon_message .= sprintf("%28s: (",'Cmd 2').$cmd2.") ".$cmdDecoder1->{'Cmd2Name'}."\n";
+		$insteon_message .= sprintf("%28s: ",'D1-D14').$Data."\n" if( $extended);
+	} elsif( $cmdDecoder1->{'Cmd2Flag'} eq 'NA') {
+		$insteon_message .= sprintf("%28s: (",'Cmd 1').$cmd1.") ".$cmdDecoder1->{'Cmd1Name'}."\n";
+		$insteon_message .= sprintf("%28s: ",'Cmd 2').$cmd2."\n";
+		$insteon_message .= sprintf("%28s: ",'D1-D14').$Data."\n" if( $extended);
+	} else {
+		$insteon_message .= "Parse database has undefined Cmd2Flag: ".$cmdDecoder1->{'Cmd2Flag'};
+	}
+
+	return $insteon_message;
+}
+
+
+#$plm_cmd is 2 byte hex cmd; $send_rec is 0 for send, 1, for rec; $is_extended is 1 if extended send
+#returns expected byte length
+sub insteon_cmd_len{
+	my ($plm_cmd, $send_rec, $is_extended) = @_;
+	if ($is_extended && $plmcmdlen{uc($plm_cmd)} > 2) {
+		return $plmcmdlen{uc($plm_cmd)}->[($send_rec+2)];
+	} else {
+		return $plmcmdlen{uc($plm_cmd)}->[$send_rec];
+	}
+}
+
+
+=back
+
+=head1 SUPPORT
+
+You can find documentation for this module with the perldoc command.
+
+    perldoc Insteon::MessageDecoder
+
+=head1 SEE ALSO
+
+L<Insteon Command Tables 20070925a|www.insteon.net/pdf/INSTEON_Command_Tables_20070925a.pdf>
+
+PLM command details can be found in the 2412S Developers Guide.  This 
+document is not supplied by SmartHome but may be available through an 
+internet search.
+
+=head1 AUTHOR
+
+Michael Stovenour
+
+=head1 LICENSE AND COPYRIGHT
+
+Copyright 2012 Michael Stovenour
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+MA  02110-1301, USA.
+
+=cut
+
+1;
diff --git a/lib/Insteon/MessageDecoder_test.pl b/lib/Insteon/MessageDecoder_test.pl
index 8e409bc9c..4487b54d4 100755
--- a/lib/Insteon/MessageDecoder_test.pl
+++ b/lib/Insteon/MessageDecoder_test.pl
@@ -1,89 +1,89 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w
 
-use strict;
-use lib "..";
-use Insteon::MessageDecoder;
-
-
-#0250 1e5d8e 1edc30 2b 0d02
-plm_decode_print('02525700');
-plm_decode_print('02525a80');
-plm_decode_print('02530102aabbcc1a1bff');
-plm_decode_print('025402');
-plm_decode_print('02560105aabbcc');
-plm_decode_print('0257ff04aabbcc0badff');
-plm_decode_print('025806');
-plm_decode_print('025a15aabbcc');
-plm_decode_print('0260');
-plm_decode_print('02601edc3003159b06');
-plm_decode_print('026105eeff');
-plm_decode_print('026105eeff06');
-plm_decode_print('02635700');
-plm_decode_print('0263570006');
-plm_decode_print('02635a80');
-plm_decode_print('02635a8006');
-plm_decode_print('02640105');
-plm_decode_print('02640305');
-plm_decode_print('0264000506');
-plm_decode_print('0264ff05');
-plm_decode_print('0265');
-plm_decode_print('026515');
-plm_decode_print('026603159b');
-plm_decode_print('026603159b06');
-plm_decode_print('0267');
-plm_decode_print('026706');
-plm_decode_print('0268bb');
-plm_decode_print('0268bb06');
-plm_decode_print('0269');
-plm_decode_print('026915');
-plm_decode_print('026a');
-plm_decode_print('026a06');
-plm_decode_print('026bf0');
-plm_decode_print('026bf006');
-plm_decode_print('026b00');
-plm_decode_print('026c');
-plm_decode_print('026c06');
-plm_decode_print('026d');
-plm_decode_print('026d15');
-plm_decode_print('026e');
-plm_decode_print('026e06');
-plm_decode_print('026f20ff05aabbcc0badff');
-plm_decode_print('026f41ff05aabbcc0badff15');
-plm_decode_print('0270bb');
-plm_decode_print('0270bb06');
-plm_decode_print('02710bad');
-plm_decode_print('02710bad06');
-plm_decode_print('0272');
-plm_decode_print('027206');
-plm_decode_print('0273f00000');
-plm_decode_print('0273f0000006');
-plm_decode_print('0273000000');
-plm_decode_print('0274000000');
-
-plm_decode_print('02621e5d8e0f0d00');
-plm_decode_print('02621e5d8e2f0d00');
-plm_decode_print('02621e5d8e4f0d00');
-plm_decode_print('02621e5d8e6f0d00');
-plm_decode_print('02621e5d8e8f0d00');
-plm_decode_print('02621e5d8eaf0d00');
-plm_decode_print('02621e5d8ecf0d00');
-plm_decode_print('02621e5d8eef0d00');
-
-plm_decode_print('02621e5d8e0f0d0006');
-plm_decode_print('02621e5d8e0f0f00');
-plm_decode_print('02501e5d8e1edc302b0f00');
-
-plm_decode_print('02622042d30f1f00');
-plm_decode_print('02501e5d8e1edc302b1f00');
-
-plm_decode_print('02502042d3000005cb1100');
-plm_decode_print('02502042d3110105cb0600');
-
-plm_decode_print('02621f058c1f2e000100000000000000000000000000');
-plm_decode_print('02511f058c1edc30112e000101000020201cfe3f0001000000');
-
-sub plm_decode_print {
-	my ($plm_string) = @_;
-	print( "PLM Message: $plm_string\n");
-	print( Insteon::MessageDecoder::plm_decode($plm_string)."\n");
-}
+use strict;
+use lib "..";
+use Insteon::MessageDecoder;
+
+
+#0250 1e5d8e 1edc30 2b 0d02
+plm_decode_print('02525700');
+plm_decode_print('02525a80');
+plm_decode_print('02530102aabbcc1a1bff');
+plm_decode_print('025402');
+plm_decode_print('02560105aabbcc');
+plm_decode_print('0257ff04aabbcc0badff');
+plm_decode_print('025806');
+plm_decode_print('025a15aabbcc');
+plm_decode_print('0260');
+plm_decode_print('02601edc3003159b06');
+plm_decode_print('026105eeff');
+plm_decode_print('026105eeff06');
+plm_decode_print('02635700');
+plm_decode_print('0263570006');
+plm_decode_print('02635a80');
+plm_decode_print('02635a8006');
+plm_decode_print('02640105');
+plm_decode_print('02640305');
+plm_decode_print('0264000506');
+plm_decode_print('0264ff05');
+plm_decode_print('0265');
+plm_decode_print('026515');
+plm_decode_print('026603159b');
+plm_decode_print('026603159b06');
+plm_decode_print('0267');
+plm_decode_print('026706');
+plm_decode_print('0268bb');
+plm_decode_print('0268bb06');
+plm_decode_print('0269');
+plm_decode_print('026915');
+plm_decode_print('026a');
+plm_decode_print('026a06');
+plm_decode_print('026bf0');
+plm_decode_print('026bf006');
+plm_decode_print('026b00');
+plm_decode_print('026c');
+plm_decode_print('026c06');
+plm_decode_print('026d');
+plm_decode_print('026d15');
+plm_decode_print('026e');
+plm_decode_print('026e06');
+plm_decode_print('026f20ff05aabbcc0badff');
+plm_decode_print('026f41ff05aabbcc0badff15');
+plm_decode_print('0270bb');
+plm_decode_print('0270bb06');
+plm_decode_print('02710bad');
+plm_decode_print('02710bad06');
+plm_decode_print('0272');
+plm_decode_print('027206');
+plm_decode_print('0273f00000');
+plm_decode_print('0273f0000006');
+plm_decode_print('0273000000');
+plm_decode_print('0274000000');
+
+plm_decode_print('02621e5d8e0f0d00');
+plm_decode_print('02621e5d8e2f0d00');
+plm_decode_print('02621e5d8e4f0d00');
+plm_decode_print('02621e5d8e6f0d00');
+plm_decode_print('02621e5d8e8f0d00');
+plm_decode_print('02621e5d8eaf0d00');
+plm_decode_print('02621e5d8ecf0d00');
+plm_decode_print('02621e5d8eef0d00');
+
+plm_decode_print('02621e5d8e0f0d0006');
+plm_decode_print('02621e5d8e0f0f00');
+plm_decode_print('02501e5d8e1edc302b0f00');
+
+plm_decode_print('02622042d30f1f00');
+plm_decode_print('02501e5d8e1edc302b1f00');
+
+plm_decode_print('02502042d3000005cb1100');
+plm_decode_print('02502042d3110105cb0600');
+
+plm_decode_print('02621f058c1f2e000100000000000000000000000000');
+plm_decode_print('02511f058c1edc30112e000101000020201cfe3f0001000000');
+
+sub plm_decode_print {
+	my ($plm_string) = @_;
+	print( "PLM Message: $plm_string\n");
+	print( Insteon::MessageDecoder::plm_decode($plm_string)."\n");
+}
diff --git a/lib/Insteon/PLMTerminal.pl b/lib/Insteon/PLMTerminal.pl
index e8eefb2b0..2af4de0cd 100755
--- a/lib/Insteon/PLMTerminal.pl
+++ b/lib/Insteon/PLMTerminal.pl
@@ -1,344 +1,344 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-B<PLMTerminal.pl> - A standalone way to test an Insteon PLM (2412/2413) 
-
-=head1 SYNOPSIS
-
-PLMTerminal.pl [OPTIONS] serialport
-
- serialport
-   May be windows or linux serial port device
-   (e.g. COM1, /dev/ttyS0, /dev/ttyUSB0, etc)
-
- Options:
-   -nochecksum, -c               Disable i2CS checksums
-   -h, -?, --help                Brief help message
-   --man                         Full documentation
-
-=head1 DESCRIPTION
-
-PLMTerminal.pl is a simple serial terminal application designed to 
-interact with an Insteon PLM.  This tool is handy for studying how 
-the PLM interacts with the Insteon network.  It will display all 
-PLM messages received on the serial port and decode those messages 
-using the Insteon::MessageDecoder module.  The tool will also 
-collect any key presses in the [0-9a-fA-F] range and interpret 
-those key presses as a hex string sent to the PLM after the user 
-presses enter.  The string will be decoded before being sent to 
-the PLM.
-
-If the user types an extended Insteon message (PLM command 0x62), a 
-checksum will be automatically added to the D14 byte for compliance 
-with i2CS devices. This can be disabled with the --nochecksum option.
-
-Pressing Ctl-C will exit the program.
-
-=head1 EXAMPLE
-
-    perl insteon_test.pl /dev/ttyS1
-    
-    perl insteon_test.pl COM1
-    
-=head1 EXAMPLE PLM COMMANDS
-
-To get started try typing some of these PLM commands.  The first 
-example 0x60 is a great command to verify that the PLM is working. 
-If you do not get a response then you may be using the wrong serial 
-port device or the PLM may not be working.  In the examples replace 
-xxyyzz with the device ID from the device label.
-    
-    0260 - Get PLM Info
-    0262xxyyzz0f0d00 - Get Insteon Engine Version of device with zzyyzz id
-    0262xxyyzz1f2e000100000000000000000000000000 - Get config request
-
-=head1 BUGS
-
-There are probably many bugs.  The script was written and tested 
-with a 2413U PLM v1.7(9b) under Debian Woody linux (perl 5.10) and 
-under Windows ActiveState Perl (perl 5.12).  It "should" work with 
-other PLMs but the decoder may not decode some messages correctly.  
-For help undestanding the decoded PLM messages see the 
-Insteon::MessageDecoder documentation. 
-
-=head1 OPTIONS AND ARGUMENTS
-
-=over 8
-
-=item B<-nochecksum, -c>
-
-Will not overwrite D14 with the user data checksum on extended messages. 
-Use this option if you are sending extended messages to non-i2CS devices 
-and the extended command needs the D14 byte.  This should not be necessary.
-
-=item B<-h, -?, --help>
-
-Prints a brief help message and exits.
-
-=item B<--man>
-
-Prints the everything you ever wanted to know about the script and exits.
-
-=back
-
-=head1 SEE ALSO
-
-L<Insteon Command Tables 20070925a|www.insteon.net/pdf/INSTEON_Command_Tables_20070925a.pdf>
-
-PLM command details can be found in the 2412S Developers Guide.  This 
-document is not supplied by SmartHome but may be available through an 
-internet search.
-
-=cut
-
-use strict;
-use lib '..', '../site';
-use Insteon::MessageDecoder;
-use Term::ReadKey;
-use Getopt::Long;
-use Pod::Usage;
-
-use constant {
-	RX_BLOCKTIME => 100, #block for 100ms
-	RX_TIMEOUT => 20,    #100ms * 20 = 2 seconds
-};
-
-our $parms = getParameters();
-
-my $device;
-my $port;
-$port = $parms->{'port'};
-if ($^O eq "MSWin32") {
-	print "Windows; opening Win32 serial port\n";
-	require Win32::SerialPort;
-	die "$@\n" if ($@);
-	$port = 'COM1' unless $port;
-	$device = Win32::SerialPort->new($port) or die "Can't start $port\n";
-}
-else {
-	print "Not Windows; opening linux serial port\n";
-	require Device::SerialPort;
-	die "$@\n" if ($@);
-	$port = '/dev/ttyS0' unless $port;
-	$device = Device::SerialPort->new($port) or die "Can't start $port\n";
-}
-print "Using port=$port\n";
-
-$device->error_msg(1);	# use built-in error messages
-$device->user_msg(0);
-$device->databits(8);
-$device->baudrate(19200);
-$device->parity("none");
-$device->stopbits(1);
-$device->dtr_active(1);
-$device->handshake("none");
-$device->read_char_time(0);    # don't wait for each character
-$device->read_const_time(RX_BLOCKTIME); # wait RX_BLOCKTIME (ms) per unfulfilled "read" call
-$device->write_settings || die "Could not set up port\n";
-print "Done setting port parameters\n";
-
-our $ctlc = 0;
-$SIG{INT} = \&handler_ctlc;
-sub handler_ctlc {
-	$SIG{INT} = \&handler_ctlc;
-	$ctlc++;
-}
-
-print( "Ready to send command.  Looking for messages. Use Ctl-C to quit.\n\n");
-my $RxMessage='';
-my $RxTimeout=RX_TIMEOUT;
-my $TxMessage='';
-ReadMode(3);  #set a consistent readmode for both linux and windows
-$| = 1;
-while(!$ctlc) {
-	#Read data from serial port
-	#Blocks for RX_BLOCKTIME (ms); set above
-	my ($count, $buffer) = $device->read(25);
-	for( my $i = 0; $i < $count; $i++) {
-		$RxMessage .= substr($buffer,$i,1);
-#		print("RXMessage=>".unpack( 'H*', $RxMessage)."\n");
-		#Check to see if an entire message was received
-		if( plmValidMessage($RxMessage)) {
-			print "PLM=>".unpack( 'H*', $RxMessage)."\n";
-			print Insteon::MessageDecoder::plm_decode(unpack( 'H*', $RxMessage))."\n";
-			$RxMessage = '';
-			$RxTimeout=RX_TIMEOUT;
-		}
-	}
-
-	#Once message reception starts check for receive timeout.  
-	#Will only occur if there is message corruption or if the 
-	#PLM sends a message type that is not in the messageLength hash below.
-	$RxTimeout-- if($RxMessage ne '');
-	if( $RxTimeout == 0) {
-		print("RX Timeout; command not parsed\n");
-		print("Dumping:  ".unpack('H*',$RxMessage)."\n");
-		print Insteon::MessageDecoder::plm_decode(unpack( 'H*', $RxMessage))."\n";
-
-		$RxMessage = '';
-		$RxTimeout=RX_TIMEOUT;
-	}
-
-	#collect keypresses from user
-	#Ignore zero length messages (i.e. user just hits enter)
-	#  but print a new line for visual separation
-	my $key;
-	while( defined ($key = ReadKey(-1))) {
-		if( $key eq "\n" or $key eq "\r" and $TxMessage ne '') { # enter
-			$TxMessage = insertChecksum($TxMessage) if( !$parms->{'nochecksum'});
-			print "\nPLM<=".$TxMessage."\n";
-			print Insteon::MessageDecoder::plm_decode($TxMessage)."\n";
-			$device->write( pack( 'H*', $TxMessage));
-			$TxMessage = '';
-		} elsif( ($key =~ /[0-9a-fA-F]/)) {
-			$TxMessage .= $key;
-			print $key;
-		} elsif( $key eq "\n" or $key eq "\r") {
-			print "\n";
-		} else { #else just drop the key
-		}
-	}
-} #while(!$ctlc)
-
-print "Closing device port\n";
-$device->close || die "\nclose problem with $port\n";
-ReadMode(0);
-
-sub plmValidMessage {
-	my ($message) = @_;
-	
-	#Need at least 2 bytes to get started
-	return 0 if(length($message)<2);
-	
-my %messageLength = (
-	'50' => 11,
-	'51' => 25,
-	'52' => 4,
-	'53' => 10,
-	'54' => 3,
-	'55' => 2,
-	'56' => 13,
-	'57' => 10,
-	'58' => 3,
-	'60' => 9,
-	'61' => 6,
-	'62' => 23, # could get 9 or 23 (Standard or Extended Message received)
-	'63' => 5,
-	'64' => 5,
-	'65' => 3,
-	'66' => 6,
-	'67' => 3,
-	'68' => 4,
-	'69' => 3,
-	'6A' => 3,
-	'6B' => 4,
-	'6C' => 3,
-	'6D' => 3,
-	'6E' => 3,
-	'6F' => 12,
-	'70' => 4,
-	'71' => 5,
-	'72' => 3,
-	'73' => 6,
-	);	
-
-	#look up hex code of message in %messageLength
-#	print("Looking up command=>".unpack('H*',substr($message,1,1))."\n");
-	my $validLength = $messageLength{unpack('H*',substr($message,1,1))};
-
-	#override for '62' and standard message flag
-	if( ord(substr($message,1,1)) == 0x62) {
-		#need 6 bytes to check insteon message type (standard/extended)
-		return 0 if(length($message)<6);
-		#Use message flags to determine
-		$validLength = 9 if( !(ord(substr($message,5,1))&0b00010000));
-	}
-
-	#Will return false always if PLM message code is not in hash above
-	#Eventually the RX_TIMEOUT should declare end of message unless
-	#the bus is very busy.  Multiple messages could get concatinated.
-#	print("\$validLength=$validLength; length(\$message)=".length($message)."\n");
-	return -1 if( defined($validLength) and length($message) == $validLength);
-	return 0;
-}
-
-
-sub insertChecksum {
-	my ($message) = @_;
-
-	#Only processes a PLM 0x62 Insteon send
-	# i.e. 0262 toaddr flags cmd1 cmd2 d1 ... d14
-	#Must be a string of hex nibbles
-	#                 1111111111222222222233333333334444
-	#       01234567890123456789012345678901234567890123
-	# i.e. '02622042d31f2e000107110000000000000000000000'
-	#Verify it is 0x62 extended message (leave others alone)
-	return $message if( substr($message,2,2) ne '62' or !(hex(substr($message,10,1))&0b0001));
-	#Mask off D14 incase one was already set
-	$message = substr($message,0,42)."00";
-	my $sum = 0;
-	$sum += hex($_) for (unpack('(A2)*', substr($message,12)));
-	$sum = (~$sum + 1) & 0xff;
-	$message = substr($message,0,42).unpack( 'H2', chr($sum));
-	return $message
-}
-
-sub getParameters {
-    
-	my $parms = {};
-
-	my $nochecksum = 0;
-#	my $port = "";
-	my $help = 0;
-	my $man = 0;
-    
-	GetOptions (
-		"nochecksum|c"     => \$nochecksum,
-#		"port|p:s"         => \$port,
-#		"verbose:i"        => \$VERBOSE,
-#		"version|v"        => sub {die( "\n$0:  Version:  $VERSION\n");},
-		"help|h|?"         => \$help,
-		"man"              => \$man,
-		);
-
-	pod2usage(-verbose => 1)  if ($help);
-	pod2usage(-verbose => 2)  if ($man);
-
-	if( !defined($ARGV[0])) {
-		print("Serial port must be specified (e.g. COM1 or /dev/ttyS0)\n\n");
-		pod2usage(-verbose => 1);
-	}
-	
-	#Build the hash of command line parameters
-	$parms->{'nochecksum'} = $nochecksum;
-#	$parms->{'port'} = $port;
-	$parms->{'port'} = $ARGV[0];
-
-	return $parms;
-}
-
-=head1 AUTHOR
-
-Michael Stovenour
-
-=head1 LICENSE AND COPYRIGHT
-
-Copyright 2012 Michael Stovenour
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-MA  02110-1301, USA.
-
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+B<PLMTerminal.pl> - A standalone way to test an Insteon PLM (2412/2413) 
+
+=head1 SYNOPSIS
+
+PLMTerminal.pl [OPTIONS] serialport
+
+ serialport
+   May be windows or linux serial port device
+   (e.g. COM1, /dev/ttyS0, /dev/ttyUSB0, etc)
+
+ Options:
+   -nochecksum, -c               Disable i2CS checksums
+   -h, -?, --help                Brief help message
+   --man                         Full documentation
+
+=head1 DESCRIPTION
+
+PLMTerminal.pl is a simple serial terminal application designed to 
+interact with an Insteon PLM.  This tool is handy for studying how 
+the PLM interacts with the Insteon network.  It will display all 
+PLM messages received on the serial port and decode those messages 
+using the Insteon::MessageDecoder module.  The tool will also 
+collect any key presses in the [0-9a-fA-F] range and interpret 
+those key presses as a hex string sent to the PLM after the user 
+presses enter.  The string will be decoded before being sent to 
+the PLM.
+
+If the user types an extended Insteon message (PLM command 0x62), a 
+checksum will be automatically added to the D14 byte for compliance 
+with i2CS devices. This can be disabled with the --nochecksum option.
+
+Pressing Ctl-C will exit the program.
+
+=head1 EXAMPLE
+
+    perl insteon_test.pl /dev/ttyS1
+    
+    perl insteon_test.pl COM1
+    
+=head1 EXAMPLE PLM COMMANDS
+
+To get started try typing some of these PLM commands.  The first 
+example 0x60 is a great command to verify that the PLM is working. 
+If you do not get a response then you may be using the wrong serial 
+port device or the PLM may not be working.  In the examples replace 
+xxyyzz with the device ID from the device label.
+    
+    0260 - Get PLM Info
+    0262xxyyzz0f0d00 - Get Insteon Engine Version of device with zzyyzz id
+    0262xxyyzz1f2e000100000000000000000000000000 - Get config request
+
+=head1 BUGS
+
+There are probably many bugs.  The script was written and tested 
+with a 2413U PLM v1.7(9b) under Debian Woody linux (perl 5.10) and 
+under Windows ActiveState Perl (perl 5.12).  It "should" work with 
+other PLMs but the decoder may not decode some messages correctly.  
+For help undestanding the decoded PLM messages see the 
+Insteon::MessageDecoder documentation. 
+
+=head1 OPTIONS AND ARGUMENTS
+
+=over 8
+
+=item B<-nochecksum, -c>
+
+Will not overwrite D14 with the user data checksum on extended messages. 
+Use this option if you are sending extended messages to non-i2CS devices 
+and the extended command needs the D14 byte.  This should not be necessary.
+
+=item B<-h, -?, --help>
+
+Prints a brief help message and exits.
+
+=item B<--man>
+
+Prints the everything you ever wanted to know about the script and exits.
+
+=back
+
+=head1 SEE ALSO
+
+L<Insteon Command Tables 20070925a|www.insteon.net/pdf/INSTEON_Command_Tables_20070925a.pdf>
+
+PLM command details can be found in the 2412S Developers Guide.  This 
+document is not supplied by SmartHome but may be available through an 
+internet search.
+
+=cut
+
+use strict;
+use lib '..', '../site';
+use Insteon::MessageDecoder;
+use Term::ReadKey;
+use Getopt::Long;
+use Pod::Usage;
+
+use constant {
+	RX_BLOCKTIME => 100, #block for 100ms
+	RX_TIMEOUT => 20,    #100ms * 20 = 2 seconds
+};
+
+our $parms = getParameters();
+
+my $device;
+my $port;
+$port = $parms->{'port'};
+if ($^O eq "MSWin32") {
+	print "Windows; opening Win32 serial port\n";
+	require Win32::SerialPort;
+	die "$@\n" if ($@);
+	$port = 'COM1' unless $port;
+	$device = Win32::SerialPort->new($port) or die "Can't start $port\n";
+}
+else {
+	print "Not Windows; opening linux serial port\n";
+	require Device::SerialPort;
+	die "$@\n" if ($@);
+	$port = '/dev/ttyS0' unless $port;
+	$device = Device::SerialPort->new($port) or die "Can't start $port\n";
+}
+print "Using port=$port\n";
+
+$device->error_msg(1);	# use built-in error messages
+$device->user_msg(0);
+$device->databits(8);
+$device->baudrate(19200);
+$device->parity("none");
+$device->stopbits(1);
+$device->dtr_active(1);
+$device->handshake("none");
+$device->read_char_time(0);    # don't wait for each character
+$device->read_const_time(RX_BLOCKTIME); # wait RX_BLOCKTIME (ms) per unfulfilled "read" call
+$device->write_settings || die "Could not set up port\n";
+print "Done setting port parameters\n";
+
+our $ctlc = 0;
+$SIG{INT} = \&handler_ctlc;
+sub handler_ctlc {
+	$SIG{INT} = \&handler_ctlc;
+	$ctlc++;
+}
+
+print( "Ready to send command.  Looking for messages. Use Ctl-C to quit.\n\n");
+my $RxMessage='';
+my $RxTimeout=RX_TIMEOUT;
+my $TxMessage='';
+ReadMode(3);  #set a consistent readmode for both linux and windows
+$| = 1;
+while(!$ctlc) {
+	#Read data from serial port
+	#Blocks for RX_BLOCKTIME (ms); set above
+	my ($count, $buffer) = $device->read(25);
+	for( my $i = 0; $i < $count; $i++) {
+		$RxMessage .= substr($buffer,$i,1);
+#		print("RXMessage=>".unpack( 'H*', $RxMessage)."\n");
+		#Check to see if an entire message was received
+		if( plmValidMessage($RxMessage)) {
+			print "PLM=>".unpack( 'H*', $RxMessage)."\n";
+			print Insteon::MessageDecoder::plm_decode(unpack( 'H*', $RxMessage))."\n";
+			$RxMessage = '';
+			$RxTimeout=RX_TIMEOUT;
+		}
+	}
+
+	#Once message reception starts check for receive timeout.  
+	#Will only occur if there is message corruption or if the 
+	#PLM sends a message type that is not in the messageLength hash below.
+	$RxTimeout-- if($RxMessage ne '');
+	if( $RxTimeout == 0) {
+		print("RX Timeout; command not parsed\n");
+		print("Dumping:  ".unpack('H*',$RxMessage)."\n");
+		print Insteon::MessageDecoder::plm_decode(unpack( 'H*', $RxMessage))."\n";
+
+		$RxMessage = '';
+		$RxTimeout=RX_TIMEOUT;
+	}
+
+	#collect keypresses from user
+	#Ignore zero length messages (i.e. user just hits enter)
+	#  but print a new line for visual separation
+	my $key;
+	while( defined ($key = ReadKey(-1))) {
+		if( $key eq "\n" or $key eq "\r" and $TxMessage ne '') { # enter
+			$TxMessage = insertChecksum($TxMessage) if( !$parms->{'nochecksum'});
+			print "\nPLM<=".$TxMessage."\n";
+			print Insteon::MessageDecoder::plm_decode($TxMessage)."\n";
+			$device->write( pack( 'H*', $TxMessage));
+			$TxMessage = '';
+		} elsif( ($key =~ /[0-9a-fA-F]/)) {
+			$TxMessage .= $key;
+			print $key;
+		} elsif( $key eq "\n" or $key eq "\r") {
+			print "\n";
+		} else { #else just drop the key
+		}
+	}
+} #while(!$ctlc)
+
+print "Closing device port\n";
+$device->close || die "\nclose problem with $port\n";
+ReadMode(0);
+
+sub plmValidMessage {
+	my ($message) = @_;
+	
+	#Need at least 2 bytes to get started
+	return 0 if(length($message)<2);
+	
+my %messageLength = (
+	'50' => 11,
+	'51' => 25,
+	'52' => 4,
+	'53' => 10,
+	'54' => 3,
+	'55' => 2,
+	'56' => 13,
+	'57' => 10,
+	'58' => 3,
+	'60' => 9,
+	'61' => 6,
+	'62' => 23, # could get 9 or 23 (Standard or Extended Message received)
+	'63' => 5,
+	'64' => 5,
+	'65' => 3,
+	'66' => 6,
+	'67' => 3,
+	'68' => 4,
+	'69' => 3,
+	'6A' => 3,
+	'6B' => 4,
+	'6C' => 3,
+	'6D' => 3,
+	'6E' => 3,
+	'6F' => 12,
+	'70' => 4,
+	'71' => 5,
+	'72' => 3,
+	'73' => 6,
+	);	
+
+	#look up hex code of message in %messageLength
+#	print("Looking up command=>".unpack('H*',substr($message,1,1))."\n");
+	my $validLength = $messageLength{unpack('H*',substr($message,1,1))};
+
+	#override for '62' and standard message flag
+	if( ord(substr($message,1,1)) == 0x62) {
+		#need 6 bytes to check insteon message type (standard/extended)
+		return 0 if(length($message)<6);
+		#Use message flags to determine
+		$validLength = 9 if( !(ord(substr($message,5,1))&0b00010000));
+	}
+
+	#Will return false always if PLM message code is not in hash above
+	#Eventually the RX_TIMEOUT should declare end of message unless
+	#the bus is very busy.  Multiple messages could get concatinated.
+#	print("\$validLength=$validLength; length(\$message)=".length($message)."\n");
+	return -1 if( defined($validLength) and length($message) == $validLength);
+	return 0;
+}
+
+
+sub insertChecksum {
+	my ($message) = @_;
+
+	#Only processes a PLM 0x62 Insteon send
+	# i.e. 0262 toaddr flags cmd1 cmd2 d1 ... d14
+	#Must be a string of hex nibbles
+	#                 1111111111222222222233333333334444
+	#       01234567890123456789012345678901234567890123
+	# i.e. '02622042d31f2e000107110000000000000000000000'
+	#Verify it is 0x62 extended message (leave others alone)
+	return $message if( substr($message,2,2) ne '62' or !(hex(substr($message,10,1))&0b0001));
+	#Mask off D14 incase one was already set
+	$message = substr($message,0,42)."00";
+	my $sum = 0;
+	$sum += hex($_) for (unpack('(A2)*', substr($message,12)));
+	$sum = (~$sum + 1) & 0xff;
+	$message = substr($message,0,42).unpack( 'H2', chr($sum));
+	return $message
+}
+
+sub getParameters {
+    
+	my $parms = {};
+
+	my $nochecksum = 0;
+#	my $port = "";
+	my $help = 0;
+	my $man = 0;
+    
+	GetOptions (
+		"nochecksum|c"     => \$nochecksum,
+#		"port|p:s"         => \$port,
+#		"verbose:i"        => \$VERBOSE,
+#		"version|v"        => sub {die( "\n$0:  Version:  $VERSION\n");},
+		"help|h|?"         => \$help,
+		"man"              => \$man,
+		);
+
+	pod2usage(-verbose => 1)  if ($help);
+	pod2usage(-verbose => 2)  if ($man);
+
+	if( !defined($ARGV[0])) {
+		print("Serial port must be specified (e.g. COM1 or /dev/ttyS0)\n\n");
+		pod2usage(-verbose => 1);
+	}
+	
+	#Build the hash of command line parameters
+	$parms->{'nochecksum'} = $nochecksum;
+#	$parms->{'port'} = $port;
+	$parms->{'port'} = $ARGV[0];
+
+	return $parms;
+}
+
+=head1 AUTHOR
+
+Michael Stovenour
+
+=head1 LICENSE AND COPYRIGHT
+
+Copyright 2012 Michael Stovenour
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+MA  02110-1301, USA.
+
 =cut
\ No newline at end of file
diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index 2b91d37f2..ab2b7bc1c 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -1,990 +1,990 @@
-=head1 B<Insteon_PLM>
-
-=head2 SYNOPSIS
-
----Example Code and Usage---
-
-=head2 DESCRIPTION
-
-This is the base interface class for Insteon Power Line Modem (PLM)
-
-=head2 INHERITS
-
-L<Serial_Item|Serial_Item>,
-L<Insteon::BaseInterface|Insteon::BaseInterface>
-
-=head2 METHODS
-
-=over
-
-=cut
-
-package Insteon_PLM;
-
-use strict;
-use Insteon;
-use Insteon::BaseInterface;
-use Insteon::BaseInsteon;
-use Insteon::AllLinkDatabase;
-use Insteon::MessageDecoder;
-
-@Insteon_PLM::ISA = ('Serial_Item','Insteon::BaseInterface');
-
-
-my %prefix = (
-#PLM Serial Commands
-                        insteon_received 	=> '0250',
-                        insteon_ext_received 	=> '0251',
-                        x10_received 		=> '0252',
-                        all_link_complete 	=> '0253',
-                        plm_button_event 	=> '0254',
-                        plm_user_reset		=> '0255',
-                        all_link_clean_failed 	=> '0256',
-                        all_link_record 	=> '0257',
-                        all_link_clean_status 	=> '0258',
-                        plm_info 		=> '0260',
-                        all_link_send 		=> '0261',
-                        insteon_send 		=> '0262',
-                        insteon_ext_send	=> '0262',
-                        all_link_direct_cleanup => '0262',
-                        x10_send 		=> '0263',
-                        all_link_start 		=> '0264',
-                        all_link_cancel		=> '0265',
-			plm_reset 		=> '0267',
-                        all_link_first_rec	=> '0269',
-                        all_link_next_rec	=> '026a',
-			plm_set_config 		=> '026b',
-			plm_led_on 		=> '026d',
-			plm_led_off 		=> '026e',
-                        all_link_manage_rec	=> '026f',
-			insteon_nak 		=> '0270',
-			insteon_ack 		=> '0271',
-			rf_sleep 		=> '0272',
-			plm_get_config 		=> '0273'
-);
-
-=item C<serial_startup()>
-
-Creates a new serial port connection.
-
-=cut
-
-sub serial_startup {
-   my ($instance) = @_;
-   my $port       = $::config_parms{$instance . "_serial_port"};
-   my $speed = 19200;
-
-   &::print_log("[Insteon_PLM] serial:$port:$speed");
-   &::serial_port_create($instance, $port, $speed,'none','raw');
-
-}
-
-=item C<new()>
-
-Instantiates a new object.
-
-=cut
-
-sub new {
-   my ($class, $port_name, $p_deviceid) = @_;
-   $port_name = 'Insteon_PLM' if !$port_name;
-   my $port       = $::config_parms{$port_name . "_serial_port"};
-
-   my $self = new Insteon::BaseInterface();
-   $$self{state}     = '';
-   $$self{said}      = '';
-   $$self{state_now} = '';
-   $$self{port_name} = $port_name;
-   $$self{port} = $port;
-	$$self{last_command} = '';
-	$$self{_prior_data_fragment} = '';
-   bless $self, $class;
-   $self->restore_data('debug', 'corrupt_count_log');
-   $$self{corrupt_count_log} = 0;
-   $$self{aldb} = new Insteon::ALDB_PLM($self);
-
-   &Insteon::add($self);
-
-   $self->device_id($p_deviceid) if defined $p_deviceid;
-
-	$$self{xmit_delay} = $::config_parms{Insteon_PLM_xmit_delay};
-	$$self{xmit_delay} = 0.25 unless defined $$self{xmit_delay}; # and $$self{xmit_delay} > 0.125;
-	&::print_log("[Insteon_PLM] setting default xmit delay to: $$self{xmit_delay}");
-	$$self{xmit_x10_delay} = $::config_parms{Insteon_PLM_xmit_x10_delay};
-	$$self{xmit_x10_delay} = 0.5 unless defined $$self{xmit_x10_delay} and $$self{xmit_x10_delay} > 0.5;
-	&::print_log("[Insteon_PLM] setting x10 xmit delay to: $$self{xmit_x10_delay}");
-	$self->_clear_timeout('xmit');
-	$self->_clear_timeout('command');
-
-   return $self;
-}
-
-=item C<corrupt_count_log([type]>
-
-Sets or gets the number of corrupt message that have arrived that could not be
-associated with any device since the last time C<reset_message_stats> was called.
-These are generally instances in which the from device ID is corrupt.
-
-If type is set, to any value, will increment corrupt count by one.
-
-Returns: current corrupt count.
-
-=cut 
-
-sub corrupt_count_log
-{
-    my ($self, $corrupt_count_log) = @_;
-    $$self{corrupt_count_log}++ if $corrupt_count_log;
-    return $$self{corrupt_count_log};
-}
-
-=item C<reset_message_stats>
-
-Resets the retry, fail, outgoing, incoming, and corrupt message counters.
-
-=cut 
-
-sub reset_message_stats
-{
-    my ($self) = @_;
-    $$self{corrupt_count_log} = 0;
-}
-
-=item C<restore_string()>
-
-This is called by mh on exit to save the cached ALDB of a device to persistant data.
-
-=cut
-
-sub restore_string
-{
-	my ($self) = @_;
-	my $restore_string = $self->SUPER::restore_string();
-	if ($self->_aldb) {
-		$restore_string .= $self->_aldb->restore_string();
-        }
-	return $restore_string;
-}
-
-=item C<check_for_data()>
-
-Called once per loop.  This checks for any data waiting on the serial port, if
-data exists it is sent to C<_parse_data>.  If there is no data waiting, then
-this checks to see if the timers for any previous commands have expired, if they
-have, it calls C<retry_active_message()>.  Else, this checks to see if there
-is any timeout preventing a transmission right now, if there is no timeout it
-calles C<process_queue()>.
-
-=cut
-
-sub check_for_data {
-
-	my ($self) = @_;
-      	my $port_name = $$self{port_name};
-      	&::check_for_generic_serial_data($port_name) if $::Serial_Ports{$port_name}{object};
-      	my $data = $::Serial_Ports{$port_name}{data};
-      	# always check for data first; if it exists, then process; otherwise check if pending commands exist
-      	if ($data)
-        {
-        	# now, clear the serial port data so that any subsequent command processing doesn't result in an immediate filling/overwriting
-	        if (length($$self{_data_fragment}))
-        	{
-#        		$main::Serial_Ports{$port_name}{data}=pack("H*",$$self{_data_fragment});
-			# always clear the buffer since we're maintaining the fragment separately
-               		$main::Serial_Ports{$port_name}{data} = '';
-       		}
-       		else
-        	{
-        		$main::Serial_Ports{$port_name}{data} = '';
-        	}
-
-         	#lets turn this into Hex. I hate perl binary funcs
-        	my $data = unpack "H*", $data;
-
-         	$self->_parse_data($data);
-      	}
-        elsif (defined $self)
-      	{
-      	# if no data being received, then check if any timeouts have expired
-        	if ($self->_check_timeout('command') == 1)
-                {
-            		$self->_clear_timeout('command');
-            		if ($self->transmit_in_progress) {
-#               &::print_log("[Insteon_PLM] WARN: No acknowledgement from PLM to last command requires forced abort of current command."
-#                  . " This may reflect a problem with your environment.");
-#               pop(@{$$self{command_stack2}}); # pop the active command off the queue
-	       			$self->retry_active_message();
-               			$self->process_queue();
-            		}
-                	else
-                	{
-               			&::print_log("[Insteon_PLM] DEBUG2: PLM command timer expired but no transmission in place.  Moving on...") if $self->debuglevel(2, 'insteon');
-	       			$self->clear_active_message();
-               			$self->process_queue();
-            		}
-		}
-                elsif ($self->_check_timeout('xmit') == 1)
-                {
-           		$self->_clear_timeout('xmit');
-         		if (!($self->transmit_in_progress))
-                        {
-            			$self->process_queue();
-               		}
-            	}
-	}
-}
-
-=item C<set()>
-
-Used to send X10 messages, generates an X10 command and queues it.
-
-=cut
-
-sub set
-{
-	my ($self,$p_state,$p_setby,$p_response) = @_;
-
-        my @x10_commands = &Insteon::X10Message::generate_commands($p_state, $p_setby);
-        foreach my $command (@x10_commands)
-        {
-	    $self->queue_message(new Insteon::X10Message($command));
-        }
-}
-
-=item C<complete_linking_as_responder()>
-
-Puts the PLM into linking mode as a responder.
-
-=cut
-
-sub complete_linking_as_responder
-{
-	my ($self, $group) = @_;
-
-	# it is not clear that group should be anything as the group will be taken from the controller
-	$group = '01' unless $group;
-	# set up the PLM as the responder
-	my $cmd = '00'; # responder code
-	$cmd .= $group; # WARN - must be 2 digits and in hex!!
-        my $message = new Insteon::InsteonMessage('all_link_start', $self);
-        $message->interface_data($cmd);
-	$self->queue_message($message)
-}
-
-=item C<log_alllink_table()>
-
-Causes MisterHouse to dump its cache of the PLM link table to the log.
-
-=cut
-
-sub log_alllink_table
-{
-	my ($self) = @_;
-        $self->_aldb->log_alllink_table if $self->_aldb;
-}
-
-=item C<scan_link_table()>
-
-Causes MisterHouse to scan the link table of the PLM only.
-
-=cut
-
-sub scan_link_table
-{
-	my ($self,$callback) = @_;
-	#$$self{links} = undef; # clear out the old
-        $$self{aldb} = new Insteon::ALDB_PLM($self);
-	$$self{_mem_activity} = 'scan';
-        $$self{_mem_callback} = ($callback) ? $callback : undef;
-	$self->_aldb->get_first_alllink();
-}
-
-=item C<initiate_linking_as_controller([p_group])>
-
-Puts the PLM into linking mode as a controller, if p_group is specified the
-controller will be added for this group, otherwise it will be for group 00.
-
-=cut
-
-sub initiate_linking_as_controller
-{
-	my ($self, $group, $success_callback, $failure_callback) = @_;
-
-	$group = '00' unless $group;
-	# set up the PLM as the responder
-	my $cmd = '01'; # controller code
-	$cmd .= $group; # WARN - must be 2 digits and in hex!!
-        my $message = new Insteon::InsteonMessage('all_link_start', $self);
-        $message->interface_data($cmd);
-        $message->success_callback($success_callback);
-        $message->failure_callback($failure_callback);
-	$self->queue_message($message);
-}
-
-=item C<initiate_unlinking_as_controller([p_group])>
-
-Puts the PLM into unlinking mode, if p_group is specified the PLM will try
-to unlink any devices linked to that group that identify themselves with a set
-button press.
-
-=cut
-
-sub initiate_unlinking_as_controller
-{
-	my ($self, $group) = @_;
-
-	$group = 'FF' unless $group;
-	# set up the PLM as the responder
-	my $cmd = 'FF'; # controller code
-	$cmd .= $group; # WARN - must be 2 digits and in hex!!
-        my $message = new Insteon::InsteonMessage('all_link_start', $self);
-        $message->interface_data($cmd);
-	$self->queue_message($message);
-}
-
-=item C<cancel_linking()>
-
-Cancels any pending linking session that has not completed.
-
-=cut
-
-sub cancel_linking
-{
-	my ($self) = @_;
-	$self->queue_message(new Insteon::InsteonMessage('all_link_cancel', $self));
-}
-
-=item C<_aldb()>
-
-Returns the PLM's aldb object.
-
-=cut
-
-sub _aldb
-{
-   my ($self) = @_;
-   return $$self{aldb};
-}
-
-=item C<_send_cmd()>
-
-Causes a message to be sent to the serial port.
-
-=cut
-
-sub _send_cmd {
-	my ($self, $message, $cmd_timeout) = @_;
-	my $instance = $$self{port_name};
-	if (!(ref $main::Serial_Ports{$instance}{object})) {
-		print "WARN: Insteon_PLM serial port not initialized!\n";
-		return;
-	}
-	unshift(@{$$self{command_history}},$::Time);
-	$self->transmit_in_progress(1);
-
-        my $command = $message->interface_data;
-	my $delay = $$self{xmit_delay};
-
-        # determine the delay from the point that the message was created to
-        # the point that it is queued
-        my $incurred_delay_time = $message->seconds_delayed;
-
-	if ($message->isa('Insteon::X10Message')) { # is x10; so, be slow
-		&main::print_log("[Insteon_PLM] DEBUG2: Sending " . $message->to_string . " incurred delay of "
-		. sprintf('%.2f',$incurred_delay_time) . " seconds") if $self->debuglevel(2, 'insteon');
-        	$command = $prefix{x10_send} . $command;
-		$delay = $$self{xmit_x10_delay};
-                # clear command timeout so that we don't wait for an insteon ack before sending the next command
-	} else {
-                my $command_type = $message->command_type;
-		&main::print_log("[Insteon_PLM] DEBUG2: Sending " . $message->to_string . " incurred delay of "
-		. sprintf('%.2f',$incurred_delay_time) . " seconds; starting hop-count: "
-		. ((ref $message->setby && $message->setby->isa('Insteon::BaseObject')) ? $message->setby->default_hop_count : "?")) if $message->setby->debuglevel(2, 'insteon');
-                $command = $prefix{$command_type} . $command;
-                if ($command_type eq 'all_link_send' or $command_type eq 'insteon_send' or $command_type eq 'insteon_ext_send' or $command_type eq 'all_link_direct_cleanup')
-                {
-         		$self->_set_timeout('command', $cmd_timeout); # a commmand needs to be PLM ack'd w/i 3 seconds or it gets dropped
-                }
-        }
-	my $is_extended = ($message->can('command_type') && $message->command_type eq "insteon_ext_send") ? 1 : 0;
-	if (length($command) != (Insteon::MessageDecoder::insteon_cmd_len(substr($command,0,4), 0, $is_extended)*2)){
-		&::print_log( "[Insteon_PLM]: ERROR!! Command sent to PLM " . lc($command) 
-		. " is of an incorrect length.  Message not sent.");
-		$self->clear_active_message();
-	} 
-	else
-	{
-		my $debug_obj = $self;
-		$debug_obj = $message->setby if ($message->can('setby') && ref $message->setby);
-		&::print_log( "[Insteon_PLM] DEBUG3: Sending  PLM raw data: ".lc($command)) if $debug_obj->debuglevel(3, 'insteon');
-		&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($command)) if $debug_obj->debuglevel(4, 'insteon');
-		my $data = pack("H*",$command);
-		$main::Serial_Ports{$instance}{object}->write($data) if $main::Serial_Ports{$instance};
-	
-	
-		if ($delay) {
-			$self->_set_timeout('xmit',$delay * 1000);
-		}
-	   	$$self{'last_change'} = $main::Time;
-	}
-}
-
-=item C<_parse_data()>
-
-A complex routine that parses data comming in from the serial port.  In many cases
-multiple messages or fragments of messages may arrive at once.  This routine sorts
-through the string of hexadecimal characters and determines what type of message 
-has arrived and its full content.  Based on the type of message, it is then 
-passed off to lower level message handling routines.
-
-=cut
-
-sub _parse_data {
-	my ($self, $data) = @_;
-   my ($name, $val);
-
-	# it is possible that a fragment exists from a previous attempt; so, if it exists, prepend it
-	if ($$self{_data_fragment})
-        {
-		&::print_log("[Insteon_PLM] DEBUG3: Prepending prior data fragment: $$self{_data_fragment}") if $self->debuglevel(3, 'insteon');
-                # maintain a copy of the parsed data fragment
-		$$self{_prior_data_fragment} = $$self{_data_fragment};
-                # append if not a repeat
-		$data = $$self{_data_fragment} . $data unless $$self{_data_fragment} eq $data;
-                # and, clear it out
-		$$self{_data_fragment} = '';
-	}
-        else
-        {
-        	# clear the memory of any prior data fragment
-                $$self{_prior_data_fragment} = '';
-        }
-
-	&::print_log( "[Insteon_PLM] DEBUG3: Received PLM raw data: $data") if $self->debuglevel(3, 'insteon');
-
-	# begin by pulling out any PLM ack/nacks
-	my $prev_cmd = '';
-	my $pending_message = $self->active_message;
-	if ($pending_message) {
-                $prev_cmd = lc $pending_message->interface_data;
-		if ($pending_message->isa('Insteon::X10Message'))
-                {
-        		$prev_cmd = $prefix{x10_send} . $prev_cmd;
-       		} else {
-               		my $command_type = $pending_message->command_type;
-                	$prev_cmd = $prefix{$command_type} . $prev_cmd;
-        	}
-	}
-
-	my $residue_data = '';
-	my $process_next_command = 1;
-	my $nack_count = 0;
-        my $entered_ack_loop;
-        my $previous_parsed_data;
-	if (defined $prev_cmd and $prev_cmd ne '')
-	{
-		my $ackcmd = $prev_cmd . '06';
-		my $nackcmd = $prev_cmd . '15';
-		my $badcmd = $prev_cmd . '0f';
-                $previous_parsed_data = '';
-		foreach my $parsed_data (split(/($ackcmd)|($nackcmd)|($prefix{plm_info}\w{12}06)|($prefix{plm_info}\w{12}15)|($badcmd)/,$data))
-		{
-			#ignore blanks.. the split does odd things
-			next if $parsed_data eq '';
-                        next if $previous_parsed_data eq $parsed_data; # guard against repeats
-                        $previous_parsed_data = $parsed_data; # and, now reinitialize
-                        $entered_ack_loop = 1;
-			if ($parsed_data =~ /^($ackcmd)|($nackcmd)|($prefix{plm_info}\w{12}06)|($prefix{plm_info}\w{12}15)|($prefix{all_link_first_rec}15)|($prefix{all_link_next_rec}15)|($badcmd)$/)
-                        {
-				my $debug_obj = $self;
-				$debug_obj = $self->active_message->setby if ($self->active_message->can('setby') && ref $self->active_message->setby);
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $debug_obj->debuglevel(4, 'insteon');
-				my $ret_code = substr($parsed_data,length($parsed_data)-2,2);
-				my $record_type = substr($parsed_data,0,4);
-                                my $message_data = substr($parsed_data,4,length($parsed_data)-4);
-				if ($ret_code eq '06')
-                                {
-					if ($record_type eq $prefix{plm_info})
-                                        {
-						$self->device_id(substr($message_data,0,6));
-						$self->firmware(substr($message_data,10,2));
-                                                $self->on_interface_info_received();
-					}
-                                        elsif ($record_type eq $prefix{all_link_first_rec}
-                                        		or $record_type eq $prefix{all_link_next_rec})
-                                        {
-						$$self{_next_link_ok} = 1;
-					}
-                                        elsif ($record_type eq $prefix{all_link_start})
-                                        {
-                                        	if ($self->active_message->success_callback){
-							package main;
-							eval ($self->active_message->success_callback);
-							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
-								if $@ and $self->active_message->setby->debuglevel(1, 'insteon');
-							package Insteon_PLM;
-                                        	}
-                                                # clear the active message because we're done
-                				$self->clear_active_message();
-                                        }
-                                        else
-                                        {
-						my $debug_obj = $self;
-						$debug_obj = $self->active_message->setby if ($self->active_message->can('setby') && ref $self->active_message->setby);
-                                        	&::print_log("[Insteon_PLM] DEBUG3: Received PLM acknowledge: "
-                                                	. $pending_message->to_string) if $debug_obj->debuglevel(3, 'insteon');
-                                        }
-
-                                        # X10 messages don't ACK back on the powerline, so clear them if the PLM acknowledges
-                                        #   AND if the current, pending message is the X10 message
-					if (($parsed_data =~ /$prefix{x10_send}\w{4}06/) && ($pending_message->isa('Insteon::X10Message')))
-                                        {
-                				$self->clear_active_message();
-					}
-
-					if ($record_type eq $prefix{all_link_manage_rec})
-                                        {
-                                                # clear the active message because we're done
-                				$self->clear_active_message();
-
-						my $callback;
-						if ($self->_aldb->{_success_callback}){
-							$callback = $self->_aldb->{_success_callback};
-							$self->_aldb->{_success_callback} = undef;
-						} elsif ($$self{_mem_callback})
-                                                {
-							$callback = $pending_message->callback(); #$$self{_mem_callback};
-							$$self{_mem_callback} = undef;
-                                                } 
-                                                if ($callback){
-							package main;
-							eval ($callback);
-							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
-								if $@ and $self->active_message->setby->debuglevel(1, 'insteon');
-							package Insteon_PLM;	
-                                                }
-					}
-				}
-                                elsif ($ret_code eq '15' or $ret_code eq '0f')
-                                { #NAK or "bad" command received
-                                        $self->clear_active_message(); # regardless, we're not retrying as we'll just get the same
-
-					if ($record_type eq $prefix{all_link_first_rec}
-                                        	or $record_type eq $prefix{all_link_next_rec})
-                                        {
-                                        	# both of these conditions are ok as it just means
-                                                # we've reached the end of the memory
-						$$self{_next_link_ok} = 0;
-						$$self{_mem_activity} = undef;
-                                                if ($record_type eq $prefix{all_link_first_rec})
-                                                {
-                                                	$self->_aldb->health("empty");
-                                                }
-                                                else
-                                                {
-                                                	$self->_aldb->health("good");
-                                                }
-                                                $self->_aldb->scandatetime(&main::get_tickcount);
-						&::print_log("[Insteon_PLM] " . $self->get_object_name 
-							. " completed link memory scan: status: " . $self->_aldb->health())
-							if $self->debuglevel(1, 'insteon');
-						if ($$self{_mem_callback})
-						{
-							my $callback = $$self{_mem_callback};
-							$$self{_mem_callback} = undef;
-							package main;
-							eval ($callback);
-							&::print_log("[Insteon_PLM] WARN1: Error encountered during nack callback: " . $@)
-								if $@ and $self->debuglevel(1, 'insteon');
-							package Insteon_PLM;
-						}
-                                        }
-                                        elsif ($record_type eq $prefix{all_link_send})
-                                        {
-                                            	&::print_log("[Insteon_PLM] WARN: PLM memory does not contain link for: "
-                                            		. $pending_message->to_string . $@)
-                                        }
-                                        elsif ($record_type eq $prefix{all_link_start})
-                                        {
-                                            	&::print_log("[Insteon_PLM] WARN: PLM unable to complete requested operation: "
-                                            		. $pending_message->to_string . $@);
-                                        }
-                                        elsif ($record_type eq $prefix{all_link_manage_rec})
-                                        {
-                                        	# parse out the data
-                                                my $failed_cmd_code = substr($pending_message->interface_data(),0,2);
-                                                my $failed_cmd = 'unknown';
-                                                if ($failed_cmd_code eq '40')
-                                                {
-                                                	$failed_cmd = 'update/add controller record';
-                                                }
-                                                elsif ($failed_cmd_code eq '41')
-                                                {
-                                                	$failed_cmd = 'update/add responder record';
-                                                }
-                                                elsif ($failed_cmd_code eq '80')
-                                                {
-                                                	$failed_cmd = 'delete record';
-                                                }
-                                                my $failed_group = substr($pending_message->interface_data(),4,2);
-                                                my $failed_deviceid = substr($pending_message->interface_data(),6,6);
-                                            	&::print_log("[Insteon_PLM] WARN: PLM unable to complete requested "
-                                                	. "PLM link table update ($failed_cmd) for "
-                                            		. "group: $failed_group and deviceid: $failed_deviceid" );
-						my $callback;
-						if ($self->_aldb->{_success_callback}){
-							$callback = $self->_aldb->{_success_callback};
-							$self->_aldb->{_success_callback} = undef;
-						} elsif ($$self{_mem_callback})
-						{
-							$callback = $pending_message->callback(); #$$self{_mem_callback};
-							$$self{_mem_callback} = undef;
-						}
-                                                if ($callback)
-                                        	{
-							package main;
-							eval ($callback);
-							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
-								if $@ and $self->debuglevel(1, 'insteon');
-							package Insteon_PLM;
-						}
-                                                # clear the active message because we're done
-                				# $self->clear_active_message();
-                                        }
-                                        else
-                                        {
-						&::print_log("[Insteon_PLM] WARN: received NACK from PLM for "
-							. $pending_message->to_string());
-					}
-				}
-                                else
-                                {
-					# We have a problem (Usually we stepped on another X10 command)
-					&::print_log("[Insteon_PLM] ERROR: encountered $parsed_data. "
-                                        	. $pending_message->to_string());
-                                        $self->active_message->no_hop_increase(1);
-					$self->retry_active_message();
-					#move it off the top of the stack and re-transmit later!
-					#TODO: We should keep track of an errored command and kill it if it fails twice.  prevent an infinite loop here
-				}
-			}
-                        else  # no match occurred--which is the "leftovers"
-                        {
-                        	# is $parsed_data an accidental anomoly? (there are other cases; but, this is a good start)
-                                if ($parsed_data =~ /^($prefix{insteon_send}\w{12}06)|($prefix{insteon_send}\w{12}15)$/)
-                                {
-                                	# first, parse the content to confirm that it could be a legitimate ACK
-                                        my $unknown_deviceid = substr($parsed_data,4,6);
-                                        my $unknown_msg_flags = substr($parsed_data,10,2);
-                                        my $unknown_command = substr($parsed_data,12,2);
-                                        my $unknown_data = substr($parsed_data,14,2);
-                                        my $unknown_obj = &Insteon::get_object($unknown_deviceid, '01');
-                                        if ($unknown_obj)
-                                        {
-                                        	&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $unknown_obj->debuglevel(4, 'insteon');
-                                        	&::print_log("[Insteon_PLM] WARN: encountered '$parsed_data' "
-                                                	. "from " . $unknown_obj->get_object_name()
-                                                        . " with command: $unknown_command, but expected '$ackcmd'.");
-				       		$residue_data .= $parsed_data;
-                                        }
-                                        else
-                                        {
-                                        	&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
-                                        	&::print_log("[Insteon_PLM] ERROR: encountered '$parsed_data' "
-                                                	. "that does not match any known device ID (expected '$ackcmd')."
-                                                        . " Discarding received data.");
-				       		#$residue_data .= $parsed_data;
-                                        }
-                                        $self->active_message->no_hop_increase(1);
-                                }
-                                else
-                                {
-					$residue_data .= $parsed_data;
-                                }
-			}
-		}  #foreach - split across the incoming data
-
-		$residue_data = $data unless $entered_ack_loop or $residue_data;
-	}
-        else
-        {
-		$residue_data = $data unless $residue_data;
-	}
-
-        my $entered_rcv_loop = 0;
-
-        $previous_parsed_data = '';
-
-	foreach my $parsed_data (split(/($prefix{x10_received}\w{4})|($prefix{insteon_received}\w{18})|($prefix{insteon_ext_received}\w{46})|($prefix{all_link_complete}\w{16})|($prefix{all_link_clean_failed}\w{8})|($prefix{all_link_record}\w{16})|($prefix{all_link_clean_status}\w{2})|($prefix{plm_button_event}\w{2})|($prefix{plm_user_reset})/,$residue_data))
-	{
-		#ignore blanks.. the split does odd things
-		next if $parsed_data eq '';
-
-		if ($previous_parsed_data eq $parsed_data){
-			# guard against repeats
-			::print_log("[Insteon_PLM] DEBUG3: Dropped duplicate message: $parsed_data") if $self->debuglevel(3, 'insteon'); 
-			next;
-		}
-                $previous_parsed_data = $parsed_data; # and, now reinitialize
-
-                $entered_rcv_loop = 1;
-
-                my $parsed_prefix = substr($parsed_data,0,4);
-                my $message_length = length($parsed_data);
-
-        	my $message_data = substr($parsed_data,4,length($parsed_data)-4);
-
-		if ($parsed_prefix eq $prefix{insteon_received} and ($message_length == 22))
-                { #Insteon Standard Received
-			my $find_obj = Insteon::get_object(substr($parsed_data,4,6), '01');
-			if (ref $find_obj) {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $find_obj->debuglevel(4, 'insteon');
-			} 
-			else {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
-			}
-                        $self->on_standard_insteon_received($message_data);
-		}
-                elsif ($parsed_prefix eq $prefix{insteon_ext_received} and ($message_length == 50))
-                { #Insteon Extended Received
-			my $find_obj = Insteon::get_object(substr($parsed_data,4,6), '01');
-			if (ref $find_obj) {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $find_obj->debuglevel(4, 'insteon');
-			} 
-			else {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
-			}
-                	$self->on_extended_insteon_received($message_data);
-		}
-                elsif($parsed_prefix eq $prefix{x10_received} and ($message_length == 8))
-                { #X10 Received
-			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
-                       	my $x10_message = new Insteon::X10Message($parsed_data);
-                        my $x10_data = $x10_message->get_formatted_data();
-			&::print_log("[Insteon_PLM] DEBUG3: received x10 data: $x10_data") if $self->debuglevel(3, 'insteon');
-			&::process_serial_data($x10_data,undef,$self);
-		}
-                elsif ($parsed_prefix eq $prefix{all_link_complete} and ($message_length == 20))
-                { #ALL-Linking Completed
-			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
-			my $link_address = substr($message_data,4,6);
-			&::print_log("[Insteon_PLM] DEBUG2: ALL-Linking Completed with $link_address ($message_data)") if $self->debuglevel(2, 'insteon');
-			if ($self->active_message->success_callback){
-				main::print_log("[Insteon::Insteon_PLM] DEBUG4: Now calling message success callback: "
-					. $self->active_message->success_callback) if $self->debuglevel(4, 'insteon');
-				package main;
-					eval $self->active_message->success_callback;
-					::print_log("[Insteon::Insteon_PLM] problem w/ success callback: $@") if $@;
-				package Insteon::BaseObject;
-			}
-			#Clear awaiting_ack flag
-			$self->active_message->setby->_process_command_stack(0);
-                        $self->clear_active_message();
-		}
-                elsif ($parsed_prefix eq $prefix{all_link_clean_failed} and ($message_length == 12))
-                { #ALL-Link Cleanup Failure Report
-			if ($self->active_message){
-                        	# extract out the pertinent parts of the message for display purposes
-                        	# bytes 0-1 - group; 2-7 device address
-                        	my $failure_group = substr($message_data,0,2);
-                        	my $failure_device = substr($message_data,2,6);
-                        	my $failed_object = &Insteon::get_object($failure_device,'01');
-                        	if (ref $failed_object){
-					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $failed_object->debuglevel(4, 'insteon');
-					&::print_log("[Insteon_PLM] DEBUG2: Received all-link cleanup failure from " . $failed_object->get_object_name
-                        		. " for all link group: $failure_group. Trying a direct cleanup.") if $failed_object->debuglevel(2, 'insteon');
-	                        	my $message = new Insteon::InsteonMessage('all_link_direct_cleanup', $failed_object, 
-	                        		$self->active_message->command, $failure_group);
-	                        	push(@{$$failed_object{command_stack}}, $message);
-	                        	$failed_object->_process_command_stack();
-                        	} else {
-					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
-					&::print_log("[Insteon_PLM] Received all-link cleanup failure from an unkown device id: "
-                        		. "$failure_device and for all link group: $failure_group. You may "
-                        			. "want to run delete orphans to remove this link from your PLM");
-                        	}
-			} else {
-				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
-				&::print_log("[Insteon_PLM] DEBUG2: Received all-link cleanup failure."
-                        		. " But there is no pending message.") if $self->debuglevel(2, 'insteon');
-			}
-                        
-		}
-                elsif ($parsed_prefix eq $prefix{all_link_record} and ($message_length == 20))
-                { #ALL-Link Record Response
-			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
-			&::print_log("[Insteon_PLM] DEBUG2: ALL-Link Record Response:$message_data") if $self->debuglevel(2, 'insteon');
-			$self->_aldb->parse_alllink($message_data);
-        		# before doing the next, make sure that the pending command
-                        #   (if it sitll exists) is pulled from the queue
-                        $self->clear_active_message();
-
-			$self->_aldb->get_next_alllink();
-		}
-		elsif ($parsed_prefix eq $prefix{plm_user_reset} and ($message_length == 4))
-		{
-			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
-			main::print_log("[Insteon_PLM] Detected PLM user reset to factory defaults");
-		}
-                elsif ($parsed_prefix eq $prefix{all_link_clean_status} and ($message_length == 6))
-                { #ALL-Link Cleanup Status Report
-			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
-			my $cleanup_ack = substr($message_data,0,2);
-			if ($cleanup_ack eq '15')
-                        {
-				&::print_log("[Insteon_PLM] WARN1: All-link cleanup failure for scene: "
-                                	. $self->active_message->setby->get_object_name . ". Retrying in 1 second.")
-					if $self->active_message->setby->debuglevel(1, 'insteon');
-                                $self->retry_active_message();
-                                # except that we should cause a bit of a delay to let things settle out
-				$self->_set_timeout('xmit', 1000);
-				$process_next_command = 0;
-			}
-                        else
-                        {
-                        	my $message_to_string = ($self->active_message) ? $self->active_message->to_string() : "";
-				&::print_log("[Insteon_PLM] Received all-link cleanup success: $message_to_string")
-                                	if $self->active_message->setby->debuglevel(1, 'insteon');
-				if (ref $self->active_message && ref $self->active_message->setby){
-					my $object = $self->active_message->setby;
-					$object->is_acknowledged(1);
-					$object->_process_command_stack();
-				}
-                                $self->clear_active_message();
-			}
-		}
-                elsif (substr($parsed_data,0,2) eq '15')
-                { # Indicates that the PLM can't receive more commands at the moment
-                  # so, slow things down
-			if (!($nack_count))
-                        {
-				if ($self->active_message){
-					my $nack_delay = ($::config_parms{Insteon_PLM_disable_throttling}) ? 0.3 : 1.0;
-					&::print_log("[Insteon_PLM] DEBUG3: Interface extremely busy. Resending command"
-						. " after delaying for $nack_delay second") if $self->debuglevel(3, 'insteon');
-					$self->_set_timeout('xmit',$nack_delay * 1000);
-					$self->active_message->no_hop_increase(1);
-                                	$self->retry_active_message();
-					$process_next_command = 0;
-				} else {
-					&::print_log("[Insteon_PLM] DEBUG3: Interface extremely busy."
-						. " No message to resend.") if $self->debuglevel(3, 'insteon');
-				}
-				$nack_count++;
-			}
-			#Remove the leading NACK bytes and place whatever remains into fragment for next read
-			$parsed_data =~ s/^(15)*//;
-			if ($parsed_data ne ''){
-				$$self{_data_fragment} .= $parsed_data;
-				::print_log("[Insteon_PLM] DEBUG3: Saving parsed data fragment: " 
-					. $parsed_data) if( $self->debuglevel(3, 'insteon'));
-			}
-		}
-                else
-                {
-			# it's probably a fragment; so, handle it
-                        # it it's the same as last time, then drop it as we can't recover
-			unless (($parsed_data eq $$self{_prior_data_fragment}) or ($parsed_data eq $$self{_data_fragment})) {
-				$$self{_data_fragment} .= $parsed_data;
-				main::print_log("[Insteon_PLM] DEBUG3: Saving parsed data fragment: " 
-					. $parsed_data) if( $self->debuglevel(3, 'insteon'));
-			}
-		}
-	}
-
-	unless( $entered_rcv_loop or $$self{_data_fragment}) {
-		$$self{_data_fragment} = $residue_data;
-		main::print_log("[Insteon_PLM] DEBUG3: Saving residue data fragment: " 
-			. $residue_data) if( $residue_data and $self->debuglevel(3, 'insteon'));
-	}
-
-	if ($process_next_command) {
- 		$self->process_queue();
-	}
-
-	return;
-}
-
-=item C<add_id_state()>
-
-Dummy sub required to support the X10 integrtion, does nothing.
-
-=cut
-
-sub add_id_state {
-   # do nothing
-}
-
-=item C<firmware()>
-
-Stores and returns the firmware version of the PLM.
-
-=cut
-
-sub firmware {
-	my ($self, $p_firmware) = @_;
-	$$self{firmware} = $p_firmware if defined $p_firmware;
-	return $$self{firmware};
-}
-
-=back
-
-=head2 INI PARAMETERS
-
-=over 
-
-=item Insteon_PLM_serial_port
-
-Identifies the port on which the PLM is attached.  Example:
-
-    Insteon_PLM_serial_port=/dev/ttyS4
-
-=item Insteon_PLM_xmit_delay
-
-Sets the minimum amount of seconds that must elapse between sending Insteon messages 
-to the PLM.  Defaults to 0.25.
-
-=item Insteon_PLM_xmit_x10_delay
-
-Sets the minimum amount of seconds that must elapse between sending X10 messages 
-to the PLM.  Defaults to 0.50.
-
-=item Insteon_PLM_disable_throttling
-
-Periodically, the PLM will report that it is too busy to accept a message from
-MisterHouse.  When this happens, MisterHouse will wait 1 second before trying
-to send a message to the PLM.  If this is set to 1, downgrades the delay to only
-.3 seconds.  Most of the issues which caused the PLM to overload have been handled
-it is unlikely that you would need to set this.
-
-=back
-
-=head2 NOTES
-
-Special Thanks to:
-
-Brian Warren for significant testing and patches
-
-Bruce Winter - MH
-
-=head2 AUTHOR
-
-Jason Sharpee / jason@sharpee.com, Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
-
-=head2 SEE ALSO
-
-For more information regarding the technical details of the PLM:
-L<Insteon PLM Dev Guide|http://www.smarthome.com/manuals/2412sdevguide.pdf>
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
-
-1;
+=head1 B<Insteon_PLM>
+
+=head2 SYNOPSIS
+
+---Example Code and Usage---
+
+=head2 DESCRIPTION
+
+This is the base interface class for Insteon Power Line Modem (PLM)
+
+=head2 INHERITS
+
+L<Serial_Item|Serial_Item>,
+L<Insteon::BaseInterface|Insteon::BaseInterface>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package Insteon_PLM;
+
+use strict;
+use Insteon;
+use Insteon::BaseInterface;
+use Insteon::BaseInsteon;
+use Insteon::AllLinkDatabase;
+use Insteon::MessageDecoder;
+
+@Insteon_PLM::ISA = ('Serial_Item','Insteon::BaseInterface');
+
+
+my %prefix = (
+#PLM Serial Commands
+                        insteon_received 	=> '0250',
+                        insteon_ext_received 	=> '0251',
+                        x10_received 		=> '0252',
+                        all_link_complete 	=> '0253',
+                        plm_button_event 	=> '0254',
+                        plm_user_reset		=> '0255',
+                        all_link_clean_failed 	=> '0256',
+                        all_link_record 	=> '0257',
+                        all_link_clean_status 	=> '0258',
+                        plm_info 		=> '0260',
+                        all_link_send 		=> '0261',
+                        insteon_send 		=> '0262',
+                        insteon_ext_send	=> '0262',
+                        all_link_direct_cleanup => '0262',
+                        x10_send 		=> '0263',
+                        all_link_start 		=> '0264',
+                        all_link_cancel		=> '0265',
+			plm_reset 		=> '0267',
+                        all_link_first_rec	=> '0269',
+                        all_link_next_rec	=> '026a',
+			plm_set_config 		=> '026b',
+			plm_led_on 		=> '026d',
+			plm_led_off 		=> '026e',
+                        all_link_manage_rec	=> '026f',
+			insteon_nak 		=> '0270',
+			insteon_ack 		=> '0271',
+			rf_sleep 		=> '0272',
+			plm_get_config 		=> '0273'
+);
+
+=item C<serial_startup()>
+
+Creates a new serial port connection.
+
+=cut
+
+sub serial_startup {
+   my ($instance) = @_;
+   my $port       = $::config_parms{$instance . "_serial_port"};
+   my $speed = 19200;
+
+   &::print_log("[Insteon_PLM] serial:$port:$speed");
+   &::serial_port_create($instance, $port, $speed,'none','raw');
+
+}
+
+=item C<new()>
+
+Instantiates a new object.
+
+=cut
+
+sub new {
+   my ($class, $port_name, $p_deviceid) = @_;
+   $port_name = 'Insteon_PLM' if !$port_name;
+   my $port       = $::config_parms{$port_name . "_serial_port"};
+
+   my $self = new Insteon::BaseInterface();
+   $$self{state}     = '';
+   $$self{said}      = '';
+   $$self{state_now} = '';
+   $$self{port_name} = $port_name;
+   $$self{port} = $port;
+	$$self{last_command} = '';
+	$$self{_prior_data_fragment} = '';
+   bless $self, $class;
+   $self->restore_data('debug', 'corrupt_count_log');
+   $$self{corrupt_count_log} = 0;
+   $$self{aldb} = new Insteon::ALDB_PLM($self);
+
+   &Insteon::add($self);
+
+   $self->device_id($p_deviceid) if defined $p_deviceid;
+
+	$$self{xmit_delay} = $::config_parms{Insteon_PLM_xmit_delay};
+	$$self{xmit_delay} = 0.25 unless defined $$self{xmit_delay}; # and $$self{xmit_delay} > 0.125;
+	&::print_log("[Insteon_PLM] setting default xmit delay to: $$self{xmit_delay}");
+	$$self{xmit_x10_delay} = $::config_parms{Insteon_PLM_xmit_x10_delay};
+	$$self{xmit_x10_delay} = 0.5 unless defined $$self{xmit_x10_delay} and $$self{xmit_x10_delay} > 0.5;
+	&::print_log("[Insteon_PLM] setting x10 xmit delay to: $$self{xmit_x10_delay}");
+	$self->_clear_timeout('xmit');
+	$self->_clear_timeout('command');
+
+   return $self;
+}
+
+=item C<corrupt_count_log([type]>
+
+Sets or gets the number of corrupt message that have arrived that could not be
+associated with any device since the last time C<reset_message_stats> was called.
+These are generally instances in which the from device ID is corrupt.
+
+If type is set, to any value, will increment corrupt count by one.
+
+Returns: current corrupt count.
+
+=cut 
+
+sub corrupt_count_log
+{
+    my ($self, $corrupt_count_log) = @_;
+    $$self{corrupt_count_log}++ if $corrupt_count_log;
+    return $$self{corrupt_count_log};
+}
+
+=item C<reset_message_stats>
+
+Resets the retry, fail, outgoing, incoming, and corrupt message counters.
+
+=cut 
+
+sub reset_message_stats
+{
+    my ($self) = @_;
+    $$self{corrupt_count_log} = 0;
+}
+
+=item C<restore_string()>
+
+This is called by mh on exit to save the cached ALDB of a device to persistant data.
+
+=cut
+
+sub restore_string
+{
+	my ($self) = @_;
+	my $restore_string = $self->SUPER::restore_string();
+	if ($self->_aldb) {
+		$restore_string .= $self->_aldb->restore_string();
+        }
+	return $restore_string;
+}
+
+=item C<check_for_data()>
+
+Called once per loop.  This checks for any data waiting on the serial port, if
+data exists it is sent to C<_parse_data>.  If there is no data waiting, then
+this checks to see if the timers for any previous commands have expired, if they
+have, it calls C<retry_active_message()>.  Else, this checks to see if there
+is any timeout preventing a transmission right now, if there is no timeout it
+calles C<process_queue()>.
+
+=cut
+
+sub check_for_data {
+
+	my ($self) = @_;
+      	my $port_name = $$self{port_name};
+      	&::check_for_generic_serial_data($port_name) if $::Serial_Ports{$port_name}{object};
+      	my $data = $::Serial_Ports{$port_name}{data};
+      	# always check for data first; if it exists, then process; otherwise check if pending commands exist
+      	if ($data)
+        {
+        	# now, clear the serial port data so that any subsequent command processing doesn't result in an immediate filling/overwriting
+	        if (length($$self{_data_fragment}))
+        	{
+#        		$main::Serial_Ports{$port_name}{data}=pack("H*",$$self{_data_fragment});
+			# always clear the buffer since we're maintaining the fragment separately
+               		$main::Serial_Ports{$port_name}{data} = '';
+       		}
+       		else
+        	{
+        		$main::Serial_Ports{$port_name}{data} = '';
+        	}
+
+         	#lets turn this into Hex. I hate perl binary funcs
+        	my $data = unpack "H*", $data;
+
+         	$self->_parse_data($data);
+      	}
+        elsif (defined $self)
+      	{
+      	# if no data being received, then check if any timeouts have expired
+        	if ($self->_check_timeout('command') == 1)
+                {
+            		$self->_clear_timeout('command');
+            		if ($self->transmit_in_progress) {
+#               &::print_log("[Insteon_PLM] WARN: No acknowledgement from PLM to last command requires forced abort of current command."
+#                  . " This may reflect a problem with your environment.");
+#               pop(@{$$self{command_stack2}}); # pop the active command off the queue
+	       			$self->retry_active_message();
+               			$self->process_queue();
+            		}
+                	else
+                	{
+               			&::print_log("[Insteon_PLM] DEBUG2: PLM command timer expired but no transmission in place.  Moving on...") if $self->debuglevel(2, 'insteon');
+	       			$self->clear_active_message();
+               			$self->process_queue();
+            		}
+		}
+                elsif ($self->_check_timeout('xmit') == 1)
+                {
+           		$self->_clear_timeout('xmit');
+         		if (!($self->transmit_in_progress))
+                        {
+            			$self->process_queue();
+               		}
+            	}
+	}
+}
+
+=item C<set()>
+
+Used to send X10 messages, generates an X10 command and queues it.
+
+=cut
+
+sub set
+{
+	my ($self,$p_state,$p_setby,$p_response) = @_;
+
+        my @x10_commands = &Insteon::X10Message::generate_commands($p_state, $p_setby);
+        foreach my $command (@x10_commands)
+        {
+	    $self->queue_message(new Insteon::X10Message($command));
+        }
+}
+
+=item C<complete_linking_as_responder()>
+
+Puts the PLM into linking mode as a responder.
+
+=cut
+
+sub complete_linking_as_responder
+{
+	my ($self, $group) = @_;
+
+	# it is not clear that group should be anything as the group will be taken from the controller
+	$group = '01' unless $group;
+	# set up the PLM as the responder
+	my $cmd = '00'; # responder code
+	$cmd .= $group; # WARN - must be 2 digits and in hex!!
+        my $message = new Insteon::InsteonMessage('all_link_start', $self);
+        $message->interface_data($cmd);
+	$self->queue_message($message)
+}
+
+=item C<log_alllink_table()>
+
+Causes MisterHouse to dump its cache of the PLM link table to the log.
+
+=cut
+
+sub log_alllink_table
+{
+	my ($self) = @_;
+        $self->_aldb->log_alllink_table if $self->_aldb;
+}
+
+=item C<scan_link_table()>
+
+Causes MisterHouse to scan the link table of the PLM only.
+
+=cut
+
+sub scan_link_table
+{
+	my ($self,$callback) = @_;
+	#$$self{links} = undef; # clear out the old
+        $$self{aldb} = new Insteon::ALDB_PLM($self);
+	$$self{_mem_activity} = 'scan';
+        $$self{_mem_callback} = ($callback) ? $callback : undef;
+	$self->_aldb->get_first_alllink();
+}
+
+=item C<initiate_linking_as_controller([p_group])>
+
+Puts the PLM into linking mode as a controller, if p_group is specified the
+controller will be added for this group, otherwise it will be for group 00.
+
+=cut
+
+sub initiate_linking_as_controller
+{
+	my ($self, $group, $success_callback, $failure_callback) = @_;
+
+	$group = '00' unless $group;
+	# set up the PLM as the responder
+	my $cmd = '01'; # controller code
+	$cmd .= $group; # WARN - must be 2 digits and in hex!!
+        my $message = new Insteon::InsteonMessage('all_link_start', $self);
+        $message->interface_data($cmd);
+        $message->success_callback($success_callback);
+        $message->failure_callback($failure_callback);
+	$self->queue_message($message);
+}
+
+=item C<initiate_unlinking_as_controller([p_group])>
+
+Puts the PLM into unlinking mode, if p_group is specified the PLM will try
+to unlink any devices linked to that group that identify themselves with a set
+button press.
+
+=cut
+
+sub initiate_unlinking_as_controller
+{
+	my ($self, $group) = @_;
+
+	$group = 'FF' unless $group;
+	# set up the PLM as the responder
+	my $cmd = 'FF'; # controller code
+	$cmd .= $group; # WARN - must be 2 digits and in hex!!
+        my $message = new Insteon::InsteonMessage('all_link_start', $self);
+        $message->interface_data($cmd);
+	$self->queue_message($message);
+}
+
+=item C<cancel_linking()>
+
+Cancels any pending linking session that has not completed.
+
+=cut
+
+sub cancel_linking
+{
+	my ($self) = @_;
+	$self->queue_message(new Insteon::InsteonMessage('all_link_cancel', $self));
+}
+
+=item C<_aldb()>
+
+Returns the PLM's aldb object.
+
+=cut
+
+sub _aldb
+{
+   my ($self) = @_;
+   return $$self{aldb};
+}
+
+=item C<_send_cmd()>
+
+Causes a message to be sent to the serial port.
+
+=cut
+
+sub _send_cmd {
+	my ($self, $message, $cmd_timeout) = @_;
+	my $instance = $$self{port_name};
+	if (!(ref $main::Serial_Ports{$instance}{object})) {
+		print "WARN: Insteon_PLM serial port not initialized!\n";
+		return;
+	}
+	unshift(@{$$self{command_history}},$::Time);
+	$self->transmit_in_progress(1);
+
+        my $command = $message->interface_data;
+	my $delay = $$self{xmit_delay};
+
+        # determine the delay from the point that the message was created to
+        # the point that it is queued
+        my $incurred_delay_time = $message->seconds_delayed;
+
+	if ($message->isa('Insteon::X10Message')) { # is x10; so, be slow
+		&main::print_log("[Insteon_PLM] DEBUG2: Sending " . $message->to_string . " incurred delay of "
+		. sprintf('%.2f',$incurred_delay_time) . " seconds") if $self->debuglevel(2, 'insteon');
+        	$command = $prefix{x10_send} . $command;
+		$delay = $$self{xmit_x10_delay};
+                # clear command timeout so that we don't wait for an insteon ack before sending the next command
+	} else {
+                my $command_type = $message->command_type;
+		&main::print_log("[Insteon_PLM] DEBUG2: Sending " . $message->to_string . " incurred delay of "
+		. sprintf('%.2f',$incurred_delay_time) . " seconds; starting hop-count: "
+		. ((ref $message->setby && $message->setby->isa('Insteon::BaseObject')) ? $message->setby->default_hop_count : "?")) if $message->setby->debuglevel(2, 'insteon');
+                $command = $prefix{$command_type} . $command;
+                if ($command_type eq 'all_link_send' or $command_type eq 'insteon_send' or $command_type eq 'insteon_ext_send' or $command_type eq 'all_link_direct_cleanup')
+                {
+         		$self->_set_timeout('command', $cmd_timeout); # a commmand needs to be PLM ack'd w/i 3 seconds or it gets dropped
+                }
+        }
+	my $is_extended = ($message->can('command_type') && $message->command_type eq "insteon_ext_send") ? 1 : 0;
+	if (length($command) != (Insteon::MessageDecoder::insteon_cmd_len(substr($command,0,4), 0, $is_extended)*2)){
+		&::print_log( "[Insteon_PLM]: ERROR!! Command sent to PLM " . lc($command) 
+		. " is of an incorrect length.  Message not sent.");
+		$self->clear_active_message();
+	} 
+	else
+	{
+		my $debug_obj = $self;
+		$debug_obj = $message->setby if ($message->can('setby') && ref $message->setby);
+		&::print_log( "[Insteon_PLM] DEBUG3: Sending  PLM raw data: ".lc($command)) if $debug_obj->debuglevel(3, 'insteon');
+		&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($command)) if $debug_obj->debuglevel(4, 'insteon');
+		my $data = pack("H*",$command);
+		$main::Serial_Ports{$instance}{object}->write($data) if $main::Serial_Ports{$instance};
+	
+	
+		if ($delay) {
+			$self->_set_timeout('xmit',$delay * 1000);
+		}
+	   	$$self{'last_change'} = $main::Time;
+	}
+}
+
+=item C<_parse_data()>
+
+A complex routine that parses data comming in from the serial port.  In many cases
+multiple messages or fragments of messages may arrive at once.  This routine sorts
+through the string of hexadecimal characters and determines what type of message 
+has arrived and its full content.  Based on the type of message, it is then 
+passed off to lower level message handling routines.
+
+=cut
+
+sub _parse_data {
+	my ($self, $data) = @_;
+   my ($name, $val);
+
+	# it is possible that a fragment exists from a previous attempt; so, if it exists, prepend it
+	if ($$self{_data_fragment})
+        {
+		&::print_log("[Insteon_PLM] DEBUG3: Prepending prior data fragment: $$self{_data_fragment}") if $self->debuglevel(3, 'insteon');
+                # maintain a copy of the parsed data fragment
+		$$self{_prior_data_fragment} = $$self{_data_fragment};
+                # append if not a repeat
+		$data = $$self{_data_fragment} . $data unless $$self{_data_fragment} eq $data;
+                # and, clear it out
+		$$self{_data_fragment} = '';
+	}
+        else
+        {
+        	# clear the memory of any prior data fragment
+                $$self{_prior_data_fragment} = '';
+        }
+
+	&::print_log( "[Insteon_PLM] DEBUG3: Received PLM raw data: $data") if $self->debuglevel(3, 'insteon');
+
+	# begin by pulling out any PLM ack/nacks
+	my $prev_cmd = '';
+	my $pending_message = $self->active_message;
+	if ($pending_message) {
+                $prev_cmd = lc $pending_message->interface_data;
+		if ($pending_message->isa('Insteon::X10Message'))
+                {
+        		$prev_cmd = $prefix{x10_send} . $prev_cmd;
+       		} else {
+               		my $command_type = $pending_message->command_type;
+                	$prev_cmd = $prefix{$command_type} . $prev_cmd;
+        	}
+	}
+
+	my $residue_data = '';
+	my $process_next_command = 1;
+	my $nack_count = 0;
+        my $entered_ack_loop;
+        my $previous_parsed_data;
+	if (defined $prev_cmd and $prev_cmd ne '')
+	{
+		my $ackcmd = $prev_cmd . '06';
+		my $nackcmd = $prev_cmd . '15';
+		my $badcmd = $prev_cmd . '0f';
+                $previous_parsed_data = '';
+		foreach my $parsed_data (split(/($ackcmd)|($nackcmd)|($prefix{plm_info}\w{12}06)|($prefix{plm_info}\w{12}15)|($badcmd)/,$data))
+		{
+			#ignore blanks.. the split does odd things
+			next if $parsed_data eq '';
+                        next if $previous_parsed_data eq $parsed_data; # guard against repeats
+                        $previous_parsed_data = $parsed_data; # and, now reinitialize
+                        $entered_ack_loop = 1;
+			if ($parsed_data =~ /^($ackcmd)|($nackcmd)|($prefix{plm_info}\w{12}06)|($prefix{plm_info}\w{12}15)|($prefix{all_link_first_rec}15)|($prefix{all_link_next_rec}15)|($badcmd)$/)
+                        {
+				my $debug_obj = $self;
+				$debug_obj = $self->active_message->setby if ($self->active_message->can('setby') && ref $self->active_message->setby);
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $debug_obj->debuglevel(4, 'insteon');
+				my $ret_code = substr($parsed_data,length($parsed_data)-2,2);
+				my $record_type = substr($parsed_data,0,4);
+                                my $message_data = substr($parsed_data,4,length($parsed_data)-4);
+				if ($ret_code eq '06')
+                                {
+					if ($record_type eq $prefix{plm_info})
+                                        {
+						$self->device_id(substr($message_data,0,6));
+						$self->firmware(substr($message_data,10,2));
+                                                $self->on_interface_info_received();
+					}
+                                        elsif ($record_type eq $prefix{all_link_first_rec}
+                                        		or $record_type eq $prefix{all_link_next_rec})
+                                        {
+						$$self{_next_link_ok} = 1;
+					}
+                                        elsif ($record_type eq $prefix{all_link_start})
+                                        {
+                                        	if ($self->active_message->success_callback){
+							package main;
+							eval ($self->active_message->success_callback);
+							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
+								if $@ and $self->active_message->setby->debuglevel(1, 'insteon');
+							package Insteon_PLM;
+                                        	}
+                                                # clear the active message because we're done
+                				$self->clear_active_message();
+                                        }
+                                        else
+                                        {
+						my $debug_obj = $self;
+						$debug_obj = $self->active_message->setby if ($self->active_message->can('setby') && ref $self->active_message->setby);
+                                        	&::print_log("[Insteon_PLM] DEBUG3: Received PLM acknowledge: "
+                                                	. $pending_message->to_string) if $debug_obj->debuglevel(3, 'insteon');
+                                        }
+
+                                        # X10 messages don't ACK back on the powerline, so clear them if the PLM acknowledges
+                                        #   AND if the current, pending message is the X10 message
+					if (($parsed_data =~ /$prefix{x10_send}\w{4}06/) && ($pending_message->isa('Insteon::X10Message')))
+                                        {
+                				$self->clear_active_message();
+					}
+
+					if ($record_type eq $prefix{all_link_manage_rec})
+                                        {
+                                                # clear the active message because we're done
+                				$self->clear_active_message();
+
+						my $callback;
+						if ($self->_aldb->{_success_callback}){
+							$callback = $self->_aldb->{_success_callback};
+							$self->_aldb->{_success_callback} = undef;
+						} elsif ($$self{_mem_callback})
+                                                {
+							$callback = $pending_message->callback(); #$$self{_mem_callback};
+							$$self{_mem_callback} = undef;
+                                                } 
+                                                if ($callback){
+							package main;
+							eval ($callback);
+							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
+								if $@ and $self->active_message->setby->debuglevel(1, 'insteon');
+							package Insteon_PLM;	
+                                                }
+					}
+				}
+                                elsif ($ret_code eq '15' or $ret_code eq '0f')
+                                { #NAK or "bad" command received
+                                        $self->clear_active_message(); # regardless, we're not retrying as we'll just get the same
+
+					if ($record_type eq $prefix{all_link_first_rec}
+                                        	or $record_type eq $prefix{all_link_next_rec})
+                                        {
+                                        	# both of these conditions are ok as it just means
+                                                # we've reached the end of the memory
+						$$self{_next_link_ok} = 0;
+						$$self{_mem_activity} = undef;
+                                                if ($record_type eq $prefix{all_link_first_rec})
+                                                {
+                                                	$self->_aldb->health("empty");
+                                                }
+                                                else
+                                                {
+                                                	$self->_aldb->health("good");
+                                                }
+                                                $self->_aldb->scandatetime(&main::get_tickcount);
+						&::print_log("[Insteon_PLM] " . $self->get_object_name 
+							. " completed link memory scan: status: " . $self->_aldb->health())
+							if $self->debuglevel(1, 'insteon');
+						if ($$self{_mem_callback})
+						{
+							my $callback = $$self{_mem_callback};
+							$$self{_mem_callback} = undef;
+							package main;
+							eval ($callback);
+							&::print_log("[Insteon_PLM] WARN1: Error encountered during nack callback: " . $@)
+								if $@ and $self->debuglevel(1, 'insteon');
+							package Insteon_PLM;
+						}
+                                        }
+                                        elsif ($record_type eq $prefix{all_link_send})
+                                        {
+                                            	&::print_log("[Insteon_PLM] WARN: PLM memory does not contain link for: "
+                                            		. $pending_message->to_string . $@)
+                                        }
+                                        elsif ($record_type eq $prefix{all_link_start})
+                                        {
+                                            	&::print_log("[Insteon_PLM] WARN: PLM unable to complete requested operation: "
+                                            		. $pending_message->to_string . $@);
+                                        }
+                                        elsif ($record_type eq $prefix{all_link_manage_rec})
+                                        {
+                                        	# parse out the data
+                                                my $failed_cmd_code = substr($pending_message->interface_data(),0,2);
+                                                my $failed_cmd = 'unknown';
+                                                if ($failed_cmd_code eq '40')
+                                                {
+                                                	$failed_cmd = 'update/add controller record';
+                                                }
+                                                elsif ($failed_cmd_code eq '41')
+                                                {
+                                                	$failed_cmd = 'update/add responder record';
+                                                }
+                                                elsif ($failed_cmd_code eq '80')
+                                                {
+                                                	$failed_cmd = 'delete record';
+                                                }
+                                                my $failed_group = substr($pending_message->interface_data(),4,2);
+                                                my $failed_deviceid = substr($pending_message->interface_data(),6,6);
+                                            	&::print_log("[Insteon_PLM] WARN: PLM unable to complete requested "
+                                                	. "PLM link table update ($failed_cmd) for "
+                                            		. "group: $failed_group and deviceid: $failed_deviceid" );
+						my $callback;
+						if ($self->_aldb->{_success_callback}){
+							$callback = $self->_aldb->{_success_callback};
+							$self->_aldb->{_success_callback} = undef;
+						} elsif ($$self{_mem_callback})
+						{
+							$callback = $pending_message->callback(); #$$self{_mem_callback};
+							$$self{_mem_callback} = undef;
+						}
+                                                if ($callback)
+                                        	{
+							package main;
+							eval ($callback);
+							&::print_log("[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@)
+								if $@ and $self->debuglevel(1, 'insteon');
+							package Insteon_PLM;
+						}
+                                                # clear the active message because we're done
+                				# $self->clear_active_message();
+                                        }
+                                        else
+                                        {
+						&::print_log("[Insteon_PLM] WARN: received NACK from PLM for "
+							. $pending_message->to_string());
+					}
+				}
+                                else
+                                {
+					# We have a problem (Usually we stepped on another X10 command)
+					&::print_log("[Insteon_PLM] ERROR: encountered $parsed_data. "
+                                        	. $pending_message->to_string());
+                                        $self->active_message->no_hop_increase(1);
+					$self->retry_active_message();
+					#move it off the top of the stack and re-transmit later!
+					#TODO: We should keep track of an errored command and kill it if it fails twice.  prevent an infinite loop here
+				}
+			}
+                        else  # no match occurred--which is the "leftovers"
+                        {
+                        	# is $parsed_data an accidental anomoly? (there are other cases; but, this is a good start)
+                                if ($parsed_data =~ /^($prefix{insteon_send}\w{12}06)|($prefix{insteon_send}\w{12}15)$/)
+                                {
+                                	# first, parse the content to confirm that it could be a legitimate ACK
+                                        my $unknown_deviceid = substr($parsed_data,4,6);
+                                        my $unknown_msg_flags = substr($parsed_data,10,2);
+                                        my $unknown_command = substr($parsed_data,12,2);
+                                        my $unknown_data = substr($parsed_data,14,2);
+                                        my $unknown_obj = &Insteon::get_object($unknown_deviceid, '01');
+                                        if ($unknown_obj)
+                                        {
+                                        	&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $unknown_obj->debuglevel(4, 'insteon');
+                                        	&::print_log("[Insteon_PLM] WARN: encountered '$parsed_data' "
+                                                	. "from " . $unknown_obj->get_object_name()
+                                                        . " with command: $unknown_command, but expected '$ackcmd'.");
+				       		$residue_data .= $parsed_data;
+                                        }
+                                        else
+                                        {
+                                        	&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
+                                        	&::print_log("[Insteon_PLM] ERROR: encountered '$parsed_data' "
+                                                	. "that does not match any known device ID (expected '$ackcmd')."
+                                                        . " Discarding received data.");
+				       		#$residue_data .= $parsed_data;
+                                        }
+                                        $self->active_message->no_hop_increase(1);
+                                }
+                                else
+                                {
+					$residue_data .= $parsed_data;
+                                }
+			}
+		}  #foreach - split across the incoming data
+
+		$residue_data = $data unless $entered_ack_loop or $residue_data;
+	}
+        else
+        {
+		$residue_data = $data unless $residue_data;
+	}
+
+        my $entered_rcv_loop = 0;
+
+        $previous_parsed_data = '';
+
+	foreach my $parsed_data (split(/($prefix{x10_received}\w{4})|($prefix{insteon_received}\w{18})|($prefix{insteon_ext_received}\w{46})|($prefix{all_link_complete}\w{16})|($prefix{all_link_clean_failed}\w{8})|($prefix{all_link_record}\w{16})|($prefix{all_link_clean_status}\w{2})|($prefix{plm_button_event}\w{2})|($prefix{plm_user_reset})/,$residue_data))
+	{
+		#ignore blanks.. the split does odd things
+		next if $parsed_data eq '';
+
+		if ($previous_parsed_data eq $parsed_data){
+			# guard against repeats
+			::print_log("[Insteon_PLM] DEBUG3: Dropped duplicate message: $parsed_data") if $self->debuglevel(3, 'insteon'); 
+			next;
+		}
+                $previous_parsed_data = $parsed_data; # and, now reinitialize
+
+                $entered_rcv_loop = 1;
+
+                my $parsed_prefix = substr($parsed_data,0,4);
+                my $message_length = length($parsed_data);
+
+        	my $message_data = substr($parsed_data,4,length($parsed_data)-4);
+
+		if ($parsed_prefix eq $prefix{insteon_received} and ($message_length == 22))
+                { #Insteon Standard Received
+			my $find_obj = Insteon::get_object(substr($parsed_data,4,6), '01');
+			if (ref $find_obj) {
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $find_obj->debuglevel(4, 'insteon');
+			} 
+			else {
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
+			}
+                        $self->on_standard_insteon_received($message_data);
+		}
+                elsif ($parsed_prefix eq $prefix{insteon_ext_received} and ($message_length == 50))
+                { #Insteon Extended Received
+			my $find_obj = Insteon::get_object(substr($parsed_data,4,6), '01');
+			if (ref $find_obj) {
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $find_obj->debuglevel(4, 'insteon');
+			} 
+			else {
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
+			}
+                	$self->on_extended_insteon_received($message_data);
+		}
+                elsif($parsed_prefix eq $prefix{x10_received} and ($message_length == 8))
+                { #X10 Received
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
+                       	my $x10_message = new Insteon::X10Message($parsed_data);
+                        my $x10_data = $x10_message->get_formatted_data();
+			&::print_log("[Insteon_PLM] DEBUG3: received x10 data: $x10_data") if $self->debuglevel(3, 'insteon');
+			&::process_serial_data($x10_data,undef,$self);
+		}
+                elsif ($parsed_prefix eq $prefix{all_link_complete} and ($message_length == 20))
+                { #ALL-Linking Completed
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
+			my $link_address = substr($message_data,4,6);
+			&::print_log("[Insteon_PLM] DEBUG2: ALL-Linking Completed with $link_address ($message_data)") if $self->debuglevel(2, 'insteon');
+			if ($self->active_message->success_callback){
+				main::print_log("[Insteon::Insteon_PLM] DEBUG4: Now calling message success callback: "
+					. $self->active_message->success_callback) if $self->debuglevel(4, 'insteon');
+				package main;
+					eval $self->active_message->success_callback;
+					::print_log("[Insteon::Insteon_PLM] problem w/ success callback: $@") if $@;
+				package Insteon::BaseObject;
+			}
+			#Clear awaiting_ack flag
+			$self->active_message->setby->_process_command_stack(0);
+                        $self->clear_active_message();
+		}
+                elsif ($parsed_prefix eq $prefix{all_link_clean_failed} and ($message_length == 12))
+                { #ALL-Link Cleanup Failure Report
+			if ($self->active_message){
+                        	# extract out the pertinent parts of the message for display purposes
+                        	# bytes 0-1 - group; 2-7 device address
+                        	my $failure_group = substr($message_data,0,2);
+                        	my $failure_device = substr($message_data,2,6);
+                        	my $failed_object = &Insteon::get_object($failure_device,'01');
+                        	if (ref $failed_object){
+					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $failed_object->debuglevel(4, 'insteon');
+					&::print_log("[Insteon_PLM] DEBUG2: Received all-link cleanup failure from " . $failed_object->get_object_name
+                        		. " for all link group: $failure_group. Trying a direct cleanup.") if $failed_object->debuglevel(2, 'insteon');
+	                        	my $message = new Insteon::InsteonMessage('all_link_direct_cleanup', $failed_object, 
+	                        		$self->active_message->command, $failure_group);
+	                        	push(@{$$failed_object{command_stack}}, $message);
+	                        	$failed_object->_process_command_stack();
+                        	} else {
+					&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
+					&::print_log("[Insteon_PLM] Received all-link cleanup failure from an unkown device id: "
+                        		. "$failure_device and for all link group: $failure_group. You may "
+                        			. "want to run delete orphans to remove this link from your PLM");
+                        	}
+			} else {
+				&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
+				&::print_log("[Insteon_PLM] DEBUG2: Received all-link cleanup failure."
+                        		. " But there is no pending message.") if $self->debuglevel(2, 'insteon');
+			}
+                        
+		}
+                elsif ($parsed_prefix eq $prefix{all_link_record} and ($message_length == 20))
+                { #ALL-Link Record Response
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
+			&::print_log("[Insteon_PLM] DEBUG2: ALL-Link Record Response:$message_data") if $self->debuglevel(2, 'insteon');
+			$self->_aldb->parse_alllink($message_data);
+        		# before doing the next, make sure that the pending command
+                        #   (if it sitll exists) is pulled from the queue
+                        $self->clear_active_message();
+
+			$self->_aldb->get_next_alllink();
+		}
+		elsif ($parsed_prefix eq $prefix{plm_user_reset} and ($message_length == 4))
+		{
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
+			main::print_log("[Insteon_PLM] Detected PLM user reset to factory defaults");
+		}
+                elsif ($parsed_prefix eq $prefix{all_link_clean_status} and ($message_length == 6))
+                { #ALL-Link Cleanup Status Report
+			&::print_log( "[Insteon_PLM] DEBUG4:\n".Insteon::MessageDecoder::plm_decode($parsed_data)) if $self->debuglevel(4, 'insteon');
+			my $cleanup_ack = substr($message_data,0,2);
+			if ($cleanup_ack eq '15')
+                        {
+				&::print_log("[Insteon_PLM] WARN1: All-link cleanup failure for scene: "
+                                	. $self->active_message->setby->get_object_name . ". Retrying in 1 second.")
+					if $self->active_message->setby->debuglevel(1, 'insteon');
+                                $self->retry_active_message();
+                                # except that we should cause a bit of a delay to let things settle out
+				$self->_set_timeout('xmit', 1000);
+				$process_next_command = 0;
+			}
+                        else
+                        {
+                        	my $message_to_string = ($self->active_message) ? $self->active_message->to_string() : "";
+				&::print_log("[Insteon_PLM] Received all-link cleanup success: $message_to_string")
+                                	if $self->active_message->setby->debuglevel(1, 'insteon');
+				if (ref $self->active_message && ref $self->active_message->setby){
+					my $object = $self->active_message->setby;
+					$object->is_acknowledged(1);
+					$object->_process_command_stack();
+				}
+                                $self->clear_active_message();
+			}
+		}
+                elsif (substr($parsed_data,0,2) eq '15')
+                { # Indicates that the PLM can't receive more commands at the moment
+                  # so, slow things down
+			if (!($nack_count))
+                        {
+				if ($self->active_message){
+					my $nack_delay = ($::config_parms{Insteon_PLM_disable_throttling}) ? 0.3 : 1.0;
+					&::print_log("[Insteon_PLM] DEBUG3: Interface extremely busy. Resending command"
+						. " after delaying for $nack_delay second") if $self->debuglevel(3, 'insteon');
+					$self->_set_timeout('xmit',$nack_delay * 1000);
+					$self->active_message->no_hop_increase(1);
+                                	$self->retry_active_message();
+					$process_next_command = 0;
+				} else {
+					&::print_log("[Insteon_PLM] DEBUG3: Interface extremely busy."
+						. " No message to resend.") if $self->debuglevel(3, 'insteon');
+				}
+				$nack_count++;
+			}
+			#Remove the leading NACK bytes and place whatever remains into fragment for next read
+			$parsed_data =~ s/^(15)*//;
+			if ($parsed_data ne ''){
+				$$self{_data_fragment} .= $parsed_data;
+				::print_log("[Insteon_PLM] DEBUG3: Saving parsed data fragment: " 
+					. $parsed_data) if( $self->debuglevel(3, 'insteon'));
+			}
+		}
+                else
+                {
+			# it's probably a fragment; so, handle it
+                        # it it's the same as last time, then drop it as we can't recover
+			unless (($parsed_data eq $$self{_prior_data_fragment}) or ($parsed_data eq $$self{_data_fragment})) {
+				$$self{_data_fragment} .= $parsed_data;
+				main::print_log("[Insteon_PLM] DEBUG3: Saving parsed data fragment: " 
+					. $parsed_data) if( $self->debuglevel(3, 'insteon'));
+			}
+		}
+	}
+
+	unless( $entered_rcv_loop or $$self{_data_fragment}) {
+		$$self{_data_fragment} = $residue_data;
+		main::print_log("[Insteon_PLM] DEBUG3: Saving residue data fragment: " 
+			. $residue_data) if( $residue_data and $self->debuglevel(3, 'insteon'));
+	}
+
+	if ($process_next_command) {
+ 		$self->process_queue();
+	}
+
+	return;
+}
+
+=item C<add_id_state()>
+
+Dummy sub required to support the X10 integrtion, does nothing.
+
+=cut
+
+sub add_id_state {
+   # do nothing
+}
+
+=item C<firmware()>
+
+Stores and returns the firmware version of the PLM.
+
+=cut
+
+sub firmware {
+	my ($self, $p_firmware) = @_;
+	$$self{firmware} = $p_firmware if defined $p_firmware;
+	return $$self{firmware};
+}
+
+=back
+
+=head2 INI PARAMETERS
+
+=over 
+
+=item Insteon_PLM_serial_port
+
+Identifies the port on which the PLM is attached.  Example:
+
+    Insteon_PLM_serial_port=/dev/ttyS4
+
+=item Insteon_PLM_xmit_delay
+
+Sets the minimum amount of seconds that must elapse between sending Insteon messages 
+to the PLM.  Defaults to 0.25.
+
+=item Insteon_PLM_xmit_x10_delay
+
+Sets the minimum amount of seconds that must elapse between sending X10 messages 
+to the PLM.  Defaults to 0.50.
+
+=item Insteon_PLM_disable_throttling
+
+Periodically, the PLM will report that it is too busy to accept a message from
+MisterHouse.  When this happens, MisterHouse will wait 1 second before trying
+to send a message to the PLM.  If this is set to 1, downgrades the delay to only
+.3 seconds.  Most of the issues which caused the PLM to overload have been handled
+it is unlikely that you would need to set this.
+
+=back
+
+=head2 NOTES
+
+Special Thanks to:
+
+Brian Warren for significant testing and patches
+
+Bruce Winter - MH
+
+=head2 AUTHOR
+
+Jason Sharpee / jason@sharpee.com, Gregg Liming / gregg@limings.net, Kevin Robert Keegan, Michael Stovenour
+
+=head2 SEE ALSO
+
+For more information regarding the technical details of the PLM:
+L<Insteon PLM Dev Guide|http://www.smarthome.com/manuals/2412sdevguide.pdf>
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
+
+1;
diff --git a/lib/Weather_davisvantageproii.pm b/lib/Weather_davisvantageproii.pm
index 97e627492..5cc962589 100644
--- a/lib/Weather_davisvantageproii.pm
+++ b/lib/Weather_davisvantageproii.pm
@@ -1,580 +1,580 @@
-package Weather_davisvantageproii;
-
-# $Date$
-# $Revision$
-
-use strict;
-use Weather_Common;
-#!#!#!# eval 'use Digest::mhCRC qw(crc16);';
-#!#!#!# if ($@) {
-#!#!#!#	die("Weather_davisvantageproii:  Can't find the Digest::mhCRC package (mhCRC.pm).  Please ensure that it is installed.\n$@");
-#!#!#!#}
-
-=begin comment
-=============================================================================
-Davis VantagePro 2 Weather Station Interface for MH
-Version 0.1 - Alpha Test
-12/4/2010
-
-By: Brian Klier
-
-Modified from Scott Huskey's Davis Weather Monitor II Code.
-
-Note: You must enable this module by setting the following parameters in mh{.private}.ini.
-    Obviously you must point the port to the actual port to which the station is connected.
-	serial_davisvantageproii_port=COM3
-	serial_davisvantageproii_baudrate=19200
-	serial_davisvantageproii_datatype=raw
-	serial_davisvantageproii_module=Weather_davisvantageproii
-
-=============================================================================
-=cut
-our $wakeupCommand = chr(10);
-our $loopCommand = join "", "LOOP", chr(255), chr(255), chr(49), chr(10);
-our $DavisVP_port;
-#our $lastRainReading = undef;
-#our $lastRainReadingTime = undef;
-
-our ($barometric_trend, $next_rec, $barometric_press, $air_temp_inside, $humidity_inside,
-    $air_temp, $wind_speed, $wind_speed_10min_ave, $wind_direction, $relative_humidity,
-    $rain_rate, $uv, $solar, $rain_storm, $storm_date, $rain_day, $rain_month, $rain_year,
-    $day_ET, $month_ET, $year_ET, $alarms_inside, $alarms_rain, $alarms_outside,
-    $batt_xmit, $batt_cons, $forecast_icon, $forecast_rule, $sunrise, $sunset, $dew_point_inside,
-    $dew_point_outside, $crc, $crc_calc, $wptr, $data);
-
-sub startup{ 
-	my ($instance)=@_;
-	$DavisVP_port = new Serial_Item(undef, undef, 'serial_davisvantageproii');
-	&requestData;
-	&::MainLoop_pre_add_hook(\&Weather_davisvantageproii::update,1);
-	&::trigger_set('$New_Minute','&Weather_davisvantageproii::requestData','NoExpire','davisvantageproii data request')
-		unless &::trigger_get('davisvantageproii data request');
-}
-
-sub wake_up{
-	my $self = shift @_; 
-  
-  foreach (1..3)
-  {
-    $DavisVP_port->set($wakeupCommand);
-    my $str = said $DavisVP_port;
-    ###my ($cnt_in, $str) = $self->read(2);
-	
-    if ($str eq "\n\r" ) 
-	{ 
-      &::print_log ("davisvantageproii: success on wakeup") if $::Debug{weather};
-   	return 1; 
-	}
-	 
-	&::print_log ("davisvantageproii: no wakeup response") if $::Debug{weather}; 
-	
-	sleep 1; # As per page 5 of VantagePro Doc 
-  }
-
-  &::print_log ("davisvantageproii: could not wake up unit") if $::Debug{weather}; 
-  return 1; # fail
-}
-
-# called by trigger every minute
-sub requestData {
-	 &::print_log ("davisvantageproii: requesting new data from station") if $::Debug{weather};
-      #!#!#!#! &wake_up;
-      $DavisVP_port->set($wakeupCommand);
-	 $DavisVP_port->set($loopCommand);
-}
-
-# called once per loop
-sub update{
-	return unless my $data = said $DavisVP_port;
-	my $remainder=&process($data, \%main::Weather);
-	$DavisVP_port->set_data($remainder) if $remainder ne '';
-	&weather_updated;
-}
-	
-# Parse DavisVP datastream into array pointed at with $wptr so Mr House
-# can use the information
-#
-
-sub process{
-  
-  my ($data, $wptr) = @_;
-  my @data = unpack('C*',$data);
-
-	if ($::Debug{weather}) {
-		my $debugInfo='davisvantageproii: Read from Davis VantagePro II ';
-		for (@data) {
-		$debugInfo .= sprintf ("0x%x ",$_);
-		}
-	&::print_log($debugInfo);
-	}
-
-  my $data = shift @_; 
-  my $loo  = substr $data,0,3;  
-  my $ack  = ord substr($data,0,1);
-
-  if ($loo eq 'LOO') {
-     &::print_log ("davisvantageproii: found proper LOO header") if $::Debug{weather};
-  }
-  else {
-     &::print_log ("davisvantageproii: proper LOO header not found") if $::Debug{weather};
-     return '';
-  }
-
-  $barometric_trend	    	= unpack("C", substr $data,3,1);  
-  $next_rec     		= unpack("s", substr $data,5,2);  
-  $barometric_press		= unpack("s", substr $data,7,2) / 1000;  
-  $air_temp_inside		= unpack("s", substr $data,9,2) / 10;  
-  if ($air_temp_inside eq '3276.7') {$air_temp_inside = undef};
-  $humidity_inside		= unpack("C", substr $data,11,1);  
-  if ($humidity_inside eq '255') {$humidity_inside = undef};
-  $air_temp			= unpack("s", substr $data,12,2) / 10;
-  if ($air_temp eq '3276.7') {$air_temp = undef};
-  $wind_speed			= unpack("C", substr $data,14,1);  
-  if ($wind_speed eq '255') {$wind_speed = undef};
-  $wind_speed_10min_ave	= unpack("C", substr $data,15,1);
-  if ($wind_speed_10min_ave eq '255') {$wind_speed_10min_ave = undef};
-  $wind_direction		= unpack("s", substr $data,16,2);
-  if ($wind_direction eq '32767') {$wind_direction = undef};
-
-  # Skip other temps for now...
-  
-  $relative_humidity		= unpack("C", substr $data,33,1);
-  if ($relative_humidity eq '255') {$relative_humidity = undef};
-
-  # Skip other humidities for now...
-
-  $rain_rate			= unpack("s", substr $data,41,2) / 100; # Inches per hr
-  if ($rain_rate < 0) {$rain_rate = undef};
-  $uv					= unpack("C", substr $data,43,1);
-  if ($uv eq '255') {$uv = undef};
-  $solar				= unpack("s", substr $data,44,2);       # watt/m**2
-  if ($solar eq '32767') {$solar = undef};
-  $rain_storm			= unpack("s", substr $data,46,2) / 100; # Inches per storm
-
-  $storm_date			= unpack("s", substr $data,48,2);  # Need to parse data (not sure what this is)
-  $rain_day			= unpack("s", substr $data,50,2)/100;  
-  $rain_month			= unpack("s", substr $data,52,2)/100;  
-  $rain_year			= unpack("s", substr $data,54,2)/100;  
-
-  $day_ET				= unpack("s", substr $data,56,2)/1000;  
-  $month_ET			= unpack("s", substr $data,58,2)/100;  
-  $year_ET				= unpack("s", substr $data,60,2)/100;  
-  # Skip Soil/Leaf Wetness
-  
-  $alarms_inside		= unpack("b8", substr $data,70,1);  
-  $alarms_rain			= unpack("b8", substr $data,70,1);  
-  $alarms_outside		= unpack("b8", substr $data,70,1);  
-  # Skip extra alarms 
-  
-#  $batt_xmit			= unpack("C", substr $data,86,1) * 0.005859375;  
-  $batt_xmit			= unpack("C", substr $data,86,1);  
-  $batt_cons			= unpack("s", substr $data,87,2) * 0.005859375;  
- 
-  $forecast_icon		= unpack("C", substr $data,89,1);  
-  $forecast_rule		= unpack("C", substr $data,90,1);  
-
-  $sunrise				= sprintf( "%04d", unpack("S", substr $data,91,2) );  
-  $sunrise				=~ s/(\d{2})(\d{2})/$1:$2/; 
-  
-  $sunset				= sprintf( "%04d", unpack("S", substr $data,93,2) );  
-  $sunset				=~ s/(\d{2})(\d{2})/$1:$2/; 
-
-  my $nl  =  ord substr $data,95,1;  
-  my $cr  =  ord substr $data,96,1;   
-
-  $crc				= unpack "%n", substr($data,97,2); 
-  $crc_calc                = CRC_CCITT(substr($data,0,98));
-#  $crc_calc                = CRC_CCITT(substr($data,0,96));
-
-  # $crc_calc			= Digest::mhCRC::crc16(substr($data,0,96));   # MH version
-  # $crc_calc			= CRC_CCITT($data);     # 3rd party version
-    		   
-  ### MISTERHOUSE STUFF VVVVV
-
-#!#!#!#		if (Digest::mhCRC::crc16(substr($data,0,96)) != $crc) {
-#!#!#!#			&::print_log ("davisvantageproii: wrong crc16, looking again for header") if $::Debug{weather};
-#!#!#!#			next;
-#!#!#!#		}
-
-# I added this next part to throw out packets that don't have a CRC value at all
-		if ($crc eq '0') {
-			&::print_log ("davisvantageproii: wrong crc16, looking again for header") if $::Debug{weather};
-			next;
-		}
-
-		# remove the 99 bytes that we just processed, we'll use the remainder as our return value
-		$data=substr($data,99); 
-#!#!#!#		last;
-## ?	}
-	
-	&::print_log ("davisvantageproii: found a header with the right checksum") if $::Debug{weather};
-
-	# calculate sea level pressure
-	my $barometer_sea=convert_local_barom_to_sea_in($barometric_press);
-	
-# 3rd party simple dew point calculation
-#     $dew_point_inside		= $air_temp - ( (100 - $relative_humidity)/5 );
-#     $dew_point_outside		= $air_temp_inside - ( (100 - $humidity_inside)/5 );	
-
-     # these dewpoints will be in Celsius
-     if ($humidity_inside ne undef) {$dew_point_inside=&::convert_humidity_to_dewpoint($humidity_inside,&::convert_f2c($air_temp_inside))};
-     if ($relative_humidity ne undef) {$dew_point_outside=&::convert_humidity_to_dewpoint($relative_humidity,&::convert_f2c($air_temp))};
-	
-#	$rain_rate=undef;
-#	if (defined ($lastRainReadingTime)) {
-#		$rain_rate=($total_rain-$lastRainReading); # delta in inches
-#		my $time_delta=(time - $lastRainReadingTime);
-#		if ($time_delta != 0) {
-#			$rain_rate/=$time_delta; # rate in inches per second
-#			$rain_rate *= 3600; # rate in inches per hour
-#			if ($rain_rate < 0) { # if total rain was reset to zero, this could happen
-#				$rain_rate=0; 
-#			}
-#		}
-#	}
-#	$lastRainReadingTime=time;
-#	$lastRainReading=$total_rain;
-	
-	if ($main::config_parms{weather_uom_temp} eq 'C') {
-		grep {$_=&::convert_f2c($_);} (
-			$air_temp_inside,
-			$air_temp
-		);
-	# remember, dewpoints are in Celsius by default
-	} elsif ($main::config_parms{weather_uom_temp} eq 'F') {
-           $dew_point_inside=&::convert_c2f($dew_point_inside);
-           if ($relative_humidity ne undef) {
-	           $dew_point_outside=&::convert_c2f($dew_point_outside);
-           }
-#		grep {$_=&::convert_c2f($_);} (
-#			$dew_point_inside,
-#			$dew_point_outside
-#		);
-	}
-	if ($main::config_parms{weather_uom_baro} eq 'mb') {
-		grep {$_=&::convert_in2mb($_);} (
-			$barometric_press,
-			$barometer_sea
-		);
-	}
-	if ($main::config_parms{weather_uom_rain} eq 'mm') {
-		grep {$_=&::convert_in2mm($_);} (
-			$rain_storm
-		);
-	}
-	if ($main::config_parms{weather_uom_rain} eq 'mm/hr') {
-		grep {$_=&::convert_in2mm($_);} (
-			$rain_rate
-		);
-		$rain_rate=sprintf('%.0f',$rain_rate); # round to nearest mm/hr
-	} else {
-		$rain_rate=sprintf('%.2f',$rain_rate); # round to nearest 0.01 in/hr
-	}
-	if ($main::config_parms{weather_uom_wind} eq 'kph') {
-		grep {$_=&::convert_mile2km($_);} (
-			$wind_speed
-		);
-	}
-	if ($main::config_parms{weather_uom_wind} eq 'm/s') {
-		grep {$_=&::convert_mph2mps($_);} (
-			$wind_speed
-		);
-	}
-	
-	$$wptr{TempIndoor}=$air_temp_inside;
-	$$wptr{TempOutdoor}=$air_temp;
-	$$wptr{DewIndoor}=$dew_point_inside;
-	$$wptr{DewOutdoor}=$dew_point_outside; 
-	$$wptr{WindAvgSpeed}=$wind_speed;
-	$$wptr{WindGustSpeed}=$wind_speed;
-	$$wptr{WindAvgDir}=$wind_direction;
-	$$wptr{WindGustDir}=$wind_direction;
-	$$wptr{Barom}=$barometric_press;
-	$$wptr{BaromSea}=$barometer_sea;
-	$$wptr{HumidIndoor}=$humidity_inside;
-	$$wptr{HumidOutdoor}=$relative_humidity;
-	$$wptr{RainTotal}=$rain_storm;
-	$$wptr{RainRate}=$rain_rate;
-	
-	if ($::Debug{weather}) {
-		foreach my $key qw(
-			TempIndoor
-			TempOutdoor
-			DewIndoor
-			DewOutdoor
-			WindAvgSpeed
-			WindAvgDir
-			Barom
-			BaromSea
-			HumidIndoor
-			HumidOutdoor
-			RainTotal
-			RainRate
-			) {
-			&::print_log ("davisvantageproii: $key ".$$wptr{$key});
-		}
-	}
-
-if ($::Debug{weather}) {
-	 &::print_log ("uv: $uv");
-	 &::print_log ("solar: $solar"); 
-	 &::print_log ("batt_xmit: $batt_xmit");
-	 &::print_log ("batt_cons: $batt_cons");
-	 &::print_log ("sunrise: $sunrise");
-	 &::print_log ("sunset: $sunset");
-	 &::print_log ("crc: $crc");
-	 &::print_log ("crc_calc: $crc_calc");
-	 &::print_log ("barometric_trend: $barometric_trend");
-	 &::print_log ("alarms_inside: $alarms_inside");
-	 &::print_log ("alarms_rain: $alarms_rain");
-	 &::print_log ("alarms_outside: $alarms_outside");
-	 &::print_log ("forecast_icon: $forecast_icon");
-	 &::print_log ("forecast_rule: $forecast_rule");
-}
-
-	&::weather_updated;
-	return $data;
-} 
-
-sub CRC_CCITT
-{
-    # Expects packed data... 
-    my $data_str = shift @_;
-
-	my @crc_table = crc_table();
-
-	my $tempcrc = 0;
-	my @lst = split //, $data_str;
-	foreach my $data (@lst)
-	{
-	   my $data = unpack("c",$data); 
-	
-	   my $crc_prev = $tempcrc;
-	   my $index = $tempcrc >> 8 ^ $data;
-	   my $lhs = $crc_table[$index];
-       my $rhs = ($tempcrc << 8) & 0xFFFF;
-       $tempcrc = $lhs ^ $rhs;
-	
-	   #$data = unpack("H*",$data); 
-	   #printf("%X\t %s\t %X\t %X\t %X\t : %x \n", $crc_prev, $data, $index, $lhs, $rhs, $crc);
-	}
-		
-	return $tempcrc;
-}
-
-# - - - - - - - - - - - - - - - - - - - 
-sub crc_table
-{
-
-my @crc_table = (
-0x0, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
-0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
-0x1231, 0x210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
-0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
-0x2462, 0x3443, 0x420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
-0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
-0x3653, 0x2672, 0x1611, 0x630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
-0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
-0x48c4, 0x58e5, 0x6886, 0x78a7, 0x840, 0x1861, 0x2802, 0x3823,
-0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
-0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0xa50, 0x3a33, 0x2a12,
-0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
-0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0xc60, 0x1c41,
-0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
-0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0xe70,
-0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
-0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
-0x1080, 0xa1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
-0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
-0x2b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
-0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
-0x34e2, 0x24c3, 0x14a0, 0x481, 0x7466, 0x6447, 0x5424, 0x4405,
-0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
-0x26d3, 0x36f2, 0x691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
-0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
-0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x8e1, 0x3882, 0x28a3,
-0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
-0x4a75, 0x5a54, 0x6a37, 0x7a16, 0xaf1, 0x1ad0, 0x2ab3, 0x3a92,
-0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
-0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0xcc1,
-0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
-0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0xed1, 0x1ef0);
-}
-
-# all modules must return 1.  don't remove the following line
-1;
-
-=begin comment
-=============================================================================
-Contents of the LOOP packet.
-Field Offset Size Explanation
-"L" 0 1
-"O" 1 1
-"O" 2 1
-Spells out "LOO" for Rev B packets and "LOOP" for Rev A
-packets. Identifies a LOOP packet
-"P" (Rev A)
-Bar Trend (Rev B)
-3 1 Signed byte that indicates the current 3-hour barometer trend. It
-is one of these values:
--60 = Falling Rapidly = 196 (as an unsigned byte)
--20 = Falling Slowly = 236 (as an unsigned byte)
-0 = Steady
-20 = Rising Slowly
-60 = Rising Rapidly
-80 = ASCII "P" = Rev A firmware, no trend info is available
-Any other value means that the Vantage does not have the 3
-hours of bar data needed to determine the bar trend.
-Packet Type 4 1 Has the value zero. In the future we may define new LOOP
-packet formats and assign a different value to this field.
-Page 21 of 52
-Field Offset Size Explanation
-Next Record 5 2 Location in the archive memory where the next data packet will
-be written. This can be monitored to detect when a new record is
-created.
-Barometer 7 2 Current Barometer. Units are (in Hg / 1000). The barometric
-value should be between 20 inches and 32.5 inches in Vantage
-Pro and between 20 inches and 32.5 inches in both Vantatge Pro
-Vantage Pro2. Values outside these ranges will not be logged.
-Inside Temperature 9 2 The value is sent as 10th of a degree in F. For example, 795 is
-returned for 79.5°F.
-Inside Humidity 11 1 This is the relative humidity in %, such as 50 is returned for 50%.
-Outside Temperature 12 2 The value is sent as 10th of a degree in F. For example, 795 is
-returned for 79.5°F.
-Wind Speed 14 1 It is a byte unsigned value in mph. If the wind speed is dashed
-because it lost synchronization with the radio or due to some
-other reason, the wind speed is forced to be 0.
-10 Min Avg Wind Speed 15 1 It is a byte unsigned value in mph.
-Wind Direction 16 2 It is a two byte unsigned value from 1 to 360 degrees. (0° is no
-wind data, 90° is East, 180° is South, 270° is West and 360° is
-north)
-Extra Temperatures 18 7 This field supports seven extra temperature stations.
-Each byte is one extra temperature value in whole degrees F with
-an offset of 90 degrees. For example, a value of 0 = -90°F ; a
-value of 100 = 10°F ; and a value of 169 = 79°F.
-Soil Temperatures 25 4 This field supports four soil temperature sensors, in the same
-format as the Extra Temperature field above
-Leaf Temperatures 29 4 This field supports four leaf temperature sensors, in the same
-format as the Extra Temperature field above
-Outside Humidity 33 1 This is the relative humitiy in %.
-Extra Humidties 34 7 Relative humidity in % for extra seven humidity stations.
-Rain Rate 41 2 This value is sent as number of rain clicks (0.2mm or 0.01in).
-For example, 256 can represent 2.56 inches/hour.
-UV 43 1 The unit is in UV index.
-Solar Radiation 44 2 The unit is in watt/meter2.
-Storm Rain 46 2 The storm is stored as 100th of an inch.
-Start Date of current Storm 48 2 Bit 15 to bit 12 is the month, bit 11 to bit 7 is the day and bit 6 to
-bit 0 is the year offseted by 2000.
-Day Rain 50 2 This value is sent as number of rain clicks. (0.2mm or 0.01in)
-Month Rain 52 2 This value is sent as number of rain clicks. (0.2mm or 0.01in)
-Year Rain 54 2 This value is sent as number of rain clicks. (0.2mm or 0.01in)
-Day ET 56 2 This value is sent as the 1000th of an inch.
-Month ET 58 2 This value is sent as the 100th of an inch.
-Year ET 60 2 This value is setnt as the 100th of an inch.
-Soil Moistures 62 4 The unit is in centibar. It supports four soil sensors.
-Leaf Wetnesses 66 4 This is a scale number from 0 to 15 with 0 meaning very dry and
-15 meaning very wet. It supports four leaf sensors.
-Inside Alarms 70 1 Currently active inside alarms. See the table below
-Rain Alarms 71 1 Currently active rain alarms. See the table below
-Outside Alarms 72 2 Currently active outside alarms. See the table below
-Extra Temp/Hum Alarms 74 8 Currently active extra temp/hum alarms. See the table below
-Soil & Leaf Alarms 82 4 Currently active soil/leaf alarms. See the table below
-Transmitter Battery Status 86 1
-Console Battery Voltage 87 2 Voltage = ((Data * 300)/512)/100.0
-Forecast Icons 89 1
-Page 22 of 52
-Field Offset Size Explanation
-Forecast Rule number 90 1
-Time of Sunrise 91 2 The time is stored as hour * 100 + min.
-Time of Sunset 93 2 The time is stored as hour * 100 + min.
-"\n" <LF> = 0x0A 95 1
-"\r" <CR> = 0x0D 96 1
-CRC 97 2
-Total Length 99
-Forecast Icons in LOOP packet
-Field Byte Bit #
-Forecast Icons 89 Bit maps for forecast icons on the console screen.
-Rain 0
-Cloud 1
-Partly Cloudy 2
-Sun 3
-Snow 4
-Forecast Icon Values
-Value Decimal Value Hex Segments Shown Forecast
-8 0x08 Sun Mostly Clear
-6 0x06 Partial Sun + Cloud Partially Cloudy
-2 0x02 Cloud Mostly Cloudy
-3 0x03 Cloud + Rain Mostly Cloudy, Rain within 12 hours
-18 0x12 Cloud + Snow Mostly Cloudy, Snow within 12 hours
-19 0x13 Cloud + Rain + Snow Mostly Cloudy, Rain or Snow within 12 hours
-7 0x07 Partial Sun + Cloud +
-Rain
-Partially Cloudy, Rain within 12 hours
-22 0x16 Partial Sun + Cloud +
-Snow
-Partially Cloudy, Snow within 12 hours
-23 0x17 Partial Sun + Cloud +
-Rain + Snow
-Partially Cloudy, Rain or Snow within 12 hours
-Currently active alarms in the LOOP packet
-This table shows which alarms correspond to each bit in the LOOP alarm fields. Not all bits in
-each field are used. The Outside Alarms field has been split into 2 1-byte sections.
-Field Byte Bit #
-Inside Alarms 70 Currently active inside alarms.
-Falling bar trend alarm 0
-Rising bar trend alarm 1
-Low inside temp alarm 2
-High inside temp alarm 3
-Page 23 of 52
-Field Byte Bit #
-Low inside hum alarm 4
-High inside hum alarm 5
-Time alarm 6
-Rain Alarms 71 Currently active rain alarms.
-High rain rate alarm 0
-15 min rain alarm 1 Flash Flood alarm
-24 hour rain alarm 2
-Storm total rain alarm 3
-Daily ET alarm 4
-Outside Alarms 72 Currently active outside alarms.
-Low outside temp alarm 0
-High outside temp alarm 1
-Wind speed alarm 2
-10 min avg speed alarm 3
-Low dewpoint alarm 4
-High dewpoint alarm 5
-High heat alarm 6
-Low wind chill alarm 7
-Outside Alarms, byte 2 73
-High THSW alarm 0
-High solar rad alarm 1
-High UV alarm 2
-UV Dose alarm 3
-UV Dose alarm Enabled 4 It is set to 1 when a UV dose alarm threshold has been entered
-AND the daily UV dose has been manually cleared.
-Outside Humidity Alarms 74 1 Currently active outside humidity alarms.
-Low Humidity alarm 2
-High Humidity alarm 3
-Extra Temp/Hum Alarms 75 - 81 7 Each byte contains four alarm bits (0 – 3) for a single extra
-Temp/Hum station. Bits (4 – 7) are not used and reserved for
-future use.
-Use the temperature and humidity sensor numbers, as
-described in Section XIII.4 to locate which byte contains the
-appropriate alarm bits. In particular, the humidity and
-temperature alarms for a single station will be found in
-different bytes.
-Low temp X alarm 0
-High temp X alarm 1
-Low hum X alarm 2
-High hum X alarm 3
-Soil & Leaf Alarms 82 - 85 4 Currently active soil/leaf alarms.
-Low leaf wetness X alarm 0
-High leaf wetness X alarm 1
-Low soil moisture X alarm 2
-High soil moisture X alarm 3
-Low leaf temp X alarm 4
-High leaf temp X alarm 5
-Low soil temp X alarm 6
-High soil temp X alarm 7
-=============================================================================
+package Weather_davisvantageproii;
+
+# $Date$
+# $Revision$
+
+use strict;
+use Weather_Common;
+#!#!#!# eval 'use Digest::mhCRC qw(crc16);';
+#!#!#!# if ($@) {
+#!#!#!#	die("Weather_davisvantageproii:  Can't find the Digest::mhCRC package (mhCRC.pm).  Please ensure that it is installed.\n$@");
+#!#!#!#}
+
+=begin comment
+=============================================================================
+Davis VantagePro 2 Weather Station Interface for MH
+Version 0.1 - Alpha Test
+12/4/2010
+
+By: Brian Klier
+
+Modified from Scott Huskey's Davis Weather Monitor II Code.
+
+Note: You must enable this module by setting the following parameters in mh{.private}.ini.
+    Obviously you must point the port to the actual port to which the station is connected.
+	serial_davisvantageproii_port=COM3
+	serial_davisvantageproii_baudrate=19200
+	serial_davisvantageproii_datatype=raw
+	serial_davisvantageproii_module=Weather_davisvantageproii
+
+=============================================================================
+=cut
+our $wakeupCommand = chr(10);
+our $loopCommand = join "", "LOOP", chr(255), chr(255), chr(49), chr(10);
+our $DavisVP_port;
+#our $lastRainReading = undef;
+#our $lastRainReadingTime = undef;
+
+our ($barometric_trend, $next_rec, $barometric_press, $air_temp_inside, $humidity_inside,
+    $air_temp, $wind_speed, $wind_speed_10min_ave, $wind_direction, $relative_humidity,
+    $rain_rate, $uv, $solar, $rain_storm, $storm_date, $rain_day, $rain_month, $rain_year,
+    $day_ET, $month_ET, $year_ET, $alarms_inside, $alarms_rain, $alarms_outside,
+    $batt_xmit, $batt_cons, $forecast_icon, $forecast_rule, $sunrise, $sunset, $dew_point_inside,
+    $dew_point_outside, $crc, $crc_calc, $wptr, $data);
+
+sub startup{ 
+	my ($instance)=@_;
+	$DavisVP_port = new Serial_Item(undef, undef, 'serial_davisvantageproii');
+	&requestData;
+	&::MainLoop_pre_add_hook(\&Weather_davisvantageproii::update,1);
+	&::trigger_set('$New_Minute','&Weather_davisvantageproii::requestData','NoExpire','davisvantageproii data request')
+		unless &::trigger_get('davisvantageproii data request');
+}
+
+sub wake_up{
+	my $self = shift @_; 
+  
+  foreach (1..3)
+  {
+    $DavisVP_port->set($wakeupCommand);
+    my $str = said $DavisVP_port;
+    ###my ($cnt_in, $str) = $self->read(2);
+	
+    if ($str eq "\n\r" ) 
+	{ 
+      &::print_log ("davisvantageproii: success on wakeup") if $::Debug{weather};
+   	return 1; 
+	}
+	 
+	&::print_log ("davisvantageproii: no wakeup response") if $::Debug{weather}; 
+	
+	sleep 1; # As per page 5 of VantagePro Doc 
+  }
+
+  &::print_log ("davisvantageproii: could not wake up unit") if $::Debug{weather}; 
+  return 1; # fail
+}
+
+# called by trigger every minute
+sub requestData {
+	 &::print_log ("davisvantageproii: requesting new data from station") if $::Debug{weather};
+      #!#!#!#! &wake_up;
+      $DavisVP_port->set($wakeupCommand);
+	 $DavisVP_port->set($loopCommand);
+}
+
+# called once per loop
+sub update{
+	return unless my $data = said $DavisVP_port;
+	my $remainder=&process($data, \%main::Weather);
+	$DavisVP_port->set_data($remainder) if $remainder ne '';
+	&weather_updated;
+}
+	
+# Parse DavisVP datastream into array pointed at with $wptr so Mr House
+# can use the information
+#
+
+sub process{
+  
+  my ($data, $wptr) = @_;
+  my @data = unpack('C*',$data);
+
+	if ($::Debug{weather}) {
+		my $debugInfo='davisvantageproii: Read from Davis VantagePro II ';
+		for (@data) {
+		$debugInfo .= sprintf ("0x%x ",$_);
+		}
+	&::print_log($debugInfo);
+	}
+
+  my $data = shift @_; 
+  my $loo  = substr $data,0,3;  
+  my $ack  = ord substr($data,0,1);
+
+  if ($loo eq 'LOO') {
+     &::print_log ("davisvantageproii: found proper LOO header") if $::Debug{weather};
+  }
+  else {
+     &::print_log ("davisvantageproii: proper LOO header not found") if $::Debug{weather};
+     return '';
+  }
+
+  $barometric_trend	    	= unpack("C", substr $data,3,1);  
+  $next_rec     		= unpack("s", substr $data,5,2);  
+  $barometric_press		= unpack("s", substr $data,7,2) / 1000;  
+  $air_temp_inside		= unpack("s", substr $data,9,2) / 10;  
+  if ($air_temp_inside eq '3276.7') {$air_temp_inside = undef};
+  $humidity_inside		= unpack("C", substr $data,11,1);  
+  if ($humidity_inside eq '255') {$humidity_inside = undef};
+  $air_temp			= unpack("s", substr $data,12,2) / 10;
+  if ($air_temp eq '3276.7') {$air_temp = undef};
+  $wind_speed			= unpack("C", substr $data,14,1);  
+  if ($wind_speed eq '255') {$wind_speed = undef};
+  $wind_speed_10min_ave	= unpack("C", substr $data,15,1);
+  if ($wind_speed_10min_ave eq '255') {$wind_speed_10min_ave = undef};
+  $wind_direction		= unpack("s", substr $data,16,2);
+  if ($wind_direction eq '32767') {$wind_direction = undef};
+
+  # Skip other temps for now...
+  
+  $relative_humidity		= unpack("C", substr $data,33,1);
+  if ($relative_humidity eq '255') {$relative_humidity = undef};
+
+  # Skip other humidities for now...
+
+  $rain_rate			= unpack("s", substr $data,41,2) / 100; # Inches per hr
+  if ($rain_rate < 0) {$rain_rate = undef};
+  $uv					= unpack("C", substr $data,43,1);
+  if ($uv eq '255') {$uv = undef};
+  $solar				= unpack("s", substr $data,44,2);       # watt/m**2
+  if ($solar eq '32767') {$solar = undef};
+  $rain_storm			= unpack("s", substr $data,46,2) / 100; # Inches per storm
+
+  $storm_date			= unpack("s", substr $data,48,2);  # Need to parse data (not sure what this is)
+  $rain_day			= unpack("s", substr $data,50,2)/100;  
+  $rain_month			= unpack("s", substr $data,52,2)/100;  
+  $rain_year			= unpack("s", substr $data,54,2)/100;  
+
+  $day_ET				= unpack("s", substr $data,56,2)/1000;  
+  $month_ET			= unpack("s", substr $data,58,2)/100;  
+  $year_ET				= unpack("s", substr $data,60,2)/100;  
+  # Skip Soil/Leaf Wetness
+  
+  $alarms_inside		= unpack("b8", substr $data,70,1);  
+  $alarms_rain			= unpack("b8", substr $data,70,1);  
+  $alarms_outside		= unpack("b8", substr $data,70,1);  
+  # Skip extra alarms 
+  
+#  $batt_xmit			= unpack("C", substr $data,86,1) * 0.005859375;  
+  $batt_xmit			= unpack("C", substr $data,86,1);  
+  $batt_cons			= unpack("s", substr $data,87,2) * 0.005859375;  
+ 
+  $forecast_icon		= unpack("C", substr $data,89,1);  
+  $forecast_rule		= unpack("C", substr $data,90,1);  
+
+  $sunrise				= sprintf( "%04d", unpack("S", substr $data,91,2) );  
+  $sunrise				=~ s/(\d{2})(\d{2})/$1:$2/; 
+  
+  $sunset				= sprintf( "%04d", unpack("S", substr $data,93,2) );  
+  $sunset				=~ s/(\d{2})(\d{2})/$1:$2/; 
+
+  my $nl  =  ord substr $data,95,1;  
+  my $cr  =  ord substr $data,96,1;   
+
+  $crc				= unpack "%n", substr($data,97,2); 
+  $crc_calc                = CRC_CCITT(substr($data,0,98));
+#  $crc_calc                = CRC_CCITT(substr($data,0,96));
+
+  # $crc_calc			= Digest::mhCRC::crc16(substr($data,0,96));   # MH version
+  # $crc_calc			= CRC_CCITT($data);     # 3rd party version
+    		   
+  ### MISTERHOUSE STUFF VVVVV
+
+#!#!#!#		if (Digest::mhCRC::crc16(substr($data,0,96)) != $crc) {
+#!#!#!#			&::print_log ("davisvantageproii: wrong crc16, looking again for header") if $::Debug{weather};
+#!#!#!#			next;
+#!#!#!#		}
+
+# I added this next part to throw out packets that don't have a CRC value at all
+		if ($crc eq '0') {
+			&::print_log ("davisvantageproii: wrong crc16, looking again for header") if $::Debug{weather};
+			next;
+		}
+
+		# remove the 99 bytes that we just processed, we'll use the remainder as our return value
+		$data=substr($data,99); 
+#!#!#!#		last;
+## ?	}
+	
+	&::print_log ("davisvantageproii: found a header with the right checksum") if $::Debug{weather};
+
+	# calculate sea level pressure
+	my $barometer_sea=convert_local_barom_to_sea_in($barometric_press);
+	
+# 3rd party simple dew point calculation
+#     $dew_point_inside		= $air_temp - ( (100 - $relative_humidity)/5 );
+#     $dew_point_outside		= $air_temp_inside - ( (100 - $humidity_inside)/5 );	
+
+     # these dewpoints will be in Celsius
+     if ($humidity_inside ne undef) {$dew_point_inside=&::convert_humidity_to_dewpoint($humidity_inside,&::convert_f2c($air_temp_inside))};
+     if ($relative_humidity ne undef) {$dew_point_outside=&::convert_humidity_to_dewpoint($relative_humidity,&::convert_f2c($air_temp))};
+	
+#	$rain_rate=undef;
+#	if (defined ($lastRainReadingTime)) {
+#		$rain_rate=($total_rain-$lastRainReading); # delta in inches
+#		my $time_delta=(time - $lastRainReadingTime);
+#		if ($time_delta != 0) {
+#			$rain_rate/=$time_delta; # rate in inches per second
+#			$rain_rate *= 3600; # rate in inches per hour
+#			if ($rain_rate < 0) { # if total rain was reset to zero, this could happen
+#				$rain_rate=0; 
+#			}
+#		}
+#	}
+#	$lastRainReadingTime=time;
+#	$lastRainReading=$total_rain;
+	
+	if ($main::config_parms{weather_uom_temp} eq 'C') {
+		grep {$_=&::convert_f2c($_);} (
+			$air_temp_inside,
+			$air_temp
+		);
+	# remember, dewpoints are in Celsius by default
+	} elsif ($main::config_parms{weather_uom_temp} eq 'F') {
+           $dew_point_inside=&::convert_c2f($dew_point_inside);
+           if ($relative_humidity ne undef) {
+	           $dew_point_outside=&::convert_c2f($dew_point_outside);
+           }
+#		grep {$_=&::convert_c2f($_);} (
+#			$dew_point_inside,
+#			$dew_point_outside
+#		);
+	}
+	if ($main::config_parms{weather_uom_baro} eq 'mb') {
+		grep {$_=&::convert_in2mb($_);} (
+			$barometric_press,
+			$barometer_sea
+		);
+	}
+	if ($main::config_parms{weather_uom_rain} eq 'mm') {
+		grep {$_=&::convert_in2mm($_);} (
+			$rain_storm
+		);
+	}
+	if ($main::config_parms{weather_uom_rain} eq 'mm/hr') {
+		grep {$_=&::convert_in2mm($_);} (
+			$rain_rate
+		);
+		$rain_rate=sprintf('%.0f',$rain_rate); # round to nearest mm/hr
+	} else {
+		$rain_rate=sprintf('%.2f',$rain_rate); # round to nearest 0.01 in/hr
+	}
+	if ($main::config_parms{weather_uom_wind} eq 'kph') {
+		grep {$_=&::convert_mile2km($_);} (
+			$wind_speed
+		);
+	}
+	if ($main::config_parms{weather_uom_wind} eq 'm/s') {
+		grep {$_=&::convert_mph2mps($_);} (
+			$wind_speed
+		);
+	}
+	
+	$$wptr{TempIndoor}=$air_temp_inside;
+	$$wptr{TempOutdoor}=$air_temp;
+	$$wptr{DewIndoor}=$dew_point_inside;
+	$$wptr{DewOutdoor}=$dew_point_outside; 
+	$$wptr{WindAvgSpeed}=$wind_speed;
+	$$wptr{WindGustSpeed}=$wind_speed;
+	$$wptr{WindAvgDir}=$wind_direction;
+	$$wptr{WindGustDir}=$wind_direction;
+	$$wptr{Barom}=$barometric_press;
+	$$wptr{BaromSea}=$barometer_sea;
+	$$wptr{HumidIndoor}=$humidity_inside;
+	$$wptr{HumidOutdoor}=$relative_humidity;
+	$$wptr{RainTotal}=$rain_storm;
+	$$wptr{RainRate}=$rain_rate;
+	
+	if ($::Debug{weather}) {
+		foreach my $key qw(
+			TempIndoor
+			TempOutdoor
+			DewIndoor
+			DewOutdoor
+			WindAvgSpeed
+			WindAvgDir
+			Barom
+			BaromSea
+			HumidIndoor
+			HumidOutdoor
+			RainTotal
+			RainRate
+			) {
+			&::print_log ("davisvantageproii: $key ".$$wptr{$key});
+		}
+	}
+
+if ($::Debug{weather}) {
+	 &::print_log ("uv: $uv");
+	 &::print_log ("solar: $solar"); 
+	 &::print_log ("batt_xmit: $batt_xmit");
+	 &::print_log ("batt_cons: $batt_cons");
+	 &::print_log ("sunrise: $sunrise");
+	 &::print_log ("sunset: $sunset");
+	 &::print_log ("crc: $crc");
+	 &::print_log ("crc_calc: $crc_calc");
+	 &::print_log ("barometric_trend: $barometric_trend");
+	 &::print_log ("alarms_inside: $alarms_inside");
+	 &::print_log ("alarms_rain: $alarms_rain");
+	 &::print_log ("alarms_outside: $alarms_outside");
+	 &::print_log ("forecast_icon: $forecast_icon");
+	 &::print_log ("forecast_rule: $forecast_rule");
+}
+
+	&::weather_updated;
+	return $data;
+} 
+
+sub CRC_CCITT
+{
+    # Expects packed data... 
+    my $data_str = shift @_;
+
+	my @crc_table = crc_table();
+
+	my $tempcrc = 0;
+	my @lst = split //, $data_str;
+	foreach my $data (@lst)
+	{
+	   my $data = unpack("c",$data); 
+	
+	   my $crc_prev = $tempcrc;
+	   my $index = $tempcrc >> 8 ^ $data;
+	   my $lhs = $crc_table[$index];
+       my $rhs = ($tempcrc << 8) & 0xFFFF;
+       $tempcrc = $lhs ^ $rhs;
+	
+	   #$data = unpack("H*",$data); 
+	   #printf("%X\t %s\t %X\t %X\t %X\t : %x \n", $crc_prev, $data, $index, $lhs, $rhs, $crc);
+	}
+		
+	return $tempcrc;
+}
+
+# - - - - - - - - - - - - - - - - - - - 
+sub crc_table
+{
+
+my @crc_table = (
+0x0, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
+0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
+0x1231, 0x210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
+0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
+0x2462, 0x3443, 0x420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
+0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
+0x3653, 0x2672, 0x1611, 0x630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
+0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
+0x48c4, 0x58e5, 0x6886, 0x78a7, 0x840, 0x1861, 0x2802, 0x3823,
+0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
+0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0xa50, 0x3a33, 0x2a12,
+0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
+0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0xc60, 0x1c41,
+0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
+0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0xe70,
+0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
+0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
+0x1080, 0xa1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
+0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
+0x2b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
+0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
+0x34e2, 0x24c3, 0x14a0, 0x481, 0x7466, 0x6447, 0x5424, 0x4405,
+0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
+0x26d3, 0x36f2, 0x691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
+0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
+0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x8e1, 0x3882, 0x28a3,
+0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
+0x4a75, 0x5a54, 0x6a37, 0x7a16, 0xaf1, 0x1ad0, 0x2ab3, 0x3a92,
+0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
+0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0xcc1,
+0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
+0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0xed1, 0x1ef0);
+}
+
+# all modules must return 1.  don't remove the following line
+1;
+
+=begin comment
+=============================================================================
+Contents of the LOOP packet.
+Field Offset Size Explanation
+"L" 0 1
+"O" 1 1
+"O" 2 1
+Spells out "LOO" for Rev B packets and "LOOP" for Rev A
+packets. Identifies a LOOP packet
+"P" (Rev A)
+Bar Trend (Rev B)
+3 1 Signed byte that indicates the current 3-hour barometer trend. It
+is one of these values:
+-60 = Falling Rapidly = 196 (as an unsigned byte)
+-20 = Falling Slowly = 236 (as an unsigned byte)
+0 = Steady
+20 = Rising Slowly
+60 = Rising Rapidly
+80 = ASCII "P" = Rev A firmware, no trend info is available
+Any other value means that the Vantage does not have the 3
+hours of bar data needed to determine the bar trend.
+Packet Type 4 1 Has the value zero. In the future we may define new LOOP
+packet formats and assign a different value to this field.
+Page 21 of 52
+Field Offset Size Explanation
+Next Record 5 2 Location in the archive memory where the next data packet will
+be written. This can be monitored to detect when a new record is
+created.
+Barometer 7 2 Current Barometer. Units are (in Hg / 1000). The barometric
+value should be between 20 inches and 32.5 inches in Vantage
+Pro and between 20 inches and 32.5 inches in both Vantatge Pro
+Vantage Pro2. Values outside these ranges will not be logged.
+Inside Temperature 9 2 The value is sent as 10th of a degree in F. For example, 795 is
+returned for 79.5°F.
+Inside Humidity 11 1 This is the relative humidity in %, such as 50 is returned for 50%.
+Outside Temperature 12 2 The value is sent as 10th of a degree in F. For example, 795 is
+returned for 79.5°F.
+Wind Speed 14 1 It is a byte unsigned value in mph. If the wind speed is dashed
+because it lost synchronization with the radio or due to some
+other reason, the wind speed is forced to be 0.
+10 Min Avg Wind Speed 15 1 It is a byte unsigned value in mph.
+Wind Direction 16 2 It is a two byte unsigned value from 1 to 360 degrees. (0° is no
+wind data, 90° is East, 180° is South, 270° is West and 360° is
+north)
+Extra Temperatures 18 7 This field supports seven extra temperature stations.
+Each byte is one extra temperature value in whole degrees F with
+an offset of 90 degrees. For example, a value of 0 = -90°F ; a
+value of 100 = 10°F ; and a value of 169 = 79°F.
+Soil Temperatures 25 4 This field supports four soil temperature sensors, in the same
+format as the Extra Temperature field above
+Leaf Temperatures 29 4 This field supports four leaf temperature sensors, in the same
+format as the Extra Temperature field above
+Outside Humidity 33 1 This is the relative humitiy in %.
+Extra Humidties 34 7 Relative humidity in % for extra seven humidity stations.
+Rain Rate 41 2 This value is sent as number of rain clicks (0.2mm or 0.01in).
+For example, 256 can represent 2.56 inches/hour.
+UV 43 1 The unit is in UV index.
+Solar Radiation 44 2 The unit is in watt/meter2.
+Storm Rain 46 2 The storm is stored as 100th of an inch.
+Start Date of current Storm 48 2 Bit 15 to bit 12 is the month, bit 11 to bit 7 is the day and bit 6 to
+bit 0 is the year offseted by 2000.
+Day Rain 50 2 This value is sent as number of rain clicks. (0.2mm or 0.01in)
+Month Rain 52 2 This value is sent as number of rain clicks. (0.2mm or 0.01in)
+Year Rain 54 2 This value is sent as number of rain clicks. (0.2mm or 0.01in)
+Day ET 56 2 This value is sent as the 1000th of an inch.
+Month ET 58 2 This value is sent as the 100th of an inch.
+Year ET 60 2 This value is setnt as the 100th of an inch.
+Soil Moistures 62 4 The unit is in centibar. It supports four soil sensors.
+Leaf Wetnesses 66 4 This is a scale number from 0 to 15 with 0 meaning very dry and
+15 meaning very wet. It supports four leaf sensors.
+Inside Alarms 70 1 Currently active inside alarms. See the table below
+Rain Alarms 71 1 Currently active rain alarms. See the table below
+Outside Alarms 72 2 Currently active outside alarms. See the table below
+Extra Temp/Hum Alarms 74 8 Currently active extra temp/hum alarms. See the table below
+Soil & Leaf Alarms 82 4 Currently active soil/leaf alarms. See the table below
+Transmitter Battery Status 86 1
+Console Battery Voltage 87 2 Voltage = ((Data * 300)/512)/100.0
+Forecast Icons 89 1
+Page 22 of 52
+Field Offset Size Explanation
+Forecast Rule number 90 1
+Time of Sunrise 91 2 The time is stored as hour * 100 + min.
+Time of Sunset 93 2 The time is stored as hour * 100 + min.
+"\n" <LF> = 0x0A 95 1
+"\r" <CR> = 0x0D 96 1
+CRC 97 2
+Total Length 99
+Forecast Icons in LOOP packet
+Field Byte Bit #
+Forecast Icons 89 Bit maps for forecast icons on the console screen.
+Rain 0
+Cloud 1
+Partly Cloudy 2
+Sun 3
+Snow 4
+Forecast Icon Values
+Value Decimal Value Hex Segments Shown Forecast
+8 0x08 Sun Mostly Clear
+6 0x06 Partial Sun + Cloud Partially Cloudy
+2 0x02 Cloud Mostly Cloudy
+3 0x03 Cloud + Rain Mostly Cloudy, Rain within 12 hours
+18 0x12 Cloud + Snow Mostly Cloudy, Snow within 12 hours
+19 0x13 Cloud + Rain + Snow Mostly Cloudy, Rain or Snow within 12 hours
+7 0x07 Partial Sun + Cloud +
+Rain
+Partially Cloudy, Rain within 12 hours
+22 0x16 Partial Sun + Cloud +
+Snow
+Partially Cloudy, Snow within 12 hours
+23 0x17 Partial Sun + Cloud +
+Rain + Snow
+Partially Cloudy, Rain or Snow within 12 hours
+Currently active alarms in the LOOP packet
+This table shows which alarms correspond to each bit in the LOOP alarm fields. Not all bits in
+each field are used. The Outside Alarms field has been split into 2 1-byte sections.
+Field Byte Bit #
+Inside Alarms 70 Currently active inside alarms.
+Falling bar trend alarm 0
+Rising bar trend alarm 1
+Low inside temp alarm 2
+High inside temp alarm 3
+Page 23 of 52
+Field Byte Bit #
+Low inside hum alarm 4
+High inside hum alarm 5
+Time alarm 6
+Rain Alarms 71 Currently active rain alarms.
+High rain rate alarm 0
+15 min rain alarm 1 Flash Flood alarm
+24 hour rain alarm 2
+Storm total rain alarm 3
+Daily ET alarm 4
+Outside Alarms 72 Currently active outside alarms.
+Low outside temp alarm 0
+High outside temp alarm 1
+Wind speed alarm 2
+10 min avg speed alarm 3
+Low dewpoint alarm 4
+High dewpoint alarm 5
+High heat alarm 6
+Low wind chill alarm 7
+Outside Alarms, byte 2 73
+High THSW alarm 0
+High solar rad alarm 1
+High UV alarm 2
+UV Dose alarm 3
+UV Dose alarm Enabled 4 It is set to 1 when a UV dose alarm threshold has been entered
+AND the daily UV dose has been manually cleared.
+Outside Humidity Alarms 74 1 Currently active outside humidity alarms.
+Low Humidity alarm 2
+High Humidity alarm 3
+Extra Temp/Hum Alarms 75 - 81 7 Each byte contains four alarm bits (0 – 3) for a single extra
+Temp/Hum station. Bits (4 – 7) are not used and reserved for
+future use.
+Use the temperature and humidity sensor numbers, as
+described in Section XIII.4 to locate which byte contains the
+appropriate alarm bits. In particular, the humidity and
+temperature alarms for a single station will be found in
+different bytes.
+Low temp X alarm 0
+High temp X alarm 1
+Low hum X alarm 2
+High hum X alarm 3
+Soil & Leaf Alarms 82 - 85 4 Currently active soil/leaf alarms.
+Low leaf wetness X alarm 0
+High leaf wetness X alarm 1
+Low soil moisture X alarm 2
+High soil moisture X alarm 3
+Low leaf temp X alarm 4
+High leaf temp X alarm 5
+Low soil temp X alarm 6
+High soil temp X alarm 7
+=============================================================================
 =cut
\ No newline at end of file
diff --git a/lib/X10_RF_rfxsensor.pm b/lib/X10_RF_rfxsensor.pm
index c2a7fbf64..5d9d9ebe4 100644
--- a/lib/X10_RF_rfxsensor.pm
+++ b/lib/X10_RF_rfxsensor.pm
@@ -1,161 +1,161 @@
-=begin comment
-
-X10_RF_rfxsensor.pm
-
-This module contains routines called by X10_RF.pm to determine if a
-group of RF data bytes represents a valid rfxsensor command and
-to decompose that data and set the state of the specific rfxsensor
-specified by the command to the state specified by the command.
-
-The rfxsensor is a wireless temperature/humidity/pressure/low voltage sensor
-that can have up to 8 one-wire sensors attached.  The default address of the
-first sensor (the built-in one) is 00f0, the second is 01f1, the third is
-02f2, and so on.  Here is the information on it:
-http://www.rfxcom.com/documents/RFXSensor.pdf
-
-David Norwood
-
-=cut
-
-use strict;
-
-package X10_RF;
-
-use X10_RF;
-
-#------------------------------------------------------------------------------
-
-# Subroutine: rf_is_rfxsensor
-#	Determine if <bytes> represents a valid rfxsensor style command.
-
-sub rf_is_rfxsensor {
-    my(@bytes) = @_;
-
-    my @rbytes;
-    for (my $i = 0; $i < 4; $i++) {
-	$rbytes[$i] = ord(pack("b8", unpack("b*", $bytes[$i])));
-    }
-
-    my $B0H = $rbytes[0] >> 4;
-    my $B0L = $rbytes[0] & 0x0F;
-    my $B1H = $rbytes[1] >> 4;
-    my $B1L = $rbytes[1] & 0x0F;
-    my $B2H = $rbytes[2] >> 4;
-    my $B2L = $rbytes[2] & 0x0F;
-    my $B3H = $rbytes[3] >> 4;
-    my $B3L = $rbytes[3] & 0x0F;
-
-    # check if unit bytes are in the right format here
-    my $found = ($B0L == $B1L and (0xf - $B0H) == $B1H);
-    # check parity bits here
-    $found = $found && ($B3L == (0xf - (($B0H + $B0L + $B1H + $B1L + $B2H + $B2L + $B3H) & 0xf)));
-    return $found;
-}
-
-#------------------------------------------------------------------------------
-
-# Subroutine: rf_process_rfxsensor
-#	Given a valid rfxsensor style command in <bytes>, set the state
-#	of rfxsensor specified by the command to the state specfied by
-#	the command.
-#	<module> indicates the source of the request (w800)
-
-sub rf_process_rfxsensor {
-    my($module, @bytes) = @_;
-
-
-    my $lc_module = lc $module;
-    my @rbytes;
-    for (my $i = 0; $i < 4; $i++) {
-	$rbytes[$i] = ord(pack("b8", unpack("b*", $bytes[$i])));
-    }
-
-    my($cmd, $device_id, $id, $state);
-    my($measurement);
-
-    # Unlike X-10 security devices, the rfxsensor's ID is 2 bytes long
-    $device_id = $rbytes[0] * 256 + $rbytes[1];
-    $id = $rbytes[0];
-
-    if ($rbytes[3] & 0x10) {      # device has no set temperature (set temp always 0x00)
-      use Switch;
-      switch ($rbytes[2]) {
-	  case 0x01  {&::print_log("$module: rfxsensor: info: sensor addresses incremented")}
-	  case 0x02  {&::print_log("$module: rfxsensor: info: battery low detected")}
-	  case 0x03  {&::print_log("$module: rfxsensor: info: conversion not ready, 1 retry is done")}
-	  case 0x81  {&::print_log("$module: rfxsensor: error: no 1-wire device connected")}
-	  case 0x82  {&::print_log("$module: rfxsensor: error: 1-Wire ROM CRC error")}
-	  case 0x83  {&::print_log("$module: rfxsensor: error: 1-Wire device connected is not a DS18B20 or DS2438")}
-	  case 0x84  {&::print_log("$module: rfxsensor: error: no end of read signal received from 1-Wire device")}
-	  case 0x85  {&::print_log("$module: rfxsensor: error: 1-Wire scratchpad CRC error")}
-	  case 0x86  {&::print_log("$module: rfxsensor: error: temperature conversion not ready in time")}
-	  case 0x87  {&::print_log("$module: rfxsensor: error: A/D conversion not ready in time")}
-      }
-    }
-    else {
-      $measurement = $rbytes[2] * 8 + ($rbytes[3] >> 5);
-	# let's assume these are standard type 3 rfxsensors and the zeroth sensor is a ds2438 temperature sensor
-      if ($id % 8 == 0) {
-        $measurement *= -1 if ($rbytes[2] & 0x80);  # check for sign bit
-        $measurement *= .125;  # this is celcius
-        if ($main::config_parms{weather_uom_temp} == 'F') {
-          $measurement = &::convert_c2f($measurement);
-        }
-      }
-	# and the 1st sensor is the ds2438 A/D converter with an attached humidity sensor, create a dummy object even if you don't have
-      # the humidity sensor so you don't get unmatched device errors
-      elsif ($id % 8 == 1) {
-        $measurement *= 10;    # this is mVols from the A/D conversion
-        &::print_log("$module: rfxsensor: the A/D input is $measurement mVolts") if ($main::Debug{$lc_module});
-	  # get temperature
-        my $tmp_id = $id - 1;
-        $tmp_id = $tmp_id * 256 + ((0xf - ($tmp_id >> 4)) * 16) + ($tmp_id & 0xf);
-        $tmp_id  = lc sprintf "%04x", $tmp_id;
-        my $temperature = &rf_get_RF_Item($module, 'rfxsensor', "unmatched device $tmp_id", $tmp_id);
-        if ($main::config_parms{weather_uom_temp} == 'F') {
-          $temperature = &::convert_f2c	($temperature);
-        }
-	  # get supply voltage
-        my $tmp_id = $id + 1;
-        $tmp_id = $tmp_id * 256 + ((0xf - ($tmp_id >> 4)) * 16) + ($tmp_id & 0xf);
-        $tmp_id  = lc sprintf "%04x", $tmp_id;
-        my $supply_voltage = &rf_get_RF_Item($module, 'rfxsensor', "unmatched device $tmp_id", $tmp_id);
-        if (defined $temperature and defined $supply_voltage and $supply_voltage) {
-          $measurement = ((($measurement / $supply_voltage) - 0.16) / 0.0062) / (1.0546 - 0.00216 * $temperature);   # this is % relative humidity
-        }
-        else {
-          &::print_log("$module: rfxsensor: error: can't calculate relative humidity without temperature and supply voltage measurements");
-          return undef;
-        }
-      }
-	# and the 2nd sensor is the ds2438 supply voltage, create a dummy object even if you don't care
-      elsif ($id % 8 == 2) {
-        $measurement *= 10;    # this is mVols
-      }
-      # assume any other device ids are ds18b20 temperature sensors, since they are cheap
-      else {
-        $measurement *= -1 if $rbytes[2] & 0x80;  # check for sign bit
-        $measurement = $measurement / 4 * .5;  # this is celcius
-        if ($main::config_parms{weather_uom_temp} == 'F') {
-          $measurement = &::convert_c2f($measurement);
-        }
-      }
-    }
-
-    my $item_id  = lc sprintf "%04x", $device_id;
-
-    # Set the state of any items or classes associated with this device.
-    &rf_set_RF_Item($module, 'rfxsensor', "unmatched device 0x$item_id", $item_id, undef, $measurement);
-
-    return $measurement;
-}
-
-1;
-
-=begin comment
-
-This module doesn't decode the "initialization" bytes sent by the rfxsensor.  This wouldn't
-add much functionality to this module because it wouldn't tell us how a DS2438 is being
-used.
-
+=begin comment
+
+X10_RF_rfxsensor.pm
+
+This module contains routines called by X10_RF.pm to determine if a
+group of RF data bytes represents a valid rfxsensor command and
+to decompose that data and set the state of the specific rfxsensor
+specified by the command to the state specified by the command.
+
+The rfxsensor is a wireless temperature/humidity/pressure/low voltage sensor
+that can have up to 8 one-wire sensors attached.  The default address of the
+first sensor (the built-in one) is 00f0, the second is 01f1, the third is
+02f2, and so on.  Here is the information on it:
+http://www.rfxcom.com/documents/RFXSensor.pdf
+
+David Norwood
+
+=cut
+
+use strict;
+
+package X10_RF;
+
+use X10_RF;
+
+#------------------------------------------------------------------------------
+
+# Subroutine: rf_is_rfxsensor
+#	Determine if <bytes> represents a valid rfxsensor style command.
+
+sub rf_is_rfxsensor {
+    my(@bytes) = @_;
+
+    my @rbytes;
+    for (my $i = 0; $i < 4; $i++) {
+	$rbytes[$i] = ord(pack("b8", unpack("b*", $bytes[$i])));
+    }
+
+    my $B0H = $rbytes[0] >> 4;
+    my $B0L = $rbytes[0] & 0x0F;
+    my $B1H = $rbytes[1] >> 4;
+    my $B1L = $rbytes[1] & 0x0F;
+    my $B2H = $rbytes[2] >> 4;
+    my $B2L = $rbytes[2] & 0x0F;
+    my $B3H = $rbytes[3] >> 4;
+    my $B3L = $rbytes[3] & 0x0F;
+
+    # check if unit bytes are in the right format here
+    my $found = ($B0L == $B1L and (0xf - $B0H) == $B1H);
+    # check parity bits here
+    $found = $found && ($B3L == (0xf - (($B0H + $B0L + $B1H + $B1L + $B2H + $B2L + $B3H) & 0xf)));
+    return $found;
+}
+
+#------------------------------------------------------------------------------
+
+# Subroutine: rf_process_rfxsensor
+#	Given a valid rfxsensor style command in <bytes>, set the state
+#	of rfxsensor specified by the command to the state specfied by
+#	the command.
+#	<module> indicates the source of the request (w800)
+
+sub rf_process_rfxsensor {
+    my($module, @bytes) = @_;
+
+
+    my $lc_module = lc $module;
+    my @rbytes;
+    for (my $i = 0; $i < 4; $i++) {
+	$rbytes[$i] = ord(pack("b8", unpack("b*", $bytes[$i])));
+    }
+
+    my($cmd, $device_id, $id, $state);
+    my($measurement);
+
+    # Unlike X-10 security devices, the rfxsensor's ID is 2 bytes long
+    $device_id = $rbytes[0] * 256 + $rbytes[1];
+    $id = $rbytes[0];
+
+    if ($rbytes[3] & 0x10) {      # device has no set temperature (set temp always 0x00)
+      use Switch;
+      switch ($rbytes[2]) {
+	  case 0x01  {&::print_log("$module: rfxsensor: info: sensor addresses incremented")}
+	  case 0x02  {&::print_log("$module: rfxsensor: info: battery low detected")}
+	  case 0x03  {&::print_log("$module: rfxsensor: info: conversion not ready, 1 retry is done")}
+	  case 0x81  {&::print_log("$module: rfxsensor: error: no 1-wire device connected")}
+	  case 0x82  {&::print_log("$module: rfxsensor: error: 1-Wire ROM CRC error")}
+	  case 0x83  {&::print_log("$module: rfxsensor: error: 1-Wire device connected is not a DS18B20 or DS2438")}
+	  case 0x84  {&::print_log("$module: rfxsensor: error: no end of read signal received from 1-Wire device")}
+	  case 0x85  {&::print_log("$module: rfxsensor: error: 1-Wire scratchpad CRC error")}
+	  case 0x86  {&::print_log("$module: rfxsensor: error: temperature conversion not ready in time")}
+	  case 0x87  {&::print_log("$module: rfxsensor: error: A/D conversion not ready in time")}
+      }
+    }
+    else {
+      $measurement = $rbytes[2] * 8 + ($rbytes[3] >> 5);
+	# let's assume these are standard type 3 rfxsensors and the zeroth sensor is a ds2438 temperature sensor
+      if ($id % 8 == 0) {
+        $measurement *= -1 if ($rbytes[2] & 0x80);  # check for sign bit
+        $measurement *= .125;  # this is celcius
+        if ($main::config_parms{weather_uom_temp} == 'F') {
+          $measurement = &::convert_c2f($measurement);
+        }
+      }
+	# and the 1st sensor is the ds2438 A/D converter with an attached humidity sensor, create a dummy object even if you don't have
+      # the humidity sensor so you don't get unmatched device errors
+      elsif ($id % 8 == 1) {
+        $measurement *= 10;    # this is mVols from the A/D conversion
+        &::print_log("$module: rfxsensor: the A/D input is $measurement mVolts") if ($main::Debug{$lc_module});
+	  # get temperature
+        my $tmp_id = $id - 1;
+        $tmp_id = $tmp_id * 256 + ((0xf - ($tmp_id >> 4)) * 16) + ($tmp_id & 0xf);
+        $tmp_id  = lc sprintf "%04x", $tmp_id;
+        my $temperature = &rf_get_RF_Item($module, 'rfxsensor', "unmatched device $tmp_id", $tmp_id);
+        if ($main::config_parms{weather_uom_temp} == 'F') {
+          $temperature = &::convert_f2c	($temperature);
+        }
+	  # get supply voltage
+        my $tmp_id = $id + 1;
+        $tmp_id = $tmp_id * 256 + ((0xf - ($tmp_id >> 4)) * 16) + ($tmp_id & 0xf);
+        $tmp_id  = lc sprintf "%04x", $tmp_id;
+        my $supply_voltage = &rf_get_RF_Item($module, 'rfxsensor', "unmatched device $tmp_id", $tmp_id);
+        if (defined $temperature and defined $supply_voltage and $supply_voltage) {
+          $measurement = ((($measurement / $supply_voltage) - 0.16) / 0.0062) / (1.0546 - 0.00216 * $temperature);   # this is % relative humidity
+        }
+        else {
+          &::print_log("$module: rfxsensor: error: can't calculate relative humidity without temperature and supply voltage measurements");
+          return undef;
+        }
+      }
+	# and the 2nd sensor is the ds2438 supply voltage, create a dummy object even if you don't care
+      elsif ($id % 8 == 2) {
+        $measurement *= 10;    # this is mVols
+      }
+      # assume any other device ids are ds18b20 temperature sensors, since they are cheap
+      else {
+        $measurement *= -1 if $rbytes[2] & 0x80;  # check for sign bit
+        $measurement = $measurement / 4 * .5;  # this is celcius
+        if ($main::config_parms{weather_uom_temp} == 'F') {
+          $measurement = &::convert_c2f($measurement);
+        }
+      }
+    }
+
+    my $item_id  = lc sprintf "%04x", $device_id;
+
+    # Set the state of any items or classes associated with this device.
+    &rf_set_RF_Item($module, 'rfxsensor', "unmatched device 0x$item_id", $item_id, undef, $measurement);
+
+    return $measurement;
+}
+
+1;
+
+=begin comment
+
+This module doesn't decode the "initialization" bytes sent by the rfxsensor.  This wouldn't
+add much functionality to this module because it wouldn't tell us how a DS2438 is being
+used.
+
 =cut
\ No newline at end of file
diff --git a/lib/ajax.pm b/lib/ajax.pm
index 77a65db7d..677150fc9 100644
--- a/lib/ajax.pm
+++ b/lib/ajax.pm
@@ -1,216 +1,216 @@
-=head1 B<ChangeWaiter>
-
-=head2 SYNOPSIS
-
-NONE
-
-=head2 DESCRIPTION
-
-A object to hold the update waiting information
-
-=head2 INHERITS
-
-NONE
-
-=head2 METHODS
-
-=over
-
-=cut
-
-
-# Here are the ajax support functions
-#
-
-use strict;
-#use diagnostics;
-
-sub html_ajax_long_poll () {
-  my ($socket, $get_req, $get_arg) = @_;
-
-  my $waiter = new ChangeWaiter ($socket, $get_arg);
-
-  ChangeChecker::addWaiter ($waiter);
-
-  #ChangeChecker::checkWaiters();
-
-  return 1;
-}
-
-package ChangeWaiter;
-
-sub new {
-  my ($class, $socket, $sub) = @_;
-  my $self  = {};
-
-  bless $self, $class;
-
-  &main::print_log ("creating ChangeWaiter object for socket $socket and sub $sub") if $main::Debug{ajax};
-
-  $sub =~ s/^/&main::/;
-  ${$$self{waitingSocket}} = $socket;
-  ${$$self{expireTime}} = time() + 60;
-  ${$$self{changed}} = 0; # Flag if at least on state is changed
-  ${$$self{event}} = "&ChangeChecker::setWaiterToChanged ('$self')";
-  ${$$self{sub}} = $sub;
-
-  return $self;
-}
-
-# Function to set the changed flag
-sub flagStateChange {
-  (my $self) = @_;
-
-  ${$$self{changed}} = 1;
-}
-
-=item C<checkForUpdate>
-
-Function to check for changes in the objects state on change a message is sent to the socket, the socket is closed and 1 is returned else 0 is returne
-
-=cut
-
-sub checkForUpdate {		
-  my ($self) = @_;
-
-  if (${$$self{expireTime}} < time()) {
-    &main::print_log ("checkForUpdate waiter for sub ${$$self{sub}} timed out, closing socket") if $main::Debug{ajax};
-    ${$$self{waitingSocket}}->close;
-    return 1;
-  }
-
-  my $xml = eval ${$$self{sub}};
-  if ($@) { 
-    &main::print_log ("checkForUpdate syntax error in sub ${$$self{sub}}\n\t$@") if $main::Debug{ajax};
-    return 1;
-  }
-
-  if ($xml) {
-    &main::print_log ("checkForUpdate sub ${$$self{sub}} returned $xml") if $main::Debug{ajax};
-    &::print_socket_fork (${$$self{waitingSocket}}, $xml);
-    ${$$self{waitingSocket}}->close;
-    ${$$self{changed}} = 1;
-  } else {
-    ${$$self{changed}} = 0;
-  }
-  return ${$$self{changed}};
-}
-
-=back
-
-=head2 INI PARAMETERS
-
-NONE
-
-=head2 AUTHOR
-
-UNK
-
-=head2 SEE ALSO
-
-NONE
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-
-
-
-
-
-
-
-
-=head1 B<ChangeChecker>
-
-=head2 SYNOPSIS
-
-NONE
-
-=head2 DESCRIPTION
-
-A class wich contains the checker for update waiter
-
-=head2 INHERITS
-
-NONE
-
-=head2 METHODS
-
-=over
-
-=item B<UnDoc>
-
-=cut
-
-# A class wich contains the checker for update waiter
-package ChangeChecker;
-
-my %waiters;
-my $started;        # True if running already
-
-sub startup {
-    return if $started++;
-    printf " - initializing state tracker ...\n";
-    %waiters = ();
-    &main::print_log ("adding hook for checkWaiters") if $main::Debug{ajax};
-    &::MainLoop_post_add_hook(\&ChangeChecker::checkWaiters, 1);
-}
-
-sub addWaiter {
-  my ($waiter) = @_;
-
-  $waiters{$waiter} = $waiter;
-  &main::print_log ("waiter '$waiter' added") if $main::Debug{ajax};
-}
-
-sub checkWaiters {
-  my ($class) = @_;
-
-  foreach my $key (keys %waiters) {
-    if ($waiters{$key}->checkForUpdate) {
-      # waiter can be removed
-      delete $waiters{$key};
-      &main::print_log ("waiter '$key' removed") if $main::Debug{ajax};
-    }
-  }
-}
-
-sub setWaiterToChanged {
-  my ($hash) = @_;
-
-  #print "Accessing hash '$hash'\n";
-  $waiters{$hash}->flagStateChange;
-}
-
-1;
-
-=back
-
-=head2 INI PARAMETERS
-
-NONE
-
-=head2 AUTHOR
-
-UNK
-
-=head2 SEE ALSO
-
-NONE
-
-=head2 LICENSE
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-=cut
-
+=head1 B<ChangeWaiter>
+
+=head2 SYNOPSIS
+
+NONE
+
+=head2 DESCRIPTION
+
+A object to hold the update waiting information
+
+=head2 INHERITS
+
+NONE
+
+=head2 METHODS
+
+=over
+
+=cut
+
+
+# Here are the ajax support functions
+#
+
+use strict;
+#use diagnostics;
+
+sub html_ajax_long_poll () {
+  my ($socket, $get_req, $get_arg) = @_;
+
+  my $waiter = new ChangeWaiter ($socket, $get_arg);
+
+  ChangeChecker::addWaiter ($waiter);
+
+  #ChangeChecker::checkWaiters();
+
+  return 1;
+}
+
+package ChangeWaiter;
+
+sub new {
+  my ($class, $socket, $sub) = @_;
+  my $self  = {};
+
+  bless $self, $class;
+
+  &main::print_log ("creating ChangeWaiter object for socket $socket and sub $sub") if $main::Debug{ajax};
+
+  $sub =~ s/^/&main::/;
+  ${$$self{waitingSocket}} = $socket;
+  ${$$self{expireTime}} = time() + 60;
+  ${$$self{changed}} = 0; # Flag if at least on state is changed
+  ${$$self{event}} = "&ChangeChecker::setWaiterToChanged ('$self')";
+  ${$$self{sub}} = $sub;
+
+  return $self;
+}
+
+# Function to set the changed flag
+sub flagStateChange {
+  (my $self) = @_;
+
+  ${$$self{changed}} = 1;
+}
+
+=item C<checkForUpdate>
+
+Function to check for changes in the objects state on change a message is sent to the socket, the socket is closed and 1 is returned else 0 is returne
+
+=cut
+
+sub checkForUpdate {		
+  my ($self) = @_;
+
+  if (${$$self{expireTime}} < time()) {
+    &main::print_log ("checkForUpdate waiter for sub ${$$self{sub}} timed out, closing socket") if $main::Debug{ajax};
+    ${$$self{waitingSocket}}->close;
+    return 1;
+  }
+
+  my $xml = eval ${$$self{sub}};
+  if ($@) { 
+    &main::print_log ("checkForUpdate syntax error in sub ${$$self{sub}}\n\t$@") if $main::Debug{ajax};
+    return 1;
+  }
+
+  if ($xml) {
+    &main::print_log ("checkForUpdate sub ${$$self{sub}} returned $xml") if $main::Debug{ajax};
+    &::print_socket_fork (${$$self{waitingSocket}}, $xml);
+    ${$$self{waitingSocket}}->close;
+    ${$$self{changed}} = 1;
+  } else {
+    ${$$self{changed}} = 0;
+  }
+  return ${$$self{changed}};
+}
+
+=back
+
+=head2 INI PARAMETERS
+
+NONE
+
+=head2 AUTHOR
+
+UNK
+
+=head2 SEE ALSO
+
+NONE
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+
+
+
+
+
+
+
+
+=head1 B<ChangeChecker>
+
+=head2 SYNOPSIS
+
+NONE
+
+=head2 DESCRIPTION
+
+A class wich contains the checker for update waiter
+
+=head2 INHERITS
+
+NONE
+
+=head2 METHODS
+
+=over
+
+=item B<UnDoc>
+
+=cut
+
+# A class wich contains the checker for update waiter
+package ChangeChecker;
+
+my %waiters;
+my $started;        # True if running already
+
+sub startup {
+    return if $started++;
+    printf " - initializing state tracker ...\n";
+    %waiters = ();
+    &main::print_log ("adding hook for checkWaiters") if $main::Debug{ajax};
+    &::MainLoop_post_add_hook(\&ChangeChecker::checkWaiters, 1);
+}
+
+sub addWaiter {
+  my ($waiter) = @_;
+
+  $waiters{$waiter} = $waiter;
+  &main::print_log ("waiter '$waiter' added") if $main::Debug{ajax};
+}
+
+sub checkWaiters {
+  my ($class) = @_;
+
+  foreach my $key (keys %waiters) {
+    if ($waiters{$key}->checkForUpdate) {
+      # waiter can be removed
+      delete $waiters{$key};
+      &main::print_log ("waiter '$key' removed") if $main::Debug{ajax};
+    }
+  }
+}
+
+sub setWaiterToChanged {
+  my ($hash) = @_;
+
+  #print "Accessing hash '$hash'\n";
+  $waiters{$hash}->flagStateChange;
+}
+
+1;
+
+=back
+
+=head2 INI PARAMETERS
+
+NONE
+
+=head2 AUTHOR
+
+UNK
+
+=head2 SEE ALSO
+
+NONE
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+
diff --git a/lib/site/ControlX10/CM11.pm.old b/lib/site/ControlX10/CM11.pm.old
index 09483f752..320e9f99b 100644
--- a/lib/site/ControlX10/CM11.pm.old
+++ b/lib/site/ControlX10/CM11.pm.old
@@ -1,839 +1,839 @@
-package ControlX10::CM11;
-#-----------------------------------------------------------------------------
-#
-# An X10 ActiveHome interface, used by Misterhouse ( http://misterhouse.net )
-#
-# Uses the Windows or Posix SerialPort.pm functions by Bill Birthisel,
-#     available on CPAN
-#
-#-----------------------------------------------------------------------------
-use strict;
-use vars qw($VERSION $DEBUG @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $POWER_RESET);
-
-require Exporter;
-
-@ISA = qw(Exporter);
-@EXPORT= qw( send_cm11 receive_cm11 read_cm11 dim_decode_cm11 ping_cm11);
-@EXPORT_OK= qw();
-%EXPORT_TAGS = (FUNC    => [qw( send_cm11   receive_cm11
-				read_cm11   dim_decode_cm11
- 				ping_cm11 )]);
-
-Exporter::export_ok_tags('FUNC');
-
-$EXPORT_TAGS{ALL} = \@EXPORT_OK;
-
-#### Package variable declarations ####
-
-($VERSION) = q$Revision: 2.22 $ =~ /: (\S+)/; # Note: cvs version reset when we moved to sourceforge
-$DEBUG = 0;
-my $Last_Dcode;
-
-sub send_cm11 {
-    return unless ( 2 == @_ );
-    return ControlX10::CM11::send ( @_ );
-}
-
-sub receive_cm11 {
-    return unless ( 1 == @_ );
-    return ControlX10::CM11::receive_buffer ( shift );
-}
-
-sub read_cm11 {
-    return unless ( 2 == @_ );
-    return ControlX10::CM11::read ( @_ );
-}
-
-sub dim_decode_cm11 {
-    return unless ( 1 == @_ );
-    return ControlX10::CM11::dim_level_decode ( shift );
-}
-
-sub ping_cm11 {
-    return unless ( 1 == @_ );
-    return ControlX10::CM11::ping ( shift );
-}
-
-
-                                # These tables are used in sending data
-my %table_hcodes  = qw(A 0110  B 1110  C 0010  D 1010  E 0001  F 1001  G 0101  H 1101
-                       I 0111  J 1111  K 0011  L 1011  M 0000  N 1000  O 0100  P 1100);
-my %table_dcodes  = qw(1 0110  2 1110  3 0010  4 1010  5 0001  6 1001  7 0101  8 1101
-                       9 0111 10 1111 11 0011 12 1011 13 0000 14 1000 15 0100 16 1100
-                       A 1111  B 0011  C 1011  D 0000  E 1000  F 0100  G 1100);
-my %table_fcodes  = qw(J 0010  K 0011  M 0100  L 0101  O 0001  P 0000
-                       ALL_OFF 0000  ALL_ON  0001  ON 0010 OFF 0011 DIM 0100 BRIGHT 0101
-                       -10 0100 -20 0100 -30 0100 -40 0100
-                       -15 0100 -25 0100 -35 0100 -45 0100 -5  0100
-                       -50 0100 -60 0100 -70 0100 -80 0100 -90 0100
-                       -55 0100 -65 0100 -75 0100 -85 0100 -95 0100 -100 0100
-                       +10 0101 +20 0101 +30 0101 +40 0101
-                       +15 0101 +25 0101 +35 0101 +45 0101 +5  0101
-                       +50 0101 +60 0101 +70 0101 +80 0101 +90 0101
-                       +55 0101 +65 0101 +75 0101 +85 0101 +95 0101 +100 0101
-                       ALL_LIGHTS_OFF 0110 EXTENDED_CODE 0111 HAIL_REQUEST 1000 HAIL_ACK 1001
-                       PRESET_DIM1 1010 PRESET_DIM2 1011 EXTENDED_DATA 1100
-                       STATUS_ON 1101 STATUS_OFF 1110 STATUS 1111);
-
-
-                                # These tables are used in receiving data
-my %table_hcodes2 = qw(0110 A  1110 B  0010 C  1010 D  0001 E  1001 F  0101 G  1101 H
-                       0111 I  1111 J  0011 K  1011 L  0000 M  1000 N  0100 O  1100 P);
-my %table_dcodes2 = qw(0110 1  1110 2  0010 3  1010 4  0001 5  1001 6  0101 7  1101 8
-                       0111 9  1111 A  0011 B  1011 C  0000 D  1000 E  0100 F  1100 G);
-                                # Yikes!  L and M are swapped!   If we fix it here, we also
-                                # have to fix it elsewhere (maybe only in bin/mh, $f_code test)
-my %table_fcodes2 = qw(0010 J  0011 K  0100 L  0101 M  0001 O  0000 P
-                       0111 Z 1010 PRESET_DIM1 1011 PRESET_DIM2
-                       1101 STATUS_ON   1110 STATUS_OFF 1111 STATUS);
-
-
-sub receive_buffer {
-    my ($serial_port) = @_;
-
-    if (exists $main::Debug{x10}) {
-        $DEBUG = ($main::Debug{x10} >= 1) ? 1 : 0;
-    }
-
-    my $pc_ready = pack('C', 0xc3);
-    print "Bad cm11 pc_ready transmition\n" unless 1 == $serial_port->write($pc_ready);
-
-    # Lets not wait for data (use no_block option), or we loop too long and mh slows way down
-
-    # let the 0xc3 ack take hold ... emperically derived ... 1/2 misses at 20 ms
-    #   - increase from 40 to 80, based on other CM11s.
-    select undef, undef, undef, 80 / 1000;
-
-    my $data;
-    return undef unless $data = &read($serial_port, 1);
-
-#   my $data = &read($serial_port);
-
-    my @bytes = split //, $data;
-
-    my $length = shift @bytes;
-    my $mask   = shift @bytes;
-
-    $length = unpack('C', $length);
-    $mask   = unpack('B8', $mask);
-    my $data_h = unpack('H*',  $data);
-    print "receive buffer length=$length, mask=$mask, data_h=$data_h.\n" if $DEBUG;
-
-    my ($house, $function, $device, $i, $extended_count);
-
-    undef $data;
-    foreach my $byte (@bytes) {
-              # Send extended data into MH as untranslated hex.
-        if ($extended_count) {
-           $data .= unpack('H*', $byte);
-           --$extended_count;
-           ++$i;
-        }
-        else {
-           my $bits = unpack('B8', $byte);
-           my $house_bits = substr($bits, 0, 4);
-           my $code_bits  = substr($bits, 4, 4);
-           print "CM11 error, not a valid house code: $house_bits\n" unless $house = $table_hcodes2{$house_bits};
-           if (substr($mask, -(++$i), 1)) {
-               print "CM11 error, not a valid function code: $code_bits at byte $i value $bits\n" unless $function = $table_fcodes2{$code_bits};
-#          print "function=$house$function\n";
-
-                                   # Add device code back in, since this is not included in status :(
-               $function = $Last_Dcode . $function if $function =~ /^STATUS/;
-                                   # Handle Vehicle Interface RF Receiver extended code - assume length of 3 for extended
-               $extended_count = 3 if ($function eq 'Z');
-## 2.08, but 'Z' not numeric ##
-##               $extended_count = 3 if ($function == 'Z');
-
-               $data .= $house . $function;
-                 print "CM11 db: data=$data\n" if $DEBUG;
-           }
-           else {
-               print "CM11 error, not a valid device code: $code_bits\n" unless $device = $table_dcodes2{$code_bits};
-#          print "device=$house$device\n";
-               $data .= $house . $device;
-           }
-        }
-#       print "byte=$byte, $bits\n";
-    }
-    return $data;
-}
-
-sub format_data {
-    my ($house_code) = @_;
-
-    print "CM11 send data=$house_code\n" if $DEBUG;
-
-    my ($house, $code, $house_bits, $header, $code_bits, $function, $dim_level);
-    my ($extended, $extended_string, $extended_checksum);
-
-    ($house, $code) = $house_code =~ /(\S)(\S+)/;
-    $house = uc($house);
-    $code  = uc($code);
-
-    unless ($house_bits = $table_hcodes{$house}) {
-        print "CM11 error, invalid house code: $house. data=$house_code\n";
-        return;
-    }
-
-# $code can be
-#    1-9,A-G  for Device code
-#    d_xyz.   for Extended code xyz for device d
-#    xyz      for Function codes, including +-## for bright/dim
-
-                                # Test for extended code
-                                #  - format is &P## where ## is the preset dim level
-    if (my($extended_data) = $code =~ /&P(\d+)/) {
-        unless (($extended_data >= 0) && ($extended_data < 65)) {
-            print "CM11 error, invalid extended code. code=$code\n";
-            return;
-        }
-        $code_bits = '0111';    # Extended code
-        $function = '1';        # Extended transmitions are a function
-        $extended = '1';
-        $dim_level = 0;         # Dim level is not applicable to extended transmitions.
-
-                                # Hard codeded preset for now ...
-
-                                # This is not documented!!  By looking at
-                                # ActiveHome errata, it seems the device code is required
-                                #  - $Last_Dcode is a hack ... assume previous selected device.
-        my $extended_device = '0000' . $table_dcodes{$Last_Dcode};
-        my $extended_code = '00110001'; # Type=3 => Control Modules  Func=1 => Preset Receiver
-
-                                # Convert from bit to string
-        my $b3 = pack('B8', $extended_device);
-        my $b4 = pack('C1', $extended_data);
-        my $b5 = pack('B8', $extended_code);
-        $extended_string = $b3 . $b4 . $b5;
-        my $b3c = unpack('C', $b3);
-        my $b4c = unpack('C', $b4);
-        my $b5c = unpack('C', $b5);
-        $extended_checksum = $b3c + $b4c + $b5c;
-        if ($DEBUG) {
-            printf "CM11 ed=%d, b345=0x%0.2x,0x%0.2x,0x%0.2x ex=%s cs=0x%0.2x\n",
-            $extended_data, $b3c, $b4c, $b5c, $extended_string,
-            $extended_checksum;
-        }
-    }
-                                # Test for device code
-    elsif ($code_bits = $table_dcodes{$code}) {
-        $function = '0';
-        $extended = '0';
-        $dim_level = 0;
-        $Last_Dcode = $code;    # This is desperate :)
-    }
-                                # Test for function code
-    elsif ($code_bits = $table_fcodes{$code}) {
-        $function = '1';
-        $extended = '0';
-        if ($code eq 'DIM' or $code eq 'M' or $code eq 'BRIGHT' or $code eq 'L') {
-            $dim_level = 34;    # Lets default to 3 bight/dims to go full swing
-        }
-        elsif ($code =~ /^[+-]\d\d$/) {
-            $dim_level = abs($code);
-        }
-        else {
-            $dim_level = 0;
-        }
-    }
-    else {
-        print "CM11 error, invalid cm11 x10 code: $code\n";
-        return;
-    }
-
-    my $dim = int($dim_level * 22 / 100);   # 22 levels = 100%
-    $header = substr(unpack('B8', pack('C', $dim)), 3);
-
-    $header .= '1';             # Bit 2 is always set to a 1 to ensure synchronization
-    $header .= $function;       # 0 for address,  1 for function
-    $header .= $extended;       # 0 for standard, 1 for extended transmition
-
-                                # Convert from bit to string
-    my $b1 = pack('B8', $header);
-    my $b2 = pack('B8', $house_bits . $code_bits);
-
-                                # Calculate checksum
-    my $b1d = unpack('C', $b1);
-    my $b2d = unpack('C', $b2);
-    my $checksum = ($b1d + $b2d) & 0xff;
-
-    my $data = $b1 . $b2;
-
-    if ($extended) {
-        $data .= $extended_string;
-        $checksum = ($checksum + $extended_checksum) & 0xff;
-    }
-
-    printf("CM11 dim=$dim header=$header hb=$house_bits cb=$code_bits " .
-           "bd=0x%0.2x,0x%0.2x checksum=0x%0.2x\n",
-           $b1d, $b2d, $checksum) if $DEBUG;
-
-    return $data, $checksum;
-
-}
-
-sub send {
-    my ($serial_port, $house_code) = @_;
-
-    if (exists $main::Debug{x10}) {
-        $DEBUG = ($main::Debug{x10} >= 1) ? 1 : 0;
-    }
-
-    my ($data_snd, $checksum) = &format_data($house_code);
-    return unless $data_snd;
-
-    my $retry_cnt = 0;
-  RETRY:
-    print "CM11 send: ", unpack('H*', $data_snd), "\n" if $DEBUG;
-
-    print "Bad cm11 data send transmition\n" unless length($data_snd) == $serial_port->write($data_snd);
-
-                                # Note: Skip the power fail check, because we the
-                                # checksum might be the power fail flag (0xa5)
-    my $data_rcv = &read($serial_port, 0, 1);
-#   my $data_rcv;
-#   return unless $data_rcv = &read($serial_port, 0, 1);
-
-    my $data_d = unpack('C', $data_rcv);
-
-                                # Unrelated incoming data ... process and re-start
-                                # Note:  Some checksums will be 0x5a or 0xa5 ... skip this test if so
-    if (($data_d == 0x5a or $data_d == 0xa5) and !($checksum == 0x5a or $checksum == 0xa5)) {
-        print "Data received while xmiting data ... will receive and retry\n";
-        &receive_buffer($serial_port);
-        goto RETRY if $retry_cnt++ < 3;
-    }
-
-    if ($checksum != $data_d) {
-        print "Bad checksum in cm11 send: cs1=$checksum cs2=$data_d.  Will retry\n";
-        goto RETRY if $retry_cnt++ < 3;
-    }
-
-    print "CM11 ack\n" if $DEBUG;
-    my $pc_ok    = pack('C', 0x00);
-    print "Bad cm11 acknowledge send transmition\n" unless 1 == $serial_port->write($pc_ok);
-
-    return unless $data_rcv = &read($serial_port);
-    $data_d = unpack('C', $data_rcv);
-
-    if ($data_d == 0x55) {
-        print "CM11 done\n" if $DEBUG;
-    }
-    # Unrelated incoming data ... process
-    elsif ($data_d == 0x5a or $data_d == 0xa5) {
-        print "Data received while xmiting data ... receive and retry\n";
-        &receive_buffer($serial_port);
-        goto RETRY if $retry_cnt++ < 3;
-    }
-
-    return $data_d;
-}
-
-sub read {
-    my ($serial_port, $no_block, $no_power_fail_check) = @_;
-    my $data;
-                                # Note ... for dim commands > 30, this will time out after 30*50=1.5 seconds
-                                # No harm done, but we would rather not wait :)
-    my $tries = ($no_block) ? 1 : 30;
-
-    if (exists $main::Debug{x10}) {
-        $DEBUG = ($main::Debug{x10} >= 1) ? 1 : 0;
-    }
-
-    while ($tries--) {
-        print "." if $DEBUG and !$no_block;
-        if ($data = $serial_port->input) {
-            my $data_d = unpack('C', $data);
-#           printf("rcv data=%s, %x.\n", $data, $data_d);
-#           my $pc_ready = pack('C', 0xc3);
-#           $serial_data = "$pc_ready";
-#           print "serial1 out=$serial_data results=", $serial_port->write($serial_data), ".\n" if $DEBUG;
-            printf("\nCM11 data=%s hex=%0.2lx\n", $data_d, $data_d) if $DEBUG;
-
-                                # If we received the power-fail string (0xa5), reset with a blank macro command
-                                #  - Protocol.txt says to send macros string, but that did not work.
-            if ($data_d == 165 and !$no_power_fail_check) {
-
-                print "\nCM11 power fail detected.";
-                &setClock($serial_port);
-                                  # We can use this to detect a power failure
-                $POWER_RESET = 1; # The user code will be responsible for reseting this
-            }
-
-            return $data;
-        }
-                # If we do not do this, we may get endless error messages.
-        else {
-            $serial_port->reset_error;
-        }
-
-        if ($tries) {
-            select undef, undef, undef, 50 / 1000;
-        }
-    }
-
-    print "No data received from cm11\n" if ($DEBUG and !$no_block);
-    return undef;
-}
-
-sub dim_level_decode {
-    my ($code) = @_;
-
-    my %table_hcodes = qw(A 0110  B 1110  C 0010  D 1010  E 0001  F 1001  G 0101  H 1101
-                          I 0111  J 1111  K 0011  L 1011  M 0000  N 1000  O 0100  P 1100);
-    my %table_dcodes = qw(1 0110  2 1110  3 0010  4 1010  5 0001  6 1001  7 0101  8 1101
-                          9 0111 10 1111 11 0011 12 1011 13 0000 14 1000 15 0100 16 1100
-                          A 1111  B 0011  C 1011  D 0000  E 1000  F 0100  G 1100);
-
-    if (exists $main::Debug{x10}) {
-        $DEBUG = ($main::Debug{x10} >= 1) ? 1 : 0;
-    }
-
-                                # Convert bit string to decimal
-    my $level_b = $table_hcodes{substr($code, 0, 1)} . $table_dcodes{substr($code, 1, 1)};
-    my $level_d = unpack('C', pack('B8', $level_b));
-                                # Varies from 36 to 201, by 11, then to 210 as a max.
-                                # 16 different values.  Round to nearest 5%, max of 95.
-    my $level_p = int(100 * $level_d / 211); # Do not allow 100% ... not a valid state?
-    ## print "CM11 debug1: levelb=$level_b level_p=$level_p\n" if $DEBUG;
-    $level_p = $level_p - ($level_p % 5);
-    print "CM11 debug: dim_code=$code leveld=$level_d level_p=$level_p\n" if $DEBUG;
-    return $level_p;
-}
-
-
-sub reset_cm11 {
-    return unless ( 1 == @_ ) ; # requires port number to reset
-    &enable_RI ( @_ );
-    &setClock ( @_ );
-}
-
-                                # This currently gets bad checksums :(
-                                # On windows, it gives Parity Errors.
-sub enable_RI {
-    my ($serial_port) = @_;
-    my $ri_on = 0xeb;
-    my $ack  = 0x00;
-    my $done = 0x55;
-    my $checksum;
-
-                                # Send RI Enable code to CM11
-    $serial_port->input;
-    $serial_port->write(pack('C',$ri_on));
-    do {
-        $checksum = $serial_port->input;
-    } until $checksum;
-
-    if ( $checksum ne pack('C',$ri_on) ) {
-        print "Checksum error in enabling RI: ", unpack('H2',$checksum),"\n";
-        return $checksum;
-    }
-
-                                # Tell the CM11 to do it
-    $serial_port->write(pack('C',$ack));
-
-    do {
-        $checksum = $serial_port->input;
-    } until $checksum;
-
-    if ( $checksum ne pack('C',$done) ) {
-        print "CM11 failed to properly acknowledge execution of RI_Enable\n";
-    }
-    return $checksum;
-}
-
-#55 to 48   timer download header (0x9b)
-#47 to 40   Current time (seconds)
-#39 to 32   Current time (minutes ranging from 0 to 119)
-#31 to 23   Current time (hours/2, ranging from 0 to 11)
-#23 to 16   Current year day (bits 0 to 7)
-#15 Current year day (bit 8)
-#14 to 8        Day mask (SMTWTFS)
-#7 to 4     Monitored house code
-#3      Reserved
-#2      Battery timer clear flag
-#1      Monitored status clear flag
-#0      Timer purge flag
-
-sub setClock {
-    my ($serial_port) = @_;
-#   $DEBUG=1;
-    my ($Second, $Minute, $Hour, $Mday, $Month, $Year, $Wday, $Yday) = localtime time;
-    my $localtime = localtime time;
-    print "Reseting time with: $localtime\n" if $DEBUG;
-#    $Wday = 2 ** (7 - $Wday);
-#    if ($Yday > 255) {
-#        $Yday -= 256;
-#        $Wday *= 2;
-#    }
-    # Manipulate Minutes to be 0 - 119 (2 hours) and Hours to be 0 - 11
-    $Minute += (($Hour % 2) * 60);
-    $Hour /= 2;
-    # Must do some weird packing of data for Yday and Wday fields.
-    my $Yday1 = $Yday % 256;        # mantisa of Yday
-    my $Yday2 = ($Yday / 256) << 7; # Radius of Yday shifted over 7 bits
-    my $Dmask = 0x01 << $Wday;      # Day mask of SMTWTFS
-    $Yday2 |= $Dmask;            # OR the two fields together to get one
-    my $CodeF = 0x06 << 4;          # Put "A" housecode in upper nibble
-    $CodeF |= 0x07;              # Put 0b0111 in lower nibble (battery,monitor, & timer cleared)
-    my $power_reset = pack('C7',
-                           0x9b,
-                           $Second,
-                           $Minute,
-                           $Hour,
-                           $Yday1,
-                           $Yday2,
-                           $CodeF);
-#                           $Wday,
-#                           0x03);    # Not sure what is best here.  x10d.c did this.
-
-    my $results = $serial_port->write($power_reset);
-    select undef, undef, undef, 50 / 1000;
-    my $checksum = $serial_port->input; # Receive, but ignore, checksum
-    if ($DEBUG) {
-        printf "\npower_reset: %s %s %s %s %s %s %s\n",
-        unpack ('H2H2H2H2H2H2H2', $power_reset);
-        print "  sent $results bytes\n";
-        printf "  checksum = %x\n", ord($checksum);
-    }
-    my $pc_ok = pack('C', 0x00);
-    print "Bad cm11 checksum acknowledge\n" unless 1 == $serial_port->write($pc_ok);
-}
-
-sub ping {
-    my ($serial_port) = @_;
-    my $ri_on = 0xeb;
-    my $ack   = 0x00;
-    my $done  = 0x55;
-    my $checksum;
-    my $counter;
-    my $maxcounter = 10000;
-
-    # Send RI Enable code to CM11
-    $serial_port->write(pack('C',$ri_on));
-
-    $counter = 0;
-    do {
-        $checksum = $serial_port->input;
-        $counter++;
-    } until (($checksum) || ($counter == $maxcounter));
-
-    return 0 if ($counter == $maxcounter);
-
-    print "cm11::ping - checksum: got: 0x", unpack('H2',$checksum),"\n" if $DEBUG;
-
-    if (($checksum ne pack('C',$ri_on)) && $DEBUG) {
-        print "cm11::ping checksum: expected 0x",unpack('H2',pack('C',$ri_on)),". got: 0x", unpack('H2',$checksum),")\n";
-    }
-
-    # 0x5a is sent by the CM11 if it has data waiting.  If we get this then the CM11 is obviously alive.
-    if ($checksum eq pack('C',0x5a)) {
-        print "cm11::ping - cm11 has data waiting!\n" if $DEBUG;
-        return 1;
-    }
-
-    $serial_port->write(pack('C',$ack));
-
-    $counter = 0;
-    do {
-        $checksum = $serial_port->input;
-        $counter++;
-    } until (($checksum) || ($counter == $maxcounter));
-
-    print "cm11::ping - checksum: got: 0x", unpack('H2',$checksum),"\n" if $DEBUG;
-
-    if (($checksum ne pack('C',$done)) && $DEBUG) {
-        print "cm11::ping - checksum: expected 0x",unpack('H2',pack('C',$done)),". got: 0x", unpack('H2',$checksum),")\n";
-    }
-
-    print "cm11::ping - counter=$counter\n" if $DEBUG;
-    return 1;
-}
-
-
-return 1;           # for require
-__END__
-
-=pod
-
-=head1 NAME
-
-ControlX10::CM11 - Perl extension for X10 'ActiveHome' Controller
-
-=head1 SYNOPSIS
-
-  use ControlX10::CM11;
-
-    # $serial_port is an object created using Win32::SerialPort
-    #     or Device::SerialPort depending on OS
-    # my $serial_port = setup_serial_port('COM10', 4800);
-
-  $data = &ControlX10::CM11::receive_buffer($serial_port);
-  $data = &ControlX10::CM11::read($serial_port, $no_block);
-  $percent = &ControlX10::CM11::dim_level_decode('GE'); # 40%
-
-  &ControlX10::CM11::send($serial_port, 'A1'); # Address device A1
-  &ControlX10::CM11::send($serial_port, 'AJ'); # Turn device ON
-    # House Code 'A' present in both send() calls
-
-  &ControlX10::CM11::send($serial_port, 'B'.'ALL_OFF');
-    # Turns All lights on house code B off
-
-=head1 DESCRIPTION
-
-The CM11A is a bi-directional X10 controller that connects to a serial
-port and transmits commands via AC power line to X10 devices. This
-module translates human-readable commands (eg. 'A2', 'AJ') into the
-Interface Communication Protocol accepted by the CM11A.
-
-=over 4
-
-=item send command
-
-This transmits a two-byte message containing dim and house information
-and either an address or a function. Checksum and acknowledge handshaking
-is automatic. The command accepts a string parameter. The first character
-in the string must be a I<House Code> in the range [A..P] and the rest of
-the string determines the type of message. Intervening whitespace is not
-currently permitted between the I<House Code> and the I<Operation>. This
-may change in the future.
-
-    STRING  ALTERNATE_STRING    FUNCTION
-     1..9               Unit Address
-     A..G               Unit Address
-       J        ON      Turn Unit On
-       K        OFF     Turn Unit Off
-       L        BRIGHT      Brighten Last Light Programmed 5%
-       M        DIM     Dim Last Light Programmed 5%
-       O        ALL_ON      All Units On
-       P        ALL_OFF     All Units Off
-
-There are also functions without "shortcut" letter commands:
-
-    ALL_LIGHTS_OFF  EXTENDED_CODE   EXTENDED_DATA
-    HAIL_REQUEST    HAIL_ACK    PRESET_DIM1
-    PRESET_DIM2 STATUS_ON   STATUS_OFF
-    STATUS
-
-Dim and Bright functions can also take a signed value in the
-range [-95,-90,...,-10,-5,+5,+10,...,+90,+95].
-
-  ControlX10::CM11::send($serial_port,'A1'); # Address device A1
-  ControlX10::CM11::send($serial_port,'AJ'); # Turn device ON
-  ControlX10::CM11::send($serial_port,'A-25'); # Dim to 25%
-
-=item send extended function
-
-Starting in version 2.04, extended commands may be sent to devices that
-support the enhanced X10 protocol. If you have one of the newer (more
-expensive) LM14A/PLM21 2 way X10 pro lamp modules, you can set it directly
-to a specific brightness level using a Preset Dim extended code.
-
-The 64 extended X10 Preset Dim codes are commanded by appending C<&##> to
-the unit address where C<##> is a number between 1 and 63.
-
-  ControlX10::CM11::send($serial_port,'A5');   # Address A5
-  ControlX10::CM11::send($serial_port,'A&P16'); # Dim to 25%
-
-A partial translation list for the most important levels:
-
-    &P##     %      &P##     %      &P##     %
-      0   0      13  20      44  70
-      1   2      16  25      47  75
-      2   4      19  30      50  80
-      3   5      25  40      57  90
-      6  10      31  50      61  95
-      9  15      38  60      63 100
-
-There is another set of Preset Dim commands that are used by some modules
-(e.g. the RCS TX15 thermostat). These 32 non-extended Preset Dim codes can
-be coded directly, using the following table:
-
-      0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15   PRESET_DIM1
-      M  N  O  P  C  D  A  B  E  F  G  H  K  L  I  J
-
-      16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31  PRESET_DIM2
-      M  N  O  P  C  D  A  B  E  F  G  H  K  L  I  J
-
-This usage, and the responses assigned to each command, are device specific.
-For example, the following commands enable preset value 18:
-
-  ControlX10::CM11::send($serial_port,'M4');           # Address thermostat
-  ControlX10::CM11::send($serial_port,'OPRESET_DIM2'); # Select preset 18
-
-
-Starting in version 2.07, incoming extended data is also processed.
-The first character will be the I<House Code> in the range [A..P].
-The next character will be I<Z>, indicating extended data.
-The remaining data will be the extended data.
-
-
-=item read
-
-This checks for an incoming transmission. It will return "" for no input.
-It also tests for a received a "power fail" message (0xa5). If it detects
-one, it automatically sends the command/data to reset the CM11 clock. If
-the C<$no_block> parameter is FALSE (0, "", or undef), the B<read> will retry
-for up to a second at 50 millisecond intervals. With C<$no_block> TRUE,
-the B<read> checks one time for available data.
-
-  $data = &ControlX10::CM11::read($serial_port, $no_block);
-
-=item receive_buffer
-
-This command handles the upload response to an "Interface Poll Signal"
-message (0x5a) B<read> from the CM11. The module sends "ready" (0xc3) and
-receives up to 10 bytes. The first two bytes are size and description of
-the remaining bytes. These are used to decode the data bytes, but are not
-returned by the B<receive_buffer> function. Each of the data bytes is
-decoded as if it was a B<send> command from an external CM11 or equivalent
-external source (such as an RF keypad).
-
-  $data = &ControlX10::CM11::receive_buffer($serial_port);
-      # $data eq "A2AK" after an external device turned off A2
-
-Multiple house and unit addresses can appear in a single buffer.
-
-  if ($data eq "B1BKA2AJ") {
-      print "B1 off, A2 on\n";
-  }
-
-=item dim_level_decode
-
-When the external command includes dim/bright information in addition to
-the address and function, the B<dim_level_decode> function converts that
-data byte (as processed by the B<receive_buffer> command) into percent.
-
-  $data = &ControlX10::CM11::receive_buffer($serial_port);
-      # $data eq "A2AMGE" after an external device dimmed A2 to 40%
-  $percent = &ControlX10::CM11::dim_level_decode("GE");
-      # $percent == 40
-
-A more complex C<$data> input is possible.
-
-  if ($data eq "B1B3B5B7B9BLLE") {
-      print "House B Inputs 1,3,5,7,9 Brightened to 85%\n";
-  }
-
-The conversion between text_data and percent makes more sense to the code
-than to humans. The following table gives representative values. Others
-may be received from a CM11 and will be properly decoded.
-
-        Percent Text        Percent Text
-            0    M7        50    AA
-            5    ED        55    I6
-           10    EC        60    NF
-           15    C7        65    N2
-           20    KD        70    F6
-           25    K4        75    DB
-           30    O7        80    D2
-           35    OA        85    LE
-           40    G6        90    PB
-           45    AF        95    P8
-
-=back
-
-=head1 EXPORTS
-
-The B<send_cm11>, B<receive_cm11>, B<read_cm11>, and B<dim_decode_cm11>
-functions are exported by default starting with Version 2.09.
-They are identical to the "fully-qualified" names and accept the same
-parameters. The I<export on request> tag C<:FUNC> is maintained for
-compatibility (but deprecated).
-
-  use ControlX10::CM11;
-  send_cm11($serial_port, 'A1');            # send() - address
-  send_cm11($serial_port, 'AJ');            # send() - function
-  $data = receive_cm11($serial_port);           # receive_buffer()
-  $data = read_cm11($serial_port, $no_block);       # read()
-  $percent = dim_decode_cm11('GE');         # dim_level_decode()
-
-=head1 AUTHORS
-
-Bruce Winter  bruce@misterhouse.net  http://misterhouse.net
-
-CPAN packaging by Bill Birthisel wcbirthisel@alum.mit.edu
-http://members.aol.com/bbirthisel
-
-=head2 MAILING LISTS
-
-General information about the mailing lists is at:
-
-  http://lists.sourceforge.net/mailman/listinfo/misterhouse-users
-  http://lists.sourceforge.net/mailman/listinfo/misterhouse-announce
-
-To post to this list, send your email to:
-
-  misterhouse-users@lists.sourceforge.net
-
-If you ever want to unsubscribe or change your options (eg, switch to
-or from digest mode, change your password, etc.), visit your
-subscription page at:
-
-  http://lists.sourceforge.net/mailman/options/misterhouse-users/$user_id
-
-=head1 SEE ALSO
-
-mh can be download from http://misterhouse.net
-
-Win32::SerialPort and Device::SerialPort from CPAN
-
-CM11A Protocol documentation available at http://www.x10.com
-
-perl(1).
-
-=head1 COPYRIGHT
-
-Copyright (C) 2000 Bruce Winter. All rights reserved.
-
-This module is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself. 30 January 2000.
-
-=cut
-
-#
-# $Log: CM11.pm,v $
-# Revision 2.22  2004/09/25 20:01:20  winter
-# *** empty log message ***
-#
-# Revision 2.21  2004/06/06 21:38:44  winter
-# *** empty log message ***
-#
-# Revision 2.20  2003/12/22 00:25:06  winter
-#  - 2.86 release
-#
-# Revision 2.19  2003/11/23 20:26:02  winter
-#  - 2.84 release
-#
-# Revision 2.18  2003/03/09 19:34:42  winter
-#  - 2.79 release
-#
-# Revision 2.17  2002/11/10 01:59:57  winter
-# - 2.73 release
-#
-# Revision 2.16  2002/03/02 02:36:51  winter
-# - 2.65 release
-#
-# Revision 2.15  2001/02/04 20:31:31  winter
-# - 2.43 release
-#
-# Revision 2.14  2001/01/20 17:47:50  winter
-# - 2.41 release
-#
-# Revision 2.13  2000/10/01 23:29:41  winter
-# - 2.29 release
-#
-# Revision 2.12  2000/08/19 01:25:09  winter
-# - 2.27 release
-#
-# Revision 2.11  2000/04/22 00:11:15  winter
-# - increase receive buffer delay from 40 to 80
-#
-# Revision 2.10  2000/02/12 06:11:37  winter
-# - commit lots of changes, in preperation for mh release 2.0
-#
-# Revision 2.08  2000/01/29 20:07:01  winter
-# - add $no_power_fail_check.
-#
-#
+package ControlX10::CM11;
+#-----------------------------------------------------------------------------
+#
+# An X10 ActiveHome interface, used by Misterhouse ( http://misterhouse.net )
+#
+# Uses the Windows or Posix SerialPort.pm functions by Bill Birthisel,
+#     available on CPAN
+#
+#-----------------------------------------------------------------------------
+use strict;
+use vars qw($VERSION $DEBUG @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $POWER_RESET);
+
+require Exporter;
+
+@ISA = qw(Exporter);
+@EXPORT= qw( send_cm11 receive_cm11 read_cm11 dim_decode_cm11 ping_cm11);
+@EXPORT_OK= qw();
+%EXPORT_TAGS = (FUNC    => [qw( send_cm11   receive_cm11
+				read_cm11   dim_decode_cm11
+ 				ping_cm11 )]);
+
+Exporter::export_ok_tags('FUNC');
+
+$EXPORT_TAGS{ALL} = \@EXPORT_OK;
+
+#### Package variable declarations ####
+
+($VERSION) = q$Revision: 2.22 $ =~ /: (\S+)/; # Note: cvs version reset when we moved to sourceforge
+$DEBUG = 0;
+my $Last_Dcode;
+
+sub send_cm11 {
+    return unless ( 2 == @_ );
+    return ControlX10::CM11::send ( @_ );
+}
+
+sub receive_cm11 {
+    return unless ( 1 == @_ );
+    return ControlX10::CM11::receive_buffer ( shift );
+}
+
+sub read_cm11 {
+    return unless ( 2 == @_ );
+    return ControlX10::CM11::read ( @_ );
+}
+
+sub dim_decode_cm11 {
+    return unless ( 1 == @_ );
+    return ControlX10::CM11::dim_level_decode ( shift );
+}
+
+sub ping_cm11 {
+    return unless ( 1 == @_ );
+    return ControlX10::CM11::ping ( shift );
+}
+
+
+                                # These tables are used in sending data
+my %table_hcodes  = qw(A 0110  B 1110  C 0010  D 1010  E 0001  F 1001  G 0101  H 1101
+                       I 0111  J 1111  K 0011  L 1011  M 0000  N 1000  O 0100  P 1100);
+my %table_dcodes  = qw(1 0110  2 1110  3 0010  4 1010  5 0001  6 1001  7 0101  8 1101
+                       9 0111 10 1111 11 0011 12 1011 13 0000 14 1000 15 0100 16 1100
+                       A 1111  B 0011  C 1011  D 0000  E 1000  F 0100  G 1100);
+my %table_fcodes  = qw(J 0010  K 0011  M 0100  L 0101  O 0001  P 0000
+                       ALL_OFF 0000  ALL_ON  0001  ON 0010 OFF 0011 DIM 0100 BRIGHT 0101
+                       -10 0100 -20 0100 -30 0100 -40 0100
+                       -15 0100 -25 0100 -35 0100 -45 0100 -5  0100
+                       -50 0100 -60 0100 -70 0100 -80 0100 -90 0100
+                       -55 0100 -65 0100 -75 0100 -85 0100 -95 0100 -100 0100
+                       +10 0101 +20 0101 +30 0101 +40 0101
+                       +15 0101 +25 0101 +35 0101 +45 0101 +5  0101
+                       +50 0101 +60 0101 +70 0101 +80 0101 +90 0101
+                       +55 0101 +65 0101 +75 0101 +85 0101 +95 0101 +100 0101
+                       ALL_LIGHTS_OFF 0110 EXTENDED_CODE 0111 HAIL_REQUEST 1000 HAIL_ACK 1001
+                       PRESET_DIM1 1010 PRESET_DIM2 1011 EXTENDED_DATA 1100
+                       STATUS_ON 1101 STATUS_OFF 1110 STATUS 1111);
+
+
+                                # These tables are used in receiving data
+my %table_hcodes2 = qw(0110 A  1110 B  0010 C  1010 D  0001 E  1001 F  0101 G  1101 H
+                       0111 I  1111 J  0011 K  1011 L  0000 M  1000 N  0100 O  1100 P);
+my %table_dcodes2 = qw(0110 1  1110 2  0010 3  1010 4  0001 5  1001 6  0101 7  1101 8
+                       0111 9  1111 A  0011 B  1011 C  0000 D  1000 E  0100 F  1100 G);
+                                # Yikes!  L and M are swapped!   If we fix it here, we also
+                                # have to fix it elsewhere (maybe only in bin/mh, $f_code test)
+my %table_fcodes2 = qw(0010 J  0011 K  0100 L  0101 M  0001 O  0000 P
+                       0111 Z 1010 PRESET_DIM1 1011 PRESET_DIM2
+                       1101 STATUS_ON   1110 STATUS_OFF 1111 STATUS);
+
+
+sub receive_buffer {
+    my ($serial_port) = @_;
+
+    if (exists $main::Debug{x10}) {
+        $DEBUG = ($main::Debug{x10} >= 1) ? 1 : 0;
+    }
+
+    my $pc_ready = pack('C', 0xc3);
+    print "Bad cm11 pc_ready transmition\n" unless 1 == $serial_port->write($pc_ready);
+
+    # Lets not wait for data (use no_block option), or we loop too long and mh slows way down
+
+    # let the 0xc3 ack take hold ... emperically derived ... 1/2 misses at 20 ms
+    #   - increase from 40 to 80, based on other CM11s.
+    select undef, undef, undef, 80 / 1000;
+
+    my $data;
+    return undef unless $data = &read($serial_port, 1);
+
+#   my $data = &read($serial_port);
+
+    my @bytes = split //, $data;
+
+    my $length = shift @bytes;
+    my $mask   = shift @bytes;
+
+    $length = unpack('C', $length);
+    $mask   = unpack('B8', $mask);
+    my $data_h = unpack('H*',  $data);
+    print "receive buffer length=$length, mask=$mask, data_h=$data_h.\n" if $DEBUG;
+
+    my ($house, $function, $device, $i, $extended_count);
+
+    undef $data;
+    foreach my $byte (@bytes) {
+              # Send extended data into MH as untranslated hex.
+        if ($extended_count) {
+           $data .= unpack('H*', $byte);
+           --$extended_count;
+           ++$i;
+        }
+        else {
+           my $bits = unpack('B8', $byte);
+           my $house_bits = substr($bits, 0, 4);
+           my $code_bits  = substr($bits, 4, 4);
+           print "CM11 error, not a valid house code: $house_bits\n" unless $house = $table_hcodes2{$house_bits};
+           if (substr($mask, -(++$i), 1)) {
+               print "CM11 error, not a valid function code: $code_bits at byte $i value $bits\n" unless $function = $table_fcodes2{$code_bits};
+#          print "function=$house$function\n";
+
+                                   # Add device code back in, since this is not included in status :(
+               $function = $Last_Dcode . $function if $function =~ /^STATUS/;
+                                   # Handle Vehicle Interface RF Receiver extended code - assume length of 3 for extended
+               $extended_count = 3 if ($function eq 'Z');
+## 2.08, but 'Z' not numeric ##
+##               $extended_count = 3 if ($function == 'Z');
+
+               $data .= $house . $function;
+                 print "CM11 db: data=$data\n" if $DEBUG;
+           }
+           else {
+               print "CM11 error, not a valid device code: $code_bits\n" unless $device = $table_dcodes2{$code_bits};
+#          print "device=$house$device\n";
+               $data .= $house . $device;
+           }
+        }
+#       print "byte=$byte, $bits\n";
+    }
+    return $data;
+}
+
+sub format_data {
+    my ($house_code) = @_;
+
+    print "CM11 send data=$house_code\n" if $DEBUG;
+
+    my ($house, $code, $house_bits, $header, $code_bits, $function, $dim_level);
+    my ($extended, $extended_string, $extended_checksum);
+
+    ($house, $code) = $house_code =~ /(\S)(\S+)/;
+    $house = uc($house);
+    $code  = uc($code);
+
+    unless ($house_bits = $table_hcodes{$house}) {
+        print "CM11 error, invalid house code: $house. data=$house_code\n";
+        return;
+    }
+
+# $code can be
+#    1-9,A-G  for Device code
+#    d_xyz.   for Extended code xyz for device d
+#    xyz      for Function codes, including +-## for bright/dim
+
+                                # Test for extended code
+                                #  - format is &P## where ## is the preset dim level
+    if (my($extended_data) = $code =~ /&P(\d+)/) {
+        unless (($extended_data >= 0) && ($extended_data < 65)) {
+            print "CM11 error, invalid extended code. code=$code\n";
+            return;
+        }
+        $code_bits = '0111';    # Extended code
+        $function = '1';        # Extended transmitions are a function
+        $extended = '1';
+        $dim_level = 0;         # Dim level is not applicable to extended transmitions.
+
+                                # Hard codeded preset for now ...
+
+                                # This is not documented!!  By looking at
+                                # ActiveHome errata, it seems the device code is required
+                                #  - $Last_Dcode is a hack ... assume previous selected device.
+        my $extended_device = '0000' . $table_dcodes{$Last_Dcode};
+        my $extended_code = '00110001'; # Type=3 => Control Modules  Func=1 => Preset Receiver
+
+                                # Convert from bit to string
+        my $b3 = pack('B8', $extended_device);
+        my $b4 = pack('C1', $extended_data);
+        my $b5 = pack('B8', $extended_code);
+        $extended_string = $b3 . $b4 . $b5;
+        my $b3c = unpack('C', $b3);
+        my $b4c = unpack('C', $b4);
+        my $b5c = unpack('C', $b5);
+        $extended_checksum = $b3c + $b4c + $b5c;
+        if ($DEBUG) {
+            printf "CM11 ed=%d, b345=0x%0.2x,0x%0.2x,0x%0.2x ex=%s cs=0x%0.2x\n",
+            $extended_data, $b3c, $b4c, $b5c, $extended_string,
+            $extended_checksum;
+        }
+    }
+                                # Test for device code
+    elsif ($code_bits = $table_dcodes{$code}) {
+        $function = '0';
+        $extended = '0';
+        $dim_level = 0;
+        $Last_Dcode = $code;    # This is desperate :)
+    }
+                                # Test for function code
+    elsif ($code_bits = $table_fcodes{$code}) {
+        $function = '1';
+        $extended = '0';
+        if ($code eq 'DIM' or $code eq 'M' or $code eq 'BRIGHT' or $code eq 'L') {
+            $dim_level = 34;    # Lets default to 3 bight/dims to go full swing
+        }
+        elsif ($code =~ /^[+-]\d\d$/) {
+            $dim_level = abs($code);
+        }
+        else {
+            $dim_level = 0;
+        }
+    }
+    else {
+        print "CM11 error, invalid cm11 x10 code: $code\n";
+        return;
+    }
+
+    my $dim = int($dim_level * 22 / 100);   # 22 levels = 100%
+    $header = substr(unpack('B8', pack('C', $dim)), 3);
+
+    $header .= '1';             # Bit 2 is always set to a 1 to ensure synchronization
+    $header .= $function;       # 0 for address,  1 for function
+    $header .= $extended;       # 0 for standard, 1 for extended transmition
+
+                                # Convert from bit to string
+    my $b1 = pack('B8', $header);
+    my $b2 = pack('B8', $house_bits . $code_bits);
+
+                                # Calculate checksum
+    my $b1d = unpack('C', $b1);
+    my $b2d = unpack('C', $b2);
+    my $checksum = ($b1d + $b2d) & 0xff;
+
+    my $data = $b1 . $b2;
+
+    if ($extended) {
+        $data .= $extended_string;
+        $checksum = ($checksum + $extended_checksum) & 0xff;
+    }
+
+    printf("CM11 dim=$dim header=$header hb=$house_bits cb=$code_bits " .
+           "bd=0x%0.2x,0x%0.2x checksum=0x%0.2x\n",
+           $b1d, $b2d, $checksum) if $DEBUG;
+
+    return $data, $checksum;
+
+}
+
+sub send {
+    my ($serial_port, $house_code) = @_;
+
+    if (exists $main::Debug{x10}) {
+        $DEBUG = ($main::Debug{x10} >= 1) ? 1 : 0;
+    }
+
+    my ($data_snd, $checksum) = &format_data($house_code);
+    return unless $data_snd;
+
+    my $retry_cnt = 0;
+  RETRY:
+    print "CM11 send: ", unpack('H*', $data_snd), "\n" if $DEBUG;
+
+    print "Bad cm11 data send transmition\n" unless length($data_snd) == $serial_port->write($data_snd);
+
+                                # Note: Skip the power fail check, because we the
+                                # checksum might be the power fail flag (0xa5)
+    my $data_rcv = &read($serial_port, 0, 1);
+#   my $data_rcv;
+#   return unless $data_rcv = &read($serial_port, 0, 1);
+
+    my $data_d = unpack('C', $data_rcv);
+
+                                # Unrelated incoming data ... process and re-start
+                                # Note:  Some checksums will be 0x5a or 0xa5 ... skip this test if so
+    if (($data_d == 0x5a or $data_d == 0xa5) and !($checksum == 0x5a or $checksum == 0xa5)) {
+        print "Data received while xmiting data ... will receive and retry\n";
+        &receive_buffer($serial_port);
+        goto RETRY if $retry_cnt++ < 3;
+    }
+
+    if ($checksum != $data_d) {
+        print "Bad checksum in cm11 send: cs1=$checksum cs2=$data_d.  Will retry\n";
+        goto RETRY if $retry_cnt++ < 3;
+    }
+
+    print "CM11 ack\n" if $DEBUG;
+    my $pc_ok    = pack('C', 0x00);
+    print "Bad cm11 acknowledge send transmition\n" unless 1 == $serial_port->write($pc_ok);
+
+    return unless $data_rcv = &read($serial_port);
+    $data_d = unpack('C', $data_rcv);
+
+    if ($data_d == 0x55) {
+        print "CM11 done\n" if $DEBUG;
+    }
+    # Unrelated incoming data ... process
+    elsif ($data_d == 0x5a or $data_d == 0xa5) {
+        print "Data received while xmiting data ... receive and retry\n";
+        &receive_buffer($serial_port);
+        goto RETRY if $retry_cnt++ < 3;
+    }
+
+    return $data_d;
+}
+
+sub read {
+    my ($serial_port, $no_block, $no_power_fail_check) = @_;
+    my $data;
+                                # Note ... for dim commands > 30, this will time out after 30*50=1.5 seconds
+                                # No harm done, but we would rather not wait :)
+    my $tries = ($no_block) ? 1 : 30;
+
+    if (exists $main::Debug{x10}) {
+        $DEBUG = ($main::Debug{x10} >= 1) ? 1 : 0;
+    }
+
+    while ($tries--) {
+        print "." if $DEBUG and !$no_block;
+        if ($data = $serial_port->input) {
+            my $data_d = unpack('C', $data);
+#           printf("rcv data=%s, %x.\n", $data, $data_d);
+#           my $pc_ready = pack('C', 0xc3);
+#           $serial_data = "$pc_ready";
+#           print "serial1 out=$serial_data results=", $serial_port->write($serial_data), ".\n" if $DEBUG;
+            printf("\nCM11 data=%s hex=%0.2lx\n", $data_d, $data_d) if $DEBUG;
+
+                                # If we received the power-fail string (0xa5), reset with a blank macro command
+                                #  - Protocol.txt says to send macros string, but that did not work.
+            if ($data_d == 165 and !$no_power_fail_check) {
+
+                print "\nCM11 power fail detected.";
+                &setClock($serial_port);
+                                  # We can use this to detect a power failure
+                $POWER_RESET = 1; # The user code will be responsible for reseting this
+            }
+
+            return $data;
+        }
+                # If we do not do this, we may get endless error messages.
+        else {
+            $serial_port->reset_error;
+        }
+
+        if ($tries) {
+            select undef, undef, undef, 50 / 1000;
+        }
+    }
+
+    print "No data received from cm11\n" if ($DEBUG and !$no_block);
+    return undef;
+}
+
+sub dim_level_decode {
+    my ($code) = @_;
+
+    my %table_hcodes = qw(A 0110  B 1110  C 0010  D 1010  E 0001  F 1001  G 0101  H 1101
+                          I 0111  J 1111  K 0011  L 1011  M 0000  N 1000  O 0100  P 1100);
+    my %table_dcodes = qw(1 0110  2 1110  3 0010  4 1010  5 0001  6 1001  7 0101  8 1101
+                          9 0111 10 1111 11 0011 12 1011 13 0000 14 1000 15 0100 16 1100
+                          A 1111  B 0011  C 1011  D 0000  E 1000  F 0100  G 1100);
+
+    if (exists $main::Debug{x10}) {
+        $DEBUG = ($main::Debug{x10} >= 1) ? 1 : 0;
+    }
+
+                                # Convert bit string to decimal
+    my $level_b = $table_hcodes{substr($code, 0, 1)} . $table_dcodes{substr($code, 1, 1)};
+    my $level_d = unpack('C', pack('B8', $level_b));
+                                # Varies from 36 to 201, by 11, then to 210 as a max.
+                                # 16 different values.  Round to nearest 5%, max of 95.
+    my $level_p = int(100 * $level_d / 211); # Do not allow 100% ... not a valid state?
+    ## print "CM11 debug1: levelb=$level_b level_p=$level_p\n" if $DEBUG;
+    $level_p = $level_p - ($level_p % 5);
+    print "CM11 debug: dim_code=$code leveld=$level_d level_p=$level_p\n" if $DEBUG;
+    return $level_p;
+}
+
+
+sub reset_cm11 {
+    return unless ( 1 == @_ ) ; # requires port number to reset
+    &enable_RI ( @_ );
+    &setClock ( @_ );
+}
+
+                                # This currently gets bad checksums :(
+                                # On windows, it gives Parity Errors.
+sub enable_RI {
+    my ($serial_port) = @_;
+    my $ri_on = 0xeb;
+    my $ack  = 0x00;
+    my $done = 0x55;
+    my $checksum;
+
+                                # Send RI Enable code to CM11
+    $serial_port->input;
+    $serial_port->write(pack('C',$ri_on));
+    do {
+        $checksum = $serial_port->input;
+    } until $checksum;
+
+    if ( $checksum ne pack('C',$ri_on) ) {
+        print "Checksum error in enabling RI: ", unpack('H2',$checksum),"\n";
+        return $checksum;
+    }
+
+                                # Tell the CM11 to do it
+    $serial_port->write(pack('C',$ack));
+
+    do {
+        $checksum = $serial_port->input;
+    } until $checksum;
+
+    if ( $checksum ne pack('C',$done) ) {
+        print "CM11 failed to properly acknowledge execution of RI_Enable\n";
+    }
+    return $checksum;
+}
+
+#55 to 48   timer download header (0x9b)
+#47 to 40   Current time (seconds)
+#39 to 32   Current time (minutes ranging from 0 to 119)
+#31 to 23   Current time (hours/2, ranging from 0 to 11)
+#23 to 16   Current year day (bits 0 to 7)
+#15 Current year day (bit 8)
+#14 to 8        Day mask (SMTWTFS)
+#7 to 4     Monitored house code
+#3      Reserved
+#2      Battery timer clear flag
+#1      Monitored status clear flag
+#0      Timer purge flag
+
+sub setClock {
+    my ($serial_port) = @_;
+#   $DEBUG=1;
+    my ($Second, $Minute, $Hour, $Mday, $Month, $Year, $Wday, $Yday) = localtime time;
+    my $localtime = localtime time;
+    print "Reseting time with: $localtime\n" if $DEBUG;
+#    $Wday = 2 ** (7 - $Wday);
+#    if ($Yday > 255) {
+#        $Yday -= 256;
+#        $Wday *= 2;
+#    }
+    # Manipulate Minutes to be 0 - 119 (2 hours) and Hours to be 0 - 11
+    $Minute += (($Hour % 2) * 60);
+    $Hour /= 2;
+    # Must do some weird packing of data for Yday and Wday fields.
+    my $Yday1 = $Yday % 256;        # mantisa of Yday
+    my $Yday2 = ($Yday / 256) << 7; # Radius of Yday shifted over 7 bits
+    my $Dmask = 0x01 << $Wday;      # Day mask of SMTWTFS
+    $Yday2 |= $Dmask;            # OR the two fields together to get one
+    my $CodeF = 0x06 << 4;          # Put "A" housecode in upper nibble
+    $CodeF |= 0x07;              # Put 0b0111 in lower nibble (battery,monitor, & timer cleared)
+    my $power_reset = pack('C7',
+                           0x9b,
+                           $Second,
+                           $Minute,
+                           $Hour,
+                           $Yday1,
+                           $Yday2,
+                           $CodeF);
+#                           $Wday,
+#                           0x03);    # Not sure what is best here.  x10d.c did this.
+
+    my $results = $serial_port->write($power_reset);
+    select undef, undef, undef, 50 / 1000;
+    my $checksum = $serial_port->input; # Receive, but ignore, checksum
+    if ($DEBUG) {
+        printf "\npower_reset: %s %s %s %s %s %s %s\n",
+        unpack ('H2H2H2H2H2H2H2', $power_reset);
+        print "  sent $results bytes\n";
+        printf "  checksum = %x\n", ord($checksum);
+    }
+    my $pc_ok = pack('C', 0x00);
+    print "Bad cm11 checksum acknowledge\n" unless 1 == $serial_port->write($pc_ok);
+}
+
+sub ping {
+    my ($serial_port) = @_;
+    my $ri_on = 0xeb;
+    my $ack   = 0x00;
+    my $done  = 0x55;
+    my $checksum;
+    my $counter;
+    my $maxcounter = 10000;
+
+    # Send RI Enable code to CM11
+    $serial_port->write(pack('C',$ri_on));
+
+    $counter = 0;
+    do {
+        $checksum = $serial_port->input;
+        $counter++;
+    } until (($checksum) || ($counter == $maxcounter));
+
+    return 0 if ($counter == $maxcounter);
+
+    print "cm11::ping - checksum: got: 0x", unpack('H2',$checksum),"\n" if $DEBUG;
+
+    if (($checksum ne pack('C',$ri_on)) && $DEBUG) {
+        print "cm11::ping checksum: expected 0x",unpack('H2',pack('C',$ri_on)),". got: 0x", unpack('H2',$checksum),")\n";
+    }
+
+    # 0x5a is sent by the CM11 if it has data waiting.  If we get this then the CM11 is obviously alive.
+    if ($checksum eq pack('C',0x5a)) {
+        print "cm11::ping - cm11 has data waiting!\n" if $DEBUG;
+        return 1;
+    }
+
+    $serial_port->write(pack('C',$ack));
+
+    $counter = 0;
+    do {
+        $checksum = $serial_port->input;
+        $counter++;
+    } until (($checksum) || ($counter == $maxcounter));
+
+    print "cm11::ping - checksum: got: 0x", unpack('H2',$checksum),"\n" if $DEBUG;
+
+    if (($checksum ne pack('C',$done)) && $DEBUG) {
+        print "cm11::ping - checksum: expected 0x",unpack('H2',pack('C',$done)),". got: 0x", unpack('H2',$checksum),")\n";
+    }
+
+    print "cm11::ping - counter=$counter\n" if $DEBUG;
+    return 1;
+}
+
+
+return 1;           # for require
+__END__
+
+=pod
+
+=head1 NAME
+
+ControlX10::CM11 - Perl extension for X10 'ActiveHome' Controller
+
+=head1 SYNOPSIS
+
+  use ControlX10::CM11;
+
+    # $serial_port is an object created using Win32::SerialPort
+    #     or Device::SerialPort depending on OS
+    # my $serial_port = setup_serial_port('COM10', 4800);
+
+  $data = &ControlX10::CM11::receive_buffer($serial_port);
+  $data = &ControlX10::CM11::read($serial_port, $no_block);
+  $percent = &ControlX10::CM11::dim_level_decode('GE'); # 40%
+
+  &ControlX10::CM11::send($serial_port, 'A1'); # Address device A1
+  &ControlX10::CM11::send($serial_port, 'AJ'); # Turn device ON
+    # House Code 'A' present in both send() calls
+
+  &ControlX10::CM11::send($serial_port, 'B'.'ALL_OFF');
+    # Turns All lights on house code B off
+
+=head1 DESCRIPTION
+
+The CM11A is a bi-directional X10 controller that connects to a serial
+port and transmits commands via AC power line to X10 devices. This
+module translates human-readable commands (eg. 'A2', 'AJ') into the
+Interface Communication Protocol accepted by the CM11A.
+
+=over 4
+
+=item send command
+
+This transmits a two-byte message containing dim and house information
+and either an address or a function. Checksum and acknowledge handshaking
+is automatic. The command accepts a string parameter. The first character
+in the string must be a I<House Code> in the range [A..P] and the rest of
+the string determines the type of message. Intervening whitespace is not
+currently permitted between the I<House Code> and the I<Operation>. This
+may change in the future.
+
+    STRING  ALTERNATE_STRING    FUNCTION
+     1..9               Unit Address
+     A..G               Unit Address
+       J        ON      Turn Unit On
+       K        OFF     Turn Unit Off
+       L        BRIGHT      Brighten Last Light Programmed 5%
+       M        DIM     Dim Last Light Programmed 5%
+       O        ALL_ON      All Units On
+       P        ALL_OFF     All Units Off
+
+There are also functions without "shortcut" letter commands:
+
+    ALL_LIGHTS_OFF  EXTENDED_CODE   EXTENDED_DATA
+    HAIL_REQUEST    HAIL_ACK    PRESET_DIM1
+    PRESET_DIM2 STATUS_ON   STATUS_OFF
+    STATUS
+
+Dim and Bright functions can also take a signed value in the
+range [-95,-90,...,-10,-5,+5,+10,...,+90,+95].
+
+  ControlX10::CM11::send($serial_port,'A1'); # Address device A1
+  ControlX10::CM11::send($serial_port,'AJ'); # Turn device ON
+  ControlX10::CM11::send($serial_port,'A-25'); # Dim to 25%
+
+=item send extended function
+
+Starting in version 2.04, extended commands may be sent to devices that
+support the enhanced X10 protocol. If you have one of the newer (more
+expensive) LM14A/PLM21 2 way X10 pro lamp modules, you can set it directly
+to a specific brightness level using a Preset Dim extended code.
+
+The 64 extended X10 Preset Dim codes are commanded by appending C<&##> to
+the unit address where C<##> is a number between 1 and 63.
+
+  ControlX10::CM11::send($serial_port,'A5');   # Address A5
+  ControlX10::CM11::send($serial_port,'A&P16'); # Dim to 25%
+
+A partial translation list for the most important levels:
+
+    &P##     %      &P##     %      &P##     %
+      0   0      13  20      44  70
+      1   2      16  25      47  75
+      2   4      19  30      50  80
+      3   5      25  40      57  90
+      6  10      31  50      61  95
+      9  15      38  60      63 100
+
+There is another set of Preset Dim commands that are used by some modules
+(e.g. the RCS TX15 thermostat). These 32 non-extended Preset Dim codes can
+be coded directly, using the following table:
+
+      0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15   PRESET_DIM1
+      M  N  O  P  C  D  A  B  E  F  G  H  K  L  I  J
+
+      16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31  PRESET_DIM2
+      M  N  O  P  C  D  A  B  E  F  G  H  K  L  I  J
+
+This usage, and the responses assigned to each command, are device specific.
+For example, the following commands enable preset value 18:
+
+  ControlX10::CM11::send($serial_port,'M4');           # Address thermostat
+  ControlX10::CM11::send($serial_port,'OPRESET_DIM2'); # Select preset 18
+
+
+Starting in version 2.07, incoming extended data is also processed.
+The first character will be the I<House Code> in the range [A..P].
+The next character will be I<Z>, indicating extended data.
+The remaining data will be the extended data.
+
+
+=item read
+
+This checks for an incoming transmission. It will return "" for no input.
+It also tests for a received a "power fail" message (0xa5). If it detects
+one, it automatically sends the command/data to reset the CM11 clock. If
+the C<$no_block> parameter is FALSE (0, "", or undef), the B<read> will retry
+for up to a second at 50 millisecond intervals. With C<$no_block> TRUE,
+the B<read> checks one time for available data.
+
+  $data = &ControlX10::CM11::read($serial_port, $no_block);
+
+=item receive_buffer
+
+This command handles the upload response to an "Interface Poll Signal"
+message (0x5a) B<read> from the CM11. The module sends "ready" (0xc3) and
+receives up to 10 bytes. The first two bytes are size and description of
+the remaining bytes. These are used to decode the data bytes, but are not
+returned by the B<receive_buffer> function. Each of the data bytes is
+decoded as if it was a B<send> command from an external CM11 or equivalent
+external source (such as an RF keypad).
+
+  $data = &ControlX10::CM11::receive_buffer($serial_port);
+      # $data eq "A2AK" after an external device turned off A2
+
+Multiple house and unit addresses can appear in a single buffer.
+
+  if ($data eq "B1BKA2AJ") {
+      print "B1 off, A2 on\n";
+  }
+
+=item dim_level_decode
+
+When the external command includes dim/bright information in addition to
+the address and function, the B<dim_level_decode> function converts that
+data byte (as processed by the B<receive_buffer> command) into percent.
+
+  $data = &ControlX10::CM11::receive_buffer($serial_port);
+      # $data eq "A2AMGE" after an external device dimmed A2 to 40%
+  $percent = &ControlX10::CM11::dim_level_decode("GE");
+      # $percent == 40
+
+A more complex C<$data> input is possible.
+
+  if ($data eq "B1B3B5B7B9BLLE") {
+      print "House B Inputs 1,3,5,7,9 Brightened to 85%\n";
+  }
+
+The conversion between text_data and percent makes more sense to the code
+than to humans. The following table gives representative values. Others
+may be received from a CM11 and will be properly decoded.
+
+        Percent Text        Percent Text
+            0    M7        50    AA
+            5    ED        55    I6
+           10    EC        60    NF
+           15    C7        65    N2
+           20    KD        70    F6
+           25    K4        75    DB
+           30    O7        80    D2
+           35    OA        85    LE
+           40    G6        90    PB
+           45    AF        95    P8
+
+=back
+
+=head1 EXPORTS
+
+The B<send_cm11>, B<receive_cm11>, B<read_cm11>, and B<dim_decode_cm11>
+functions are exported by default starting with Version 2.09.
+They are identical to the "fully-qualified" names and accept the same
+parameters. The I<export on request> tag C<:FUNC> is maintained for
+compatibility (but deprecated).
+
+  use ControlX10::CM11;
+  send_cm11($serial_port, 'A1');            # send() - address
+  send_cm11($serial_port, 'AJ');            # send() - function
+  $data = receive_cm11($serial_port);           # receive_buffer()
+  $data = read_cm11($serial_port, $no_block);       # read()
+  $percent = dim_decode_cm11('GE');         # dim_level_decode()
+
+=head1 AUTHORS
+
+Bruce Winter  bruce@misterhouse.net  http://misterhouse.net
+
+CPAN packaging by Bill Birthisel wcbirthisel@alum.mit.edu
+http://members.aol.com/bbirthisel
+
+=head2 MAILING LISTS
+
+General information about the mailing lists is at:
+
+  http://lists.sourceforge.net/mailman/listinfo/misterhouse-users
+  http://lists.sourceforge.net/mailman/listinfo/misterhouse-announce
+
+To post to this list, send your email to:
+
+  misterhouse-users@lists.sourceforge.net
+
+If you ever want to unsubscribe or change your options (eg, switch to
+or from digest mode, change your password, etc.), visit your
+subscription page at:
+
+  http://lists.sourceforge.net/mailman/options/misterhouse-users/$user_id
+
+=head1 SEE ALSO
+
+mh can be download from http://misterhouse.net
+
+Win32::SerialPort and Device::SerialPort from CPAN
+
+CM11A Protocol documentation available at http://www.x10.com
+
+perl(1).
+
+=head1 COPYRIGHT
+
+Copyright (C) 2000 Bruce Winter. All rights reserved.
+
+This module is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself. 30 January 2000.
+
+=cut
+
+#
+# $Log: CM11.pm,v $
+# Revision 2.22  2004/09/25 20:01:20  winter
+# *** empty log message ***
+#
+# Revision 2.21  2004/06/06 21:38:44  winter
+# *** empty log message ***
+#
+# Revision 2.20  2003/12/22 00:25:06  winter
+#  - 2.86 release
+#
+# Revision 2.19  2003/11/23 20:26:02  winter
+#  - 2.84 release
+#
+# Revision 2.18  2003/03/09 19:34:42  winter
+#  - 2.79 release
+#
+# Revision 2.17  2002/11/10 01:59:57  winter
+# - 2.73 release
+#
+# Revision 2.16  2002/03/02 02:36:51  winter
+# - 2.65 release
+#
+# Revision 2.15  2001/02/04 20:31:31  winter
+# - 2.43 release
+#
+# Revision 2.14  2001/01/20 17:47:50  winter
+# - 2.41 release
+#
+# Revision 2.13  2000/10/01 23:29:41  winter
+# - 2.29 release
+#
+# Revision 2.12  2000/08/19 01:25:09  winter
+# - 2.27 release
+#
+# Revision 2.11  2000/04/22 00:11:15  winter
+# - increase receive buffer delay from 40 to 80
+#
+# Revision 2.10  2000/02/12 06:11:37  winter
+# - commit lots of changes, in preperation for mh release 2.0
+#
+# Revision 2.08  2000/01/29 20:07:01  winter
+# - add $no_power_fail_check.
+#
+#
diff --git a/lib/site/MSN.pm b/lib/site/MSN.pm
index 45a1309ba..997289a23 100644
--- a/lib/site/MSN.pm
+++ b/lib/site/MSN.pm
@@ -1,835 +1,835 @@
-#================================================
-package MSN;
-#================================================
-
-=head1 MSN v2.0
-
-=cut
-
-use strict;
-use warnings;
-
-# IO
-use IO::Select;
-
-use MSN::Notification;
-use MSN::SwitchBoard;
-use MSN::Util;
-
-use constant CVER10 => '0x0409 winnt 5.0 i386 MSNMSGR 6.1.0203 MSMSGS ';
-use constant VER => 'MSNP10 MSNP9 CVR0';
-
-my $REVISION = '$Rev: 84 $';
-$REVISION =~ s/\$//g;
-my $VER = 'MSNP10 MSNP9 CVR0';
-
-# print out the version and checksum
-my $strVERSION = "MSN 2.0 (01/21/2005) $REVISION";
-sub checksum { my $o = tell(DATA); seek DATA,0,0; local $/; my $t = unpack("%32C*",<DATA>) % 65535;seek DATA,$o,0; return $t;};
-print $strVERSION . " - Checksum: " . checksum() . "-NS" . MSN::Notification::checksum() . "-SB" . MSN::SwitchBoard::checksum() . "\n\n";
-
-
-=head2 Methods
-
-=item
-new
-
-Creates an instance of the MSN object used to communicate with MSN Servers.
-
-=cut
-
-sub new
-{
-	my $class = shift;
-
-	my $self  =
-	{
-		Host					=> 'messenger.hotmail.com',
-		Port					=> 1863,
-		Handle				=> '',
-		Password				=> '',
-		Debug					=> 0,
-		ServerError			=> 1,
-		Error					=> 1,
-		AutoloadError		=> 0,
-		CMDError				=> 0,
-		ShowTX				=> 0,
-		ShowRX				=> 0,
-		AutoReconnect		=> 1,
-		Select				=> new IO::Select(),
-		Notification		=> undef,
-		Connections			=> {},
-		Connected			=> 0,
-		Status				=> 'NLN',
-		LastError			=> '',
-		MessageStyle		=> { Font			=> "MS Shell Dlg",
-									  Effect			=> "",
-									  Color			=> "000000",
-									  CharacterSet => 0,
-									  PitchFamily  => 0
-									},
-		ClientID				=> 536870920,
-		ClientCaps			=> { },
-		@_
-	};
-	bless( $self, $class );
-
-	return $self;
-}
-
-sub DESTROY
-{
-	my $self = shift;
-
-	# placeholder for possible destructor code
-}
-
-sub AUTOLOAD
-{
-	my $self = shift;
-
-	$self->error( "method $MSN::AUTOLOAD not defined" ) if( $self->{AutoloadError} );
-}
-
-sub toggle
-{
-	my $self = shift;
-	my $flag = shift || return $self->error( "Flag is missing" );
-
-	return $self->error( "Unknown flag (check spelling or case?)" ) if( $flag !~ /^Debug|ServerError|Error|AutoloadError|CMDError|ShowTX|ShowRX|AutoReconnect$/ );
-
-	$self->{$flag} = !$self->{$flag};
-
-	return 1;
-}
-
-sub setKey
-{
-	my $self = shift;
-	my $key = shift || return $self->error( "Key is missing" );
-	my $value = shift;
-
-	if( $key =~ /^Debug|ServerError|Error|AutoloadError|CMDError|ShowTX|ShowRX|AutoReconnect$/ )
-	{
-		return $self->error( "Invalid value for $key (should be 0 or 1)" ) if( $value != 1 && $value != 0 );
-		$self->{$key} = $value;
-	}
-	elsif( $key =~ /^PingIncrement|NoPongMax$/ )
-	{
-		return $self->error( "Invalid value for $key (should be greater than 0)" ) if( $value <= 0 );
-		$self->{Notification}->{$key} = $value;
-	}
-	else
-	{
-		return $self->error( "Unknown key (check spelling or case?)" );
-	}
-
-	return 1;
-}
-
-sub debug
-{
-	my $self = shift;
-	my $message = shift || '';
-
-	if( defined $self->{handler}->{Debug} )
-	{
-		$self->call_event( $self, 'Debug', $message );
-	}
-	elsif( $self->{Debug} )
-	{
-		print( "$message\n" );
-	}
-
-	return 1;
-}
-
-sub serverError
-{
-	my $self = shift;
-	my $message = shift || '';
-
-	if( defined $self->{handler}->{ServerError} )
-	{
-		$self->call_event( $self, 'ServerError', $message );
-	}
-	elsif( $self->{ServerError} )
-	{
-		print( "SERVER ERROR : $message\n" );
-	}
-
-	return 0;
-}
-
-sub error
-{
-	my $self = shift;
-	my $message = shift || '';
-
-	$self->{LastError} = $message;
-
-	if( defined $self->{handler}->{Error} )
-	{
-		$self->call_event( $self, 'Error', $message );
-	}
-	elsif( $self->{Error} )
-	{
-		print( "ERROR : $message\nCaller trace:\n" );
-
-		for( my $i=0; $i<20; $i++ )
-		{
-			my ($package, $filename, $line, $subroutine, @more ) = caller($i);
-			last if( !defined $package );
-			$filename =~ s/.*MSN/MSN/gi;
-			print( "  $i: $subroutine ($filename, line $line)\n" );
-		}
-	}
-
-	return 0;
-}
-
-sub cmdError
-{
-	my $self = shift;
-	my $message = shift || '';
-
-	print( "UNDEFINED CMD : $message\n" ) if( $self->{CMDError} );
-
-	return 0;
-}
-
-sub getLastError
-{
-	my $self = shift;
-
-	return $self->{LastError};
-}
-
-
-=item
-connect
-
-Connect to MSN. Call this after your object is created and your event handlers are set.
-
-=cut
-
-sub connect
-{
-	my $self = shift;
-
-	$self->debug( "Connecting to $self->{Host}:$self->{Port} as $self->{Handle}/$self->{Password}" );
-
-	$self->{Notification} = new MSN::Notification( $self, $self->{Host}, $self->{Port}, $self->{Handle}, $self->{Password} );
-
-	if( $self->{Notification}->connect() )
-	{
-		$self->{Connected} = time;
-	}
-}
-
-=item
-disconnect
-
-Disconnect from MSN.
-
-=cut
-
-sub disconnect
-{
-	my $self = shift;
-
-	foreach my $convo (values %{$self->getConvoList()})
-	{
-		$convo->leave();
-	}
-
-	$self->{Notification}->disconnect();
-
-	$self->{Connected} = 0;
-
-	return 1;
-}
-
-=item
-isConnected()
-
-Checks if the connection is active.
-
-=cut
-
-sub isConnected
-{
-	my $self = shift;
-
-	return $self->{Connected};
-}
-
-=item
-uptime()
-
-Get the current uptime in seconds (since the last connection).
-
-=cut
-
-sub uptime
-{
-	my $self = shift;
-
-	return ($self->{Connected}) ? (time - $self->{Connected}) : 0;
-}
-
-#================================================
-# Set and Get methods
-#================================================
-
-=item
-setName
-
-Set the display name.
-
-=cut
-
-sub setName
-{
-	my $self = shift;
-
-	return $self->{Notification}->setName( @_ );
-}
-
-=item
-setDisplayPicture($file)
-
-Set the display picture. This must be passed a png file and resets your status to NLN so that your Display picture gets sent out.
-
-=cut
-
-sub setDisplayPicture
-{
-	my $self = shift;
-
-	return $self->{Notification}->setDisplayPicture( @_ );
-}
-
-=item
-setMessageStyle(%hash)
-
-Set the default style information (font, effect, etc) for sending messages.
-
-=cut
-
-sub setMessageStyle
-{
-	my $self = shift;
-
-	$self->{MessageStyle} = { (%{$self->{MessageStyle}}), @_ };
-}
-
-=item
-getMessageStyle()
-
-Get the default style information (font, effect, etc) for sending messages.
-
-=cut
-
-sub getMessageStyle
-{
-	my $self = shift;
-
-	return $self->{MessageStyle};
-}
-
-=item
-setClientInfo(%hash)
-
-Set the client info. This is the client id and flags that make up the cid.
-
-=cut
-
-sub setClientInfo
-{
-	my $self = shift;
-	my %info = @_;
-
-	$self->{ClientID} = MSN::Util::convertToCid( %info );
-
-	return 1;
-}
-
-=item
-getClientInfo()
-
-Get the client info. This is the client id and flags that make up the cid.
-
-=cut
-
-sub getClientInfo
-{
-	my $self = shift;
-
-	return MSN::Util::convertFromCid( $self->{ClientID} );
-}
-
-=item
-setClientCaps(%hash)
-
-Set the client caps. These are the x-clientcaps data.
-
-=cut
-
-sub setClientCaps
-{
-	my $self = shift;
-	my %caps = @_;
-
-	$self->{ClientCaps} = \%caps;
-
-	return 1;
-}
-
-=item
-getClientCaps()
-
-Get the client caps. These are the x-clientcaps data.
-
-=cut
-
-sub getClientCaps
-{
-	my $self = shift;
-
-	return $self->{ClientCaps};
-}
-
-=item
-setStatus
-
-Set the status.
-
-=cut
-
-sub setStatus
-{
-	my $self = shift;
-
-	return $self->{Notification}->setStatus( @_ );
-}
-
-#================================================
-# Contact methods
-#================================================
-
-=item
-blockContact($email)
-
-Puts $email on your block list.
-
-=cut
-
-sub blockContact
-{
-	my $self = shift;
-
-	return $self->{Notification}->blockContact( @_ );
-}
-
-=item
-unblockContact($email)
-
-Removes $email from your block list.
-
-=cut
-
-sub unblockContact
-{
-	my $self = shift;
-
-	return $self->{Notification}->unblockContact( @_ );
-}
-
-=item
-addContact($email)
-
-Puts $email on your contact list. This allows you to recieve status messages about this individual.
-
-=cut
-
-sub addContact
-{
-	my $self = shift;
-
-	return $self->{Notification}->addContact( @_ );
-}
-
-=item
-remContact($email)
-
-Removes $email from your contact list.
-
-=cut
-
-sub remContact
-{
-	my $self = shift;
-
-	return $self->{Notification}->remContact( @_ );
-}
-
-=item
-allowContact($email)
-
-Puts $email on your allow list. This is generaly automatic but there might be some cases where it is useful.
-If you do not want to automatically allow contacts to see you online, you can set a handler for the "ContactAddingUs"
-event and return 0.
-
-=cut
-
-sub allowContact
-{
-	my $self = shift;
-
-	return $self->{Notification}->allowContact( @_ );
-}
-
-=item
-disallowContact($email)
-
-Removes $email from your allow list.  They will no longer be able to see you or talk to you.
-
-=cut
-
-sub disallowContact
-{
-	my $self = shift;
-
-	return $self->{Notification}->disallowContact( @_ );
-}
-
-=item
-getContactList($list)
-
-Expects $list to be one of FL, RL, AL, or BL.  Returns the email addresses on said list.
-
-=cut
-
-sub getContactList
-{
-	my $self = shift;
-
-	return $self->{Notification}->getContactList( @_ );
-}
-
-=item
-getContact($email)
-
-Returns a hash containing all known info for this contact.
-
-=cut
-
-sub getContact
-{
-	my $self = shift;
-
-	return $self->{Notification}->getContact( @_ );
-}
-
-=item
-getContactName($email)
-
-Returns the friendly name used by this contact, if they are on your FL list.
-
-=cut
-
-sub getContactName
-{
-	my $self = shift;
-
-	return $self->{Notification}->getContactName( @_ );
-}
-
-=item
-getContactStatus($email)
-
-Returns the status of this contact, if they are on your FL list.
-
-=cut
-
-sub getContactStatus
-{
-	my $self = shift;
-
-	return $self->{Notification}->getContactStatus( @_ );
-}
-
-=item
-getContactClientInfo($email)
-
-Returns the client info of this contact, if they are on your FL list.
-
-=cut
-
-sub getContactClientInfo
-{
-	my $self = shift;
-
-	return $self->{Notification}->getContactClientInfo( @_ );
-}
-
-#================================================
-# Other
-#================================================
-
-=item
-findMember($email)
-
-Looks for a member in an active SwitchBoard and returns the SB or undef, if not found.
-
-=cut
-
-sub findMember
-{
-	my $self = shift;
-	my $email = shift || '';
-
-	foreach my $convo (values %{$self->getConvoList()})
-	{
-		my $members = $convo->getMembers();
-
-		return $convo if( defined $members->{$email} );
-	}
-
-	return undef;
-}
-
-=item
-addEmoticon($shortcut, $filename)
-
-Adds an emoticon to your connection. This loads the file and prepares it. Anytime you use the text form $shortcut in an outgoing message it will be replaced with the appropriate emoticon. You can only use 5 different emoticons per message.
-
-=cut
-
-sub addEmoticon
-{
-	my $self = shift;
-
-	return return $self->{Notification}->addEmoticon( @_ );
-}
-
-=item
-broadcast($msg,%style)
-
-Broadcasts the message to all open conversations.
-
-=cut
-
-sub broadcast
-{
-	my $self = shift;
-	my @data = @_;		# probably don't have to do this, but just to be safe
-
-	foreach my $convo (values %{$self->getConvoList()})
-	{
-		$convo->sendMessage( @data );
-	}
-}
-
-=item
-call($email,$msg,%style)
-
-Calls the contact, starting a conversation with them.
-
-=cut
-
-sub call
-{
-	my $self = shift;
-
-    print "db in call for $self\n";
-
-	$self->{Notification}->call( @_ );
-}
-
-sub isOnline
-{
-	my $self = shift;
-
-}
-
-=item
-do_one_loop()
-
-Process a single cycle's worth of incoming and outgoing messages.  This should be done at a regular intervals, preferably under a second.
-
-=cut
-
-sub do_one_loop
-{
-	my $self = shift;
-
-	# return immediately if we are not connected
-	return if( !$self->{Connected} );
-
-	$self->{Notification}->ping( );
-
-	foreach my $convo (values %{$self->getConvoList()})
-	{
-		$convo->p2pSendOne() if $convo->p2pWaiting;
-	}
-
-	my @ready = $self->{Select}->can_read(.1);
-	foreach my $fh ( @ready )
-	{
-		# get the filenumber for this filehandle
-		my $fn = $fh->fileno;
-
-		# get the object assocatied with this filenumber
-		my $connection = $self->{Connections}->{$fn};
-
-		# DO WE NEED THIS CODE? if the connection is really dead, will it even be showing up in the list of filehandles that can be read from??
-		# if the connection is dead, remove it from the select, delete it from the Connections list and output a warn
-		if( !$connection->{Socket}->connected() )
-		{
-			$self->{Select}->remove( $fn );
-			delete( $self->{Connections}->{fn} );
-			warn "Killing dead socket";
-			next;
-		}
-
-		sysread( $fh, $connection->{buf}, 2048, length( $connection->{buf} || '' ) );
-
-		while( $connection->{buf} =~ s/^(.*?\n)// )
-		{
-			$connection->{line}= $1;
-			my $incomingdata = $connection->{line};
-			$incomingdata =~ s/[\r\n]//g;
-
-			print( "($fn $connection->{Type}) RX: $incomingdata\n" ) if( $self->{ShowRX} );
-
-			my $result = $connection->dispatch( $incomingdata );
-			last if( $result && $result eq "wait" );
-		}
-	}
-}
-
-
-=item
-setHandler($event, $handler)
-
-$event should be an event listed in the events section.  These are called based on information sent by MSN,
-receiving a message is an event, status changes are events, getting a call is an event, etc.
-
-	 $msn->setHandler( Connected => \&connected );
-
-	 sub connected {
-		 my $self = shift;
-		 print "Yay we connected";
-	 }
-
-=cut
-
-sub setHandler
-{
-	my $self = shift;
-	my ($event, $handler) = @_;
-
-	$self->{handler}->{$event} = $handler;
-}
-
-=item
-setHandlers( $event1 => $handler1, $event2 => $handler2)
-
-Expects a list of events and handlers.
-
-	  my $msn = new MSN;
-	  $msn->setHandlers( Connected	  => \&connected,
-								 Disconnected => \&disconnected );
-
-=cut
-
-sub setHandlers
-{
-	my $self = shift;
-	my $handlers = { @_ };
-	for my $event (keys %$handlers)
-	{
-		$self->setHandler( $event, $handlers->{$event} );
-	}
-}
-
-sub call_event
-{
-	my $self = shift;
-	my $receiver = shift;
-	my $event = shift;
-
-	# get and run the handler if it is defined
-	my $function = $self->{handler}->{$event};
-	return &$function( $receiver, @_ ) if( defined $function );
-
-	# get and run the default handler if it is defined
-	$function = $self->{handler}->{Default};
-	return &$function( $receiver, $event, @_ ) if( defined $function );
-
-	return undef;
-}
-
-=item
-getNotification
-
-Returns the MSN::Notification object if you have a need to interact with it directly.
-
-=cut
-
-sub getNotification
-{
-	my $self = shift;
-
-	return $self->{Notification};
-}
-
-=item
-getConvoList
-
-Returns a hash of conversations (MSN::SwitchBoard objects) keyed by file number of the socket they are on.
-
-=cut
-
-sub getConvoList
-{
-	my $self = shift;
-
-	my $convos = {};
-
-	foreach my $fn (keys %{$self->{Connections}} )
-	{
-		if( $self->{Connections}->{$fn}->getType() eq 'SB' )
-		{
-			$convos->{$fn} = $self->{Connections}->{$fn};
-		}
-	}
-
-	return $convos;
-}
-
-=item
-getConvo
-
-Returns a conversation (MSN::SwitchBoard object) found by socket number.
-
-=cut
-
-sub getConvo
-{
-	my $self = shift;
-	my $key = shift;
-
-	if( defined $self->{Connections}->{$key} && $self->{Connections}->{$key}->getType() eq 'SB' )
-	{
-		return $self->{Connections}->{$key};
-	}
-
-	return undef;
-}
-
-
-return 1;
-__DATA__
+#================================================
+package MSN;
+#================================================
+
+=head1 MSN v2.0
+
+=cut
+
+use strict;
+use warnings;
+
+# IO
+use IO::Select;
+
+use MSN::Notification;
+use MSN::SwitchBoard;
+use MSN::Util;
+
+use constant CVER10 => '0x0409 winnt 5.0 i386 MSNMSGR 6.1.0203 MSMSGS ';
+use constant VER => 'MSNP10 MSNP9 CVR0';
+
+my $REVISION = '$Rev: 84 $';
+$REVISION =~ s/\$//g;
+my $VER = 'MSNP10 MSNP9 CVR0';
+
+# print out the version and checksum
+my $strVERSION = "MSN 2.0 (01/21/2005) $REVISION";
+sub checksum { my $o = tell(DATA); seek DATA,0,0; local $/; my $t = unpack("%32C*",<DATA>) % 65535;seek DATA,$o,0; return $t;};
+print $strVERSION . " - Checksum: " . checksum() . "-NS" . MSN::Notification::checksum() . "-SB" . MSN::SwitchBoard::checksum() . "\n\n";
+
+
+=head2 Methods
+
+=item
+new
+
+Creates an instance of the MSN object used to communicate with MSN Servers.
+
+=cut
+
+sub new
+{
+	my $class = shift;
+
+	my $self  =
+	{
+		Host					=> 'messenger.hotmail.com',
+		Port					=> 1863,
+		Handle				=> '',
+		Password				=> '',
+		Debug					=> 0,
+		ServerError			=> 1,
+		Error					=> 1,
+		AutoloadError		=> 0,
+		CMDError				=> 0,
+		ShowTX				=> 0,
+		ShowRX				=> 0,
+		AutoReconnect		=> 1,
+		Select				=> new IO::Select(),
+		Notification		=> undef,
+		Connections			=> {},
+		Connected			=> 0,
+		Status				=> 'NLN',
+		LastError			=> '',
+		MessageStyle		=> { Font			=> "MS Shell Dlg",
+									  Effect			=> "",
+									  Color			=> "000000",
+									  CharacterSet => 0,
+									  PitchFamily  => 0
+									},
+		ClientID				=> 536870920,
+		ClientCaps			=> { },
+		@_
+	};
+	bless( $self, $class );
+
+	return $self;
+}
+
+sub DESTROY
+{
+	my $self = shift;
+
+	# placeholder for possible destructor code
+}
+
+sub AUTOLOAD
+{
+	my $self = shift;
+
+	$self->error( "method $MSN::AUTOLOAD not defined" ) if( $self->{AutoloadError} );
+}
+
+sub toggle
+{
+	my $self = shift;
+	my $flag = shift || return $self->error( "Flag is missing" );
+
+	return $self->error( "Unknown flag (check spelling or case?)" ) if( $flag !~ /^Debug|ServerError|Error|AutoloadError|CMDError|ShowTX|ShowRX|AutoReconnect$/ );
+
+	$self->{$flag} = !$self->{$flag};
+
+	return 1;
+}
+
+sub setKey
+{
+	my $self = shift;
+	my $key = shift || return $self->error( "Key is missing" );
+	my $value = shift;
+
+	if( $key =~ /^Debug|ServerError|Error|AutoloadError|CMDError|ShowTX|ShowRX|AutoReconnect$/ )
+	{
+		return $self->error( "Invalid value for $key (should be 0 or 1)" ) if( $value != 1 && $value != 0 );
+		$self->{$key} = $value;
+	}
+	elsif( $key =~ /^PingIncrement|NoPongMax$/ )
+	{
+		return $self->error( "Invalid value for $key (should be greater than 0)" ) if( $value <= 0 );
+		$self->{Notification}->{$key} = $value;
+	}
+	else
+	{
+		return $self->error( "Unknown key (check spelling or case?)" );
+	}
+
+	return 1;
+}
+
+sub debug
+{
+	my $self = shift;
+	my $message = shift || '';
+
+	if( defined $self->{handler}->{Debug} )
+	{
+		$self->call_event( $self, 'Debug', $message );
+	}
+	elsif( $self->{Debug} )
+	{
+		print( "$message\n" );
+	}
+
+	return 1;
+}
+
+sub serverError
+{
+	my $self = shift;
+	my $message = shift || '';
+
+	if( defined $self->{handler}->{ServerError} )
+	{
+		$self->call_event( $self, 'ServerError', $message );
+	}
+	elsif( $self->{ServerError} )
+	{
+		print( "SERVER ERROR : $message\n" );
+	}
+
+	return 0;
+}
+
+sub error
+{
+	my $self = shift;
+	my $message = shift || '';
+
+	$self->{LastError} = $message;
+
+	if( defined $self->{handler}->{Error} )
+	{
+		$self->call_event( $self, 'Error', $message );
+	}
+	elsif( $self->{Error} )
+	{
+		print( "ERROR : $message\nCaller trace:\n" );
+
+		for( my $i=0; $i<20; $i++ )
+		{
+			my ($package, $filename, $line, $subroutine, @more ) = caller($i);
+			last if( !defined $package );
+			$filename =~ s/.*MSN/MSN/gi;
+			print( "  $i: $subroutine ($filename, line $line)\n" );
+		}
+	}
+
+	return 0;
+}
+
+sub cmdError
+{
+	my $self = shift;
+	my $message = shift || '';
+
+	print( "UNDEFINED CMD : $message\n" ) if( $self->{CMDError} );
+
+	return 0;
+}
+
+sub getLastError
+{
+	my $self = shift;
+
+	return $self->{LastError};
+}
+
+
+=item
+connect
+
+Connect to MSN. Call this after your object is created and your event handlers are set.
+
+=cut
+
+sub connect
+{
+	my $self = shift;
+
+	$self->debug( "Connecting to $self->{Host}:$self->{Port} as $self->{Handle}/$self->{Password}" );
+
+	$self->{Notification} = new MSN::Notification( $self, $self->{Host}, $self->{Port}, $self->{Handle}, $self->{Password} );
+
+	if( $self->{Notification}->connect() )
+	{
+		$self->{Connected} = time;
+	}
+}
+
+=item
+disconnect
+
+Disconnect from MSN.
+
+=cut
+
+sub disconnect
+{
+	my $self = shift;
+
+	foreach my $convo (values %{$self->getConvoList()})
+	{
+		$convo->leave();
+	}
+
+	$self->{Notification}->disconnect();
+
+	$self->{Connected} = 0;
+
+	return 1;
+}
+
+=item
+isConnected()
+
+Checks if the connection is active.
+
+=cut
+
+sub isConnected
+{
+	my $self = shift;
+
+	return $self->{Connected};
+}
+
+=item
+uptime()
+
+Get the current uptime in seconds (since the last connection).
+
+=cut
+
+sub uptime
+{
+	my $self = shift;
+
+	return ($self->{Connected}) ? (time - $self->{Connected}) : 0;
+}
+
+#================================================
+# Set and Get methods
+#================================================
+
+=item
+setName
+
+Set the display name.
+
+=cut
+
+sub setName
+{
+	my $self = shift;
+
+	return $self->{Notification}->setName( @_ );
+}
+
+=item
+setDisplayPicture($file)
+
+Set the display picture. This must be passed a png file and resets your status to NLN so that your Display picture gets sent out.
+
+=cut
+
+sub setDisplayPicture
+{
+	my $self = shift;
+
+	return $self->{Notification}->setDisplayPicture( @_ );
+}
+
+=item
+setMessageStyle(%hash)
+
+Set the default style information (font, effect, etc) for sending messages.
+
+=cut
+
+sub setMessageStyle
+{
+	my $self = shift;
+
+	$self->{MessageStyle} = { (%{$self->{MessageStyle}}), @_ };
+}
+
+=item
+getMessageStyle()
+
+Get the default style information (font, effect, etc) for sending messages.
+
+=cut
+
+sub getMessageStyle
+{
+	my $self = shift;
+
+	return $self->{MessageStyle};
+}
+
+=item
+setClientInfo(%hash)
+
+Set the client info. This is the client id and flags that make up the cid.
+
+=cut
+
+sub setClientInfo
+{
+	my $self = shift;
+	my %info = @_;
+
+	$self->{ClientID} = MSN::Util::convertToCid( %info );
+
+	return 1;
+}
+
+=item
+getClientInfo()
+
+Get the client info. This is the client id and flags that make up the cid.
+
+=cut
+
+sub getClientInfo
+{
+	my $self = shift;
+
+	return MSN::Util::convertFromCid( $self->{ClientID} );
+}
+
+=item
+setClientCaps(%hash)
+
+Set the client caps. These are the x-clientcaps data.
+
+=cut
+
+sub setClientCaps
+{
+	my $self = shift;
+	my %caps = @_;
+
+	$self->{ClientCaps} = \%caps;
+
+	return 1;
+}
+
+=item
+getClientCaps()
+
+Get the client caps. These are the x-clientcaps data.
+
+=cut
+
+sub getClientCaps
+{
+	my $self = shift;
+
+	return $self->{ClientCaps};
+}
+
+=item
+setStatus
+
+Set the status.
+
+=cut
+
+sub setStatus
+{
+	my $self = shift;
+
+	return $self->{Notification}->setStatus( @_ );
+}
+
+#================================================
+# Contact methods
+#================================================
+
+=item
+blockContact($email)
+
+Puts $email on your block list.
+
+=cut
+
+sub blockContact
+{
+	my $self = shift;
+
+	return $self->{Notification}->blockContact( @_ );
+}
+
+=item
+unblockContact($email)
+
+Removes $email from your block list.
+
+=cut
+
+sub unblockContact
+{
+	my $self = shift;
+
+	return $self->{Notification}->unblockContact( @_ );
+}
+
+=item
+addContact($email)
+
+Puts $email on your contact list. This allows you to recieve status messages about this individual.
+
+=cut
+
+sub addContact
+{
+	my $self = shift;
+
+	return $self->{Notification}->addContact( @_ );
+}
+
+=item
+remContact($email)
+
+Removes $email from your contact list.
+
+=cut
+
+sub remContact
+{
+	my $self = shift;
+
+	return $self->{Notification}->remContact( @_ );
+}
+
+=item
+allowContact($email)
+
+Puts $email on your allow list. This is generaly automatic but there might be some cases where it is useful.
+If you do not want to automatically allow contacts to see you online, you can set a handler for the "ContactAddingUs"
+event and return 0.
+
+=cut
+
+sub allowContact
+{
+	my $self = shift;
+
+	return $self->{Notification}->allowContact( @_ );
+}
+
+=item
+disallowContact($email)
+
+Removes $email from your allow list.  They will no longer be able to see you or talk to you.
+
+=cut
+
+sub disallowContact
+{
+	my $self = shift;
+
+	return $self->{Notification}->disallowContact( @_ );
+}
+
+=item
+getContactList($list)
+
+Expects $list to be one of FL, RL, AL, or BL.  Returns the email addresses on said list.
+
+=cut
+
+sub getContactList
+{
+	my $self = shift;
+
+	return $self->{Notification}->getContactList( @_ );
+}
+
+=item
+getContact($email)
+
+Returns a hash containing all known info for this contact.
+
+=cut
+
+sub getContact
+{
+	my $self = shift;
+
+	return $self->{Notification}->getContact( @_ );
+}
+
+=item
+getContactName($email)
+
+Returns the friendly name used by this contact, if they are on your FL list.
+
+=cut
+
+sub getContactName
+{
+	my $self = shift;
+
+	return $self->{Notification}->getContactName( @_ );
+}
+
+=item
+getContactStatus($email)
+
+Returns the status of this contact, if they are on your FL list.
+
+=cut
+
+sub getContactStatus
+{
+	my $self = shift;
+
+	return $self->{Notification}->getContactStatus( @_ );
+}
+
+=item
+getContactClientInfo($email)
+
+Returns the client info of this contact, if they are on your FL list.
+
+=cut
+
+sub getContactClientInfo
+{
+	my $self = shift;
+
+	return $self->{Notification}->getContactClientInfo( @_ );
+}
+
+#================================================
+# Other
+#================================================
+
+=item
+findMember($email)
+
+Looks for a member in an active SwitchBoard and returns the SB or undef, if not found.
+
+=cut
+
+sub findMember
+{
+	my $self = shift;
+	my $email = shift || '';
+
+	foreach my $convo (values %{$self->getConvoList()})
+	{
+		my $members = $convo->getMembers();
+
+		return $convo if( defined $members->{$email} );
+	}
+
+	return undef;
+}
+
+=item
+addEmoticon($shortcut, $filename)
+
+Adds an emoticon to your connection. This loads the file and prepares it. Anytime you use the text form $shortcut in an outgoing message it will be replaced with the appropriate emoticon. You can only use 5 different emoticons per message.
+
+=cut
+
+sub addEmoticon
+{
+	my $self = shift;
+
+	return return $self->{Notification}->addEmoticon( @_ );
+}
+
+=item
+broadcast($msg,%style)
+
+Broadcasts the message to all open conversations.
+
+=cut
+
+sub broadcast
+{
+	my $self = shift;
+	my @data = @_;		# probably don't have to do this, but just to be safe
+
+	foreach my $convo (values %{$self->getConvoList()})
+	{
+		$convo->sendMessage( @data );
+	}
+}
+
+=item
+call($email,$msg,%style)
+
+Calls the contact, starting a conversation with them.
+
+=cut
+
+sub call
+{
+	my $self = shift;
+
+    print "db in call for $self\n";
+
+	$self->{Notification}->call( @_ );
+}
+
+sub isOnline
+{
+	my $self = shift;
+
+}
+
+=item
+do_one_loop()
+
+Process a single cycle's worth of incoming and outgoing messages.  This should be done at a regular intervals, preferably under a second.
+
+=cut
+
+sub do_one_loop
+{
+	my $self = shift;
+
+	# return immediately if we are not connected
+	return if( !$self->{Connected} );
+
+	$self->{Notification}->ping( );
+
+	foreach my $convo (values %{$self->getConvoList()})
+	{
+		$convo->p2pSendOne() if $convo->p2pWaiting;
+	}
+
+	my @ready = $self->{Select}->can_read(.1);
+	foreach my $fh ( @ready )
+	{
+		# get the filenumber for this filehandle
+		my $fn = $fh->fileno;
+
+		# get the object assocatied with this filenumber
+		my $connection = $self->{Connections}->{$fn};
+
+		# DO WE NEED THIS CODE? if the connection is really dead, will it even be showing up in the list of filehandles that can be read from??
+		# if the connection is dead, remove it from the select, delete it from the Connections list and output a warn
+		if( !$connection->{Socket}->connected() )
+		{
+			$self->{Select}->remove( $fn );
+			delete( $self->{Connections}->{fn} );
+			warn "Killing dead socket";
+			next;
+		}
+
+		sysread( $fh, $connection->{buf}, 2048, length( $connection->{buf} || '' ) );
+
+		while( $connection->{buf} =~ s/^(.*?\n)// )
+		{
+			$connection->{line}= $1;
+			my $incomingdata = $connection->{line};
+			$incomingdata =~ s/[\r\n]//g;
+
+			print( "($fn $connection->{Type}) RX: $incomingdata\n" ) if( $self->{ShowRX} );
+
+			my $result = $connection->dispatch( $incomingdata );
+			last if( $result && $result eq "wait" );
+		}
+	}
+}
+
+
+=item
+setHandler($event, $handler)
+
+$event should be an event listed in the events section.  These are called based on information sent by MSN,
+receiving a message is an event, status changes are events, getting a call is an event, etc.
+
+	 $msn->setHandler( Connected => \&connected );
+
+	 sub connected {
+		 my $self = shift;
+		 print "Yay we connected";
+	 }
+
+=cut
+
+sub setHandler
+{
+	my $self = shift;
+	my ($event, $handler) = @_;
+
+	$self->{handler}->{$event} = $handler;
+}
+
+=item
+setHandlers( $event1 => $handler1, $event2 => $handler2)
+
+Expects a list of events and handlers.
+
+	  my $msn = new MSN;
+	  $msn->setHandlers( Connected	  => \&connected,
+								 Disconnected => \&disconnected );
+
+=cut
+
+sub setHandlers
+{
+	my $self = shift;
+	my $handlers = { @_ };
+	for my $event (keys %$handlers)
+	{
+		$self->setHandler( $event, $handlers->{$event} );
+	}
+}
+
+sub call_event
+{
+	my $self = shift;
+	my $receiver = shift;
+	my $event = shift;
+
+	# get and run the handler if it is defined
+	my $function = $self->{handler}->{$event};
+	return &$function( $receiver, @_ ) if( defined $function );
+
+	# get and run the default handler if it is defined
+	$function = $self->{handler}->{Default};
+	return &$function( $receiver, $event, @_ ) if( defined $function );
+
+	return undef;
+}
+
+=item
+getNotification
+
+Returns the MSN::Notification object if you have a need to interact with it directly.
+
+=cut
+
+sub getNotification
+{
+	my $self = shift;
+
+	return $self->{Notification};
+}
+
+=item
+getConvoList
+
+Returns a hash of conversations (MSN::SwitchBoard objects) keyed by file number of the socket they are on.
+
+=cut
+
+sub getConvoList
+{
+	my $self = shift;
+
+	my $convos = {};
+
+	foreach my $fn (keys %{$self->{Connections}} )
+	{
+		if( $self->{Connections}->{$fn}->getType() eq 'SB' )
+		{
+			$convos->{$fn} = $self->{Connections}->{$fn};
+		}
+	}
+
+	return $convos;
+}
+
+=item
+getConvo
+
+Returns a conversation (MSN::SwitchBoard object) found by socket number.
+
+=cut
+
+sub getConvo
+{
+	my $self = shift;
+	my $key = shift;
+
+	if( defined $self->{Connections}->{$key} && $self->{Connections}->{$key}->getType() eq 'SB' )
+	{
+		return $self->{Connections}->{$key};
+	}
+
+	return undef;
+}
+
+
+return 1;
+__DATA__
diff --git a/lib/site/Tie/Hash.pm.original b/lib/site/Tie/Hash.pm.original
index 63a5ee708..282006984 100644
--- a/lib/site/Tie/Hash.pm.original
+++ b/lib/site/Tie/Hash.pm.original
@@ -1,243 +1,243 @@
-package Tie::Hash;
-
-our $VERSION = '1.00';
-
-=head1 NAME
-
-Tie::Hash, Tie::StdHash, Tie::ExtraHash - base class definitions for tied hashes
-
-=head1 SYNOPSIS
-
-    package NewHash;
-    require Tie::Hash;
-
-    @ISA = (Tie::Hash);
-
-    sub DELETE { ... }		# Provides needed method
-    sub CLEAR { ... }		# Overrides inherited method
-
-
-    package NewStdHash;
-    require Tie::Hash;
-
-    @ISA = (Tie::StdHash);
-
-    # All methods provided by default, define only those needing overrides
-    # Accessors access the storage in %{$_[0]};
-    # TIEHANDLE should return a reference to the actual storage
-    sub DELETE { ... }
-
-    package NewExtraHash;
-    require Tie::Hash;
-
-    @ISA = (Tie::ExtraHash);
-
-    # All methods provided by default, define only those needing overrides
-    # Accessors access the storage in %{$_[0][0]};
-    # TIEHANDLE should return an array reference with the first element being
-    # the reference to the actual storage 
-    sub DELETE { 
-      $_[0][1]->('del', $_[0][0], $_[1]); # Call the report writer
-      delete $_[0][0]->{$_[1]};		  #  $_[0]->SUPER::DELETE($_[1]) }
-
-
-    package main;
-
-    tie %new_hash, 'NewHash';
-    tie %new_std_hash, 'NewStdHash';
-    tie %new_extra_hash, 'NewExtraHash',
-	sub {warn "Doing \U$_[1]\E of $_[2].\n"};
-
-=head1 DESCRIPTION
-
-This module provides some skeletal methods for hash-tying classes. See
-L<perltie> for a list of the functions required in order to tie a hash
-to a package. The basic B<Tie::Hash> package provides a C<new> method, as well
-as methods C<TIEHASH>, C<EXISTS> and C<CLEAR>. The B<Tie::StdHash> and
-B<Tie::ExtraHash> packages
-provide most methods for hashes described in L<perltie> (the exceptions
-are C<UNTIE> and C<DESTROY>).  They cause tied hashes to behave exactly like standard hashes,
-and allow for selective overwriting of methods.  B<Tie::Hash> grandfathers the
-C<new> method: it is used if C<TIEHASH> is not defined
-in the case a class forgets to include a C<TIEHASH> method.
-
-For developers wishing to write their own tied hashes, the required methods
-are briefly defined below. See the L<perltie> section for more detailed
-descriptive, as well as example code:
-
-=over 4
-
-=item TIEHASH classname, LIST
-
-The method invoked by the command C<tie %hash, classname>. Associates a new
-hash instance with the specified class. C<LIST> would represent additional
-arguments (along the lines of L<AnyDBM_File> and compatriots) needed to
-complete the association.
-
-=item STORE this, key, value
-
-Store datum I<value> into I<key> for the tied hash I<this>.
-
-=item FETCH this, key
-
-Retrieve the datum in I<key> for the tied hash I<this>.
-
-=item FIRSTKEY this
-
-Return the first key in the hash.
-
-=item NEXTKEY this, lastkey
-
-Return the next key in the hash.
-
-=item EXISTS this, key
-
-Verify that I<key> exists with the tied hash I<this>.
-
-The B<Tie::Hash> implementation is a stub that simply croaks.
-
-=item DELETE this, key
-
-Delete the key I<key> from the tied hash I<this>.
-
-=item CLEAR this
-
-Clear all values from the tied hash I<this>.
-
-=back
-
-=head1 Inheriting from B<Tie::StdHash>
-
-The accessor methods assume that the actual storage for the data in the tied
-hash is in the hash referenced by C<tied(%tiedhash)>.  Thus overwritten
-C<TIEHANDLE> method should return a hash reference, and the remaining methods
-should operate on the hash referenced by the first argument:
-
-  package ReportHash;
-  our @ISA = 'Tie::StdHash';
-
-  sub TIEHASH  {
-    my $storage = bless {}, shift;
-    warn "New ReportHash created, stored in $storage.\n";
-    $storage
-  }
-  sub STORE    {
-    warn "Storing data with key $_[1] at $_[0].\n";
-    $_[0]{$_[1]} = $_[2]
-  }
-
-
-=head1 Inheriting from B<Tie::ExtraHash>
-
-The accessor methods assume that the actual storage for the data in the tied
-hash is in the hash referenced by C<(tied(%tiedhash))[0]>.  Thus overwritten
-C<TIEHANDLE> method should return an array reference with the first
-element being a hash reference, and the remaining methods should operate on the
-hash C<< %{ $_[0]->[0] } >>:
-
-  package ReportHash;
-  our @ISA = 'Tie::StdHash';
-
-  sub TIEHASH  {
-    my $storage = bless {}, shift;
-    warn "New ReportHash created, stored in $storage.\n";
-    [$storage, @_]
-  }
-  sub STORE    {
-    warn "Storing data with key $_[1] at $_[0].\n";
-    $_[0][0]{$_[1]} = $_[2]
-  }
-
-The default C<TIEHANDLE> method stores "extra" arguments to tie() starting
-from offset 1 in the array referenced by C<tied(%tiedhash)>; this is the
-same storage algorithm as in TIEHASH subroutine above.  Hence, a typical
-package inheriting from B<Tie::ExtraHash> does not need to overwrite this
-method.
-
-=head1 C<UNTIE> and C<DESTROY>
-
-The methods C<UNTIE> and C<DESTROY> are not defined in B<Tie::Hash>,
-B<Tie::StdHash>, or B<Tie::ExtraHash>.  Tied hashes do not require
-presense of these methods, but if defined, the methods will be called in
-proper time, see L<perltie>.
-
-If needed, these methods should be defined by the package inheriting from
-B<Tie::Hash>, B<Tie::StdHash>, or B<Tie::ExtraHash>.
-
-=head1 MORE INFORMATION
-
-The packages relating to various DBM-related implementations (F<DB_File>,
-F<NDBM_File>, etc.) show examples of general tied hashes, as does the
-L<Config> module. While these do not utilize B<Tie::Hash>, they serve as
-good working examples.
-
-=cut
-
-use Carp;
-use warnings::register;
-
-sub new {
-    my $pkg = shift;
-    $pkg->TIEHASH(@_);
-}
-
-# Grandfather "new"
-
-sub TIEHASH {
-    my $pkg = shift;
-    if (defined &{"${pkg}::new"}) {
-	warnings::warnif("WARNING: calling ${pkg}->new since ${pkg}->TIEHASH is missing");
-	$pkg->new(@_);
-    }
-    else {
-	croak "$pkg doesn't define a TIEHASH method";
-    }
-}
-
-sub EXISTS {
-    my $pkg = ref $_[0];
-    croak "$pkg doesn't define an EXISTS method";
-}
-
-sub CLEAR {
-    my $self = shift;
-    my $key = $self->FIRSTKEY(@_);
-    my @keys;
-
-    while (defined $key) {
-	push @keys, $key;
-	$key = $self->NEXTKEY(@_, $key);
-    }
-    foreach $key (@keys) {
-	$self->DELETE(@_, $key);
-    }
-}
-
-# The Tie::StdHash package implements standard perl hash behaviour.
-# It exists to act as a base class for classes which only wish to
-# alter some parts of their behaviour.
-
-package Tie::StdHash;
-# @ISA = qw(Tie::Hash);		# would inherit new() only
-
-sub TIEHASH  { bless {}, $_[0] }
-sub STORE    { $_[0]->{$_[1]} = $_[2] }
-sub FETCH    { $_[0]->{$_[1]} }
-sub FIRSTKEY { my $a = scalar keys %{$_[0]}; each %{$_[0]} }
-sub NEXTKEY  { each %{$_[0]} }
-sub EXISTS   { exists $_[0]->{$_[1]} }
-sub DELETE   { delete $_[0]->{$_[1]} }
-sub CLEAR    { %{$_[0]} = () }
-
-package Tie::ExtraHash;
-
-sub TIEHASH  { my $p = shift; bless [{}, @_], $p }
-sub STORE    { $_[0][0]{$_[1]} = $_[2] }
-sub FETCH    { $_[0][0]{$_[1]} }
-sub FIRSTKEY { my $a = scalar keys %{$_[0][0]}; each %{$_[0][0]} }
-sub NEXTKEY  { each %{$_[0][0]} }
-sub EXISTS   { exists $_[0][0]->{$_[1]} }
-sub DELETE   { delete $_[0][0]->{$_[1]} }
-sub CLEAR    { %{$_[0][0]} = () }
-
-1;
+package Tie::Hash;
+
+our $VERSION = '1.00';
+
+=head1 NAME
+
+Tie::Hash, Tie::StdHash, Tie::ExtraHash - base class definitions for tied hashes
+
+=head1 SYNOPSIS
+
+    package NewHash;
+    require Tie::Hash;
+
+    @ISA = (Tie::Hash);
+
+    sub DELETE { ... }		# Provides needed method
+    sub CLEAR { ... }		# Overrides inherited method
+
+
+    package NewStdHash;
+    require Tie::Hash;
+
+    @ISA = (Tie::StdHash);
+
+    # All methods provided by default, define only those needing overrides
+    # Accessors access the storage in %{$_[0]};
+    # TIEHANDLE should return a reference to the actual storage
+    sub DELETE { ... }
+
+    package NewExtraHash;
+    require Tie::Hash;
+
+    @ISA = (Tie::ExtraHash);
+
+    # All methods provided by default, define only those needing overrides
+    # Accessors access the storage in %{$_[0][0]};
+    # TIEHANDLE should return an array reference with the first element being
+    # the reference to the actual storage 
+    sub DELETE { 
+      $_[0][1]->('del', $_[0][0], $_[1]); # Call the report writer
+      delete $_[0][0]->{$_[1]};		  #  $_[0]->SUPER::DELETE($_[1]) }
+
+
+    package main;
+
+    tie %new_hash, 'NewHash';
+    tie %new_std_hash, 'NewStdHash';
+    tie %new_extra_hash, 'NewExtraHash',
+	sub {warn "Doing \U$_[1]\E of $_[2].\n"};
+
+=head1 DESCRIPTION
+
+This module provides some skeletal methods for hash-tying classes. See
+L<perltie> for a list of the functions required in order to tie a hash
+to a package. The basic B<Tie::Hash> package provides a C<new> method, as well
+as methods C<TIEHASH>, C<EXISTS> and C<CLEAR>. The B<Tie::StdHash> and
+B<Tie::ExtraHash> packages
+provide most methods for hashes described in L<perltie> (the exceptions
+are C<UNTIE> and C<DESTROY>).  They cause tied hashes to behave exactly like standard hashes,
+and allow for selective overwriting of methods.  B<Tie::Hash> grandfathers the
+C<new> method: it is used if C<TIEHASH> is not defined
+in the case a class forgets to include a C<TIEHASH> method.
+
+For developers wishing to write their own tied hashes, the required methods
+are briefly defined below. See the L<perltie> section for more detailed
+descriptive, as well as example code:
+
+=over 4
+
+=item TIEHASH classname, LIST
+
+The method invoked by the command C<tie %hash, classname>. Associates a new
+hash instance with the specified class. C<LIST> would represent additional
+arguments (along the lines of L<AnyDBM_File> and compatriots) needed to
+complete the association.
+
+=item STORE this, key, value
+
+Store datum I<value> into I<key> for the tied hash I<this>.
+
+=item FETCH this, key
+
+Retrieve the datum in I<key> for the tied hash I<this>.
+
+=item FIRSTKEY this
+
+Return the first key in the hash.
+
+=item NEXTKEY this, lastkey
+
+Return the next key in the hash.
+
+=item EXISTS this, key
+
+Verify that I<key> exists with the tied hash I<this>.
+
+The B<Tie::Hash> implementation is a stub that simply croaks.
+
+=item DELETE this, key
+
+Delete the key I<key> from the tied hash I<this>.
+
+=item CLEAR this
+
+Clear all values from the tied hash I<this>.
+
+=back
+
+=head1 Inheriting from B<Tie::StdHash>
+
+The accessor methods assume that the actual storage for the data in the tied
+hash is in the hash referenced by C<tied(%tiedhash)>.  Thus overwritten
+C<TIEHANDLE> method should return a hash reference, and the remaining methods
+should operate on the hash referenced by the first argument:
+
+  package ReportHash;
+  our @ISA = 'Tie::StdHash';
+
+  sub TIEHASH  {
+    my $storage = bless {}, shift;
+    warn "New ReportHash created, stored in $storage.\n";
+    $storage
+  }
+  sub STORE    {
+    warn "Storing data with key $_[1] at $_[0].\n";
+    $_[0]{$_[1]} = $_[2]
+  }
+
+
+=head1 Inheriting from B<Tie::ExtraHash>
+
+The accessor methods assume that the actual storage for the data in the tied
+hash is in the hash referenced by C<(tied(%tiedhash))[0]>.  Thus overwritten
+C<TIEHANDLE> method should return an array reference with the first
+element being a hash reference, and the remaining methods should operate on the
+hash C<< %{ $_[0]->[0] } >>:
+
+  package ReportHash;
+  our @ISA = 'Tie::StdHash';
+
+  sub TIEHASH  {
+    my $storage = bless {}, shift;
+    warn "New ReportHash created, stored in $storage.\n";
+    [$storage, @_]
+  }
+  sub STORE    {
+    warn "Storing data with key $_[1] at $_[0].\n";
+    $_[0][0]{$_[1]} = $_[2]
+  }
+
+The default C<TIEHANDLE> method stores "extra" arguments to tie() starting
+from offset 1 in the array referenced by C<tied(%tiedhash)>; this is the
+same storage algorithm as in TIEHASH subroutine above.  Hence, a typical
+package inheriting from B<Tie::ExtraHash> does not need to overwrite this
+method.
+
+=head1 C<UNTIE> and C<DESTROY>
+
+The methods C<UNTIE> and C<DESTROY> are not defined in B<Tie::Hash>,
+B<Tie::StdHash>, or B<Tie::ExtraHash>.  Tied hashes do not require
+presense of these methods, but if defined, the methods will be called in
+proper time, see L<perltie>.
+
+If needed, these methods should be defined by the package inheriting from
+B<Tie::Hash>, B<Tie::StdHash>, or B<Tie::ExtraHash>.
+
+=head1 MORE INFORMATION
+
+The packages relating to various DBM-related implementations (F<DB_File>,
+F<NDBM_File>, etc.) show examples of general tied hashes, as does the
+L<Config> module. While these do not utilize B<Tie::Hash>, they serve as
+good working examples.
+
+=cut
+
+use Carp;
+use warnings::register;
+
+sub new {
+    my $pkg = shift;
+    $pkg->TIEHASH(@_);
+}
+
+# Grandfather "new"
+
+sub TIEHASH {
+    my $pkg = shift;
+    if (defined &{"${pkg}::new"}) {
+	warnings::warnif("WARNING: calling ${pkg}->new since ${pkg}->TIEHASH is missing");
+	$pkg->new(@_);
+    }
+    else {
+	croak "$pkg doesn't define a TIEHASH method";
+    }
+}
+
+sub EXISTS {
+    my $pkg = ref $_[0];
+    croak "$pkg doesn't define an EXISTS method";
+}
+
+sub CLEAR {
+    my $self = shift;
+    my $key = $self->FIRSTKEY(@_);
+    my @keys;
+
+    while (defined $key) {
+	push @keys, $key;
+	$key = $self->NEXTKEY(@_, $key);
+    }
+    foreach $key (@keys) {
+	$self->DELETE(@_, $key);
+    }
+}
+
+# The Tie::StdHash package implements standard perl hash behaviour.
+# It exists to act as a base class for classes which only wish to
+# alter some parts of their behaviour.
+
+package Tie::StdHash;
+# @ISA = qw(Tie::Hash);		# would inherit new() only
+
+sub TIEHASH  { bless {}, $_[0] }
+sub STORE    { $_[0]->{$_[1]} = $_[2] }
+sub FETCH    { $_[0]->{$_[1]} }
+sub FIRSTKEY { my $a = scalar keys %{$_[0]}; each %{$_[0]} }
+sub NEXTKEY  { each %{$_[0]} }
+sub EXISTS   { exists $_[0]->{$_[1]} }
+sub DELETE   { delete $_[0]->{$_[1]} }
+sub CLEAR    { %{$_[0]} = () }
+
+package Tie::ExtraHash;
+
+sub TIEHASH  { my $p = shift; bless [{}, @_], $p }
+sub STORE    { $_[0][0]{$_[1]} = $_[2] }
+sub FETCH    { $_[0][0]{$_[1]} }
+sub FIRSTKEY { my $a = scalar keys %{$_[0][0]}; each %{$_[0][0]} }
+sub NEXTKEY  { each %{$_[0][0]} }
+sub EXISTS   { exists $_[0][0]->{$_[1]} }
+sub DELETE   { delete $_[0][0]->{$_[1]} }
+sub CLEAR    { %{$_[0][0]} = () }
+
+1;
diff --git a/lib/site/Tk/CursorControl.pm b/lib/site/Tk/CursorControl.pm
index 3ca1c0dc0..2f38d68ae 100644
--- a/lib/site/Tk/CursorControl.pm
+++ b/lib/site/Tk/CursorControl.pm
@@ -1,914 +1,914 @@
-package Tk::CursorControl;
-
-require 5.005_62;
-use Tk 800.015;
-use Carp;
-use strict;
-
-$Tk::CursorControl::VERSION = '0.4';
-
-my $AlreadyInit   = 0;
-my $CurrentObject = 0;
-my $Main;
-
-#Create Aliases to some public methods.
-*jail = \&confine;
-*free = \&release;
-*Show = \&show;
-
-Construct Tk::Widget 'CursorControl';
-
-sub new {
-  my ( $me, $parent ) = @_;
-  my $class = ref($me) || $me;
-  my $self = {};
-  bless $self => $class;
-
-  # provide access to class data
-  $self->{_Init}       = \$AlreadyInit;
-  $self->{_CurrentObj} = \$CurrentObject;
-
-  # set MainWindow reference in 'accessible' class data
-  $Main = $parent->MainWindow;
-  $parent->OnDestroy( sub { $self->DESTROY } );
-  $self->{MAIN} = \$Main if ( defined $Main );
-
-  if ( ${ $self->{_Init} } == 0 ) {
-    ++${ $self->{_Init} };
-    $self->_init;
-    ${ $self->{_CurrentObj} } =
-      $self;    #store object in case user tries to create two!
-    return $self;
-  }
-  else {
-    ++${ $self->{_Init} };    # DESTROY will be called, so increment anyway
-        # These error messages are now suppressed - JD October 13, 2003
-        # Thanks for the suggestion Ala.
-    ### carp "A $class object has ALREADY been created !";
-    ### carp "The object returned is the original object for $class";
-   # This means that either a module already called Tk::CursorControl on behalf
-   # of the user (i.e. via a 'use SomeModule' where the code within SomeModule
-   # creates a Tk::CursorControl object ---OR--- the programmer didn't read the
-   # documentation and tried to create two or more CursorControl objects for one
-   # MainWindow.
-    return ${ $self->{_CurrentObj} };    #return ORIGINALLY created object
-  }
-}
-
-# For erroneous understanding of this Class!
-sub _errmsg { croak "You cannot $_[1] a ", ref( $_[0] ); }
-
-########## Public NON-methods ##########
-# Just in case someone treats this like a Tk widget
-# Override geometry managers
-
-sub pack      { $_[0]->_errmsg('pack') }
-sub grid      { $_[0]->_errmsg('grid') }
-sub form      { $_[0]->_errmsg('form') }
-sub place     { $_[0]->_errmsg('place') }
-sub configure { $_[0]->_errmsg('configure') }
-sub cget      { $_[0]->_errmsg('cget') }
-
-########## Public Methods ##########
-sub confine {
-  my ( $self, $widget ) = @_;
-  unless ( defined $widget ) {
-    carp "\$cursor->confine(\$widget)";
-    return;
-  }
-
-  #free the cursor if already confined elsewhere
-  $self->release if ( $self->{Confined} );
-
-  #does the widget exist? is it mapped?
-  return unless ( $self->_check($widget) );
-
-  if ( $self->{Type} eq 'win32' ) {
-    $self->_Win32confine($widget);
-  }
-  else {
-
-    #Then $self->{Type} is the default 'unix'
-    $self->_Unixconfine($widget);
-  }
-}
-
-sub release {
-  my $self = shift;
-  if ( $self->{Type} eq 'win32' ) {
-    $self->_Win32release;
-  }
-  else {
-
-    #Then $self->{Type} is the default 'unix'
-    $self->_Unixrelease;
-  }
-}
-
-sub hide {
-  my $self = shift;
-  my $w;
-
-  foreach $w (@_) {
-
-    #bind to Enter and Leave Events
-    if ( $self->{Type} eq 'win32' ) {
-
- #Showcursor is a system-wide API - so we want to ensure that the cursor doesn't
- #disappear forever!
-      $self->_Win32saveBindings($w);
-      $self->_Win32setBindings($w);
-      $self->_Win32hidecursor;
-    }
-    else {
-      $self->_setOldCursor($w);
-      $w->configure( -cursor =>
-          [ '@' . $self->{bitmapfile}, $self->{maskfile}, 'black', 'white' ] );
-    }
-  }
-}
-
-sub show {
-  my $self = shift;
-
-  foreach my $w (@_) {
-
-    #delete bindings for hide Events for specified widget
-    if ( $self->{Type} eq 'win32' ) {
-      $self->_Win32restoreBindings($w);
-      $self->_Win32showcursor;
-    }
-    else {
-      my $cursor = $self->_getOldCursor($w);
-      $w->configure( -cursor => $cursor ) if ($cursor);
-    }
-  }
-}
-
-sub moveto {
-
-# Similar to the warpto sub. Instead - we always use the root window coordinates
-# So, all we are interested in is the starting x,y coordinates and the ending
-# x,y coordinates. Most of the code is a copy and paste from the warpto sub.
-
-  my $self = shift;
-  my $w;
-
-  #parse the time off the arguments...there has to be a better way!
-  my $movetime = 1000;    #default to 1 second (1000ms)
-  if ( grep /time/, @_ ) {
-    my $i = 0;
-    my $timefound;
-    map {
-      if (/time/) {
-        splice @_, $i, 1;
-        $timefound = pop(@_);
-        $movetime = $timefound if ( $timefound =~ /\d+/ );
-      }
-      $i++;
-    } @_;
-  }
-
-  #minimum time allowed
-  $movetime = 25 if ( $movetime < 25 );
-
-# Three ways of warping:
-# 1. Pass a widget reference - default warp the cursor to the center.
-# 2. Pass a widget reference and x,y value - warp the cursor to x,y of that widget.
-# 3. Pass only an x,y coordinate (with no widget reference) then it is treated like
-#    a screen coordinate.
-
-  my $finalx;
-  my $finaly;
-  my $startx = ${ $self->{MAIN} }->pointerx;
-  my $starty = ${ $self->{MAIN} }->pointery;
-
-  my $argnum = scalar(@_);
-  my $ref    = ref( $_[0] );
-  if ( $ref and $ref =~ /^Tk/ ) {
-    $w = shift;
-
-    # Does the widget exist and is it mapped?
-    return unless ( $self->_check($w) );
-
-    if ( $argnum == 1 ) {
-
-      #assume only a widget reference passed
-      $self->release if ( $self->{Confined} );
-
-      #Get ROOT coordinates of the final position
-      $finalx = $w->rootx + ( $w->width / 2 );
-      $finaly = $w->rooty + ( $w->height / 2 );
-
-    }
-    elsif ( $argnum == 3 ) {
-
-      #assume a widget reference AND x,y value passed
-      my $x = shift;
-      my $y = shift;
-
-      $self->release if ( $self->{Confined} );
-
-      #warp pointer to x,y coordinate relative to widgets NW corner
-      my $width  = $w->width;
-      my $height = $w->height;
-      $x = 0           if ( $x < 0 );
-      $x = $width - 1  if ( $x > $width );
-      $y = 0           if ( $y < 0 );
-      $y = $height - 1 if ( $y > $height );
-
-      $finalx = $w->rootx + $x;
-      $finaly = $w->rooty + $y;
-    }
-  }    #end if $widget is passed
-  elsif ( $argnum == 2 ) {
-
-    # Assume only an x,y value passed..
-
-    my $X = shift;
-    my $Y = shift;
-
-    $self->release if ( $self->{Confined} );
-
-# Sanity check - don't warp beyond the screen. The window managers won't let you
-# anyways - but we might as well not try!
-    my $sw = ${ $self->{MAIN} }->screenwidth;
-    my $sh = ${ $self->{MAIN} }->screenheight;
-
-    $X = 0   if ( $X < 0 );
-    $Y = 0   if ( $Y < 0 );
-    $X = $sw if ( $X > $sw );
-    $Y = $sh if ( $Y > $sh );
-
-    $finalx = $X;
-    $finaly = $Y;
-
-  }
-
-  return unless ( defined $finalx and defined $finaly );
-
-  #finally "move" the cursor (based on time passed)
-  my $denom  = $movetime / 25;
-  my $deltax = ( $finalx - $startx ) / $denom;
-  my $deltay = ( $finaly - $starty ) / $denom;
-  my $interx = $startx;
-  my $intery = $starty;
-  for ( my $i = 1 ; $i <= $denom ; $i++ ) {
-    $interx = $interx + $deltax;
-    $intery = $intery + $deltay;
-    $self->warpto( $interx, $intery );
-    ${ $self->{MAIN} }->update;
-
-    # Blocking is actually a good thing here.
-    ${ $self->{MAIN} }->after(25);
-  }
-
-  # Now make sure we end up where we originally wanted !
-  # Round off errors may have crept in.
-  $self->warpto( $finalx, $finaly );
-
-}
-
-sub warpto {
-
-  my $self = shift;
-  my $w;
-
-# Three ways of warping:
-# 1. Pass a widget reference - default warp the cursor to the center.
-# 2. Pass a widget reference and x,y value - warp the cursor to x,y of that widget.
-# 3. Pass only an x,y coordinate (with no widget reference) then it is treated like
-#    a screen coordinate.
-
-  my $argnum = scalar(@_);
-  my $ref    = ref( $_[0] );
-  if ( $ref and $ref =~ /^Tk/ ) {
-    $w = shift;
-
-    # Does the widget exist and is it mapped?
-    return unless ( $self->_check($w) );
-
-    if ( $argnum == 1 ) {
-
-      #assume only a widget reference passed
-      $self->release if ( $self->{Confined} );
-
-      #warp pointer to the center of the widget
-      my $x = ( $w->width / 2 );
-      my $y = ( $w->height / 2 );
-
-      $w->eventGenerate(
-        "<Motion>",
-        -when => 'head',
-        -x    => $x,
-        -y    => $y,
-        -warp => 1
-      );
-    }
-    elsif ( $argnum == 3 ) {
-
-      #assume a widget reference AND x,y value passed
-      my $x = shift;
-      my $y = shift;
-
-      $self->release if ( $self->{Confined} );
-
-      #warp pointer to x,y coordinate relative to widgets NW corner
-      my $width  = $w->width;
-      my $height = $w->height;
-      $x = 0           if ( $x < 0 );
-      $x = $width - 1  if ( $x > $width );
-      $y = 0           if ( $y < 0 );
-      $y = $height - 1 if ( $y > $height );
-
-      $w->eventGenerate(
-        "<Motion>",
-        -when => 'head',
-        -x    => $x,
-        -y    => $y,
-        -warp => 1
-      );
-    }
-  }    #end if $widget is passed
-  elsif ( $argnum == 2 ) {
-
-# Assume only an x,y value passed..
-# Warp to specific screen coordinates. There is no way to do this outright using
-# eventGenerate...at least "I" couldn't find one.
-# So we use the rootx and rooty of the MainWindow as our anchor position.
-# and we might end up actually warping to negative values of x and y.
-
-    my $X = shift;
-    my $Y = shift;
-
-    $self->release if ( $self->{Confined} );
-
-    # works on windows even if iconified - check on unix. Maybe not needed!!
-    # return unless ( $self->_check(${$self->{MAIN}}) );
-
-# Sanity check - don't warp beyond the screen. The window managers won't let you
-# anyways - but we might as well not try!
-    my $sw = ${ $self->{MAIN} }->screenwidth;
-    my $sh = ${ $self->{MAIN} }->screenheight;
-
-    $X = 0   if ( $X < 0 );
-    $Y = 0   if ( $Y < 0 );
-    $X = $sw if ( $X > $sw );
-    $Y = $sh if ( $Y > $sh );
-
-    my $x = $X - ${ $self->{MAIN} }->rootx;
-    my $y = $Y - ${ $self->{MAIN} }->rooty;
-
-    ${ $self->{MAIN} }->eventGenerate(
-      "<Motion>",
-      -when => 'head',
-      -x    => $x,
-      -y    => $y,
-      -warp => 1
-    );
-  }
-
-}
-
-sub destroy { shift->DESTROY }
-
-############# Private methods ##################
-sub _check {
-  my ( $self, $w ) = @_;
-  my $ok = 1;
-  unless ( $ok = Exists($w) ) {
-    carp "Widget $w: Does not exist!";
-  }
-  unless ( $ok = $w->viewable ) {
-    carp "Widget $w: is not mapped";
-  }
-  return $ok;
-}
-
-sub _getposition {
-
-  #return the top left corner and width/height of widget passed.
-  my ( $self, $w ) = @_;
-  my $x0     = $w->rootx;
-  my $y0     = $w->rooty;
-  my $width  = $w->width;
-  my $height = $w->height;
-
-  return ( $x0, $y0, $width, $height );
-}
-
-sub _getbbox {
-
-  #return the absolute screen coordinates (i.e. bbox)
-  my ( $self, $w ) = @_;
-  my @c = $self->_getposition($w);
-  return ( $c[0], $c[1], $c[0] + $c[2], $c[1] + $c[3] );
-}
-
-sub _init {
-  my $self = shift;
-
-  $self->{Type} = 'unix';    #default to 'perl based' cursor confine
-
-  if ( $Tk::platform eq 'MSWin32' ) {
-    if ( eval "require Win32::API" ) {
-
-      #Create API's
-      $self->{ClipCursor} =
-        Win32::API->new( 'user32', 'ClipCursor', ['P'], 'N' );
-      $self->{ShowCursor} =
-        Win32::API->new( 'user32', 'ShowCursor', ['N'], 'N' );
-      $self->{Type} = 'win32' if ( $self->{ClipCursor} && $self->{ShowCursor} );
-      $self->{DisplayCount} = 0;
-      return if $self->{Type} eq 'win32';
-      croak "Creating API objects failed for unknown reason";
-    }
-    else {
-      croak "Please install Win32::API !!";
-    }
-  }
-  else {
-
-    #retrieve proper filenames for transparent cursor for *NIX..
-    $self->{bitmapfile} = Tk->findINC('trans_cur.xbm');
-    $self->{maskfile}   = Tk->findINC('trans_cur.mask');
-    croak "Files for tranparent cursor not found"
-      unless ( $self->{bitmapfile} && $self->{maskfile} );
-  }
-}
-
-####### On Unix Only #############
-sub _setOldCursor {
-
-  #save the current cursor on a ->hide command
-  my ( $self, $w ) = @_;
-  my $oldcursor = $w->cget('-cursor') || 'left_ptr';
-  $self->{OldCursor}{$w} = $oldcursor if ($oldcursor);
-}
-
-sub _getOldCursor {
-
-  #get saved cursor on a ->show command
-  my ( $self, $w ) = @_;
-  my $cursor = $self->{OldCursor}{$w};
-  delete $self->{OldCursor}{$w};
-  return ($cursor);
-}
-
-sub _Unixconfine {
-  my ( $self, $w ) = @_;
-  my @coords = $self->_getposition($w);
-
-# Stop Class <Leave> bindings from being triggered - as a Leave should NEVER occur
-# Why? Because the cursor is 'supposed' to be confined to the widget! Since this
-# event 'will' still occur we Tk->break it before the Class binding occurs.
-# An example if we did not do this (and I know from testing) is: a Button relief rapidly
-# changing between sunken and normal to causing massive flickering
-
-# Also - We cannot guarantee a Motion binding will get triggered for the passed widget.
-# Instead we overwrite the Motion binding for the toplevel containg $widget. This virtually
-# guarantees (fingers crossed) that a proper Motion binding exists. Of course the Leave
-# event must stay with the passed $widget.
-
-  my @bindtags = $w->bindtags;
-  $w->bindtags( [ @bindtags[ 1, 0, 2, 3 ] ] );
-
-  #Save current leave binding..if there is one
-  my $old_leave;
-  my $old_motion;
-  eval { $old_leave  = $w->Tk::bind('<Any-Leave>') };
-  eval { $old_motion = $w->toplevel->bind('<Motion>') };
-  ( defined $old_leave )
-    ? ( $self->{OldLeave} = $old_leave )
-    : ( $self->{OldLeave} = 0 );
-  ( defined $old_motion )
-    ? ( $self->{OldMotion} = $old_motion )
-    : ( $self->{OldMotion} = 0 );
-
-  $w->Tk::bind( '<Any-Leave>', sub { $_[0]->break } );
-
-  $w->toplevel->bind(
-    '<Motion>',
-    sub {
-      $self->{OldMotion}->Call if ( $self->{OldMotion} );
-      $self->_warpToConfine( $w, @coords );
-    }
-  );
-  $self->{Confined} = $w;
-}
-
-sub _Unixrelease {
-  my $self = shift;
-
-  #Restore proper bindtag order for widget..
-  return unless $self->{Confined};
-  my @bindtags = $self->{Confined}->bindtags;
-  $self->{Confined}->bindtags( [ @bindtags[ 1, 0, 2, 3 ] ] );
-
-  ( $self->{OldLeave} )
-    ? ( $self->{Confined}->Tk::bind( '<Any-Leave>', $self->{OldLeave} ) )
-    : ( $self->{Confined}->Tk::bind( '<Any-Leave>', '' ) );
-  ( $self->{OldMotion} )
-    ? ( $self->{Confined}->toplevel->bind( '<Motion>', $self->{OldMotion} ) )
-    : ( $self->{Confined}->toplevel->bind( '<Motion>', '' ) );
-
-  $self->{Confined} = 0;
-}
-
-sub _warpToConfine {
-  my ( $self, $w, $x0, $y0, $wi, $he ) = @_;
-
-  my $e = $w->XEvent;
-  my ( $x, $y ) = ( $e->x, $e->y );
-
-  my $warpneeded = 0;
-
-  if ( $x <= 0 ) {
-    $x          = 1;
-    $warpneeded = 1;
-  }
-  elsif ( $x >= $wi ) {
-    $x          = $wi - 1;
-    $warpneeded = 1;
-  }
-
-  if ( $y <= 0 ) {
-    $y          = 1;
-    $warpneeded = 1;
-  }
-  elsif ( $y >= $he ) {
-    $y          = $he - 1;
-    $warpneeded = 1;
-  }
-
-  if ($warpneeded) {
-    $w->eventGenerate(
-      "<Motion>",
-      -when => 'head',
-      -x    => $x,
-      -y    => $y,
-      -warp => 1
-    );
-  }
-}
-
-########### On Win32 Only #############
-sub _Win32confine {
-  my ( $self, $w ) = @_;
-  my @coords = $self->_getbbox($w);
-
-  my $rect = CORE::pack "L4", @coords;
-
-  if ( defined $self->{ClipCursor} ) {
-    $self->{ClipCursor}->Call($rect);
-    $self->{Confined} = 1;
-  }
-}
-
-sub _Win32release {
-  my $self = shift;
-  my $null = 0;
-  if ( defined $self->{ClipCursor} ) {
-    $self->{ClipCursor}->Call($null);
-    $self->{Confined} = 0;
-  }
-}
-
-sub _Win32saveBindings {
-  my ( $self, $w ) = @_;
-
-  # Save current Enter, Leave and Unmap bindings..if there are any
-  # Fully specify Tk::bind in case of a canvas widget.
-  my $old_leave;
-  my $old_enter;
-  my $old_unmap;
-  eval { $old_leave = $w->Tk::bind('<Leave>') };
-  eval { $old_enter = $w->Tk::bind('<Enter>') };
-  eval { $old_unmap = $w->Tk::bind('<Unmap>') };
-  ( defined $old_leave )
-    ? ( $self->{Win32Leave}{$w} = $old_leave )
-    : ( $self->{Win32Leave}{$w} = 0 );
-  ( defined $old_enter )
-    ? ( $self->{Win32Enter}{$w} = $old_enter )
-    : ( $self->{Win32Enter}{$w} = 0 );
-  ( defined $old_unmap )
-    ? ( $self->{Win32Unmap}{$w} = $old_unmap )
-    : ( $self->{Win32Unmap}{$w} = 0 );
-}
-
-sub _Win32setBindings {
-  my ( $self, $w ) = @_;
-  $w->Tk::bind(
-    '<Enter>',
-    sub {
-      $self->{Win32Enter}{$w}->Call if ( $self->{Win32Enter}{$w} );
-      $self->_Win32hidecursor;
-    }
-  );
-  $w->Tk::bind(
-    '<Leave>',
-    sub {
-      $self->{Win32Leave}{$w}->Call if ( $self->{Win32Leave}{$w} );
-      $self->_Win32showcursor;
-    }
-  );
-
-  #ensure cursor gets shown again if widget disappears..
-  $w->Tk::bind(
-    '<Unmap>',
-    sub {
-      $self->{Win32Unmap}{$w}->Call if ( $self->{Win32Unmap}{$w} );
-      $self->_Win32showcursor;
-    }
-  );
-}
-
-sub _Win32restoreBindings {
-  my ( $self, $w ) = @_;
-  ( $self->{Win32Enter}{$w} )
-    ? ( $w->Tk::bind( '<Enter>', $self->{Win32Enter}{$w} ) )
-    : ( $w->Tk::bind( '<Enter>', '' ) );
-  ( $self->{Win32Leave}{$w} )
-    ? ( $w->Tk::bind( '<Leave>', $self->{Win32Leave}{$w} ) )
-    : ( $w->Tk::bind( '<Leave>', '' ) );
-  ( $self->{Win32Unmap}{$w} )
-    ? ( $w->Tk::bind( '<Unmap>', $self->{Win32Unmap}{$w} ) )
-    : ( $w->Tk::bind( '<Unmap>', '' ) );
-}
-
-sub _Win32hidecursor {
-  my $self = shift;
-  $self->_Win32resetDisplayCount;
-  $self->{DisplayCount} = $self->{ShowCursor}->Call(0);
-}
-
-sub _Win32showcursor {
-  my $self = shift;
-  $self->_Win32resetDisplayCount;
-  $self->{DisplayCount} = $self->{ShowCursor}->Call(1);
-}
-
-sub _Win32resetDisplayCount {
-  my $self = shift;
-
-  #Decrement display count to get ready for a hide. i.e. set count to 0.
-  if ( $self->{DisplayCount} > 0 ) {
-    my $count = $self->{DisplayCount};
-    for ( my $i = $count ; $i > 0 ; $i-- ) {
-      $self->{DisplayCount} = $self->{ShowCursor}->Call(0);
-    }
-  }
-
-  #Increment display count to get ready for a show. i.e. set count to -1.
-  elsif ( $self->{DisplayCount} < 0 ) {
-    my $count = $self->{DisplayCount};
-    for ( my $i = $count ; $i < -1 ; $i++ ) {
-      $self->{DisplayCount} = $self->{ShowCursor}->Call(1);
-    }
-  }
-}
-
-########################################
-sub DESTROY {
-  my $self = shift;
-  $self->release;
-  ##carp "DESTROY CALLED ON $self";
-  --${ $self->{_Init} };    #decrement initialize value
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Tk::CursorControl - Manipulate the mouse cursor programmatically
-
-=head1 SYNOPSIS
-
-    use Tk::CursorControl;
-    $cursor = $main->CursorControl;
-
-    # Lock the mouse cursor to $widget
-    $cursor->confine($widget);
-
-    # Free the cursor
-    $cursor->release;
-
-    # cursor disappears over $widget
-    $cursor->hide($widget);
-
-    # show cursor again over $widget
-    $cursor->show($widget);
-
-    # warp cursor to $widget (jump)
-    $cursor->warpto($widget);
-
-    # move cursor to $widget
-    $cursor->moveto($widget);
-
-=head1 DESCRIPTION
-
-B<Tk::CursorControl> is-B<NOT>-a Tk::Widget.
-Rather, it I<uses> Tk and encompasses a collection of methods
-used to manipulate the cursor I<(aka pointer)> programmatically
-from a Tk program.
-
-=head1 STANDARD OPTIONS
-
-B<Tk::CursorControl> does I<not> accept any standard options
-
-=head1 METHODS
-
-The following methods are available:
-
-=over 4
-
-=item I<$cursor>-E<gt>B<confine>( $widget )
-
-Confine the cursor to stay within the bounding box of $widget.
-
-=over 4
-
-=item I<$cursor>-E<gt>B<jail>( $widget )
-
-Alias for the B<confine> method.
-
-=back
-
-=item I<$cursor>-E<gt>B<release>
-
-Release the cursor. Used to restore proper cursor functionality
-after a confine. Note: I<$widget> does B<not> need to be specified.
-
-=over 4
-
-=item I<$cursor>-E<gt>B<free>
-
-Alias for the B<release> method.
-
-=back
-
-=item I<$cursor>-E<gt>B<hide>( @widgets )
-
-Make cursor I<invisible> over each widget in @widgets.
-
-=item I<$cursor>-E<gt>B<show>( @widgets )
-
-Make cursor I<visible> over each widget in @widgets. This is used after a B<hide>.
-B<Note: S>how (capital S) can be used as well.
-
-=item I<$cursor>-E<gt>B<warpto>( $widget I<?x,y?>)
-
-Warp the cursor to the specified I<(?x,y?)> position in $widget. If the x,y values
-are not specified, then the I<center> of the widget is used as the target.
-
-OR
-
-=item I<$cursor>-E<gt>B<warpto>( X,Y )
-
-Warp the cursor to the specified I<X,Y> screen coordinate.
-
-=item I<$cursor>-E<gt>B<moveto>( $widget I<?x,y?>, -time=E<gt>I<integer in milliseconds>)
-
-Move the cursor to the specified I<(?x,y?)> position in $widget in I<-time> milliseconds.
-If the x,y values are not specified, then the I<center> of the widget is used as the
-target. The -time value defaults to 1000ms (1 second) if not specified. The smaller the
-time, the faster the cursor will move. The time given will not be exact. See bugs below.
-
-OR
-
-=item I<$cursor>-E<gt>B<moveto>( X,Y, -time=E<gt>I<integer in milliseconds>)
-
-Move the cursor to the specified I<X,Y> screen coordinate in I<-time> milliseconds.
-The -time value defaults to 1000ms (1 second) if not specified. The smaller the
-time, the faster the cursor will move. The time given will not be exact. See bugs below.
-
-=back
-
-=head1 DEPENDENCIES
-
-B<Win32::API> is required on Win32 systems.
-
-=head1 POSSIBLE USES
-
-Don't e-mail me to debate whether or not a program I<should> warp or 
-hide a cursor. I will give you a few instances where "I think" a
-module like this could come in handy.
-
-1. Confining a canvas item to remain within the Canvas boundaries
-on a move. See the cursor demonstration in 'widget'.
-
-2. Giving the user some 'leeway' on clicking near an item. Say,
-clicking on the picture of a thermometer, warps the cursor to a
-Tk::Scale (right beside it) which actually controls that thermometer.
-
-3. Confining a window within another window (Tk::MDI should be
-upgraded to 'use Tk::CursorControl')
-
-4. A step by step, show and tell session on 'How to use this GUI'.
-
-5. Make the cursor disappear for a keyboard only Tk::Canvas game.
-
-The key to using this module properly, is subtlety! Don't start making
-the cursor warp all over the screen or making it disappear sporadically.
-That is a misuse of the functionality.
-
-For some 'real world' applications which already have these types of
-functionality, see any Multiple Document Interface (MDI); such as in
-Excel or Word). Also have a look at the Win32 color chooser. The cursor
-will be confined to the color palette while the button is pressed. Also,
-try clicking on the gradient bar to the right of the palette. See what
-happens to the mouse cursor?!
-I'll bet you didn't even know that this existed until now.
-
-If you discover another good use for this module, I would definitely
-like to hear about it ! I<That> is the type of e-mail I would welcome.
-
-=head1 BUGS & IDIOSYNCRASIES
-
-B<Take ONE please!>
-
-B<Tk::CursorControl> only allows ONE object per MainWindow! If you try
-to create more than one, B<only the first object created will be returned>.
-This will also be true if using a widget or module which already defines
-a Tk::CursorControl object.
-
-B<Bindings>
-
-B<Tk::CursorControl> internally generates E<lt>EnterE<gt>,
-E<lt>LeaveE<gt> and E<lt>MotionE<gt> bindings for the I<$widget>
-passed. Any user-defined bindings of the same type for I<$widget>
-should I<still> get executed. This feature has not been completely
-tested.
-
-B<Win32>
-
-This module makes heavy use of the ShowCursor and ClipCursor API's on 
-Win32. Be aware that when you change a cursor using the API, you
-are doing so for your entire system. You, (the programmer) are
-responsible for generating the show/hide and confine/release commands
-in the proper order.
-
-For every hide - you I<*will*> want a show. For every confine - you
-I<*should*> have a release. There are cautionary measures built-in
-to ensure that the cursor doesn't disappear forever or get locked
-within a widget.
-
-i.e. A B<release> is automatically called if you try to confine
-the cursor to two widgets at the same time.
-
-In other words, the last B<confine> always wins!
-
-B<Unix>
-
-The methods for hiding and confining the cursor on Unix-based systems
-is different than for Win32.
-
-A blank cursor is defined using the Tk::Widget configure method for
-each widget passed. Two files have been provided for this purpose in
-the installation - I<trans_cur.xbm> and I<trans_cur.mask>. These files
-must exist under a B<Tk-E<gt>FindINC> directory.
-
-Confining a cursor on *nix does I<not> use any sort of API or Xlib
-calls. Motion events are generated on the toplevel window to confine
-the cursor to the proper widget. On slow systems, this will make the
-cursor I<look> like it is attached to the widget sides with a spring.
-On faster systems, while still there, this I<bouncing> type action
-is much less noticible.
-
-B<moveto>
-
-The time parameter passed to a moveto method will not be exact. The
-reason for this is because a crude L<Tk::After|Tk::After> command is
-used to I<wait> for a very short period. You will find that the
-actual time taken for the cursor to stop is alway slightly B<more>
-than the time you specified. This time difference will be greater
-on slower computers. The time error will also increase for higher
-time values.
-
-B<Other>
-
-Warping the cursor will cause problems for users of absolute location
-pointing devices (like graphics tablets). Users of graphics tablets
-should B<not> use this module.
-
-=head1 AUTHOR
-
-B<Jack Dunnigan> <dunniganj@cpan.org>.
-
-Copyright (c) 2002-2004 Jack Dunnigan. All rights reserved.
-
-This program is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-My thanks to Tk gurus Steve Lidie and Slaven Rezic for their suggestions
-and their patches. This is my first module on CPAN and I appreciate
-their help. Thanks to Ala Qumsieh for utilizing the power of my module
-in L<Tk::Toolbar|Tk::Toolbar>.
-
-=cut
-
-
-
-
+package Tk::CursorControl;
+
+require 5.005_62;
+use Tk 800.015;
+use Carp;
+use strict;
+
+$Tk::CursorControl::VERSION = '0.4';
+
+my $AlreadyInit   = 0;
+my $CurrentObject = 0;
+my $Main;
+
+#Create Aliases to some public methods.
+*jail = \&confine;
+*free = \&release;
+*Show = \&show;
+
+Construct Tk::Widget 'CursorControl';
+
+sub new {
+  my ( $me, $parent ) = @_;
+  my $class = ref($me) || $me;
+  my $self = {};
+  bless $self => $class;
+
+  # provide access to class data
+  $self->{_Init}       = \$AlreadyInit;
+  $self->{_CurrentObj} = \$CurrentObject;
+
+  # set MainWindow reference in 'accessible' class data
+  $Main = $parent->MainWindow;
+  $parent->OnDestroy( sub { $self->DESTROY } );
+  $self->{MAIN} = \$Main if ( defined $Main );
+
+  if ( ${ $self->{_Init} } == 0 ) {
+    ++${ $self->{_Init} };
+    $self->_init;
+    ${ $self->{_CurrentObj} } =
+      $self;    #store object in case user tries to create two!
+    return $self;
+  }
+  else {
+    ++${ $self->{_Init} };    # DESTROY will be called, so increment anyway
+        # These error messages are now suppressed - JD October 13, 2003
+        # Thanks for the suggestion Ala.
+    ### carp "A $class object has ALREADY been created !";
+    ### carp "The object returned is the original object for $class";
+   # This means that either a module already called Tk::CursorControl on behalf
+   # of the user (i.e. via a 'use SomeModule' where the code within SomeModule
+   # creates a Tk::CursorControl object ---OR--- the programmer didn't read the
+   # documentation and tried to create two or more CursorControl objects for one
+   # MainWindow.
+    return ${ $self->{_CurrentObj} };    #return ORIGINALLY created object
+  }
+}
+
+# For erroneous understanding of this Class!
+sub _errmsg { croak "You cannot $_[1] a ", ref( $_[0] ); }
+
+########## Public NON-methods ##########
+# Just in case someone treats this like a Tk widget
+# Override geometry managers
+
+sub pack      { $_[0]->_errmsg('pack') }
+sub grid      { $_[0]->_errmsg('grid') }
+sub form      { $_[0]->_errmsg('form') }
+sub place     { $_[0]->_errmsg('place') }
+sub configure { $_[0]->_errmsg('configure') }
+sub cget      { $_[0]->_errmsg('cget') }
+
+########## Public Methods ##########
+sub confine {
+  my ( $self, $widget ) = @_;
+  unless ( defined $widget ) {
+    carp "\$cursor->confine(\$widget)";
+    return;
+  }
+
+  #free the cursor if already confined elsewhere
+  $self->release if ( $self->{Confined} );
+
+  #does the widget exist? is it mapped?
+  return unless ( $self->_check($widget) );
+
+  if ( $self->{Type} eq 'win32' ) {
+    $self->_Win32confine($widget);
+  }
+  else {
+
+    #Then $self->{Type} is the default 'unix'
+    $self->_Unixconfine($widget);
+  }
+}
+
+sub release {
+  my $self = shift;
+  if ( $self->{Type} eq 'win32' ) {
+    $self->_Win32release;
+  }
+  else {
+
+    #Then $self->{Type} is the default 'unix'
+    $self->_Unixrelease;
+  }
+}
+
+sub hide {
+  my $self = shift;
+  my $w;
+
+  foreach $w (@_) {
+
+    #bind to Enter and Leave Events
+    if ( $self->{Type} eq 'win32' ) {
+
+ #Showcursor is a system-wide API - so we want to ensure that the cursor doesn't
+ #disappear forever!
+      $self->_Win32saveBindings($w);
+      $self->_Win32setBindings($w);
+      $self->_Win32hidecursor;
+    }
+    else {
+      $self->_setOldCursor($w);
+      $w->configure( -cursor =>
+          [ '@' . $self->{bitmapfile}, $self->{maskfile}, 'black', 'white' ] );
+    }
+  }
+}
+
+sub show {
+  my $self = shift;
+
+  foreach my $w (@_) {
+
+    #delete bindings for hide Events for specified widget
+    if ( $self->{Type} eq 'win32' ) {
+      $self->_Win32restoreBindings($w);
+      $self->_Win32showcursor;
+    }
+    else {
+      my $cursor = $self->_getOldCursor($w);
+      $w->configure( -cursor => $cursor ) if ($cursor);
+    }
+  }
+}
+
+sub moveto {
+
+# Similar to the warpto sub. Instead - we always use the root window coordinates
+# So, all we are interested in is the starting x,y coordinates and the ending
+# x,y coordinates. Most of the code is a copy and paste from the warpto sub.
+
+  my $self = shift;
+  my $w;
+
+  #parse the time off the arguments...there has to be a better way!
+  my $movetime = 1000;    #default to 1 second (1000ms)
+  if ( grep /time/, @_ ) {
+    my $i = 0;
+    my $timefound;
+    map {
+      if (/time/) {
+        splice @_, $i, 1;
+        $timefound = pop(@_);
+        $movetime = $timefound if ( $timefound =~ /\d+/ );
+      }
+      $i++;
+    } @_;
+  }
+
+  #minimum time allowed
+  $movetime = 25 if ( $movetime < 25 );
+
+# Three ways of warping:
+# 1. Pass a widget reference - default warp the cursor to the center.
+# 2. Pass a widget reference and x,y value - warp the cursor to x,y of that widget.
+# 3. Pass only an x,y coordinate (with no widget reference) then it is treated like
+#    a screen coordinate.
+
+  my $finalx;
+  my $finaly;
+  my $startx = ${ $self->{MAIN} }->pointerx;
+  my $starty = ${ $self->{MAIN} }->pointery;
+
+  my $argnum = scalar(@_);
+  my $ref    = ref( $_[0] );
+  if ( $ref and $ref =~ /^Tk/ ) {
+    $w = shift;
+
+    # Does the widget exist and is it mapped?
+    return unless ( $self->_check($w) );
+
+    if ( $argnum == 1 ) {
+
+      #assume only a widget reference passed
+      $self->release if ( $self->{Confined} );
+
+      #Get ROOT coordinates of the final position
+      $finalx = $w->rootx + ( $w->width / 2 );
+      $finaly = $w->rooty + ( $w->height / 2 );
+
+    }
+    elsif ( $argnum == 3 ) {
+
+      #assume a widget reference AND x,y value passed
+      my $x = shift;
+      my $y = shift;
+
+      $self->release if ( $self->{Confined} );
+
+      #warp pointer to x,y coordinate relative to widgets NW corner
+      my $width  = $w->width;
+      my $height = $w->height;
+      $x = 0           if ( $x < 0 );
+      $x = $width - 1  if ( $x > $width );
+      $y = 0           if ( $y < 0 );
+      $y = $height - 1 if ( $y > $height );
+
+      $finalx = $w->rootx + $x;
+      $finaly = $w->rooty + $y;
+    }
+  }    #end if $widget is passed
+  elsif ( $argnum == 2 ) {
+
+    # Assume only an x,y value passed..
+
+    my $X = shift;
+    my $Y = shift;
+
+    $self->release if ( $self->{Confined} );
+
+# Sanity check - don't warp beyond the screen. The window managers won't let you
+# anyways - but we might as well not try!
+    my $sw = ${ $self->{MAIN} }->screenwidth;
+    my $sh = ${ $self->{MAIN} }->screenheight;
+
+    $X = 0   if ( $X < 0 );
+    $Y = 0   if ( $Y < 0 );
+    $X = $sw if ( $X > $sw );
+    $Y = $sh if ( $Y > $sh );
+
+    $finalx = $X;
+    $finaly = $Y;
+
+  }
+
+  return unless ( defined $finalx and defined $finaly );
+
+  #finally "move" the cursor (based on time passed)
+  my $denom  = $movetime / 25;
+  my $deltax = ( $finalx - $startx ) / $denom;
+  my $deltay = ( $finaly - $starty ) / $denom;
+  my $interx = $startx;
+  my $intery = $starty;
+  for ( my $i = 1 ; $i <= $denom ; $i++ ) {
+    $interx = $interx + $deltax;
+    $intery = $intery + $deltay;
+    $self->warpto( $interx, $intery );
+    ${ $self->{MAIN} }->update;
+
+    # Blocking is actually a good thing here.
+    ${ $self->{MAIN} }->after(25);
+  }
+
+  # Now make sure we end up where we originally wanted !
+  # Round off errors may have crept in.
+  $self->warpto( $finalx, $finaly );
+
+}
+
+sub warpto {
+
+  my $self = shift;
+  my $w;
+
+# Three ways of warping:
+# 1. Pass a widget reference - default warp the cursor to the center.
+# 2. Pass a widget reference and x,y value - warp the cursor to x,y of that widget.
+# 3. Pass only an x,y coordinate (with no widget reference) then it is treated like
+#    a screen coordinate.
+
+  my $argnum = scalar(@_);
+  my $ref    = ref( $_[0] );
+  if ( $ref and $ref =~ /^Tk/ ) {
+    $w = shift;
+
+    # Does the widget exist and is it mapped?
+    return unless ( $self->_check($w) );
+
+    if ( $argnum == 1 ) {
+
+      #assume only a widget reference passed
+      $self->release if ( $self->{Confined} );
+
+      #warp pointer to the center of the widget
+      my $x = ( $w->width / 2 );
+      my $y = ( $w->height / 2 );
+
+      $w->eventGenerate(
+        "<Motion>",
+        -when => 'head',
+        -x    => $x,
+        -y    => $y,
+        -warp => 1
+      );
+    }
+    elsif ( $argnum == 3 ) {
+
+      #assume a widget reference AND x,y value passed
+      my $x = shift;
+      my $y = shift;
+
+      $self->release if ( $self->{Confined} );
+
+      #warp pointer to x,y coordinate relative to widgets NW corner
+      my $width  = $w->width;
+      my $height = $w->height;
+      $x = 0           if ( $x < 0 );
+      $x = $width - 1  if ( $x > $width );
+      $y = 0           if ( $y < 0 );
+      $y = $height - 1 if ( $y > $height );
+
+      $w->eventGenerate(
+        "<Motion>",
+        -when => 'head',
+        -x    => $x,
+        -y    => $y,
+        -warp => 1
+      );
+    }
+  }    #end if $widget is passed
+  elsif ( $argnum == 2 ) {
+
+# Assume only an x,y value passed..
+# Warp to specific screen coordinates. There is no way to do this outright using
+# eventGenerate...at least "I" couldn't find one.
+# So we use the rootx and rooty of the MainWindow as our anchor position.
+# and we might end up actually warping to negative values of x and y.
+
+    my $X = shift;
+    my $Y = shift;
+
+    $self->release if ( $self->{Confined} );
+
+    # works on windows even if iconified - check on unix. Maybe not needed!!
+    # return unless ( $self->_check(${$self->{MAIN}}) );
+
+# Sanity check - don't warp beyond the screen. The window managers won't let you
+# anyways - but we might as well not try!
+    my $sw = ${ $self->{MAIN} }->screenwidth;
+    my $sh = ${ $self->{MAIN} }->screenheight;
+
+    $X = 0   if ( $X < 0 );
+    $Y = 0   if ( $Y < 0 );
+    $X = $sw if ( $X > $sw );
+    $Y = $sh if ( $Y > $sh );
+
+    my $x = $X - ${ $self->{MAIN} }->rootx;
+    my $y = $Y - ${ $self->{MAIN} }->rooty;
+
+    ${ $self->{MAIN} }->eventGenerate(
+      "<Motion>",
+      -when => 'head',
+      -x    => $x,
+      -y    => $y,
+      -warp => 1
+    );
+  }
+
+}
+
+sub destroy { shift->DESTROY }
+
+############# Private methods ##################
+sub _check {
+  my ( $self, $w ) = @_;
+  my $ok = 1;
+  unless ( $ok = Exists($w) ) {
+    carp "Widget $w: Does not exist!";
+  }
+  unless ( $ok = $w->viewable ) {
+    carp "Widget $w: is not mapped";
+  }
+  return $ok;
+}
+
+sub _getposition {
+
+  #return the top left corner and width/height of widget passed.
+  my ( $self, $w ) = @_;
+  my $x0     = $w->rootx;
+  my $y0     = $w->rooty;
+  my $width  = $w->width;
+  my $height = $w->height;
+
+  return ( $x0, $y0, $width, $height );
+}
+
+sub _getbbox {
+
+  #return the absolute screen coordinates (i.e. bbox)
+  my ( $self, $w ) = @_;
+  my @c = $self->_getposition($w);
+  return ( $c[0], $c[1], $c[0] + $c[2], $c[1] + $c[3] );
+}
+
+sub _init {
+  my $self = shift;
+
+  $self->{Type} = 'unix';    #default to 'perl based' cursor confine
+
+  if ( $Tk::platform eq 'MSWin32' ) {
+    if ( eval "require Win32::API" ) {
+
+      #Create API's
+      $self->{ClipCursor} =
+        Win32::API->new( 'user32', 'ClipCursor', ['P'], 'N' );
+      $self->{ShowCursor} =
+        Win32::API->new( 'user32', 'ShowCursor', ['N'], 'N' );
+      $self->{Type} = 'win32' if ( $self->{ClipCursor} && $self->{ShowCursor} );
+      $self->{DisplayCount} = 0;
+      return if $self->{Type} eq 'win32';
+      croak "Creating API objects failed for unknown reason";
+    }
+    else {
+      croak "Please install Win32::API !!";
+    }
+  }
+  else {
+
+    #retrieve proper filenames for transparent cursor for *NIX..
+    $self->{bitmapfile} = Tk->findINC('trans_cur.xbm');
+    $self->{maskfile}   = Tk->findINC('trans_cur.mask');
+    croak "Files for tranparent cursor not found"
+      unless ( $self->{bitmapfile} && $self->{maskfile} );
+  }
+}
+
+####### On Unix Only #############
+sub _setOldCursor {
+
+  #save the current cursor on a ->hide command
+  my ( $self, $w ) = @_;
+  my $oldcursor = $w->cget('-cursor') || 'left_ptr';
+  $self->{OldCursor}{$w} = $oldcursor if ($oldcursor);
+}
+
+sub _getOldCursor {
+
+  #get saved cursor on a ->show command
+  my ( $self, $w ) = @_;
+  my $cursor = $self->{OldCursor}{$w};
+  delete $self->{OldCursor}{$w};
+  return ($cursor);
+}
+
+sub _Unixconfine {
+  my ( $self, $w ) = @_;
+  my @coords = $self->_getposition($w);
+
+# Stop Class <Leave> bindings from being triggered - as a Leave should NEVER occur
+# Why? Because the cursor is 'supposed' to be confined to the widget! Since this
+# event 'will' still occur we Tk->break it before the Class binding occurs.
+# An example if we did not do this (and I know from testing) is: a Button relief rapidly
+# changing between sunken and normal to causing massive flickering
+
+# Also - We cannot guarantee a Motion binding will get triggered for the passed widget.
+# Instead we overwrite the Motion binding for the toplevel containg $widget. This virtually
+# guarantees (fingers crossed) that a proper Motion binding exists. Of course the Leave
+# event must stay with the passed $widget.
+
+  my @bindtags = $w->bindtags;
+  $w->bindtags( [ @bindtags[ 1, 0, 2, 3 ] ] );
+
+  #Save current leave binding..if there is one
+  my $old_leave;
+  my $old_motion;
+  eval { $old_leave  = $w->Tk::bind('<Any-Leave>') };
+  eval { $old_motion = $w->toplevel->bind('<Motion>') };
+  ( defined $old_leave )
+    ? ( $self->{OldLeave} = $old_leave )
+    : ( $self->{OldLeave} = 0 );
+  ( defined $old_motion )
+    ? ( $self->{OldMotion} = $old_motion )
+    : ( $self->{OldMotion} = 0 );
+
+  $w->Tk::bind( '<Any-Leave>', sub { $_[0]->break } );
+
+  $w->toplevel->bind(
+    '<Motion>',
+    sub {
+      $self->{OldMotion}->Call if ( $self->{OldMotion} );
+      $self->_warpToConfine( $w, @coords );
+    }
+  );
+  $self->{Confined} = $w;
+}
+
+sub _Unixrelease {
+  my $self = shift;
+
+  #Restore proper bindtag order for widget..
+  return unless $self->{Confined};
+  my @bindtags = $self->{Confined}->bindtags;
+  $self->{Confined}->bindtags( [ @bindtags[ 1, 0, 2, 3 ] ] );
+
+  ( $self->{OldLeave} )
+    ? ( $self->{Confined}->Tk::bind( '<Any-Leave>', $self->{OldLeave} ) )
+    : ( $self->{Confined}->Tk::bind( '<Any-Leave>', '' ) );
+  ( $self->{OldMotion} )
+    ? ( $self->{Confined}->toplevel->bind( '<Motion>', $self->{OldMotion} ) )
+    : ( $self->{Confined}->toplevel->bind( '<Motion>', '' ) );
+
+  $self->{Confined} = 0;
+}
+
+sub _warpToConfine {
+  my ( $self, $w, $x0, $y0, $wi, $he ) = @_;
+
+  my $e = $w->XEvent;
+  my ( $x, $y ) = ( $e->x, $e->y );
+
+  my $warpneeded = 0;
+
+  if ( $x <= 0 ) {
+    $x          = 1;
+    $warpneeded = 1;
+  }
+  elsif ( $x >= $wi ) {
+    $x          = $wi - 1;
+    $warpneeded = 1;
+  }
+
+  if ( $y <= 0 ) {
+    $y          = 1;
+    $warpneeded = 1;
+  }
+  elsif ( $y >= $he ) {
+    $y          = $he - 1;
+    $warpneeded = 1;
+  }
+
+  if ($warpneeded) {
+    $w->eventGenerate(
+      "<Motion>",
+      -when => 'head',
+      -x    => $x,
+      -y    => $y,
+      -warp => 1
+    );
+  }
+}
+
+########### On Win32 Only #############
+sub _Win32confine {
+  my ( $self, $w ) = @_;
+  my @coords = $self->_getbbox($w);
+
+  my $rect = CORE::pack "L4", @coords;
+
+  if ( defined $self->{ClipCursor} ) {
+    $self->{ClipCursor}->Call($rect);
+    $self->{Confined} = 1;
+  }
+}
+
+sub _Win32release {
+  my $self = shift;
+  my $null = 0;
+  if ( defined $self->{ClipCursor} ) {
+    $self->{ClipCursor}->Call($null);
+    $self->{Confined} = 0;
+  }
+}
+
+sub _Win32saveBindings {
+  my ( $self, $w ) = @_;
+
+  # Save current Enter, Leave and Unmap bindings..if there are any
+  # Fully specify Tk::bind in case of a canvas widget.
+  my $old_leave;
+  my $old_enter;
+  my $old_unmap;
+  eval { $old_leave = $w->Tk::bind('<Leave>') };
+  eval { $old_enter = $w->Tk::bind('<Enter>') };
+  eval { $old_unmap = $w->Tk::bind('<Unmap>') };
+  ( defined $old_leave )
+    ? ( $self->{Win32Leave}{$w} = $old_leave )
+    : ( $self->{Win32Leave}{$w} = 0 );
+  ( defined $old_enter )
+    ? ( $self->{Win32Enter}{$w} = $old_enter )
+    : ( $self->{Win32Enter}{$w} = 0 );
+  ( defined $old_unmap )
+    ? ( $self->{Win32Unmap}{$w} = $old_unmap )
+    : ( $self->{Win32Unmap}{$w} = 0 );
+}
+
+sub _Win32setBindings {
+  my ( $self, $w ) = @_;
+  $w->Tk::bind(
+    '<Enter>',
+    sub {
+      $self->{Win32Enter}{$w}->Call if ( $self->{Win32Enter}{$w} );
+      $self->_Win32hidecursor;
+    }
+  );
+  $w->Tk::bind(
+    '<Leave>',
+    sub {
+      $self->{Win32Leave}{$w}->Call if ( $self->{Win32Leave}{$w} );
+      $self->_Win32showcursor;
+    }
+  );
+
+  #ensure cursor gets shown again if widget disappears..
+  $w->Tk::bind(
+    '<Unmap>',
+    sub {
+      $self->{Win32Unmap}{$w}->Call if ( $self->{Win32Unmap}{$w} );
+      $self->_Win32showcursor;
+    }
+  );
+}
+
+sub _Win32restoreBindings {
+  my ( $self, $w ) = @_;
+  ( $self->{Win32Enter}{$w} )
+    ? ( $w->Tk::bind( '<Enter>', $self->{Win32Enter}{$w} ) )
+    : ( $w->Tk::bind( '<Enter>', '' ) );
+  ( $self->{Win32Leave}{$w} )
+    ? ( $w->Tk::bind( '<Leave>', $self->{Win32Leave}{$w} ) )
+    : ( $w->Tk::bind( '<Leave>', '' ) );
+  ( $self->{Win32Unmap}{$w} )
+    ? ( $w->Tk::bind( '<Unmap>', $self->{Win32Unmap}{$w} ) )
+    : ( $w->Tk::bind( '<Unmap>', '' ) );
+}
+
+sub _Win32hidecursor {
+  my $self = shift;
+  $self->_Win32resetDisplayCount;
+  $self->{DisplayCount} = $self->{ShowCursor}->Call(0);
+}
+
+sub _Win32showcursor {
+  my $self = shift;
+  $self->_Win32resetDisplayCount;
+  $self->{DisplayCount} = $self->{ShowCursor}->Call(1);
+}
+
+sub _Win32resetDisplayCount {
+  my $self = shift;
+
+  #Decrement display count to get ready for a hide. i.e. set count to 0.
+  if ( $self->{DisplayCount} > 0 ) {
+    my $count = $self->{DisplayCount};
+    for ( my $i = $count ; $i > 0 ; $i-- ) {
+      $self->{DisplayCount} = $self->{ShowCursor}->Call(0);
+    }
+  }
+
+  #Increment display count to get ready for a show. i.e. set count to -1.
+  elsif ( $self->{DisplayCount} < 0 ) {
+    my $count = $self->{DisplayCount};
+    for ( my $i = $count ; $i < -1 ; $i++ ) {
+      $self->{DisplayCount} = $self->{ShowCursor}->Call(1);
+    }
+  }
+}
+
+########################################
+sub DESTROY {
+  my $self = shift;
+  $self->release;
+  ##carp "DESTROY CALLED ON $self";
+  --${ $self->{_Init} };    #decrement initialize value
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Tk::CursorControl - Manipulate the mouse cursor programmatically
+
+=head1 SYNOPSIS
+
+    use Tk::CursorControl;
+    $cursor = $main->CursorControl;
+
+    # Lock the mouse cursor to $widget
+    $cursor->confine($widget);
+
+    # Free the cursor
+    $cursor->release;
+
+    # cursor disappears over $widget
+    $cursor->hide($widget);
+
+    # show cursor again over $widget
+    $cursor->show($widget);
+
+    # warp cursor to $widget (jump)
+    $cursor->warpto($widget);
+
+    # move cursor to $widget
+    $cursor->moveto($widget);
+
+=head1 DESCRIPTION
+
+B<Tk::CursorControl> is-B<NOT>-a Tk::Widget.
+Rather, it I<uses> Tk and encompasses a collection of methods
+used to manipulate the cursor I<(aka pointer)> programmatically
+from a Tk program.
+
+=head1 STANDARD OPTIONS
+
+B<Tk::CursorControl> does I<not> accept any standard options
+
+=head1 METHODS
+
+The following methods are available:
+
+=over 4
+
+=item I<$cursor>-E<gt>B<confine>( $widget )
+
+Confine the cursor to stay within the bounding box of $widget.
+
+=over 4
+
+=item I<$cursor>-E<gt>B<jail>( $widget )
+
+Alias for the B<confine> method.
+
+=back
+
+=item I<$cursor>-E<gt>B<release>
+
+Release the cursor. Used to restore proper cursor functionality
+after a confine. Note: I<$widget> does B<not> need to be specified.
+
+=over 4
+
+=item I<$cursor>-E<gt>B<free>
+
+Alias for the B<release> method.
+
+=back
+
+=item I<$cursor>-E<gt>B<hide>( @widgets )
+
+Make cursor I<invisible> over each widget in @widgets.
+
+=item I<$cursor>-E<gt>B<show>( @widgets )
+
+Make cursor I<visible> over each widget in @widgets. This is used after a B<hide>.
+B<Note: S>how (capital S) can be used as well.
+
+=item I<$cursor>-E<gt>B<warpto>( $widget I<?x,y?>)
+
+Warp the cursor to the specified I<(?x,y?)> position in $widget. If the x,y values
+are not specified, then the I<center> of the widget is used as the target.
+
+OR
+
+=item I<$cursor>-E<gt>B<warpto>( X,Y )
+
+Warp the cursor to the specified I<X,Y> screen coordinate.
+
+=item I<$cursor>-E<gt>B<moveto>( $widget I<?x,y?>, -time=E<gt>I<integer in milliseconds>)
+
+Move the cursor to the specified I<(?x,y?)> position in $widget in I<-time> milliseconds.
+If the x,y values are not specified, then the I<center> of the widget is used as the
+target. The -time value defaults to 1000ms (1 second) if not specified. The smaller the
+time, the faster the cursor will move. The time given will not be exact. See bugs below.
+
+OR
+
+=item I<$cursor>-E<gt>B<moveto>( X,Y, -time=E<gt>I<integer in milliseconds>)
+
+Move the cursor to the specified I<X,Y> screen coordinate in I<-time> milliseconds.
+The -time value defaults to 1000ms (1 second) if not specified. The smaller the
+time, the faster the cursor will move. The time given will not be exact. See bugs below.
+
+=back
+
+=head1 DEPENDENCIES
+
+B<Win32::API> is required on Win32 systems.
+
+=head1 POSSIBLE USES
+
+Don't e-mail me to debate whether or not a program I<should> warp or 
+hide a cursor. I will give you a few instances where "I think" a
+module like this could come in handy.
+
+1. Confining a canvas item to remain within the Canvas boundaries
+on a move. See the cursor demonstration in 'widget'.
+
+2. Giving the user some 'leeway' on clicking near an item. Say,
+clicking on the picture of a thermometer, warps the cursor to a
+Tk::Scale (right beside it) which actually controls that thermometer.
+
+3. Confining a window within another window (Tk::MDI should be
+upgraded to 'use Tk::CursorControl')
+
+4. A step by step, show and tell session on 'How to use this GUI'.
+
+5. Make the cursor disappear for a keyboard only Tk::Canvas game.
+
+The key to using this module properly, is subtlety! Don't start making
+the cursor warp all over the screen or making it disappear sporadically.
+That is a misuse of the functionality.
+
+For some 'real world' applications which already have these types of
+functionality, see any Multiple Document Interface (MDI); such as in
+Excel or Word). Also have a look at the Win32 color chooser. The cursor
+will be confined to the color palette while the button is pressed. Also,
+try clicking on the gradient bar to the right of the palette. See what
+happens to the mouse cursor?!
+I'll bet you didn't even know that this existed until now.
+
+If you discover another good use for this module, I would definitely
+like to hear about it ! I<That> is the type of e-mail I would welcome.
+
+=head1 BUGS & IDIOSYNCRASIES
+
+B<Take ONE please!>
+
+B<Tk::CursorControl> only allows ONE object per MainWindow! If you try
+to create more than one, B<only the first object created will be returned>.
+This will also be true if using a widget or module which already defines
+a Tk::CursorControl object.
+
+B<Bindings>
+
+B<Tk::CursorControl> internally generates E<lt>EnterE<gt>,
+E<lt>LeaveE<gt> and E<lt>MotionE<gt> bindings for the I<$widget>
+passed. Any user-defined bindings of the same type for I<$widget>
+should I<still> get executed. This feature has not been completely
+tested.
+
+B<Win32>
+
+This module makes heavy use of the ShowCursor and ClipCursor API's on 
+Win32. Be aware that when you change a cursor using the API, you
+are doing so for your entire system. You, (the programmer) are
+responsible for generating the show/hide and confine/release commands
+in the proper order.
+
+For every hide - you I<*will*> want a show. For every confine - you
+I<*should*> have a release. There are cautionary measures built-in
+to ensure that the cursor doesn't disappear forever or get locked
+within a widget.
+
+i.e. A B<release> is automatically called if you try to confine
+the cursor to two widgets at the same time.
+
+In other words, the last B<confine> always wins!
+
+B<Unix>
+
+The methods for hiding and confining the cursor on Unix-based systems
+is different than for Win32.
+
+A blank cursor is defined using the Tk::Widget configure method for
+each widget passed. Two files have been provided for this purpose in
+the installation - I<trans_cur.xbm> and I<trans_cur.mask>. These files
+must exist under a B<Tk-E<gt>FindINC> directory.
+
+Confining a cursor on *nix does I<not> use any sort of API or Xlib
+calls. Motion events are generated on the toplevel window to confine
+the cursor to the proper widget. On slow systems, this will make the
+cursor I<look> like it is attached to the widget sides with a spring.
+On faster systems, while still there, this I<bouncing> type action
+is much less noticible.
+
+B<moveto>
+
+The time parameter passed to a moveto method will not be exact. The
+reason for this is because a crude L<Tk::After|Tk::After> command is
+used to I<wait> for a very short period. You will find that the
+actual time taken for the cursor to stop is alway slightly B<more>
+than the time you specified. This time difference will be greater
+on slower computers. The time error will also increase for higher
+time values.
+
+B<Other>
+
+Warping the cursor will cause problems for users of absolute location
+pointing devices (like graphics tablets). Users of graphics tablets
+should B<not> use this module.
+
+=head1 AUTHOR
+
+B<Jack Dunnigan> <dunniganj@cpan.org>.
+
+Copyright (c) 2002-2004 Jack Dunnigan. All rights reserved.
+
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
+
+My thanks to Tk gurus Steve Lidie and Slaven Rezic for their suggestions
+and their patches. This is my first module on CPAN and I appreciate
+their help. Thanks to Ala Qumsieh for utilizing the power of my module
+in L<Tk::Toolbar|Tk::Toolbar>.
+
+=cut
+
+
+
+
diff --git a/lib/site/Tk/ToolBar.pm b/lib/site/Tk/ToolBar.pm
index d3f1ddd3f..54687f35e 100644
--- a/lib/site/Tk/ToolBar.pm
+++ b/lib/site/Tk/ToolBar.pm
@@ -1,1096 +1,1096 @@
-
-package Tk::ToolBar;
-
-use strict;
-use Tk::Frame;
-use Tk::Balloon;
-
-use base qw/Tk::Frame/;
-use Tk::widgets qw(Frame);
-
-use Carp;
-use POSIX qw/ceil/;
-
-Construct Tk::Widget 'ToolBar';
-
-use vars qw/$VERSION/;
-$VERSION = 0.09;
-
-my $edgeH = 24;
-my $edgeW = 5;
-
-my $sepH  = 24;
-my $sepW  = 3;
-
-my %sideToSticky = qw(
-		      top    n
-		      right  e
-		      left   w
-		      bottom s
-		      );
-
-my $packIn     = '';
-my @allWidgets = ();
-my $floating   = 0;
-my %packIn;
-my %containers;
-my %isDummy;
-
-1;
-
-sub ClassInit {
-    my ($class, $mw) = @_;
-    $class->SUPER::ClassInit($mw);
-
-    # load the images.
-    my $imageFile = Tk->findINC('ToolBar/tkIcons');
-
-    if (defined $imageFile) {
-	local *F;
-	open F, $imageFile;
-
-	local $_;
-
-	while (<F>) {
-	    chomp;
-	    my ($n, $d) = (split /:/)[0, 4];
-
-	    $mw->Photo($n, -data => $d);
-	}
-	close F;
-    } else {
-	carp <<EOW;
-WARNING: can not find tkIcons. Your installation of Tk::ToolBar is broken.
-         No icons will be loaded.
-EOW
-;
-    }
-}
-
-sub Populate {
-    my ($self, $args) = @_;
-
-    $self->SUPER::Populate($args);
-    $self->{MW}     = $self->parent;
-    $self->{SIDE}   = exists $args->{-side}          ? delete $args->{-side}          : 'top';
-    $self->{STICKY} = exists $args->{-sticky}        ? delete $args->{-sticky}        : 'nsew';
-    $self->{USECC}  = exists $args->{-cursorcontrol} ? delete $args->{-cursorcontrol} : 1;
-    $self->{STYLE}  = exists $args->{-mystyle}       ? delete $args->{-mystyle}       : 0;
-    $packIn         = exists $args->{-in}            ? delete $args->{-in}            : '';
-
-    if ($packIn) {
-      unless ($packIn->isa('Tk::ToolBar')) {
-	croak "value of -packin '$packIn' is not a Tk::ToolBar object";
-      } else {
-	$self->{SIDE} = $packIn->{SIDE};
-      }
-    }
-
-    unless ($self->{STICKY} =~ /$sideToSticky{$self->{SIDE}}/) {
-	croak "can't place '$self->{STICKY}' toolbar on '$self->{SIDE}' side";
-    }
-
-    $self->{CONTAINER} = $self->{MW}->Frame;
-    $self->_packSelf;
-
-    my $edge = $self->{CONTAINER}->Frame(qw/
-					 -borderwidth 2
-					 -relief ridge
-					 /);
-
-    $self->{EDGE} = $edge;
-
-    $self->_packEdge($edge, 1);
-
-    $self->ConfigSpecs(
-		       -movable          => [qw/METHOD  movable          Movable             1/],
-		       -close            => [qw/PASSIVE close            Close              15/],
-		       -activebackground => [qw/METHOD  activebackground ActiveBackground/, Tk::ACTIVE_BG],
-		       -indicatorcolor   => [qw/PASSIVE indicatorcolor   IndicatorColor/,   '#00C2F1'],
-		       -indicatorrelief  => [qw/PASSIVE indicatorrelief  IndicatorRelief    flat/],
-		       -float            => [qw/PASSIVE float            Float              1/],
-		      );
-
-    push @allWidgets => $self;
-
-    $containers{$self->{CONTAINER}} = $self;
-
-    $self->{BALLOON} = $self->{MW}->Balloon;
-
-    # check for Tk::CursorControl
-    $self->{CC} = undef;
-    if ($self->{USECC}) {
-	local $^W = 0; # suppress message from Win32::API
-	eval "require Tk::CursorControl";
-	unless ($@) {
-	    # CC is installed. Use it.
-	    $self->{CC} = $self->{MW}->CursorControl;
-	}
-    }
-}
-
-sub activebackground {
-    my ($self, $c) = @_;
-
-    return unless $c; # ignore falses.
-
-    $self->{ACTIVE_BG} = $c;
-}
-
-sub _packSelf {
-    my $self = shift;
-
-    my $side = $self->{SIDE};
-    my $fill = 'y';
-    if ($side eq 'top' or $side eq 'bottom') { $fill = 'x' }
-
-    if ($packIn && $packIn != $self) {
-	my $side = $packIn->{SIDE} =~ /top|bottom/ ? 'left' : 'top';
-
-	$self->{CONTAINER}->pack(-in => $packIn->{CONTAINER},
-				 -side => $side,
-				 -anchor => ($fill eq 'x' ? 'w' : 'n'),
-				 -expand => 0);
-	$self->{CONTAINER}->raise;
-	$packIn{$self->{CONTAINER}} = $packIn->{CONTAINER};
-    } else {
-	# force a certain look! for now.
-	my $slave = ($self->{MW}->packSlaves)[0];
-
-	$self->configure(qw/-relief raised -borderwidth 1/);
-	$self->pack(-side => $side, -fill => $fill,
-		    $slave ? (-before => $slave) : ()
-		    );
-
-	$self->{CONTAINER}->pack(-in => $self,
-				 -anchor => ($fill eq 'x' ? 'w' : 'n'),
-				 -expand => 0);
-
-	$packIn{$self->{CONTAINER}} = $self;
-    }
-}
-
-sub _packEdge {
-    my $self = shift;
-    my $e    = shift;
-    my $w    = shift;
-
-    my $s    = $self->{SIDE};
-
-    my ($pack, $pad, $nopad, $fill);
-
-    if ($s eq 'top' or $s eq 'bottom') {
-      if ($w) {
-	$e->configure(-height => $edgeH, -width => $edgeW);
-      } else {
-	$e->configure(-height => $sepH, -width => $sepW);
-      }
-      $pack  = 'left';
-      $pad   = '-padx';
-      $nopad = '-pady';
-      $fill  = 'y';
-    } else {
-      if ($w) {
-	$e->configure(-height => $edgeW, -width => $edgeH);
-      } else {
-	$e->configure(-height => $sepW, -width => $sepH);
-      }
-
-      $pack  = 'top';
-      $pad   = '-pady';
-      $nopad = '-padx';
-      $fill  = 'x';
-    }
-
-    if (exists $self->{SEPARATORS}{$e}) {
-	$e->configure(-cursor => $pack eq 'left' ? 'sb_h_double_arrow' : 'sb_v_double_arrow');
-	$self->{SEPARATORS}{$e}->pack(-side   => $pack,
-				      -fill   => $fill);
-    }
-
-    $e->pack(-side  => $pack, $pad => 5,
-	     $nopad => 0,  -expand => 0);
-}
-
-sub movable {
-    my ($self, $value) = @_;
-
-    if (defined $value) {
-	$self->{ISMOVABLE} = $value;
-	my $e = $self->_edge;
-
-	if ($value) {
-	    $e->configure(qw/-cursor fleur/);
-	    $self->afterIdle(sub {$self->_enableEdge()});
-	} else {
-	    $e->configure(-cursor => undef);
-	    $self->_disableEdge($e);
-	}
-    }
-
-    return $self->{ISMOVABLE};
-}
-
-sub _enableEdge {
-  my ($self) = @_;
-
-  my $e     = $self->_edge;
-  my $hilte = $self->{MW}->Frame(-bg     => $self->cget('-indicatorcolor'),
-				 -relief => $self->cget('-indicatorrelief'));
-
-  my $dummy = $self->{MW}->Frame(
-				 qw/
-				 -borderwidth 2
-				 -relief ridge
-				 /);
-
-  $self->{DUMMY} = $dummy;
-
-  my $drag     = 0;
-  #my $floating = 0;
-  my $clone;
-
-  my @mwSize;  # extent of mainwindow.
-
-  $e->bind('<1>'         => sub {
-	     $self->{CC}->confine($self->{MW}) if defined $self->{CC};
-	     my $geom      = $self->{MW}->geometry;
-	     my ($rx, $ry) = ($self->{MW}->rootx, $self->{MW}->rooty);
-
-	     if ($geom =~ /(\d+)x(\d+)/) {#\+(\d+)\+(\d+)/) {
-#	       @mwSize = ($3, $4, $1 + $3, $2 + $4);
-	       @mwSize = ($rx, $ry, $1 + $rx, $2 + $ry);
-	     } else {
-	       @mwSize = ();
-	     }
-
-	     if (!$self->{ISCLONE} && $self->{CLONE}) {
-	       $self->{CLONE}->destroy;
-	       $self->{CLONE} = $clone = undef;
-	       @allWidgets = grep Tk::Exists, @allWidgets;
-	     }
-
-	   });
-
-  $e->bind('<B1-Motion>' => sub {
-	     my ($x, $y) = ($self->pointerx - $self->{MW}->rootx - ceil($e->width /2) - $e->x,
-			    $self->pointery - $self->{MW}->rooty - ceil($e->height/2) - $e->y);
-
-	     my ($px, $py) = $self->pointerxy;
-
-	     $dummy = $self->{ISCLONE} ? $self->{CLONE}{DUMMY} : $self->{DUMMY};
-
-	     unless ($drag or $floating) {
-	       $drag = 1;
-	       $dummy->raise;
-	       my $noclone = $self->{ISCLONE} ? $self->{CLONE} : $self;
-	       $noclone->packForget;
-	       $noclone->{CONTAINER}->pack(-in => $dummy);
-	       $noclone->{CONTAINER}->raise;
-	       ref($_) eq 'Tk::Frame' && $_->raise for $noclone->{CONTAINER}->packSlaves;
-	     }
-	     $hilte->placeForget;
-
-	     if ($self->cget('-float') &&
-		 (@mwSize and
-		 $px < $mwSize[0] or
-		 $py < $mwSize[1] or
-		 $px > $mwSize[2] or
-		 $py > $mwSize[3])) {
-
-	       # we are outside .. switch to toplevel mode.
-	       $dummy->placeForget;
-	       $floating = 1;
-
-	       unless ($self->{CLONE} || $self->{ISCLONE}) {
-		 # clone it.
-		 my $clone = $self->{MW}->Toplevel(qw/-relief ridge -borderwidth 2/);
-		 $clone->withdraw;
-		 $clone->overrideredirect(1);
-		 $self->_clone($clone);
-		 $self->{CLONE} = $clone;
-	       }
-
-	       $clone = $self->{ISCLONE} || $self->{CLONE};
-	       $clone->deiconify unless $clone->ismapped;
-	       $clone->geometry("+$px+$py");
-
-	     } else {
-	       $self->{ISCLONE}->withdraw if $self->{CLONE} && $self->{ISCLONE};
-
-	       $dummy->place('-x' => $x, '-y' => $y);
-	       $floating = 0;
-
-	       if (my $newSide = $self->_whereAmI($x, $y)) {
-		 # still inside main window.
-		 # highlight the close edge.
-		 $clone && $clone->ismapped && $clone->withdraw;
-		 #$self->{ISCLONE}->withdraw if $self->{CLONE} && $self->{ISCLONE};
-
-		 my ($op, $pp);
-		 if ($newSide =~ /top/) {
-		   $op = [qw/-height 5/];
-		   $pp = [qw/-relx 0 -relwidth 1 -y 0/];
-		 } elsif ($newSide =~ /bottom/) {
-		   $op = [qw/-height 5/];
-		   $pp = [qw/-relx 0 -relwidth 1 -y -5 -rely 1/];
-		 } elsif ($newSide =~ /left/) {
-		   $op = [qw/-width 5/];
-		   $pp = [qw/-x 0 -relheight 1 -y 0/];
-		 } elsif ($newSide =~ /right/) {
-		   $op = [qw/-width 5/];
-		   $pp = [qw/-x -5 -relx 1 -relheight 1 -y 0/];
-		 }
-
-		 $hilte->configure(@$op);
-		 $hilte->place(@$pp);
-		 $hilte->raise;
-	       }
-	     }
-	   });
-
-    $e->bind('<ButtonRelease-1>' => sub {
-	my $noclone = $self->{ISCLONE} ? $self->{CLONE} : $self;
-	$noclone->{CC}->free($noclone->{MW}) if defined $noclone->{CC};
-	return unless $drag;
-
-	$drag = 0;
-	$dummy->placeForget;
-
-	# forget everything if it's cloned.
-	return if $clone && $clone->ismapped;
-
-	# destroy the clone.
-	#$clone->destroy;
-
-	#return unless $self->_whereAmI(1);
-	$noclone->_whereAmI(1);
-	$hilte->placeForget;
-
-	# repack everything now.
-	my $ec = $noclone->_edge;
-	my @allSlaves = grep {$_ ne $ec} $noclone->{CONTAINER}->packSlaves;
-	$_   ->packForget for $noclone, @allSlaves, $noclone->{CONTAINER};
-
-	$noclone->_packSelf;
-	$noclone->_packEdge($ec, 1);
-	$noclone->_packWidget($_) for @allSlaves;
-    });
-}
-
-sub _whereAmI {
-    my $self = shift;
-
-    my $flag = 0;
-    my ($x, $y);
-
-    if (@_ == 1) {
-	$flag = shift;
-	my $e    = $self->_edge;
-	($x, $y) = ($self->pointerx - $self->{MW}->rootx - ceil($e->width /2) - $e->x,
-		    $self->pointery - $self->{MW}->rooty - ceil($e->height/2) - $e->y);
-    } else {
-	($x, $y) = @_;
-    }
-
-    my $x2 = $x + $self->{CONTAINER}->width;
-    my $y2 = $y + $self->{CONTAINER}->height;
-
-    my $w  = $self->{MW}->Width;
-    my $h  = $self->{MW}->Height;
-
-    # bound check
-    $x     = 1      if $x  <= 0;
-    $y     = 1      if $y  <= 0;
-    $x     = $w - 1 if $x  >= $w;
-    $y     = $h - 1 if $y  >= $h;
-
-    $x2    = 0      if $x2 <= 0;
-    $y2    = 0      if $y2 <= 0;
-    $x2    = $w - 1 if $x2 >= $w;
-    $y2    = $h - 1 if $y2 >= $h;
-
-    my $dx = 0;
-    my $dy = 0;
-
-    my $close = $self->cget('-close');
-
-    if    ($x       < $close) { $dx = $x }
-    elsif ($w - $x2 < $close) { $dx = $x2 - $w }
-
-    if    ($y       < $close) { $dy = $y }
-    elsif ($h - $y2 < $close) { $dy = $y2 - $h }
-
-    $packIn       = '';
-    if ($dx || $dy) {
-	my $newSide;
-	if ($dx && $dy) {
-	    # which is closer?
-	    if (abs($dx) < abs($dy)) {
-		$newSide = $dx > 0 ? 'left' : 'right';
-	    } else {
-		$newSide = $dy > 0 ? 'top' : 'bottom';
-	    }
-	} elsif ($dx) {
-	    $newSide = $dx > 0 ? 'left' : 'right';
-	} else {
-	    $newSide = $dy > 0 ? 'top' : 'bottom';
-	}
-
-	# make sure we're stickable on that side.
-	return undef unless $self->{STICKY} =~ /$sideToSticky{$newSide}/;
-
-	$self->{SIDE} = $newSide if $flag;
-	return $newSide;
-    } elsif ($flag) {
-	# check for overlaps.
-	for my $w (@allWidgets) {
-	    next if $w == $self;
-
-	    my $x1 = $w->x;
-	    my $y1 = $w->y;
-	    my $x2 = $x1 + $w->width;
-	    my $y2 = $y1 + $w->height;
-
-	    if ($x > $x1 and $y > $y1 and $x < $x2 and $y < $y2) {
-		$packIn = $w;
-		last;
-	    }
-	}
-
-      $self->{SIDE} = $packIn->{SIDE} if $packIn;
-#	if ($packIn) {
-#	  $self->{SIDE} = $packIn->{SIDE};
-#	} else {
-#	  return undef;
-#	}
-    } else {
-	return undef;
-    }
-
-    return 1;
-}
-
-sub _disableEdge {
-    my ($self, $e) = @_;
-
-    $e->bind('<B1-Motion>'       => undef);
-    $e->bind('<ButtonRelease-1>' => undef);
-}
-
-sub _edge {
-    $_[0]->{EDGE};
-}
-
-sub ToolButton {
-    my $self = shift;
-    my %args = @_;
-
-    my $type = delete $args{-type} || 'Button';
-
-    unless ($type eq 'Button' or
-	    $type eq 'Checkbutton' or
-	    $type eq 'Menubutton' or
-	    $type eq 'Radiobutton') {
-
-	croak "toolbutton can be only 'Button', 'Menubutton', 'Checkbutton', or 'Radiobutton'";
-    }
-
-    my $m = delete $args{-tip}         || '';
-    my $x = delete $args{-accelerator} || '';
-
-    my $b = $self->{CONTAINER}->$type(%args,
-				      $self->{STYLE} ? () : (
-							     -relief      => 'flat',
-							     -borderwidth => 1,
-							    ),
-				     );
-
-    $self->_createButtonBindings($b);
-    $self->_configureWidget     ($b);
-
-    push @{$self->{WIDGETS}} => $b;
-    $self->_packWidget($b);
-
-    $self->{BALLOON}->attach($b, -balloonmsg => $m) if $m;
-    $self->{MW}->bind($x => [$b, 'invoke'])         if $x;
-
-    # change the bind tags.
-    #$b->bindtags([$b, ref($b), $b->toplevel, 'all']);
-
-    return $b;
-}
-
-sub ToolLabel {
-    my $self = shift;
-
-    my $l = $self->{CONTAINER}->Label(@_);
-
-    push @{$self->{WIDGETS}} => $l;
-
-    $self->_packWidget($l);
-
-    return $l;
-}
-
-sub ToolEntry {
-    my $self = shift;
-    my %args = @_;
-
-    my $m = delete $args{-tip} || '';
-    my $l = $self->{CONTAINER}->Entry(%args, -width => 5);
-
-    push @{$self->{WIDGETS}} => $l;
-
-    $self->_packWidget($l);
-    $self->{BALLOON}->attach($b, -balloonmsg => $m) if $m;
-
-    return $l;
-}
-
-sub ToolLabEntry {
-    my $self = shift;
-    my %args = @_;
-
-    require Tk::LabEntry;
-    my $m = delete $args{-tip} || '';
-    my $l = $self->{CONTAINER}->LabEntry(%args, -width => 5);
-
-    push @{$self->{WIDGETS}} => $l;
-
-    $self->_packWidget($l);
-    $self->{BALLOON}->attach($b, -balloonmsg => $m) if $m;
-
-    return $l;
-}
-
-sub ToolOptionmenu {
-    my $self = shift;
-    my %args = @_;
-
-    my $m = delete $args{-tip} || '';
-    my $l = $self->{CONTAINER}->Optionmenu(%args);
-
-    push @{$self->{WIDGETS}} => $l;
-
-    $self->_packWidget($l);
-    $self->{BALLOON}->attach($b, -balloonmsg => $m) if $m;
-
-    return $l;
-}
-
-sub separator {
-    my $self = shift;
-    my %args = @_;
-
-    my $move = 1;
-    $move    = $args{-movable} if exists $args{-movable};
-    my $just = $args{-space} || 0;
-
-    my $f    = $self->{CONTAINER}->Frame(-width => $just, -height => 0);
-
-    my $sep  = $self->{CONTAINER}->Frame(qw/
-					 -borderwidth 5
-					 -relief sunken
-					 /);
-
-    $isDummy{$f} = $self->{SIDE};
-
-    push @{$self->{WIDGETS}} => $sep;
-    $self->{SEPARATORS}{$sep} = $f;
-    $self->_packWidget($sep);
-
-    $self->_createSeparatorBindings($sep) if $move;
-
-    if ($just eq 'right' || $just eq 'bottom') {
-      # just figure out the good width.
-    }
-
-    return 1;
-}
-
-sub _packWidget {
-    my ($self, $b) = @_;
-
-    return $self->_packEdge($b) if exists $self->{SEPARATORS}{$b};
-
-    my ($side, $pad, $nopad) = $self->{SIDE} =~ /^top$|^bottom$/ ? 
-	qw/left -padx -pady/ : qw/top -pady -padx/;
-
-    if (ref($b) eq 'Tk::LabEntry') {
-	$b->configure(-labelPack => [-side => $side]);
-    }
-
-    my @extra;
-    if (exists $packIn{$b}) {
-	@extra = (-in => $packIn{$b});
-
-	# repack everything now.
-	my $top = $containers{$b};
-	$top->{SIDE} = $self->{SIDE};
-
-	my $e = $top->_edge;
-	my @allSlaves = grep {$_ ne $e} $b->packSlaves;
-	$_   ->packForget for @allSlaves;
-
-	$top->_packEdge($e, 1);
-	$top->_packWidget($_) for @allSlaves;
-    }
-
-    if (exists $isDummy{$b}) { # swap width/height if we need to.
-	my ($w, $h);
-
-	if ($side eq 'left' && $isDummy{$b} =~ /left|right/) {
-	    $w = 0;
-	    $h = $b->height;
-	} elsif ($side eq 'top'  && $isDummy{$b} =~ /top|bottom/) {
-	    $w = $b->width;
-	    $h = 0;
-	}
-
-	$b->configure(-width => $h, -height => $w) if defined $w;
-	$isDummy{$b} = $self->{SIDE};
-    }
-
-    $b->pack(-side => $side, $pad => 4, $nopad => 0, @extra);
-}
-
-sub _packWidget_old {
-    my ($self, $b) = @_;
-
-    return $self->_packEdge($b) if exists $self->{SEPARATORS}{$b};
-
-    my ($side, $pad, $nopad) = $self->{SIDE} =~ /^top$|^bottom$/ ? 
-	qw/left -padx -pady/ : qw/top -pady -padx/;
-
-    if (ref($b) eq 'Tk::LabEntry') {
-	$b->configure(-labelPack => [-side => $side]);
-    }
-
-    my @extra;
-    if (exists $packIn{$b}) {
-	@extra = (-in => $packIn{$b});
-
-	# repack everything now.
-	my $top = $containers{$b};
-	$top->{SIDE} = $self->{SIDE};
-
-	my $e = $top->_edge;
-	my @allSlaves = grep {$_ ne $e} $b->packSlaves;
-	$_   ->packForget for @allSlaves;
-
-	$top->_packEdge($e, 1);
-	$top->_packWidget($_) for @allSlaves;
-    }
-
-    $b->pack(-side => $side, $pad => 4, $nopad => 0, @extra);
-}
-
-sub _configureWidget {
-    my ($self, $w) = @_;
-
-    $w->configure(-activebackground => $self->{ACTIVE_BG});
-}
-
-sub _createButtonBindings {
-    my ($self, $b) = @_;
-
-    my $bg = $b->cget('-bg');
-
-    $b->bind('<Enter>' => [$b, 'configure', qw/-relief raised/]);
-    $b->bind('<Leave>' => [$b, 'configure', qw/-relief flat/]);
-}
-
-sub _createSeparatorBindings {
-  my ($self, $s) = @_;
-
-  my ($ox, $oy);
-
-  $s->bind('<1>'         => sub {
-	     $ox = $s->XEvent->x;
-	     $oy = $s->XEvent->y;
-	   });
-
-  $s->bind('<B1-Motion>' => sub {
-	     my $x = $s->XEvent->x;
-	     my $y = $s->XEvent->y;
-
-	     my $f = $self->{SEPARATORS}{$s};
-
-	     if ($self->{SIDE} =~ /top|bottom/) {
-	       my $dx = $x - $ox;
-
-	       my $w  = $f->width + $dx;
-	       $w     = 0 if $w < 0;
-
-	       $f->GeometryRequest($w, $f->height);
-	     } else {
-	       my $dy = $y - $oy;
-
-	       my $h  = $f->height + $dy;
-	       $h     = 0 if $h < 0;
-
-	       $f->GeometryRequest($f->width, $h);
-	     }
-	   });
-}
-
-sub Button     { goto &ToolButton     }
-sub Label      { goto &ToolLabel      }
-sub Entry      { goto &ToolEntry      }
-sub LabEntry   { goto &ToolLabEntry   }
-sub Optionmenu { goto &ToolOptionmenu }
-
-sub _clone {
-  my ($self, $top, $in) = @_;
-
-  my $new = $top->ToolBar(qw/-side top -cursorcontrol/, $self->{USECC}, ($in ? (-in => $in, -movable => 0) : ()));
-  my $e   = $self->_edge;
-
-  my @allSlaves = grep {$_ ne $e} $self->{CONTAINER}->packSlaves;
-  for my $w (@allSlaves) {
-    my $t = ref $w;
-    $t =~ s/Tk:://;
-
-    if ($t eq 'Frame' && exists $containers{$w}) { # embedded toolbar
-      my $obj = $containers{$w};
-      $obj->_clone($top, $new);
-    }
-
-    if ($t eq 'Frame' && exists $self->{SEPARATORS}{$w}) {  # separator
-      $new->separator;
-    }
-
-    my %c = map { $_->[0], $_->[4] || $_->[3] } grep {defined $_->[4] || $_->[3] } grep @$_ > 2, $w->configure;
-    delete $c{$_} for qw/-offset -class -tile -visual -colormap -labelPack/;
-
-    if ($t =~ /.button/) {
-      $new->Button(-type => $t,
-		   %c);
-    } else {
-      $new->$t(%c);
-    }
-  }
-
-  $new ->{MW}      = $self->{MW};
-  $new ->{CLONE}   = $self;
-  $new ->{ISCLONE} = $top;
-  $self->{ISCLONE} = 0;
-}
-
-__END__
-
-=pod
-
-=head1 NAME
-
-Tk::ToolBar - A toolbar widget for Perl/Tk
-
-=for category Tk Widget Classes
-
-=head1 SYNOPSIS
-
-        use Tk;
-        use Tk::ToolBar;
-
-        my $mw = new MainWindow;
-        my $tb = $mw->ToolBar(qw/-movable 1 -side top
-                                 -indicatorcolor blue/);
-
-        $tb->ToolButton  (-text  => 'Button',
-                          -tip   => 'tool tip',
-                          -command => sub { print "hi\n" });
-        $tb->ToolLabel   (-text  => 'A Label');
-        $tb->Label       (-text  => 'Another Label');
-        $tb->ToolLabEntry(-label => 'A LabEntry',
-                          -labelPack => [-side => "left",
-                                         -anchor => "w"]);
-
-        my $tb2 = $mw->ToolBar;
-	$tb2->ToolButton(-image   => 'navback22',
-			 -tip     => 'back',
-			 -command => \&back);
-        $tb2->ToolButton(-image   => 'navforward22',
-			 -tip     => 'forward',
-			 -command => \&forward);
-        $tb2->separator;
-        $tb2->ToolButton(-image   => 'navhome22',
-			 -tip     => 'home',
-			 -command => \&home);
-        $tb2->ToolButton(-image   => 'actreload22',
-			 -tip     => 'reload',
-			 -command => \&reload);
-
-        MainLoop;
-
-=head1 DESCRIPTION
-
-This module implements a dockable toolbar. It is in the same spirit as the
-"short-cut" toolbars found in most major applications, such as most web browsers
-and text editors (where you find the "back" or "save" and other shortcut buttons).
-
-Buttons of any type (regular, menu, check, radio) can be created inside this widget.
-You can also create Label, Entry and LabEntry widgets.
-Moreover, the ToolBar itself can be made dockable, such that it can be dragged to
-any edge of your window. Dragging is done in "real-time" so that you can see the
-contents of your ToolBar as you are dragging it. Furthermore, if you are close to
-a stickable edge, a visual indicator will show up along that edge to guide you.
-ToolBars can be made "floatable" such that if they are dragged beyond their
-associated window, they will detach and float on the desktop.
-Also, multiple ToolBars are embeddable inside each other.
-
-If you drag a ToolBar to within 15 pixels of an edge, it will stick to that
-edge. If the ToolBar is further than 15 pixels away from an edge and still
-inside the window, but you
-release it over another ToolBar widget, then it will be embedded inside the
-second ToolBar. You can "un-embed" an embedded ToolBar simply by dragging it
-out. You can change the 15 pixel limit using the B<-close> option.
-
-Various icons are built into the Tk::ToolBar widget. Those icons can be used
-as images for ToolButtons (see L</SYNOPSIS>). A demo program is bundled with
-the module that should be available under the 'User Contributed Demonstrations'
-when you run the B<widget> program. Run it to see a list of the available
-images.
-
-Tk::ToolBar attempts to use Tk::CursorControl if it's already installed on
-the system. You can further control this using the I<-cursorcontrol> option.
-See L</PREREQUISITES>.
-
-The ToolBar is supposed to be created as a child of a Toplevel (MainWindow is
-a Toplevel widget) or a Frame. You are free to experiment otherwise,
-but expect the unexpected :-)
-
-=head1 WIDGET-SPECIFIC OPTIONS
-
-The ToolBar widget takes the following arguments:
-
-=over 4
-
-=item B<-side>
-
-This option tells the ToolBar what edge to I<initially> stick to. Can be one of 'top', 'bottom',
-'left' or 'right'. Defaults to 'top'. This option can be set only during object
-creation. Default is 'top'.
-
-=item B<-movable>
-
-This option specifies whether the ToolBar is dockable or not. A dockable ToolBar
-can be dragged around with the mouse to any edge of the window, subject to the
-sticky constraints defined by I<-sticky>. Default is 1.
-
-=item B<-close>
-
-This option specifies, in pixels, how close we have to drag the ToolBar an edge for the
-ToolBar to stick to it. Default is 15.
-
-=item B<-sticky>
-
-This option specifies which sides the toolbar is allowed to stick to. The value
-must be a string of the following characters 'nsew'. A string of 'ns' means that
-the ToolBar can only stick to the north (top) or south (bottom) sides. Defaults to
-'nsew'. This option can be set only during object creation.
-
-=item B<-in>
-
-This option allows the toolbar to be embedded within another already instantiated
-Tk::ToolBar object. The value must be a Tk::ToolBar object. This option can be set
-only during object creation.
-
-=item B<-float>
-
-This option specifies whether the toolbar should "float" on the desktop if
-dragged outside of the window. It defaults to 1. Note that this value is
-ignored if I<-cursorcontrol> is set to 1.
-
-=item B<-cursorcontrol>
-
-This option specifies whether to use Tk::CursorControl to confine the cursor
-during dragging. The value must be either 1 or 0. The default is 1 which
-checks for Tk::CursorControl and uses it if present.
-
-=item B<-mystyle>
-
-This option indicates that you want to control how the ToolBar looks like
-and not rely on Tk::ToolBar's own judgement. The value must be either
-1 or 0. For now, the only thing this controls is the relief of ToolButtons
-and the borderwidth. Defaults to 0.
-
-=item B<-indicatorcolor>
-
-This option controls the color of the visual indicator that tells you
-whether you are close enough to an edge when dragging the ToolBar.
-Defaults to some shade of blue and green (I like it :P).
-
-=item B<-indicatorrelief>
-
-This option controls the relief of the visual indicator that tells you
-whether you are close enough to an edge when dragging the ToolBar.
-Defaults to flat.
-
-=back
-
-=head1 WIDGET METHODS
-
-The following methods are used to create widgets that are placed inside
-the ToolBar. Widgets are ordered in the same order they are created, left to right.
-
-For all widgets, except Labels, a tooltip can be specified via the B<-tip> option.
-An image can be specified using the -image option for Button- and Label-based widgets.
-
-=over 4
-
-=item I<$ToolBar>-E<gt>B<ToolButton>(?-type => I<buttonType>,? I<options>)
-
-=item I<$ToolBar>-E<gt>B<Button>(?-type => I<buttonType>,? I<options>)
-
-This method creates a new Button inside the ToolBar.
-The I<-type> option can be used to specify
-what kind of button to create. Can be one of 'Button', 'Checkbutton', 'Menubutton', or
-'Radiobutton'. A tooltip message can be specified via the -tip option.
-An accelerator binding can be specified using the -accelerator option.
-The value of this option is any legal binding sequence as defined
-in L<bind>. For example,
-C<-accelerator =E<gt> 'E<lt>fE<gt>'> will invoke the button when the 'f' key is pressed.
-Any other options will be passed directly to the constructor
-of the button. The Button object is returned.
-
-=item I<$ToolBar>-E<gt>B<ToolLabel>(I<options>)
-
-=item I<$ToolBar>-E<gt>B<Label>(I<options>)
-
-This method creates a new Label inside the ToolBar.
-Any options will be passed directly to the constructor
-of the label. The Label object is returned.
-
-=item I<$ToolBar>-E<gt>B<ToolEntry>(I<options>)
-
-=item I<$ToolBar>-E<gt>B<Entry>(I<options>)
-
-This method creates a new Entry inside the ToolBar.
-A tooltip message can be specified via the -tip option.
-Any other options will be passed directly to the constructor
-of the entry. The Entry object is returned.
-
-=item I<$ToolBar>-E<gt>B<ToolLabEntry>(I<options>)
-
-=item I<$ToolBar>-E<gt>B<LabEntry>(I<options>)
-
-This method creates a new LabEntry inside the ToolBar.
-A tooltip message can be specified via the -tip option.
-Any other options will be passed directly to the constructor
-of the labentry. The LabEntry object is returned.
-In horizontal ToolBars, the label of the LabEntry widget
-will be packed to the left of the entry. On vertical
-ToolBars, the label will be packed on top of the entry.
-
-=item I<$ToolBar>-E<gt>B<ToolOptionmenu>(I<options>)
-
-=item I<$ToolBar>-E<gt>B<Optionmenu>(I<options>)
-
-This method creates a new Optionmenu inside the ToolBar.
-A tooltip message can be specified via the -tip option.
-Any other options will be passed directly to the constructor
-of the Optionmenu. The Optionmenu object is returned.
-
-=item I<$ToolBar>-E<gt>B<separator>(?-movable => 0/1, -space => num?)
-
-This method inserts a separator. Separators are movable by default.
-To change that, set the -movable option to 0. If you want to add some
-space to the left of a separator (or at the top if your ToolBar is
-vertical), then you can specify the amount of space (in pixels) via
-the -space option. This can be used to "right-justify" some buttons.
-
-=back
-
-=head1 IMAGES
-
-Tk::ToolBar now comes with a set of useful images that can be used
-in your Tk programs. To view those images, run the B<widget> program
-that is bundled with Tk, scroll down to the 'User Contributed
-Demonstrations', and click on the Tk::ToolBar entry.
-
-Note that the images are created using the L<text|Photo> method. Also,
-Tk::ToolBar, upon its creation, pre-loads all of the bundled images
-into memory. This means that those images are available for use in other
-widgets in your Tk program. This also means that unless those images
-are explicitly destroyed, they will use up a small amount of memory even
-if you are not using them explicitly.
-
-As far as I know, all the bundled images are in the free domain. If that
-is not the case, then please let me know.
-
-=head1 BUGS
-
-Not really a bug, but a feature ;-)
-The ToolBar widget assumes that you use I<pack> in its parent.
-Actually, it will I<pack()> itself inside its parent. If you are using
-another geometry manager, then you I<MIGHT> get some weird behaviour.
-I have tested it very quickly, and found no surprises, but let me know
-if you do.
-
-Another thing I noticed is that on slower window managers dragging a
-ToolBar might not go very smoothly, and you can "drop" the ToolBar
-midway through dragging it. I noticed this on Solaris 7 and 8, running
-any of OpenLook, CDE or GNOME2 window managers. I would appreciate any
-reports on different platforms.
-
-=head1 TODO
-
-I have implemented everything I wanted, and then some.
-Here are things that were requested, but are not implemented yet.
-If you want more, send me requests.
-
-=over 4
-
-=item o Allow buttons to be "tied" to menu items. Somewhat taken care of
-with the -accelerator method for buttons.
-
-=item o Implement Drag-n-Drop to be able to move Tool* widgets interactively.
-Do we really want this?
-
-=back
-
-
-=head1 PREREQUISITES
-
-Tk::ToolBar uses only core pTk modules. So you don't need any special
-prerequisites. But, if Tk::CursorControl is installed on your system,
-then Tk::ToolBar will use it to confine the cursor to your window when
-dragging ToolBars (unless you tell it not to).
-
-Note also that Tk::CursorControl is defined as a prerequisite in
-Makefile.PL. So, during installation you might get a warning saying:
-
-C<Warning: prerequisite Tk::CursorControl failed to load ...>
-
-if you don't have it installed. You can ignore this warning if you
-don't want to install Tk::CursorControl. Tk::ToolBar will continue
-to work properly.
-
-=head1 INSTALLATION
-
-Either the usual:
-
-	perl Makefile.PL
-	make
-	make install
-
-or just stick it somewhere in @INC where perl can find it. It's in pure Perl.
-
-=head1 ACKNOWLEDGEMENTS
-
-The following people have given me helpful comments and bug reports to keep me busy:
-Chris Whiting, Jack Dunnigan, Robert Brooks, Peter Lipecka, Martin Thurn and Shahriar Mokhtarzad.
-
-Also thanks to the various artists of the KDE team for creating those great icons,
-and to Adrian Davis for packaging them in a Tk-friendly format.
-
-=head1 AUTHOR
-
-Ala Qumsieh I<aqumsieh@cpan.org>
-
-=head1 COPYRIGHTS
-
-This module is distributed under the same terms as Perl itself.
-
-=cut
+
+package Tk::ToolBar;
+
+use strict;
+use Tk::Frame;
+use Tk::Balloon;
+
+use base qw/Tk::Frame/;
+use Tk::widgets qw(Frame);
+
+use Carp;
+use POSIX qw/ceil/;
+
+Construct Tk::Widget 'ToolBar';
+
+use vars qw/$VERSION/;
+$VERSION = 0.09;
+
+my $edgeH = 24;
+my $edgeW = 5;
+
+my $sepH  = 24;
+my $sepW  = 3;
+
+my %sideToSticky = qw(
+		      top    n
+		      right  e
+		      left   w
+		      bottom s
+		      );
+
+my $packIn     = '';
+my @allWidgets = ();
+my $floating   = 0;
+my %packIn;
+my %containers;
+my %isDummy;
+
+1;
+
+sub ClassInit {
+    my ($class, $mw) = @_;
+    $class->SUPER::ClassInit($mw);
+
+    # load the images.
+    my $imageFile = Tk->findINC('ToolBar/tkIcons');
+
+    if (defined $imageFile) {
+	local *F;
+	open F, $imageFile;
+
+	local $_;
+
+	while (<F>) {
+	    chomp;
+	    my ($n, $d) = (split /:/)[0, 4];
+
+	    $mw->Photo($n, -data => $d);
+	}
+	close F;
+    } else {
+	carp <<EOW;
+WARNING: can not find tkIcons. Your installation of Tk::ToolBar is broken.
+         No icons will be loaded.
+EOW
+;
+    }
+}
+
+sub Populate {
+    my ($self, $args) = @_;
+
+    $self->SUPER::Populate($args);
+    $self->{MW}     = $self->parent;
+    $self->{SIDE}   = exists $args->{-side}          ? delete $args->{-side}          : 'top';
+    $self->{STICKY} = exists $args->{-sticky}        ? delete $args->{-sticky}        : 'nsew';
+    $self->{USECC}  = exists $args->{-cursorcontrol} ? delete $args->{-cursorcontrol} : 1;
+    $self->{STYLE}  = exists $args->{-mystyle}       ? delete $args->{-mystyle}       : 0;
+    $packIn         = exists $args->{-in}            ? delete $args->{-in}            : '';
+
+    if ($packIn) {
+      unless ($packIn->isa('Tk::ToolBar')) {
+	croak "value of -packin '$packIn' is not a Tk::ToolBar object";
+      } else {
+	$self->{SIDE} = $packIn->{SIDE};
+      }
+    }
+
+    unless ($self->{STICKY} =~ /$sideToSticky{$self->{SIDE}}/) {
+	croak "can't place '$self->{STICKY}' toolbar on '$self->{SIDE}' side";
+    }
+
+    $self->{CONTAINER} = $self->{MW}->Frame;
+    $self->_packSelf;
+
+    my $edge = $self->{CONTAINER}->Frame(qw/
+					 -borderwidth 2
+					 -relief ridge
+					 /);
+
+    $self->{EDGE} = $edge;
+
+    $self->_packEdge($edge, 1);
+
+    $self->ConfigSpecs(
+		       -movable          => [qw/METHOD  movable          Movable             1/],
+		       -close            => [qw/PASSIVE close            Close              15/],
+		       -activebackground => [qw/METHOD  activebackground ActiveBackground/, Tk::ACTIVE_BG],
+		       -indicatorcolor   => [qw/PASSIVE indicatorcolor   IndicatorColor/,   '#00C2F1'],
+		       -indicatorrelief  => [qw/PASSIVE indicatorrelief  IndicatorRelief    flat/],
+		       -float            => [qw/PASSIVE float            Float              1/],
+		      );
+
+    push @allWidgets => $self;
+
+    $containers{$self->{CONTAINER}} = $self;
+
+    $self->{BALLOON} = $self->{MW}->Balloon;
+
+    # check for Tk::CursorControl
+    $self->{CC} = undef;
+    if ($self->{USECC}) {
+	local $^W = 0; # suppress message from Win32::API
+	eval "require Tk::CursorControl";
+	unless ($@) {
+	    # CC is installed. Use it.
+	    $self->{CC} = $self->{MW}->CursorControl;
+	}
+    }
+}
+
+sub activebackground {
+    my ($self, $c) = @_;
+
+    return unless $c; # ignore falses.
+
+    $self->{ACTIVE_BG} = $c;
+}
+
+sub _packSelf {
+    my $self = shift;
+
+    my $side = $self->{SIDE};
+    my $fill = 'y';
+    if ($side eq 'top' or $side eq 'bottom') { $fill = 'x' }
+
+    if ($packIn && $packIn != $self) {
+	my $side = $packIn->{SIDE} =~ /top|bottom/ ? 'left' : 'top';
+
+	$self->{CONTAINER}->pack(-in => $packIn->{CONTAINER},
+				 -side => $side,
+				 -anchor => ($fill eq 'x' ? 'w' : 'n'),
+				 -expand => 0);
+	$self->{CONTAINER}->raise;
+	$packIn{$self->{CONTAINER}} = $packIn->{CONTAINER};
+    } else {
+	# force a certain look! for now.
+	my $slave = ($self->{MW}->packSlaves)[0];
+
+	$self->configure(qw/-relief raised -borderwidth 1/);
+	$self->pack(-side => $side, -fill => $fill,
+		    $slave ? (-before => $slave) : ()
+		    );
+
+	$self->{CONTAINER}->pack(-in => $self,
+				 -anchor => ($fill eq 'x' ? 'w' : 'n'),
+				 -expand => 0);
+
+	$packIn{$self->{CONTAINER}} = $self;
+    }
+}
+
+sub _packEdge {
+    my $self = shift;
+    my $e    = shift;
+    my $w    = shift;
+
+    my $s    = $self->{SIDE};
+
+    my ($pack, $pad, $nopad, $fill);
+
+    if ($s eq 'top' or $s eq 'bottom') {
+      if ($w) {
+	$e->configure(-height => $edgeH, -width => $edgeW);
+      } else {
+	$e->configure(-height => $sepH, -width => $sepW);
+      }
+      $pack  = 'left';
+      $pad   = '-padx';
+      $nopad = '-pady';
+      $fill  = 'y';
+    } else {
+      if ($w) {
+	$e->configure(-height => $edgeW, -width => $edgeH);
+      } else {
+	$e->configure(-height => $sepW, -width => $sepH);
+      }
+
+      $pack  = 'top';
+      $pad   = '-pady';
+      $nopad = '-padx';
+      $fill  = 'x';
+    }
+
+    if (exists $self->{SEPARATORS}{$e}) {
+	$e->configure(-cursor => $pack eq 'left' ? 'sb_h_double_arrow' : 'sb_v_double_arrow');
+	$self->{SEPARATORS}{$e}->pack(-side   => $pack,
+				      -fill   => $fill);
+    }
+
+    $e->pack(-side  => $pack, $pad => 5,
+	     $nopad => 0,  -expand => 0);
+}
+
+sub movable {
+    my ($self, $value) = @_;
+
+    if (defined $value) {
+	$self->{ISMOVABLE} = $value;
+	my $e = $self->_edge;
+
+	if ($value) {
+	    $e->configure(qw/-cursor fleur/);
+	    $self->afterIdle(sub {$self->_enableEdge()});
+	} else {
+	    $e->configure(-cursor => undef);
+	    $self->_disableEdge($e);
+	}
+    }
+
+    return $self->{ISMOVABLE};
+}
+
+sub _enableEdge {
+  my ($self) = @_;
+
+  my $e     = $self->_edge;
+  my $hilte = $self->{MW}->Frame(-bg     => $self->cget('-indicatorcolor'),
+				 -relief => $self->cget('-indicatorrelief'));
+
+  my $dummy = $self->{MW}->Frame(
+				 qw/
+				 -borderwidth 2
+				 -relief ridge
+				 /);
+
+  $self->{DUMMY} = $dummy;
+
+  my $drag     = 0;
+  #my $floating = 0;
+  my $clone;
+
+  my @mwSize;  # extent of mainwindow.
+
+  $e->bind('<1>'         => sub {
+	     $self->{CC}->confine($self->{MW}) if defined $self->{CC};
+	     my $geom      = $self->{MW}->geometry;
+	     my ($rx, $ry) = ($self->{MW}->rootx, $self->{MW}->rooty);
+
+	     if ($geom =~ /(\d+)x(\d+)/) {#\+(\d+)\+(\d+)/) {
+#	       @mwSize = ($3, $4, $1 + $3, $2 + $4);
+	       @mwSize = ($rx, $ry, $1 + $rx, $2 + $ry);
+	     } else {
+	       @mwSize = ();
+	     }
+
+	     if (!$self->{ISCLONE} && $self->{CLONE}) {
+	       $self->{CLONE}->destroy;
+	       $self->{CLONE} = $clone = undef;
+	       @allWidgets = grep Tk::Exists, @allWidgets;
+	     }
+
+	   });
+
+  $e->bind('<B1-Motion>' => sub {
+	     my ($x, $y) = ($self->pointerx - $self->{MW}->rootx - ceil($e->width /2) - $e->x,
+			    $self->pointery - $self->{MW}->rooty - ceil($e->height/2) - $e->y);
+
+	     my ($px, $py) = $self->pointerxy;
+
+	     $dummy = $self->{ISCLONE} ? $self->{CLONE}{DUMMY} : $self->{DUMMY};
+
+	     unless ($drag or $floating) {
+	       $drag = 1;
+	       $dummy->raise;
+	       my $noclone = $self->{ISCLONE} ? $self->{CLONE} : $self;
+	       $noclone->packForget;
+	       $noclone->{CONTAINER}->pack(-in => $dummy);
+	       $noclone->{CONTAINER}->raise;
+	       ref($_) eq 'Tk::Frame' && $_->raise for $noclone->{CONTAINER}->packSlaves;
+	     }
+	     $hilte->placeForget;
+
+	     if ($self->cget('-float') &&
+		 (@mwSize and
+		 $px < $mwSize[0] or
+		 $py < $mwSize[1] or
+		 $px > $mwSize[2] or
+		 $py > $mwSize[3])) {
+
+	       # we are outside .. switch to toplevel mode.
+	       $dummy->placeForget;
+	       $floating = 1;
+
+	       unless ($self->{CLONE} || $self->{ISCLONE}) {
+		 # clone it.
+		 my $clone = $self->{MW}->Toplevel(qw/-relief ridge -borderwidth 2/);
+		 $clone->withdraw;
+		 $clone->overrideredirect(1);
+		 $self->_clone($clone);
+		 $self->{CLONE} = $clone;
+	       }
+
+	       $clone = $self->{ISCLONE} || $self->{CLONE};
+	       $clone->deiconify unless $clone->ismapped;
+	       $clone->geometry("+$px+$py");
+
+	     } else {
+	       $self->{ISCLONE}->withdraw if $self->{CLONE} && $self->{ISCLONE};
+
+	       $dummy->place('-x' => $x, '-y' => $y);
+	       $floating = 0;
+
+	       if (my $newSide = $self->_whereAmI($x, $y)) {
+		 # still inside main window.
+		 # highlight the close edge.
+		 $clone && $clone->ismapped && $clone->withdraw;
+		 #$self->{ISCLONE}->withdraw if $self->{CLONE} && $self->{ISCLONE};
+
+		 my ($op, $pp);
+		 if ($newSide =~ /top/) {
+		   $op = [qw/-height 5/];
+		   $pp = [qw/-relx 0 -relwidth 1 -y 0/];
+		 } elsif ($newSide =~ /bottom/) {
+		   $op = [qw/-height 5/];
+		   $pp = [qw/-relx 0 -relwidth 1 -y -5 -rely 1/];
+		 } elsif ($newSide =~ /left/) {
+		   $op = [qw/-width 5/];
+		   $pp = [qw/-x 0 -relheight 1 -y 0/];
+		 } elsif ($newSide =~ /right/) {
+		   $op = [qw/-width 5/];
+		   $pp = [qw/-x -5 -relx 1 -relheight 1 -y 0/];
+		 }
+
+		 $hilte->configure(@$op);
+		 $hilte->place(@$pp);
+		 $hilte->raise;
+	       }
+	     }
+	   });
+
+    $e->bind('<ButtonRelease-1>' => sub {
+	my $noclone = $self->{ISCLONE} ? $self->{CLONE} : $self;
+	$noclone->{CC}->free($noclone->{MW}) if defined $noclone->{CC};
+	return unless $drag;
+
+	$drag = 0;
+	$dummy->placeForget;
+
+	# forget everything if it's cloned.
+	return if $clone && $clone->ismapped;
+
+	# destroy the clone.
+	#$clone->destroy;
+
+	#return unless $self->_whereAmI(1);
+	$noclone->_whereAmI(1);
+	$hilte->placeForget;
+
+	# repack everything now.
+	my $ec = $noclone->_edge;
+	my @allSlaves = grep {$_ ne $ec} $noclone->{CONTAINER}->packSlaves;
+	$_   ->packForget for $noclone, @allSlaves, $noclone->{CONTAINER};
+
+	$noclone->_packSelf;
+	$noclone->_packEdge($ec, 1);
+	$noclone->_packWidget($_) for @allSlaves;
+    });
+}
+
+sub _whereAmI {
+    my $self = shift;
+
+    my $flag = 0;
+    my ($x, $y);
+
+    if (@_ == 1) {
+	$flag = shift;
+	my $e    = $self->_edge;
+	($x, $y) = ($self->pointerx - $self->{MW}->rootx - ceil($e->width /2) - $e->x,
+		    $self->pointery - $self->{MW}->rooty - ceil($e->height/2) - $e->y);
+    } else {
+	($x, $y) = @_;
+    }
+
+    my $x2 = $x + $self->{CONTAINER}->width;
+    my $y2 = $y + $self->{CONTAINER}->height;
+
+    my $w  = $self->{MW}->Width;
+    my $h  = $self->{MW}->Height;
+
+    # bound check
+    $x     = 1      if $x  <= 0;
+    $y     = 1      if $y  <= 0;
+    $x     = $w - 1 if $x  >= $w;
+    $y     = $h - 1 if $y  >= $h;
+
+    $x2    = 0      if $x2 <= 0;
+    $y2    = 0      if $y2 <= 0;
+    $x2    = $w - 1 if $x2 >= $w;
+    $y2    = $h - 1 if $y2 >= $h;
+
+    my $dx = 0;
+    my $dy = 0;
+
+    my $close = $self->cget('-close');
+
+    if    ($x       < $close) { $dx = $x }
+    elsif ($w - $x2 < $close) { $dx = $x2 - $w }
+
+    if    ($y       < $close) { $dy = $y }
+    elsif ($h - $y2 < $close) { $dy = $y2 - $h }
+
+    $packIn       = '';
+    if ($dx || $dy) {
+	my $newSide;
+	if ($dx && $dy) {
+	    # which is closer?
+	    if (abs($dx) < abs($dy)) {
+		$newSide = $dx > 0 ? 'left' : 'right';
+	    } else {
+		$newSide = $dy > 0 ? 'top' : 'bottom';
+	    }
+	} elsif ($dx) {
+	    $newSide = $dx > 0 ? 'left' : 'right';
+	} else {
+	    $newSide = $dy > 0 ? 'top' : 'bottom';
+	}
+
+	# make sure we're stickable on that side.
+	return undef unless $self->{STICKY} =~ /$sideToSticky{$newSide}/;
+
+	$self->{SIDE} = $newSide if $flag;
+	return $newSide;
+    } elsif ($flag) {
+	# check for overlaps.
+	for my $w (@allWidgets) {
+	    next if $w == $self;
+
+	    my $x1 = $w->x;
+	    my $y1 = $w->y;
+	    my $x2 = $x1 + $w->width;
+	    my $y2 = $y1 + $w->height;
+
+	    if ($x > $x1 and $y > $y1 and $x < $x2 and $y < $y2) {
+		$packIn = $w;
+		last;
+	    }
+	}
+
+      $self->{SIDE} = $packIn->{SIDE} if $packIn;
+#	if ($packIn) {
+#	  $self->{SIDE} = $packIn->{SIDE};
+#	} else {
+#	  return undef;
+#	}
+    } else {
+	return undef;
+    }
+
+    return 1;
+}
+
+sub _disableEdge {
+    my ($self, $e) = @_;
+
+    $e->bind('<B1-Motion>'       => undef);
+    $e->bind('<ButtonRelease-1>' => undef);
+}
+
+sub _edge {
+    $_[0]->{EDGE};
+}
+
+sub ToolButton {
+    my $self = shift;
+    my %args = @_;
+
+    my $type = delete $args{-type} || 'Button';
+
+    unless ($type eq 'Button' or
+	    $type eq 'Checkbutton' or
+	    $type eq 'Menubutton' or
+	    $type eq 'Radiobutton') {
+
+	croak "toolbutton can be only 'Button', 'Menubutton', 'Checkbutton', or 'Radiobutton'";
+    }
+
+    my $m = delete $args{-tip}         || '';
+    my $x = delete $args{-accelerator} || '';
+
+    my $b = $self->{CONTAINER}->$type(%args,
+				      $self->{STYLE} ? () : (
+							     -relief      => 'flat',
+							     -borderwidth => 1,
+							    ),
+				     );
+
+    $self->_createButtonBindings($b);
+    $self->_configureWidget     ($b);
+
+    push @{$self->{WIDGETS}} => $b;
+    $self->_packWidget($b);
+
+    $self->{BALLOON}->attach($b, -balloonmsg => $m) if $m;
+    $self->{MW}->bind($x => [$b, 'invoke'])         if $x;
+
+    # change the bind tags.
+    #$b->bindtags([$b, ref($b), $b->toplevel, 'all']);
+
+    return $b;
+}
+
+sub ToolLabel {
+    my $self = shift;
+
+    my $l = $self->{CONTAINER}->Label(@_);
+
+    push @{$self->{WIDGETS}} => $l;
+
+    $self->_packWidget($l);
+
+    return $l;
+}
+
+sub ToolEntry {
+    my $self = shift;
+    my %args = @_;
+
+    my $m = delete $args{-tip} || '';
+    my $l = $self->{CONTAINER}->Entry(%args, -width => 5);
+
+    push @{$self->{WIDGETS}} => $l;
+
+    $self->_packWidget($l);
+    $self->{BALLOON}->attach($b, -balloonmsg => $m) if $m;
+
+    return $l;
+}
+
+sub ToolLabEntry {
+    my $self = shift;
+    my %args = @_;
+
+    require Tk::LabEntry;
+    my $m = delete $args{-tip} || '';
+    my $l = $self->{CONTAINER}->LabEntry(%args, -width => 5);
+
+    push @{$self->{WIDGETS}} => $l;
+
+    $self->_packWidget($l);
+    $self->{BALLOON}->attach($b, -balloonmsg => $m) if $m;
+
+    return $l;
+}
+
+sub ToolOptionmenu {
+    my $self = shift;
+    my %args = @_;
+
+    my $m = delete $args{-tip} || '';
+    my $l = $self->{CONTAINER}->Optionmenu(%args);
+
+    push @{$self->{WIDGETS}} => $l;
+
+    $self->_packWidget($l);
+    $self->{BALLOON}->attach($b, -balloonmsg => $m) if $m;
+
+    return $l;
+}
+
+sub separator {
+    my $self = shift;
+    my %args = @_;
+
+    my $move = 1;
+    $move    = $args{-movable} if exists $args{-movable};
+    my $just = $args{-space} || 0;
+
+    my $f    = $self->{CONTAINER}->Frame(-width => $just, -height => 0);
+
+    my $sep  = $self->{CONTAINER}->Frame(qw/
+					 -borderwidth 5
+					 -relief sunken
+					 /);
+
+    $isDummy{$f} = $self->{SIDE};
+
+    push @{$self->{WIDGETS}} => $sep;
+    $self->{SEPARATORS}{$sep} = $f;
+    $self->_packWidget($sep);
+
+    $self->_createSeparatorBindings($sep) if $move;
+
+    if ($just eq 'right' || $just eq 'bottom') {
+      # just figure out the good width.
+    }
+
+    return 1;
+}
+
+sub _packWidget {
+    my ($self, $b) = @_;
+
+    return $self->_packEdge($b) if exists $self->{SEPARATORS}{$b};
+
+    my ($side, $pad, $nopad) = $self->{SIDE} =~ /^top$|^bottom$/ ? 
+	qw/left -padx -pady/ : qw/top -pady -padx/;
+
+    if (ref($b) eq 'Tk::LabEntry') {
+	$b->configure(-labelPack => [-side => $side]);
+    }
+
+    my @extra;
+    if (exists $packIn{$b}) {
+	@extra = (-in => $packIn{$b});
+
+	# repack everything now.
+	my $top = $containers{$b};
+	$top->{SIDE} = $self->{SIDE};
+
+	my $e = $top->_edge;
+	my @allSlaves = grep {$_ ne $e} $b->packSlaves;
+	$_   ->packForget for @allSlaves;
+
+	$top->_packEdge($e, 1);
+	$top->_packWidget($_) for @allSlaves;
+    }
+
+    if (exists $isDummy{$b}) { # swap width/height if we need to.
+	my ($w, $h);
+
+	if ($side eq 'left' && $isDummy{$b} =~ /left|right/) {
+	    $w = 0;
+	    $h = $b->height;
+	} elsif ($side eq 'top'  && $isDummy{$b} =~ /top|bottom/) {
+	    $w = $b->width;
+	    $h = 0;
+	}
+
+	$b->configure(-width => $h, -height => $w) if defined $w;
+	$isDummy{$b} = $self->{SIDE};
+    }
+
+    $b->pack(-side => $side, $pad => 4, $nopad => 0, @extra);
+}
+
+sub _packWidget_old {
+    my ($self, $b) = @_;
+
+    return $self->_packEdge($b) if exists $self->{SEPARATORS}{$b};
+
+    my ($side, $pad, $nopad) = $self->{SIDE} =~ /^top$|^bottom$/ ? 
+	qw/left -padx -pady/ : qw/top -pady -padx/;
+
+    if (ref($b) eq 'Tk::LabEntry') {
+	$b->configure(-labelPack => [-side => $side]);
+    }
+
+    my @extra;
+    if (exists $packIn{$b}) {
+	@extra = (-in => $packIn{$b});
+
+	# repack everything now.
+	my $top = $containers{$b};
+	$top->{SIDE} = $self->{SIDE};
+
+	my $e = $top->_edge;
+	my @allSlaves = grep {$_ ne $e} $b->packSlaves;
+	$_   ->packForget for @allSlaves;
+
+	$top->_packEdge($e, 1);
+	$top->_packWidget($_) for @allSlaves;
+    }
+
+    $b->pack(-side => $side, $pad => 4, $nopad => 0, @extra);
+}
+
+sub _configureWidget {
+    my ($self, $w) = @_;
+
+    $w->configure(-activebackground => $self->{ACTIVE_BG});
+}
+
+sub _createButtonBindings {
+    my ($self, $b) = @_;
+
+    my $bg = $b->cget('-bg');
+
+    $b->bind('<Enter>' => [$b, 'configure', qw/-relief raised/]);
+    $b->bind('<Leave>' => [$b, 'configure', qw/-relief flat/]);
+}
+
+sub _createSeparatorBindings {
+  my ($self, $s) = @_;
+
+  my ($ox, $oy);
+
+  $s->bind('<1>'         => sub {
+	     $ox = $s->XEvent->x;
+	     $oy = $s->XEvent->y;
+	   });
+
+  $s->bind('<B1-Motion>' => sub {
+	     my $x = $s->XEvent->x;
+	     my $y = $s->XEvent->y;
+
+	     my $f = $self->{SEPARATORS}{$s};
+
+	     if ($self->{SIDE} =~ /top|bottom/) {
+	       my $dx = $x - $ox;
+
+	       my $w  = $f->width + $dx;
+	       $w     = 0 if $w < 0;
+
+	       $f->GeometryRequest($w, $f->height);
+	     } else {
+	       my $dy = $y - $oy;
+
+	       my $h  = $f->height + $dy;
+	       $h     = 0 if $h < 0;
+
+	       $f->GeometryRequest($f->width, $h);
+	     }
+	   });
+}
+
+sub Button     { goto &ToolButton     }
+sub Label      { goto &ToolLabel      }
+sub Entry      { goto &ToolEntry      }
+sub LabEntry   { goto &ToolLabEntry   }
+sub Optionmenu { goto &ToolOptionmenu }
+
+sub _clone {
+  my ($self, $top, $in) = @_;
+
+  my $new = $top->ToolBar(qw/-side top -cursorcontrol/, $self->{USECC}, ($in ? (-in => $in, -movable => 0) : ()));
+  my $e   = $self->_edge;
+
+  my @allSlaves = grep {$_ ne $e} $self->{CONTAINER}->packSlaves;
+  for my $w (@allSlaves) {
+    my $t = ref $w;
+    $t =~ s/Tk:://;
+
+    if ($t eq 'Frame' && exists $containers{$w}) { # embedded toolbar
+      my $obj = $containers{$w};
+      $obj->_clone($top, $new);
+    }
+
+    if ($t eq 'Frame' && exists $self->{SEPARATORS}{$w}) {  # separator
+      $new->separator;
+    }
+
+    my %c = map { $_->[0], $_->[4] || $_->[3] } grep {defined $_->[4] || $_->[3] } grep @$_ > 2, $w->configure;
+    delete $c{$_} for qw/-offset -class -tile -visual -colormap -labelPack/;
+
+    if ($t =~ /.button/) {
+      $new->Button(-type => $t,
+		   %c);
+    } else {
+      $new->$t(%c);
+    }
+  }
+
+  $new ->{MW}      = $self->{MW};
+  $new ->{CLONE}   = $self;
+  $new ->{ISCLONE} = $top;
+  $self->{ISCLONE} = 0;
+}
+
+__END__
+
+=pod
+
+=head1 NAME
+
+Tk::ToolBar - A toolbar widget for Perl/Tk
+
+=for category Tk Widget Classes
+
+=head1 SYNOPSIS
+
+        use Tk;
+        use Tk::ToolBar;
+
+        my $mw = new MainWindow;
+        my $tb = $mw->ToolBar(qw/-movable 1 -side top
+                                 -indicatorcolor blue/);
+
+        $tb->ToolButton  (-text  => 'Button',
+                          -tip   => 'tool tip',
+                          -command => sub { print "hi\n" });
+        $tb->ToolLabel   (-text  => 'A Label');
+        $tb->Label       (-text  => 'Another Label');
+        $tb->ToolLabEntry(-label => 'A LabEntry',
+                          -labelPack => [-side => "left",
+                                         -anchor => "w"]);
+
+        my $tb2 = $mw->ToolBar;
+	$tb2->ToolButton(-image   => 'navback22',
+			 -tip     => 'back',
+			 -command => \&back);
+        $tb2->ToolButton(-image   => 'navforward22',
+			 -tip     => 'forward',
+			 -command => \&forward);
+        $tb2->separator;
+        $tb2->ToolButton(-image   => 'navhome22',
+			 -tip     => 'home',
+			 -command => \&home);
+        $tb2->ToolButton(-image   => 'actreload22',
+			 -tip     => 'reload',
+			 -command => \&reload);
+
+        MainLoop;
+
+=head1 DESCRIPTION
+
+This module implements a dockable toolbar. It is in the same spirit as the
+"short-cut" toolbars found in most major applications, such as most web browsers
+and text editors (where you find the "back" or "save" and other shortcut buttons).
+
+Buttons of any type (regular, menu, check, radio) can be created inside this widget.
+You can also create Label, Entry and LabEntry widgets.
+Moreover, the ToolBar itself can be made dockable, such that it can be dragged to
+any edge of your window. Dragging is done in "real-time" so that you can see the
+contents of your ToolBar as you are dragging it. Furthermore, if you are close to
+a stickable edge, a visual indicator will show up along that edge to guide you.
+ToolBars can be made "floatable" such that if they are dragged beyond their
+associated window, they will detach and float on the desktop.
+Also, multiple ToolBars are embeddable inside each other.
+
+If you drag a ToolBar to within 15 pixels of an edge, it will stick to that
+edge. If the ToolBar is further than 15 pixels away from an edge and still
+inside the window, but you
+release it over another ToolBar widget, then it will be embedded inside the
+second ToolBar. You can "un-embed" an embedded ToolBar simply by dragging it
+out. You can change the 15 pixel limit using the B<-close> option.
+
+Various icons are built into the Tk::ToolBar widget. Those icons can be used
+as images for ToolButtons (see L</SYNOPSIS>). A demo program is bundled with
+the module that should be available under the 'User Contributed Demonstrations'
+when you run the B<widget> program. Run it to see a list of the available
+images.
+
+Tk::ToolBar attempts to use Tk::CursorControl if it's already installed on
+the system. You can further control this using the I<-cursorcontrol> option.
+See L</PREREQUISITES>.
+
+The ToolBar is supposed to be created as a child of a Toplevel (MainWindow is
+a Toplevel widget) or a Frame. You are free to experiment otherwise,
+but expect the unexpected :-)
+
+=head1 WIDGET-SPECIFIC OPTIONS
+
+The ToolBar widget takes the following arguments:
+
+=over 4
+
+=item B<-side>
+
+This option tells the ToolBar what edge to I<initially> stick to. Can be one of 'top', 'bottom',
+'left' or 'right'. Defaults to 'top'. This option can be set only during object
+creation. Default is 'top'.
+
+=item B<-movable>
+
+This option specifies whether the ToolBar is dockable or not. A dockable ToolBar
+can be dragged around with the mouse to any edge of the window, subject to the
+sticky constraints defined by I<-sticky>. Default is 1.
+
+=item B<-close>
+
+This option specifies, in pixels, how close we have to drag the ToolBar an edge for the
+ToolBar to stick to it. Default is 15.
+
+=item B<-sticky>
+
+This option specifies which sides the toolbar is allowed to stick to. The value
+must be a string of the following characters 'nsew'. A string of 'ns' means that
+the ToolBar can only stick to the north (top) or south (bottom) sides. Defaults to
+'nsew'. This option can be set only during object creation.
+
+=item B<-in>
+
+This option allows the toolbar to be embedded within another already instantiated
+Tk::ToolBar object. The value must be a Tk::ToolBar object. This option can be set
+only during object creation.
+
+=item B<-float>
+
+This option specifies whether the toolbar should "float" on the desktop if
+dragged outside of the window. It defaults to 1. Note that this value is
+ignored if I<-cursorcontrol> is set to 1.
+
+=item B<-cursorcontrol>
+
+This option specifies whether to use Tk::CursorControl to confine the cursor
+during dragging. The value must be either 1 or 0. The default is 1 which
+checks for Tk::CursorControl and uses it if present.
+
+=item B<-mystyle>
+
+This option indicates that you want to control how the ToolBar looks like
+and not rely on Tk::ToolBar's own judgement. The value must be either
+1 or 0. For now, the only thing this controls is the relief of ToolButtons
+and the borderwidth. Defaults to 0.
+
+=item B<-indicatorcolor>
+
+This option controls the color of the visual indicator that tells you
+whether you are close enough to an edge when dragging the ToolBar.
+Defaults to some shade of blue and green (I like it :P).
+
+=item B<-indicatorrelief>
+
+This option controls the relief of the visual indicator that tells you
+whether you are close enough to an edge when dragging the ToolBar.
+Defaults to flat.
+
+=back
+
+=head1 WIDGET METHODS
+
+The following methods are used to create widgets that are placed inside
+the ToolBar. Widgets are ordered in the same order they are created, left to right.
+
+For all widgets, except Labels, a tooltip can be specified via the B<-tip> option.
+An image can be specified using the -image option for Button- and Label-based widgets.
+
+=over 4
+
+=item I<$ToolBar>-E<gt>B<ToolButton>(?-type => I<buttonType>,? I<options>)
+
+=item I<$ToolBar>-E<gt>B<Button>(?-type => I<buttonType>,? I<options>)
+
+This method creates a new Button inside the ToolBar.
+The I<-type> option can be used to specify
+what kind of button to create. Can be one of 'Button', 'Checkbutton', 'Menubutton', or
+'Radiobutton'. A tooltip message can be specified via the -tip option.
+An accelerator binding can be specified using the -accelerator option.
+The value of this option is any legal binding sequence as defined
+in L<bind>. For example,
+C<-accelerator =E<gt> 'E<lt>fE<gt>'> will invoke the button when the 'f' key is pressed.
+Any other options will be passed directly to the constructor
+of the button. The Button object is returned.
+
+=item I<$ToolBar>-E<gt>B<ToolLabel>(I<options>)
+
+=item I<$ToolBar>-E<gt>B<Label>(I<options>)
+
+This method creates a new Label inside the ToolBar.
+Any options will be passed directly to the constructor
+of the label. The Label object is returned.
+
+=item I<$ToolBar>-E<gt>B<ToolEntry>(I<options>)
+
+=item I<$ToolBar>-E<gt>B<Entry>(I<options>)
+
+This method creates a new Entry inside the ToolBar.
+A tooltip message can be specified via the -tip option.
+Any other options will be passed directly to the constructor
+of the entry. The Entry object is returned.
+
+=item I<$ToolBar>-E<gt>B<ToolLabEntry>(I<options>)
+
+=item I<$ToolBar>-E<gt>B<LabEntry>(I<options>)
+
+This method creates a new LabEntry inside the ToolBar.
+A tooltip message can be specified via the -tip option.
+Any other options will be passed directly to the constructor
+of the labentry. The LabEntry object is returned.
+In horizontal ToolBars, the label of the LabEntry widget
+will be packed to the left of the entry. On vertical
+ToolBars, the label will be packed on top of the entry.
+
+=item I<$ToolBar>-E<gt>B<ToolOptionmenu>(I<options>)
+
+=item I<$ToolBar>-E<gt>B<Optionmenu>(I<options>)
+
+This method creates a new Optionmenu inside the ToolBar.
+A tooltip message can be specified via the -tip option.
+Any other options will be passed directly to the constructor
+of the Optionmenu. The Optionmenu object is returned.
+
+=item I<$ToolBar>-E<gt>B<separator>(?-movable => 0/1, -space => num?)
+
+This method inserts a separator. Separators are movable by default.
+To change that, set the -movable option to 0. If you want to add some
+space to the left of a separator (or at the top if your ToolBar is
+vertical), then you can specify the amount of space (in pixels) via
+the -space option. This can be used to "right-justify" some buttons.
+
+=back
+
+=head1 IMAGES
+
+Tk::ToolBar now comes with a set of useful images that can be used
+in your Tk programs. To view those images, run the B<widget> program
+that is bundled with Tk, scroll down to the 'User Contributed
+Demonstrations', and click on the Tk::ToolBar entry.
+
+Note that the images are created using the L<text|Photo> method. Also,
+Tk::ToolBar, upon its creation, pre-loads all of the bundled images
+into memory. This means that those images are available for use in other
+widgets in your Tk program. This also means that unless those images
+are explicitly destroyed, they will use up a small amount of memory even
+if you are not using them explicitly.
+
+As far as I know, all the bundled images are in the free domain. If that
+is not the case, then please let me know.
+
+=head1 BUGS
+
+Not really a bug, but a feature ;-)
+The ToolBar widget assumes that you use I<pack> in its parent.
+Actually, it will I<pack()> itself inside its parent. If you are using
+another geometry manager, then you I<MIGHT> get some weird behaviour.
+I have tested it very quickly, and found no surprises, but let me know
+if you do.
+
+Another thing I noticed is that on slower window managers dragging a
+ToolBar might not go very smoothly, and you can "drop" the ToolBar
+midway through dragging it. I noticed this on Solaris 7 and 8, running
+any of OpenLook, CDE or GNOME2 window managers. I would appreciate any
+reports on different platforms.
+
+=head1 TODO
+
+I have implemented everything I wanted, and then some.
+Here are things that were requested, but are not implemented yet.
+If you want more, send me requests.
+
+=over 4
+
+=item o Allow buttons to be "tied" to menu items. Somewhat taken care of
+with the -accelerator method for buttons.
+
+=item o Implement Drag-n-Drop to be able to move Tool* widgets interactively.
+Do we really want this?
+
+=back
+
+
+=head1 PREREQUISITES
+
+Tk::ToolBar uses only core pTk modules. So you don't need any special
+prerequisites. But, if Tk::CursorControl is installed on your system,
+then Tk::ToolBar will use it to confine the cursor to your window when
+dragging ToolBars (unless you tell it not to).
+
+Note also that Tk::CursorControl is defined as a prerequisite in
+Makefile.PL. So, during installation you might get a warning saying:
+
+C<Warning: prerequisite Tk::CursorControl failed to load ...>
+
+if you don't have it installed. You can ignore this warning if you
+don't want to install Tk::CursorControl. Tk::ToolBar will continue
+to work properly.
+
+=head1 INSTALLATION
+
+Either the usual:
+
+	perl Makefile.PL
+	make
+	make install
+
+or just stick it somewhere in @INC where perl can find it. It's in pure Perl.
+
+=head1 ACKNOWLEDGEMENTS
+
+The following people have given me helpful comments and bug reports to keep me busy:
+Chris Whiting, Jack Dunnigan, Robert Brooks, Peter Lipecka, Martin Thurn and Shahriar Mokhtarzad.
+
+Also thanks to the various artists of the KDE team for creating those great icons,
+and to Adrian Davis for packaging them in a Tk-friendly format.
+
+=head1 AUTHOR
+
+Ala Qumsieh I<aqumsieh@cpan.org>
+
+=head1 COPYRIGHTS
+
+This module is distributed under the same terms as Perl itself.
+
+=cut
diff --git a/lib/site/Tk/ToolBar/tkIcons b/lib/site/Tk/ToolBar/tkIcons
index 31b5572d9..0d5b2c869 100644
--- a/lib/site/Tk/ToolBar/tkIcons
+++ b/lib/site/Tk/ToolBar/tkIcons
@@ -1,195 +1,195 @@
-actattach16:act act16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBPz+/AQCBAAAACH5BAEAAAAALAAAAAAQABAAAAI2hAOCxg2h0nJHyEshi9HpxU1GOCLdZoKpQ15nibUoprKp9lh2oucUxsBRXsJh4Hjs/QTMpr8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actbookmark16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actbookmarknew16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy6vERGRFRWVDQyNKSipAQCBMTGxKyurISChJSSlJyanHR2dIyKjPz+xISGhPz+BGxubMTCBHx+fPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVfICACwWieY1CibCCsrBkMb0zchTEcNYsIiYHiwIOdEAvigdFQGE0Ix4NBbSAgsWjk+jBIAlcUYrJASChnSXZSoUDelKfoKpFALJA61ueGI2IAZmhogGFmCGGAgXsifiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actcheck16:act act16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBMT+xATCBASCBARCBAQCBEQCBAAAACH5BAEAAAAALAAAAAAQABAAAAM2CLrc/itAF8RkdVyVye4FpzUgJwijORCGUhDDOZbLG6Nd2xjwibIQ2y80sRGIl4IBuWk6Af4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actcross16:act act16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/PwCBMQCBEQCBIQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMuCLrc/hCGFyYLQjQsquLDQ2ScEEJjZkYfyQKlJa2j7AQnMM7NfucLze1FLD78CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actexit16:act act16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBDQyNHR2dCH5BAEAAAAALAAAAAAQABAAAAI4hI+pFrHb3nEg1iWiDiINCwYDko0V9XUTda6I1TIsUMpGinyzbB6ZeGuoEr+GUDL4CXqSphPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-acthelp16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQ6XAQCBCyCvARSjAQ+ZGSm1ARCbEyWzESOxIy63ARalAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ/EEgQqhUz00GEJx2WFUY3BZw5HYh4cu6mSkEy06B72LHkiYFST0NRLIaa4I0oQyZhTKInSq2eAlaaMAuYEv0RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actitemadd16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBARCZPz+/Mzq9BTC3ITC1HSyzGSivAw+XBSStIS6zHy2zAQCDFyatAQOHFSStEyOtAQSJBSq1DR2nCxunCRmlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICCOQTmeaCAMRIC+AVu47xkTBl2Ld16XQNYBQTQBVIOkMHFQJBeMI4tAbSSu2IRDSnhAvFfI97sFRM6RwOMacbjLKckVvgvIJ5EdSU7J648VgXQ7Dmd/hyJ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actitemdelete16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBARCZPz+/Mzq9BTC3AQCDAQOHFSStAQSJAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQwEMhJq704681n+GAISoEwnGg6EAUQrEQsz4ThEkeu77kNIAagMEj0dY7IpHI58UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actlock16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJEQ+FExGHCQiDBwaDGxiLHxyNHRuPIR+TIyGZJSSfFxaRFxWJGRiLJyaXNzWpNTOnMzGnLy2hJSKTGReLKyqjPTu1NzarMS+jLSyfKyibJySXIyGVCQeDLSytPT29Ozu7OTi5NTS1KyurJSSjGxqVFxaXLS2tKSebOzuzLSufJSOXExGLGRiTExONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwGCgGhkhkQDBoEpLKQoBACAyOUID1qTVwoQGvMPxNFgVjAxp6QCQUicSCwVgkG44HJCKRRCYUCAxIFRYXhxgZGhYbHINEHR4fGCAhIiMkFSVKJicoKSoFKwMsLZtDLison6GjLA92qCueoAUvpC2xQhWqrLYDErmEMDEXlDIwMxAHukI0NS01EzY2NAmPAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actredo16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxOHBxSHBRGHKzCtNzu3MTSzBQ2FLzSxIzCjCSKFCyeHDzCLAxGHAwuFDSCNBxKLES+NHSmfBQ6FBxWJAQaDAQWFAw+HDSyLJzOnISyjMTexAQOBAwmDAw+FMzizAQODDymNKzWrAQKDAwaDEy6TFTGTFSyXDyKTAQCBAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ2QIBwSCwaj0hAICBICgcDQsEgaB4PiIRiW0AEiE3sdsFgcK2CBsCheEAcjgYjoigwJRM2pUK0XDAKGRobDRwKHUcegAsfExUdIEcVCgshImojfEUkCiUmJygHACkqHEQpqKkpogAgK5FOQywtprFDKRwptrZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actreload16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCRaJBxWJBxOHBRGBCxeLLTatCSKFCymJBQ6BAwmBNzu3AQCBAQOBCRSJKzWrGy+ZDy+NBxSHFSmTBxWHLTWtCyaHCSSFCx6PETKNBQ+FBwaHCRKJMTixLy6vExOTKyqrFxaXDQyNDw+PBQSFHx6fCwuLJyenDQ2NISChLSytJSSlFxeXAwODCQmJBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIBQGBAMBALCcCksGA4IQkJBUDIDC6gVwGhshY5HlMn9DiCRL1MyYE8iiapaSKlALBdMRiPckDkdeXt9HgxkGhWDXB4fH4ZMGnxcICEiI45kQiQkDCUmJZskmUIiJyiPQgyoQwwpH35LqqgMKiEjq5obqh8rLCMtowAkLqovuH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actrun16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/ISChKSipMTCxLS2tLy+vMzOzMTGxNTS1AAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARlEMgJQqDYyiDGrR8oWJxnCcQXDMU4GEYqFN4UEHB+FEhtv7EBIYEohkjBkwJBqggEMB+ncHhaBsDUZmbAXq67EecQ02x2CMWzkAs504gCO3qcDZjkl11FMJVIN0cqHSpuGYYSfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actstop16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/Gw6NGQuLHQ6NGQmJFweHFQaFPTm5PTa3PTW1Oy+vOS6tNSinKReVDQWFPz+/Nx6fNyCfNyGhNR+dMxybMRiXLxGRIwWFNx2dNx+fNx2bMxuZLQWFBwWFPTu7Pzy9NRqZNRuZMRSVLwmJGwWFNR2dMQiHPTKxMxmXMQyLMxmZNx6dMxiXMRSRMRaVKxybMxaVEQWFMQuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaaQIAQEBAMCAWDYcgkHhAJxYLRcDQBggckIplQKpaLdRh4YDIaSWa94Vw6woAHgv6AMKGPaMQhwQMJJRkfhHmEJhdvRCcgGSCEkCgpbnAECiorGYYfLCItlAAFCygQj5AfbYlwBQwVE5AukG6KBi8tMC0fLi0pHxyzcAAxFxwmMny/wEwOxMm/qlcdJCSJ1H5XQh3a28HY3kx+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actundo16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxSHBxOHMTSzNzu3KzCtBRGHCSKFIzCjLzSxBQ2FAxGHDzCLCyeHBQ+FHSmfAwuFBxKLDSCNMzizISyjJzOnDSyLAw+FAQSDAQeDBxWJAwmDAQOBKzWrDymNAQaDAQODAwaDDyKTFSyXFTGTEy6TAQCBAQKDAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ1QIBwSCwaj0hiQCBICpcDQsFgGAaIguhhi0gohIsrQEDYMhiNrRfgeAQC5fMCAolIDhD2hFI5WC4YRBkaBxsOE2l/RxsHHA4dHmkfRyAbIQ4iIyQlB5NFGCAACiakpSZEJyinTgAcKSesACorgU4mJ6uxR35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actunlock16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJExGHEQ+FCQiDBwaDBweDGxiLHxyNHRuPIR+RIyGZJSSfFxaRGxmLJyaXNzWpNTOnMzGnMS+jJSKTGReLKyqjPTu1NzarLSufKyibJySXIyGVGxiNFxaXLSytPT29Ozu7OTi5NTS1KyurGxqVCQeDJSSjLS2tNTW1KSmpGRiLKSebOzuzJSOXExONExGLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaVQIBwOAwYA8SkMCAYOAnKYiFAIAQGyOgVCggYuEovVxztMpdnwAGRSCgUCwOjIeQ6HpCIZDKRUNYMRBUWF4UYGRoWGxyBRR0eHxgaICEiIyR0QyUmJygpKgUrAxMsLUQlKyieoKIuEAunK52fBS8DLiywQySpnjC1Mbi6QjIzNBeSIBY1EQfDQgosLAEUNjY3Co1DfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appbook16:app app16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBDyKhDSChGSinFSWlEySjCx+fHSqrGSipESOjCR6dKTGxISytIy6vFSalBxydAQeHHyurAxubARmZCR+fBx2dDyKjPz+/MzKzLTS1IyOjAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVkICCOZGmKQXCWqTCoa0oUxnDAZIrsSaEMCxwgwGggHI3E47eA4AKRogQxcy0mFFhgEW3MCoOKBZsdUrhFxSUMyT7P3bAlhcnk4BoHvb4RBuABGHwpJn+BGX1CLAGJKzmKjpF+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appbookopen16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExCNGSenHRmVCwqJPTq1GxeTHRqXPz+/DwyJPTq3Ny+lOzexPzy5HRuVFSWlNzClPTexIR2ZOzevPz29AxqbPz6/IR+ZDyKjPTy5IyCZPz27ESOjJySfDSGhPTm1PTizJSKdDSChNzWxMS2nIR6ZKyijNzOrOzWtIx+bLSifNTGrMy6lIx+ZCRWRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQEAAQCwWBYJiYEAoGAFIw0E5QCScAIVikUgQqNargtFwdB9KSDhxiEjMiUlgHlB3E48IpdKdLCxzEAQJFxUTblwJGH9zGQgVGhUbbhxdG4wBHQQaCwaTb10emB8EBiAhInp8CSKYIw8kDRSfDiUmJ4xCIxMoKSoRJRMrJyy5uhMtLisTLCQkC8bHGBMj1daARgEjLyN03kPZc09FfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appboxes16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+xAT+BASCBATCBMT+/AT+/ASChATCxPz+xPz+BISCBMTCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgZwrwYBCFqvhs3DNYXjChRlWBRjIRqGN4UuEUczMZxsDeXykdEsDQVVSLhQxhBCkVlmXA+KVHFYhFYOoHbMGN6pTQaW8YYiQmcG+q16a0+Zipw+4e9B/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-appbox16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+xISCBMTCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANECKoR6ys2IVqokF08yMTA1gwkYX5WQK5ma4VceTYPxXnBWdtY6+0834/Bowgzm6APWRQcH4TiMhPK2WYRiZWW7XK7/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appbrowser16:app app16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxONCROfCRKfKx6LNy+bNTOpGSS1DRupAwyXBRSnPTSjPTqvOzqzMzSvHSSlKy6ZDxutAxCpBQ2XBxepLTKvPzqzPzy5OTShLS2dLSqRFR2jBRerBQ+jOTixOzetNS2XHx6XDR2tCRexBwyTDyKzOTavPzq1OzKdCx23BRKtCQ6VCQmHFSa7IyirOzSnGSGpIR+bFSO1DyK7DR+5CRixBw2VDQuHFye7IS27NzGXISuhEyS5DR25BRWxBQ+lBQyXCQqPCxSfGyu7GyerKy2ZFR+rERqfCRmxBROtBQ+fBwuTBwmNDSW9JyabLyqRIx+TExSXBQ6bAQCBBQ6ZBxapDR+zBxq3LyaLJySRHxqPGxeNBxGbCRmrHRyRERONDRKNDQ2JCQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAeygACCg4SFhgABAQIDh4MBBAUGBwgDCYcKCwwNDg8QERIThRQVFhcNGBkaGxwdoYMDHhcXHxggISIjEiSvJSYXJwsoISkpIyorLIIDLS4WLzAxMjM0NSo2N8o4OS46OzwzPSk+P0BBgkI8Q0NERUZHCEhJSktMgwk4Qy1NTk9QUVJLphCiUsWKlStYsmjZQiJgIS4KuijQ4iXAFxYCDVFJwGUFmDBhMjYSw0KMyEYoBfkJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appcalc16:app app16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChPz+/AQCBCH5BAEAAAAALAAAAAAQABAAAAI4hI9pwe0Ogpi00hHF2LzzzFlTsIHD45SSx6oCeW4wjK2tl83y7t64pIsJaxrfh2bEAJIlhRPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appclock16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAALy+vAQCBPwCBMQCBIQCBISChPz+/MTCxCH5BAAAAAAALAAAAAAQABAAAANbCLHcrSLKOZcYmDSCsR1aUABAsXDDJwJGa5SBFwgaWxbCG3CWaBwG3C8Y67FawpYiNQscg65fsVkYuoAmJs1pBR522lQB6ILJLqHRwQQOZzYdZnw+dzruDIA/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appdate16:app app16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPzerPyqXMRaBIQCBISChPz+/KSipMTCxPz+BMTCBPwCBPz+xPzCxMQCBISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVxICCOQGCeJjkGwkC8RFEEavkax2G8dB0QuRyhhzoBg8MSYsncJXKJZIDZHCoWP1ogGIwGrtnSgUFmHLyNRHhrdpjRamnO/SYkromHdnxwnwkKVxByZW8DgQsQM2JcfwZXO0MBCZSVBgMuLzJaRZ0pfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-apppencil16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/IQCBMQCBPzCxAQCBPz+/MTCxISChDQyNKSipEQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARDEMhJZRBD1H2z3lMnjKCFjUJQimOgcmcbELCXzjXq0hV785WCQYcDFQjDXeloMByKG6YTAdwIDAlqSZJSVFeKLcUfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appsheet16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAT+/Pz+/KSipPz+BAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANFCBDc7iqIKUW98WkWpx1DAIphR41ouWya+YVpoBAaCKtMoRfsyue8WGC3YxBii5+RtiEWmASFdDVs6GRTKfCa7UK6AH8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-apptool16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBISChGRmZMTCxKSipLS2tHx6fPz+/OTm5FxaXOzu7DQyNMzOzAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMhAq7wYBDECKVSGBcbRfcEYauSZXgFCrEEXgDCSeIEyzKSXZoBYVCoJVIqBGByKu0Cy8QHxmgNngWCkGgqsGWFseu6oMApoXHAWhWnKrv0UqeYDe0YO10/6fhJ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-apptools16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExKTERCRAQCBOzu7Nze3MzKzLy+vCxqZBQ2NJyanKyqrGRiZDRydKza3FRWVPT29LSytDw6PMTm5EySjCxaXGRaJFSanCRSVGxqbPTmvMSqVJTW1GSurHS6vOzq7KSipISChFRKHJSGNPz23GxKFBQ6PKyurCwqLMyufJx2RAQGBJSWlEwyDIRiLNy+lLSKVDwmDJRuNOTOrLyabGRCFDx2dKSCVOzWtHzCxOTGnNSyhAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQIBwCAgIBAOiUiggFAyHASKxDAwUC8Zg0HAglA9IZPGQABoTSqJCFTIOEIsFgHBcEhhHUpKJFCwaGxYYHB0VEx4IEh8gIQwiIyQbJRMcHokmEicfDygAkCkqJQgIGG0rLElCLS4vMCWqQwMCQg0UMTIzNDVLQjaIGDE3ODQlS785CEkxKjowvEOHybG4O6JDCdNKuDUxRAmxRDHeveUAfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appuser16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MTCxISChMT+/ATCxASChFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMg5gw00yyDGIAR1YUDggeFWFIZhnSBZrsZxdIOFEGTA2oeBAHeyuGwvzxBlYdUOLROMFzDQntJPrNoqAKUBaqnV+k57ZORruykHDj2LqIzUVKp1u0iuB/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-appusers16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxISChAT+BMRaBPyqXARCBPz+/FxaXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARLEIRJa5Ui673nsGAgeKE1Bl9AUEXbiqTlFlZaGUZoszm4BzhDAVf5BYbAXI+TAR6CS2ZGSZSEiIIqYIsSIEaJ7GRrlY7J1lKA7I8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-appwp16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBKSinJyOfPz27Pzy7AwKDExOTJyWlERCRKSelPz69LyyrKymnPz+/MS2fDQyJAQCBOTazLSiXOzivMS2jKSSVOzmxPz25NzSpPTu5KyebOzixNTGjOTWpMSydMSybCwqFGReVKyaXNzSnGxeNJSCVMS2nPz23MSuZIR+bJyShLyqnOTOtGxiXIR6XOTSvIx6RMSubIyCdKSalMS6pOTWxMzKvKSabJyKTOzezHxuPGRmZKyurMTCvPTq3AAAACH5BAEAAAAALAAAAAAQABAAAAajQIBwCAgIiEhiYEA4FgwHRDKhIBAWz4OhgGQ0FAPHA7qFEBONb0Qy0ULeQ2+aUrFcMI+3GYBOZzQbHB0eHyAhIQByDREiEwMjFRIkJQImAgJ+jScjHigkKSorLC0AKg2NFSMoki4qCy+IQgITKDAxkjIzNDWkQxQoJaskMgk2Eb1DNzgoOCoHDDY5yEIwJToAOzw9ET7TQiREAhkZ3kmy5QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-cal1day16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANOCLrMEUDIOUS9AFLLhx8LIRZjKYZmMRCkaChFLHty/AIiS3y6q+QtT49wq8VotRtQJGwRf6Zmrlj7DJLQXsupTJmeEIN4TB5nII20wp8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-cal5days16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANMCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiIdMmcec7jy53q81qP9OO5VMAj8RXTFWzOZW95HDLdEEM4LA4nIE0zgp/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-cal7days16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANPCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiwcp0fucsj873qvGMv5Jw2FIACUsW4WakGW1O046I05qmGYBhTC6TM5CGWuFPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-calappointment16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxPz+BISCBISChKSipAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARbEMhJaQhA6D1E/wDGeeRgDhOhFoTBEi+REgdrIHScSEVvAD9Xr7cDqGSGpFEnQSqTv2NxCFQOiU1VEAiTZmstHFg1vQKuw+LxxfYaV/AuOQRI2O/4ewhT6Uv8EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-calbell16:cal cal16 16:photo:16 16:R0lGODlhDwAOAIIAAPwCBISCBPz+BIQCBMTCxISChPz+/AQCBCH5BAEAAAAALAAAAAAPAA4AAAM+CLrR+zCIAWsgLVRGRBhOVQiG94WPVAbHaZHYAWqRYLbge88RsbInGuBCEhRYrZYm4xk4nYdoKzKIbiKHawIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-callist16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/KSipPzerMRaBEQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARDEMhJaQhA6D1E/wDGeeRgDhOhruyatjBRSIRxxOsMEAdC0BUZDcfSEYvDo3Bn++2Cxt7RqFxWhZiCdsvdhjCVsMQfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-calmonth16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANSCLrMEUDIOUS9AFLLhx8LIRZjKYbiRxLFIBpK0Q6z7MkwkJIe8b0KEeuWchFysuStVsjtfMbeMQitWpG25YfmNK1WU53XNIUYzug0OgNpuBX+BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-caltoday16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxKSipPyCBMRaBPyqXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARTEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyIQhFfiBIAfuFzaAioBIJBCummRYPCaDPh3vhwsOZdihNfa8Ub/AJXemFZPPNBvGwG672yFMZS7xRwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-caltodo16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBAT+BAQC/AQCjPz+/MTCxPzCxKSipPwCBMQCBIQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARaEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyMYhFXiuFwZiA6qZYbbqJX5BIw2RAPxwAAWCyWMCCsiXFGEEErKz6LQZfOqiTR1YJiGq1rFyyHmo2+/1EKbCl/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-connecting16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZbihUiz60FPnfaA0iBpBVGdHEYWxToEoSHBRHHM9AgSEQRcj+AYkYAJxIPKQFUJiOdTJQFIDU6dYzKKFhTCM+E5g4mXaDAyrlogEG+DGTecA7wsP8EcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-connectno16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBAQCBERCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARPEMhJq704axBEHoPUEdhQGMNYFuwxkKInDYjBniEnwMCQIIebSzXx/WwsFK+YMABZikWuYlrUCtZpEYv4WRPaHhb064YB41kCfJFSQBh/BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-connectyes16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/KSipDQyNMTCxMTGxISChFxaXMzGzAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZxCjgsAtDtUlCOA1gJQ4kl/IDatAoF7xxkS6GgEBr6jAobCyBX42SQBxMOx6A8MhiGASR8YDgrYsNEeJ0zaEGZY7uoH2oB6nOUwtbdLaVOeTUwo/8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-devcdmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tOzOvNTqvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/LzKvMTCxDQyNASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAa0QIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTBqUiuUCVmAeiYzmsKlwOt/AAKFIFAIIFx4WHyAhUwIDIgsZFyMkFxchJSYmiBkSBBoIJJwIGgOhiCYFJSEnFyQjFwNZewABISAfFiYnCAEmCREIrwAIFhwVGwcaBAkPGApsQsAVFA0GBQMRbxBTKM0ODQwTEq192ClDgROkBHvYKuNJUu5CKCorX1RDKCkpUn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-devcdunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tNzmvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/MTCxLy6vDQyNOTm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAapQIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTLqUigWsuDwSmMxBQ9lwvoEBQpEoBBAWHRseHyBTAgMhCxgWIiMWFiASJCSHEgQSGQgjmwglGKCHBQUSICYWIyIWAwshIVMBIB8eFSQmCAEFCREIekIIFRsUGgcZEgkPFydrvxUUDg0GBSEREGJfv9AMEySsJxDYQ4DcEhh64UpS6lTs7QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-devdiskmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKROzSrOzKpOTGnLSafLySZKxuLMSOVPTWvPzixLSehNyibOzOrGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTOpHxOJKyKXFw+HKSipISChMTCxFxaXIRiPNSWXExOTOS2hLR+PLRyLPTWtMyOTASCBARCBPz+/DTSJIyKjIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwrA3HQ7scQAqFAcEQOUi0zAkFUSFYLghMBloUCDQNGxwdHhwHekcfICEhICIfIxkLJBABJUYCICABIhAOBiYnKJaXmH4CGSkYCCqkSAEfTKenrkOwsrQll0IrS7G5uwArLLaxLbXCLsTFLyDBKy4wZEVHvCwsRn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-devdiskunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKRPTWtOzKpOTGnLSafLySZKxuLMSOVOzOrPzm1LSehNyibGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTWvHxOJKyKXFw+HPTOpKSipISChMTCxFxaXIRiPHxaNLRyLNSWXExOTPzixOS2hLR+PMyOTPz+/IyKjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaIQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwGgiD46FdDiCFwoDQAEe0TMkEQSFULIcLBloUCDIaDRscHRsNHhhHHyAhISAiHyMkJSYQASdGAiAgASIQKA0pKguXmJl+AiQGFwgrpUgBH0yoqK9DsbO1J5hbsrq8SrgstlJFHy0gwMVFR1J+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-devfloppymount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVrICCOQBCQKBkIw5mqLFG47zoQ+FwbN57TosDhgPD5dMEEIqE04kwlBWKBUEiNVYFpyqAyGEUCgqEtERiNNMLhQKzLQYJg7n7Y4aMAwbCUPvAQeWNgfzQQETAIhSMQEogwgBITQEGGEREmfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-devfloppyunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVCH5BAEAAAAALAAAAAAQABAAAARcEMgJQqCYBjFu1hxReN82EOhYGieaklJwHIjrqnGCJLqNWhUFYoFQCG1FgWXIIDIYNQKCoawQGI0swuFAbKsxgmDsfZjBkwDBsNM90Jot9A3DbBD0Dwiur9QnfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-devnetwork16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBISChPz+/Nza3ARaZESanCyKlARudARGTLy+vNzq7ARmbMTCxARufAROVMzOzKSipARyfOzq7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVmICAGZFmKQiACweCSBImq41AYB5IodLq2hwWO0ejRWDac48Gb/QKNqNRoqspmrVcAUuIJBANS8sBIFCORUgooPEh4J8B67NgdsVBp9C5XWfl9LRMTCyReX19hARNojWlWLH+AAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-devpc16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBISChHx+fPz+/AQCBAQC/AT+/AQCxAQChAT+BLy+vAR+BAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARYEIAgqK1YzsG754QUDERpmkEpkkXrtoK6EcVgHIibhnNx564Yb0TDvQq7FQ34EiqPOhnREqhWSUPsyZSQAbbg7GcMEgwUiYVivTa1R+y4XEGoWO/4AMAfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-devscanner16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MT+/ASChARCRATCxMTCxFxaXKSipDQyNAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEMgJgqWBVivEldkUdKSXhVjZfenommglDERh3Tc4E4ZRHAGgkEPr9X6H5AHBERSMRyWzkug8jQXFEhWoOo8dRYxqLXSmGjIJnVaz29Q3fAP3RwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-devscreen16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXFRSVPz+/PT29OTm5OTi5DQyNDw+PERGRExKTHx+fISChIyKjHRydFxeXDQ2NCQmJBQSFAQCBERCRMTGxHR2dGRiZExOTDw6PCQiJAwODCwuLFRWVOzu7BweHAwKDCwqLHx6fBQWFGxqbGRmZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAanQIBwSCwKAwKkMslEAgSDqDRKqBYKhkNgcDggEorkMrDQchkNhuOhgEQkk0l5S2lUGpYLJqPZTAwMHB0DCmhqAW0Rfh5zAxgOkBcCFAcfIBMECxwBBAEPFw8dChkhcBMDDAcdnQqtFKSWcQMimx4dGRkQBxGxsg6bBQEawx8jl3GnJFoFHRNXVVNRJYIFDAsL1tgiDiQXFx0HABwcXeQH5OjkRutEfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-devspeaker16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXAT+/DQyNATCxMTCxPz+/AQCBKSipASChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMgJQqCXziDG2JoUEENhZBkmHIWJVptAmqcIW/Js1MiF56TBzkckAAcHoa9nMRKeA4TyJk0knsHhTeK5khBaH2VwLYVh40TJhQ6RzeIQV32Quz8hfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editcopy16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAFxaXPwCBNze3GxubERCRPz+/Pz29Pzy5OTe3LS2tAQCBPTq3PTizLyulKyqrOzexLymhLy+vPTy9OzWvLyifMTCxHRydOzSrLyihPz6/OTKpLyabOzu7OTm5MS2nMSqjKSipDQyNJyenLSytOTi5NTS1JyanNTW1JSWlLy6vKyurAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAaUQIBwCAgYj0eAYLkcEJBIZWFaGBie0ICUOnBiowKq4YBIKIbJcGG8YDQUDoHTKGU/HhBFpHrVIiQHbQ8TFAoVBRZeSoEIgxcYhhkSAmZKghcXGht6EhwdDmcRHh4NHxgbmwkcCwIgZwqwsbAhCR0CCiIKWQAOCQkjJAolJrpQShK2wicoxVEJKSMqDiAizLuysiF+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editcut16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAIwhI9pwaHrGFRBNDdPlYB3bWHQ1YXPtYln+iCpmqCDp6El7Ylsp6ssR1uYSKuW0V8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-editdelete16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPT29GxubMzOzDQyNIyKjHRydERCROTi3IyKhPz29Ox6bPzCxPzy7PTm3NS6rIQCBMxCNPTq3PTi1PTezMyynPTm1PTaxOzWvMyulOzGrMymhPTq5OzOtNTKxNTOzNTCtNS+rMSehAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaKQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhSEQkFgrBAcr1URiPhKAsDD3QB8RhA3FM0IlLHnyUTVBMSFBUWfl0XGBMTGBcZGodmcQWKjpAbHIgIBY2LHRoempOdjooTGx8giIOPFYofISJ+DyMXI6AfFySyfiUmJSUnKBYcICIpfgELzM3OZX5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-edit16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaVMR+RPzKjNze3AQCBMR6RPzGjPyODPz+/MzOzPyKDPyKBPz29OTWzPyGDPyGBOx6BOza1OR2BKROBNSOXKRKBBwOBOzu7PTWxPzizOySZPyCDFxaXOy2lNRyRMxmJCQOBPTm1OzStPTKrMR+XIRWLFxGNCQSBDQyNIRSNDQuJERGRLyqlNzSvIx6ZKRuVEw6LLSyrLymhKSShBwaFFROTJyWjMS+vNzW1OTazNzKrHRqXOzezOTOpPTq3OzWvOTStLyedMS+rLy2pMSynMSulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAewgAAAAYSFhoQCA4IBBI2OjgUGBwiLBAmXlpcKkgsMlZcJBA0JDpIPEBGVjwkSBgOnExSfmBIVBxAMExYXswkYGRobHLq8gh2PHhoeHyAWIYKzIiMkJSYnKCnQg5YNHtQqKywtK9qMBC4vMDEBMjIz2dCMDTQ1Njc4OToz5PEEOzw3ZPToMcLHO23HfogQ0QMIkCA+hPBbhAPHECJFjMyYIUQIvEUpUqwQOXKkSEF+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editpaste16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQiFHRqNIx+LFxSBDw6PKSaRPz+/NTOjKyiZDw+POTe3AQCBIR2HPT23Ly2dIR2FMTCxLS2tCQmJKSipExGLHx+fHR2dJyenJyanJSSlERCRGRmZNTW1ERGRNze3GxubBweHMzOzJSWlIyOjHRydPz29MzKzIyKjPTq3Ly2rLy+vISGhPzy5LymhISChPTizOzWvKyurPTexOzSrDQyNHx6fCwuLGxqbOzKpMSabAQGBMS2nLyulMSidAAAACH5BAEAAAAALAAAAAAQABAAAAa7QIBQGBAMCMMkoMAsGA6IBKFZECoWDEbDgXgYIIRIRDJZMigUMKHCrlgul7KCgcloNJu8fsMpFzoZgRoeHx0fHwsgGyEACiIjIxokhAeVByUmG0snkpIbC5YHF4obBREkJCgon5YmKQsqDAUrqiwsrAcmLSkpLrISLC/CrCYOKTAxvgUywhYvGx+6xzM0vjUSNhdvn7zIMdUMNxw4IByKH8fINDk6DABZWTsbYzw9Li4+7UoAHvD+4X6CAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editshred16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbGxubMzOzPz69DQyNIyKjERCRPz29PT29OTi3IyKhPz27PTu5PTy5Pz6/Pzy7PTq3OzexLyqlPTm1PTizOzavLyqjOzWvOzaxLyifOzizOTOpAQCBOzezAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaEQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhWEQkFYYHkeqkMxKFBFpq9jgdkEGlPqwrJhCIY2N8FFRYUFxcYGX9dgRKEGhiHiYEOhBcbGBwdiQEOARcBGwEeAZllAgEUnQEfoQEgmp4hrCKtrwEYsrRlTiMBJAG8syN/IyMAxMXHSH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-edittrash16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipFxaXPz+/MTCxISChDQyNCH5BAEAAAAALAAAAAAQABAAAANQCKrRsZA5EYZ7K5BdugkdlQVCsRHdoGLMRwqw8UWvIKvGwTICQdmGgY7W+92GEJKPdNwBlMYgMlNkSp3QgOxKXAKFWE0UHHlObI3yyFH2JwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-fileclose16:file file16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCQiJBwaHAQCBDQyNDw6PFxaXFRSVERGRCwqLAwODGRiZHx6fPz+/GxqbAwKDCQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVaICCOZGmeqBgEwjCkRGEcSKK4JrEcBrMgAdeLVDg0GguGsYEbBQyGYyN6FDoPDIf0+LCKBIgetQERDgGDBGIpNY8GioAU0m6KXFw883w3+/l9f4AkfimGIn4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-filedocument16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJSWjPz+/Ozq7GxqbJyanPT29HRydMzOzDQyNIyKjERCROTi3Pz69PTy7Pzy7PTu5Ozm3LyqlJyWlJSSjJSOhOzi1LyulPz27PTq3PTm1OzezLyqjIyKhJSKfOzaxPz29OzizLyidIyGdIyCdOTOpLymhOzavOTStMTCtMS+rMS6pMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaQQIAQECgajcNkQMBkDgKEQFK4LFgLhkMBIVUKroWEYlEgMLxbBKLQUBwc52HgAQ4LBo049atWQyIPA3pEdFcQEhMUFYNVagQWFxgZGoxfYRsTHB0eH5UJCJAYICEinUoPIxIcHCQkIiIllQYEGCEhJicoKYwPmiQeKisrKLFKLCwtLi8wHyUlMYwM0tPUDH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-filefind16:file file16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBCQmJDw+PBQSFAQCBMza3NTm5MTW1HyChOT29Ozq7MTq7Kze5Kzm7Oz6/NTy9Iza5GzGzKzS1Nzy9Nz29Kzq9HTGzHTK1Lza3AwKDLzu9JTi7HTW5GTCzITO1Mzq7Hza5FTK1ESyvHzKzKzW3DQyNDyqtDw6PIzW5HzGzAT+/Dw+RKyurNTOzMTGxMS+tJSGdATCxHRydLSqpLymnLSijBweHERCRNze3Pz69PTy9Oze1OTSxOTGrMSqlLy+vPTu5OzSvMymjNTGvNS+tMy2pMyunMSefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCAAECA4OIiAIEBQYHBAKJgwIICQoLDA0IkZIECQ4PCxARCwSSAxITFA8VEBYXGBmJAQYLGhUbHB0eH7KIGRIMEBAgISIjJKaIJQQLFxERIialkieUGigpKRoIBCqJKyyLBwvJAioEyoICLS4v6QQwMQQyLuqLli8zNDU2BCf1lN3AkUPHDh49fAQAAEnGD1MCCALZEaSHkIUMBQS8wWMIkSJGhBzBmFEGgRsBUqpMiSgdAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-filenew16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz6/GxubNTKxDQyNIyKhHRydERCROTi3PT29Pz29Pzy7PTq3My2pPzu5PTi1NS+rPTq5PTezMyynPTm1Pz69OzWvMyqjPTu5PTm3OzOtOzGrMSehNTCtNS+tAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ/QAAgQCwWhUhhQMBkDgKEQFIpKFgLhgMiOl1eC4iEYrtIer+MxsFRRgYe3wLkMWC0qXE5/T6sfiMSExR8Z1YRFRMWF4RwYIcYFhkahH6AGBuRk2YCCBwSFZgdHR6UgB8gkR0hpJsSGCAZoiEiI4QKtyQlFBQeHrVmC8HCw21+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fileopen16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBOSmZPzSnPzChPzGhPyuZEwyHExOTFROTFxaVFRSTMSGTPT29Ozu7Nze3NTS1MzKzMTGxLy6vLS2tLSytDQyNOTm5OTi5Ly+vKyqrKSmpIyOjLR+RNTW1MzOzJyenGxqZBweHKSinJSWlExKTMTCxKyurGxubBQSFAwKDJyanERCRERGRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaRQIBwGCgGhkhkEWA8HpNPojFJFU6ryitTiw0IBgRBkxsYFAiGtDodDZwPCERCEV8sEk0CI9FoOB4BEBESExQVFgEEBw8PFxcYEBIZGhscCEwdCxAPGA8eHxkUGyAhIkwHEREQqxEZExUjJCVWCBAZJhEmGRUnoygpQioZGxsnxsQrHByzQiJxz3EsLSwWpkJ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fileprint16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFRKNAQCBPz+/MTCxExKLPTq5Pz29Pz6/OzezPT29PTu7PTy7NzClOzm1PTu5LSabJyanPTm3FxaXOzCjOTKrOzi1OzaxOTSvJyenGRmZLyyTKSipDQyNERCROTi5Hx+fMzKzJSSlIyOjISChLS2tAT+BDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaYQIBwKAwIBMTkMDAYEApIpVBgOCAOg4RRGlAoEAuGIdGITgWOq4LxcCQgZkEkIHksHgYJOR6ZQCgVFhYJFxgTBVMZihoCfxUYDWUbUBGKGREcjBoQEB2TAB4CAx+Vl5WMhyACHiEhH6IfIiMktCQgE0cZJQStr6O2t6EARxO6vK6iEx4dZsMCxbsmBB4nzUTEutVSSUdmfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filesave16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBFRSVMTCxKyurPz+/JSWlFRWVJyenKSipJSSlOzu7ISChISGhIyOjHR2dJyanIyKjHx6fMzOzGRiZAQGBFxeXGRmZHRydGxqbAwODOTm5ExOTERGRExKTHx+fGxubNza3Dw+PDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaAQIAQECgOj0jBgFAoBpBHpaFAbRqRh0F1a30ClAhuNZHwZhViqgFhJizSjIZXQCAoHOKHYw5xRBiAElQTFAoVQgINFBYXGBkZFxYHGRqIDBQbmRwdHgKeH2YgHpmkIR0HAhFeTqSZIhwCFIdIrBsjAgcPXlBERZ4Gu7xCRZVDfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folderhtml16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBERGRBQWFMzKzOzq7CwqLDw6NARqnAQ+XHR2dKyqrOTm5ExKTERCRHRydMTi7NTu9HS+1KSmpBweHDy67DyixHS61ITG3AxypByu7DxinBw+ZERmdIySjITC3ARypExOTDRurIR2RPTSdJyulEyGvBw+bFSyzJTK3LzKvPzivOTixNTChLSybGyCfCRSnBQqRASGtFyuzDw+PCRShPzy5OzerOTShKyaTEx6pCxerGRufBR+rOTezPTShNy6bER+1BxCfBQuRAxelFSixBw2VISq3GySrPTWlHyanIyitFSO3IymtCRujAxWhCRqlCQ6XGyWvNS2bFyGvDxuvCRSpLy+vMS+vGxqbFyO1GSi3EyO1FRaVCQuPLS2tDxyzKyWNFxaNCQyPGxubCxajERSVExKNJyenAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAECg4eIAAMEBQICBomDBwgJCgsEDA0BDg8BhwYQERKUDxOYDAyeghQVFhehGBmVlwwOqxobHB0eH6EfIAkPIYIiIyQlJhsnKBcpvrYiKissLS4vMDEyFjOvNAA1LDY3ODk6Oyc8PTIyFzQ1Jj42P0A6QTtCQ0REIEUORkdIkihZwsSekBhNnDyBciCKiSNSplDRUcWKkRhXCGDJYgiGli1cpuTocsILjytfFmRpACAGRTBhRogZgzHlAjKGWnIoY+bMgRgBDHRBo/LAIZoxuhwKatRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-folderlocked16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQSFMzKzOTm5CwuLERCRARqnAQ+XHR2dKSmpOzm5GxqbCQiJMTi7NTu9HS+1HRydOTm1Ozq7Dy67DyixHS61ITC3AxypERGRBweHByu7ASGtFyy1DSOtDRmfExOTBSazBR+rCwqLAxWhAxelByGtDSaxAwODHy+1Dw+PPT29IyqvCxujOzu7NTW1Nza3ExGJJyebKyqfMTCpFRSPOTi5DQqHOTezDw2NMTGxKyqhMTGrGxmXDQ2NMTCxMTGpHx6bHx2bBQWFIyOXDQuDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQICBomDBwgJCgsEDAKFDQGHDg8QEZQSlxMUDJ2CDhUWF6AYGZWXFBqCGxwdFh4XGK8fIAohtiIIIx25EZwBDREHgiQjJSYmGScoKSoRKQ8rggIsDC0uJS4oGygoAyjdAAcsLxQUMDEyMzQ1EzapBy8MDDc36tFwgONFjlQ6dgCEEZBHDx8+ctRIRehHAyAwZASZIGRIEBoUBwUwIGMCiwFEaBQJichIjo9FZLBsacRIAB0A/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-foldernew16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBPz+hPz+BOSmZPzSnPzChFxaXMTCBPyuZPz+xPzGhEwyHExOTPz+/MSGTFROTPT29OTm5KyurDQyNNza3Ozq5Nze3LR+RLy+vJyenMzKzNTS1Ly6vJSWlFRSTMzOzMTGxLS2tKSmpGxubBQSFAwKDKSinJyanIyOjCQiJERCRERGRBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaNQIBwSCwaj8ikcokMCIqBaEDoBAQG1meAUDAQpIcBQoy1dg2JdBqhECgQ1IWB0WgcBIOBwIHXBwwPEBEREhIBbG4IExR/DBUVFhIXV2NjDVYYDY8SFU4ZVxpVAQwbGxynGxkdTh6XVh8gGSGzGSITIxokJUImGSMTwLcnKCkprgAqDSt1zCssKxQtQ35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folderopen16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOzi1Ozq7ERCRCwqLPz+/PT29Ozu7OTm5FRSVHRydIR+fISCfMTCvAQ6XARqnJSKfIx6XPz6/MzKxJTa9Mzq9JzO5PTy7OzizJSOhIyCdOTi5Dy65FTC7HS2zMzm7OTSvNTCnIRyVNza3Dw+PASq5BSGrFyqzMyyjMzOzAR+zBRejBxqnBx+rHRmTPTy9IyqvDRylFxaXNze3DRujAQ2VLSyrDQ2NNTW1NTS1AQ6VJyenGxqbMTGxLy6vGRiZKyurKyqrKSmpDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfCgACCAAECg4eIAAMEBQYCB4mHAQgJCgsLDAEGDQGIkw4PBQkJBYwQnRESEREIoRMUE6IVChYGERcYGaoRGhsbHBQdHgu2HyAhGSK6qxsjJCUmJwARKCkpKsjKqislLNIRLS4vLykw2MkRMRAGhDIJMzTiLzDXETUQ0gAGCgU2HjM35N3AkYMdAB0EbCjcwcPCDBguevjIR0jHDwgWLACBECRIBB8GJekQMiRIjhxEIlBMFOBADR9FIhiJ5OnAEQB+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailforward16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRydHxubHxmZGxiXHRmZFxOTFxGPFxKTPwCBLymlMy+pOze3PTq3PTu5Pzy7LSmnOTaxOzm5LyqlNzOtPz69Pz27MzCtLyqrPT27IRubPzuzNTGvNTCxLSelPz25Bw+ZFxKPPzy1Pz65LyupBxKdCxWfPTm1Pz23LyinBxGbGzO5DRafBxWfBxajCymxHTS5BxSdBxKbFTK3EzG1CSGvCyKvCSSxCSavGTO5GRaVPzqzFzK5EzG3BSCtAwiPGxaVPTivPzy3NzKpBxObCRefBxqlPTmzJR2bKyahAwyRPzmvOTOpKyObNS+nPz21AQOFKyOfPzuxAQCBGRORLSadPzyzLymjMy2lOzetDwuJFRCPEw6NEQ6LEQyLEQ6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAkALAAAAAAQABAAAAfhgAABAgIDBAQFBgcIBwmOCQIKCwwNDg8OEBESjY8CDBMUFRYVFxgZDJyOGhsPChwVHR4fFSAhjwkaIiMOJBQQDRUVJSa3GicoHw4pEA8SGSorLI8tLtQu19gqLzDECTEyMzQ14zY1Njc3ODkqCTo7MjIxNCs5PD03PjctPwlAQUIihhBpQbCIihtG+CUocASFkAhIkogQ8kFJwkcFlogIkoRJEydPnkBR6GiAxiQLgiiIIkXElFQJqESoMsRKkAhXqkhhApNKFSxZggTJ4nHIEJhaDhzYwoVLFy1avHyB6ScQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mailget16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAxKdBRSfCyGvFSm1BxKfCSWzCyWzBRCXCRKfBwuRAQGDDw6PHy23Cym1CSSxByCxBxunBQSFKyurMTCxExihNza3NTW1JSSlMzKzFxaXLS2tNze3KSipCQmJGxmbNTS1KSepLy2vISGhJSWlHx+fERGRPz6/IyKjDw+POzq7JyenMzOzKSmpCwuLDQyNIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQIBwGBAIAsOkUjAgFJRQQMHgjC4PBIEVgAh4D4aEYrGAMhINxwPyiCgYSsmEUmk82grLRZJkYCgXaAEKFxYZcEISGhsZFxwFeY0WHR5CDB8dGCAXG5shGxQicBIMpSMUGxgTGSQlpQwSJicnEwwdI7gdKAwTsykpKiobr8QMKxeHDBcsGRvOzxsT0i0uL9HSHdkT2ZkoMJXF4a8AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mail16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBGxaVOTe1Oze3OTWxOTWvNzStNzKpEQ6LOTezPz+/Pzy7Pz69Pz27Pz25Pz21PzuzPzuxEQyLLyinLSmnPz67Pz23LSafKyObDwuJMzCtLSelPzy1My6nLymjNTCxLyqnPzq1LyihKyOfOzavOzetEQ6NPTq3NzOtLymnNTGxJR2bOTOpPTivNTGvLymlKSShKyahEw+NOTe3PTm1Pzu1Pzy3FRCPPz65LSadFxGPOzm3PzqzPTmzPzmvEw6NCH5BAEAAAAALAAAAAAQABAAAAaqQIBwSCwaj8ikMhloOp/QpmAgqAoIhELBUDgcEIGEYrFgNBoLx+IBiRwkgQnFoWAwKhWLhX3BZAILGhsCDXgODhwdGB5vgAofICBlDiEiIx4kJSYBJ2UoEykqHSMrLC0nLWAnFS4UCycvMAcEMR0RLTIBMwaSahw0NTYtFwclNwEdLws4eoc2DxwQOR06ASk7PBAhIRE9Pj0tLSUY1T8I5gjn6Qgy7D8SfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailreplyall16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBLymlMy6pOTa1PTq3PTu5Pz27Dw+POzi3PTm1OTWvPz25FRSVERCRLympPzuzPTu7NTGvFxaXKSmpPzu1Pz65Hx6fHxqZPzq1Pz23HR2dBw+ZHx+fISChJSWlDQmJHRydCxWfBxGbJyenExKTHRiXPzqzPzy3CQmJDRafGTO5ExOTERKTGxWVCRSfHTS5CymxBxajBxWfPTmvPzy1CyixCSaxCySxDSaxDSWxDSSvDyaxGS21PTmzPz21AwiPBRejCSavByGtCSezEzG3FzK5FzG3GzO5FTK3CQ2bPTixBxqlCRefBxSdBxSfBx2nCQ+dHxmXPzmvLSafAwmRAwyRPzyzDw6POzavNzKpAQOFPzuxBwWTBw2ZGRORLyWdMy2lOzetPTivAQCBKyObOTOpAweNBwWVEQyLEw2LEQ2LDwuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAf4gAABAgMEBQUGBwgJCguOCwEMDQ4PEBESDA4TjY8DFAwVERYXGBkRm4+QGhsMHB0eGB8bDpyOARogEBceIRgXv8COIiMkGB4lJSYnIcwoKb/DGyoXKywtKS4pHinMLzAxJDIzNDUtNjcv6B0hLzgfMh85OjstPDw99zwd7T4/LTVAgggZQqSIECNHevSAgSSJkiVMmjh5AiWKlClAiFARUeVHFSVWmLS40gNLlh5agGzh0kWDlwZfrIDREKaCAjEqrFA5MMYLmTAxlJTxYoZMozNozqRRs4ZNmy5s3LwhA0dBnDNn5MxBoAABnTp17IitowDrmQV+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailreply16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTEw+NFxKTFxGPPwCBLymnMy6pOTa1PTm1Pzy7LymlOzi3HxqZOTWvPz69Pz25My+tLympFRGRHxuZPzu1LymjNTGvNTCxBw+ZPz23PzuzPz65PTu5NzOtCxWfBxKbPzq1DRafGTO5BxGbPzy9HTS5CymxBxajHRiXPzqzCyixCSaxCySxDSaxDSSvGS21GxWVAwmRBRejCSavByGtCSezEzG3FzK5FzG3CQ2bPzuxAwiPBxqlBxKdCRefBxWfBxSdBxSfBx2nCQ+dPzy1CRqlAwyRDQmJPTmvPTixLSafOTOpAQOFPz21BwWTBw2ZPzmvNS6nPTivAQCBAweNBwWVNzKpPzyzLyihGRORLyWdMy2lOzetKyObEQyLEw6NEw2LDwuJEQ2LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfqgAABAgMEBQUGBwgJCguOCwEMDQ4PEJYRDhKNjxMPDBQVFhAXGBUSGY8LGhsQHB0VHh8gFQ6bjgEhIiMMJCUmFbS2CwMnG6IoKSorI7WpEycWFiUsLSou1yXXji8wFiopMTIzNDUz4zbZNxsbODk6Ozw9Pj8pPzEzQDdB60JDOkRFjBw5giRJDCWdlmxwIIRJExAWKDRyMgTIiydLoESRImQKlSUSF1SxUoXAlSBRsGSJoCVICIlbqlThcoBClC5eYFD4EiVIFwUyqywAE0ZMlqNjpJDpIkUBl0dlFChAYOZMmTJoyqQR5icQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mailsend16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBHxqZLyqlMy6pOze3PTq3PTu5Pz27Pzy7LyinOTaxOzi3Ozq3LymlOTOtPz69Pzy5My+tLympPzqzNTGvLSelPzy3BxGbBQ6VPzuzPz65LyupNzOtPz+/GzO5BRejPzq1Pz23LymjHTS5CyixCSavBxqlPz25LymnGTO5CymxCSaxByGtHRiXPzy1CySxCSezGxWVPzuxKyOhMy6nDSaxEzG3PTivNzKpKyOfPzu1FzK5PTmzJR2ZLyihLSWfKyObOzmzPzmvDyaxOzavLSafGRORMy2lOzetDwuJEw6NEw2LEQyLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfUgAABAgMEBQUGBwgJCguOCwwNDg8QERITFBUWjY8DFxgZGhsaHB0aD5yODB4TGB+kICEaIiOPCwEkJRcmJyYPKCIpKrWqKywTmC0SIi4vMDHEDCsyMg8zEyI0NTY3z7U4Hhs5Mx+0IyI6OyPrIzw9Gys+PxIy2EBBxAs8Qjk5Q0RFWFxAZySfgSMsilRAkiRECHQ08hHgJ0TJkCU/mECU2ISEkowUlpAQ4QTfowNPoAzJIeRJCyjm8kVRIkWIzSkXhwxJtYAKgp9VrFi5QoWKFZ5+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav1downarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PUZi0zmTtypflV0VdRJbm6fgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-nav1leftarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAP///wAAACH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxqdwoNGTmgvy9px/IEWBWRkKZ2oWrKu4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav1rightarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxCtwoNHTmpvy3rxnnwQh1mUI52o6rCu6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav1uparrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PWwhxzmetzFpxnnxfRJbmufgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-nav2downarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+pq+EPXYpxUckoO3AjbF3dJwahllXe6AFgC8d+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav2leftarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pyxf5VohmSlsxmpjTzAHeN5ak6UHpqKRi2GpwvH3Q3eT64RcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav2rightarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pq5HOAjQyVnqfhHue7oAaKH5kiW0AmnLqaHomkj02g+e6XwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav2uparrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIghI+pyxfR0HsRzNnuXVqn3mVQZWFRyIDjp65Ga5Ly4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-navback16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRSdBRObCQ2TBxObISevAQCBNzu/BRGZPz6/FzC3Pz+/HTS5ByyzJze7Mzq9ITC3AQWLAyWvBSavFyuxAwaLAwSHBRafBSOrDzW5AyixCS61ETW3CzG1AQeLAweLAxefBSStEze7CSWtCyatBSCnBRWfAwmPBRWdByixAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZiQIBwSCwah4HjUTBQFgkFg3MoKBykU0QhoUAIAuAksbpgNByPxQMSGVsVDYlkIqdUiJYLJqORbDgcHRseRR8gISIaEyMkGCVYRBEmeyAnlgaQkSgpmU4RAZ1OKqFOpFNGfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-navdown16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObCRKZBxCXAwyTKTK3Ozy/NTm9GSivAQWHNzu/FzC3IzO5CySrAQOHAyuzETS3CSWtAyOtETa5Aw2VLze7ByWtBy61BSavAxWdBRCXAwqPAQCBDR+nKTe7FS+1Eze7ByixBRmjPz+/AyexAyixAQKFBRqjAQGDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZeQIBwSCwaj0hAYCkYEJLKguGASEADigWj4bgaHpBINykwSCYRa5HCFFQsF0xGo9lwhpSOwfORYC4gISJ3RAQdIyQYJSAlImNrh4uNJkl5CoKUUBQnjlB4KJ6hokN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-navforward16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAwyTBRObAw2VDR+nCRKZOzy/KTe7Pz+/KTK3Nzu/Lze7FS+1AyexAyuzBSavAyOtBSmzOTy/BRqjNTm9IzO5ETS3ETa5By61AyixByixBRmjAQGDBxCXGSivCySrCSWtBTC3AQOHAQWHAxWdEze7AQKFBRCXAwqPAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZjQIBwSCwahYGjUjBQGgWEpHNYMBCaT4G2UDggos+EwmBYMBpf6VBgYDgeEMgjIpmoAQVKxXLBPDIXGhscRB0eHyAgDSGBGyJFASMiIiMkJYImUwAnmJqbjp4AKCmhAKSlTn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-navhome16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBDw6PBQWFCQiJAQCBFxeXMTCxJyanDwyLDQqLFRSVLSytJSSlISChCQmJERGRFRWVGxubKSmpJyenGRmZLy+vOzq7OTi5Ly6vGRiZPTy9Pz6/OTm5ExOTPT29BwaHNza3NS6tJRqRGQqBNy6pIyKjDwGBPTe1JSWlDQyNOTGrNRiBGwmBIRaLNymdLxWBHxGFNySXCwqLKyqrNR6LKxGBNTS1NTW1Jw+BEweDDQ2NAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaoQIBwCAgIiEjAgAAoGA6I5DBBUBgWjIZDqnwYGgVIoTGQQgyRiGRCgZCR1nTFcsFkHm9hBp2paDYbHAsZHW9eERkYGh4eGx4ag3gfSgMTIBshIiMkGyAlCCZTEpciJyQjGxcoKUQBEhcbIiorLB4XEltDrhcaLS4vtbcJra8bMDHAGrcyrTMXHjA0NSypEsO6EzY3IzU4OdoTzK0BCAkDMgkIOjJlAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-navup16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObAwSHBRSdISevBRWfAweLNzu/BSOrAQWLPz6/FzC3DzW5BxObHTS5ByyzAyixEze7BSStBRWdAyWvByixAQSHCQ2TAQCBBRGZJze7CS61BSavAxefMzq9ETW3CSWtAwmPPz+/CzG1ITC3FyuxBSCnAQeLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZfQIBwSCwaj8hhQJAkDggFQxMQIBwQhUSyqlgwsFpjg6BwPCARySSstC4eFAqEURlYhoMLBpPRUDYcHXt7RgUeFB8gIU0BIoiKjAcUIwiLSQUkJRsmGIwJJwmEU6OkfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-playeject16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+py+0R3IFQUtruXVqn3kkWyIARR4rqKvoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-playend16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+py8Eb3ENRggrxjRnrVIWcIoYd91FaenysMU6wTNeLXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-playpause16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+py+1vgoxzyUCxrZd18ClfmIyVyJ1lqkHuC0N+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-playstart16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pyxudwlNyguqkqRZh3h0gl43hpoElqlHt9UKw7NG27BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-playstop16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+1vgpySUWpvXXqrHmSaeJEYhKYq6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textblock16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py40Bo5SOzRvrwlgrfnkJOIkPaaaJXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textbold16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIihI+py70BowPQ1HZpwNv212Vg9IGHmIjoWa4ey5DSRNd+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-textbottom16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIVhI+py+0Po5y0hYtzrkB7zH0fN/kFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textcenter16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsnRkqtDnhu1zHfFSpjaY4PavgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textitalic16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+0BgztwUmmjBXX3jE0auHHhM5Yq4xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textleft16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsgRoqr3Vnt102fFSJjUC6nlPoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textmiddle16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIXhI+py+0PT5i01pisphjt3UmfFZYm5hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textmove16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsg2kfZvblXbwTg10WlA4rjyvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textright16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+pm+EPIZstSrqsDhhv1ylfFE5jiYwX6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textsortdec16:text text16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BPwCBAQCBAQC/FxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM5CBDM+uKp8KiMsmaAs82dtnGeCHnNp4TjNQ4jq8CbDNOroIe3ROyEx2A4vOgkOBzgFxQ6Xa0owJ8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textsortinc16:text text16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BAQC/AQCBPwCBFxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM4CAqxLm61CGBs81FMrQxgpnhKJlaXFJHUGg0w7DrDUmvtPQo8qyuEHoHW6hEVv+DQFvuhWtCFPwEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIlhI8Jwe2/AmpTynqPTXSqrnBM+I0kdmpmGmUp+K4nPMvhYx9+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-texttop16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIWhI9pwe2uYnq0yQtqxbz7D4biSIZ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-textunder16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pu+FxXoOIKpds1oBH7hlYxYxRCaIZ01lhJbHy9tTv7BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewchoose16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMzCLrcGlAs6UAYgwLdLtEcI4ygQo7VVp2oupGpG4vmaUVTemX523qlFcw0a4RqNlkx5k8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewdetailed16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMmCLrc/i1IAVkYg1Z1iRYUKCqitp1oikqBWV3ZOnhkWNagqu+qnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewicon16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrcG1AwGOQbw6qANeCEB3pCSZpO6pgowJZqLKuUGE0dnuEhf8IL1kz1shSHDX8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewmag-16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ+QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7Kmpl0CtLGLvbW2Zn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewmag16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ8QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7GLArS5Q7O1tmZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewmag+16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6cAsLECrqeys7WxpqZdtK9Ct8C0fsHAZn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewmulticolumn16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrc/ixI0WSgKoyBl+beQFACpo1AqXbKCr1wLAMWS08hGG3dSZqin4sxnBmPD38CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewtext16:view view16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIchI+py40BTQSwuovp3DXkv1ia1IHmIXLiyWJ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewtree16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBDQyNPz+/PzerAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAMuCLHcri4yGISlj4kxcANgNRBQCIbL6U1Su7bB62rXvGydG25kqpwfIGxILBr9CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actattach22:act act22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBMTCxPz+/DQyNKSipAQCBISChFxaXDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARrEMgJgqA4zzus/gLhFd5HCcZAXqsphYPUdhcYFNRcZnvdtpnDqPTbUWgAJKBYwzBlw+bRo3xmkNWoBgm0OrVLn3GC9RgCk8DhUw7c0rHPr4CDu5SYQNyEt7uSY3p/UAKFhYKDSQOLiwgFdhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actbookmark22:act act22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBCQmJCwqLMTGxAQCBBwaHMTCxLSytERGRFRWVLy+vKyqrKSmpHR2dJSSlJyanISGhGxubIyOjKyurGxqbFxeXGRmZHx+fKSipLy6vGRiZLS2tFRSVHRydJSWlHx6fCH5BAEAAAAALAAAAAAWABYAAAWWICCOZGmewamaQrq+wUC8azHINGocOI38iIRAceDNaISFYklkGHOEhoNBfUAOhuOLEJE8HoPiRKFdESiQBqViuTDIUAsEcyAeGJmyiqC5RCwJGg0YcEh9D0V3Dxt6JwQVDRYVHBUdi40mjw0PTgwQHgeYJQQJfxUXFxAOoTkFpQ0fsRSimQkWEQ0VtI62HLt7vjl7JQYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actbookmarknew22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCwqLCQiJCQmJMTGxAQCBLy+vLSytERGRFRWVKyurKyqrLS2tKSmpHR2dJSWlKSipISGhGxubIyOjGxqbIyKjFxaXGRmZHx+fPz+NGRiZPz+ZPz+HMTCBKSiHPz+jFxeXPz+XPz+tPz+zPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAamQIBwSCwaj4Gj0hgQLJ+AAaEAVQoI06pRYDhkoYgwIhEgKBTfZ2FhaBsYDS8VWnA8Go0FJIKeqyUTDw8EDHBpSwUUFQ4UFhcYDQYFfkoFFxEQDG8KEAUZlEeWGBIakw4FG1STiBoYBRwdBR4fHgUdHKBEBSCnIR8iIyIfIblFu6ceIyQjtcXGCbLKzAUKzrq+wMLEVa+xs7W31kOTk6nkWuOf6Ea5QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actexit22:act act22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBHR2dDQyNCH5BAEAAAAALAAAAAAWABYAAAJOhI+py90RnIMyRUOxhDfzJkACdoXBuEDDkQFDi5go0MrKx16kns80b7qdELCgBYaEGWwL5nG1ePFiKp9A6kuYRNuho8vxVrrZivmMRtMLACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-acthelp22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBCQuNBwiJAwiLAwaJAwSHAwSFIy+3ERynCw2PCQuPAwmPCxOZCxWdJzG3FSazBwmNAQKDAQGBDRmhBQyTDxujDR2rIy21AwWJDyGxCxmjAwmNDRihAQOFDxmhCxunBQWFAwaLCRahDR6rESGvDQ2PCRWdDRunDSGvCRSdAwWHCwuLDSOzHSmxDyKxBxCZBwqNHSu1DyOzAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAahQIBwCAgIBAPCoGAgOoeBAyKhWCwYDUf0CX1AIhLiJEGpBLiAAaRxdgYsl7Ybk8igBZoN5xmAdDxoanp8HyANISF8EBsiXBMjJBolBEQmGHFoRScbKHIKDykqK5lFAZRCnyknTaROLA8tq61OChgtKqyzQgEYEJi6UC4vI3LAASkbMBPARAEBdszR0sACEaPSMTIQM8W6KzNl3bo0NOJDdEEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actlock22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBHRudFxaXExGTERCRAwGDGxubPz+/Pz2/Ozm7Nza3NTS1KympFRSVHR2dNTO1JSSlKyqrKSipDQyNMTGxDw+PLSutKymrMTCxAQCBHRqLBQODJyanDQuFFxSJFRSJFRGJERCHExCHISChHxyLEQ6HGRaJExKHLSmbLy2fOzitPz23KSiZHxuNHxyNJSOTNTOnMTCjLSudKSaXJSKRJyOTOTetNzWpHxuPOTi5MzKzLS2tFxWXOzq7Ly6vOTe5Ix+RLSqdNzSpLyydKyqbKyiZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBAgMEBQKEjI0GBwgJCgsMDY2XjwkOAgQBDxCLl4QNCaGCBBGWooINCAqqrBKgqwATFKaDFRYVtBMXsIMNGBm0GRADjQIJxKIaGxwdHh8gISIhGyMZzIwkGholJiYfJiAfJyEZISDbg90oKCkqKwcHKyooLC0f7IIuLzD2YMSQgW8GDRri+AFoUMOGvRsxUhSsQQPHvmQSchyQtEAHhh0WJHDQcJERjwsKDvRI0BGDjwgicXhQyCOjSgUKPO6AObIkIQESfmxk6REDT4s0bfaYpDNkT4VAha5s+TLmzEYtatwIOHAiDZIKNQAJYk9IjCFEisyoocFEB4UACtBpm0t3LiF4gQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actredo22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3Pz+/JTWbHy+VHTCTMTivPT69BxGDESuJDyiHESiHEymJIzKZAQCBFS2LFzKNGzWPDRqHCxqDFSqLHy2XESCHAwaBAQOBBQqBDyWJHyqZDyKFGSiVESeJBQ6BAwSBGTGPFyWPFSSLEyOLESGJBQiDAwiBBQmDCRGFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaoQIBwSCwaj8hkMcBkKpcBwYAwEDif0YLhwEUkFItFMkAwMBoOR+PxgHwjRDggamhIJpQ8ZbKGKOQLcgEFdhUWEYgRF3sNfhELBHALAhgZFhobRBwREhQdEAIEHpIKHwsaSJwUDQgQIJINARxKESESDQ0dgCIjSpAkDAwPco+ZSJAlJicnKHIAIrNHidOIQxunT0kpCyrZSCss0d5Fj6jjRonn6uvs2QZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actreload22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBCRSFCRSHBw+DBxCFCQ6FBwyDBQWBBxGFCxyLGTChMzqzLzmvHzKjDyOTER+RERyNDSqXNzy3LzivFS+fCyCPBQmBCQiBBxKFBQqDOTy3LTitES2dDR+PCxuJOT25KTarCx+PESSTCxKHDSeVCyKRNT21ESWVDSGPBQyDAQCBBQSFDRuLDSyZDySTGzChCRiJKSmpExKTDS2ZGzGhLy+vGxqbISChDSKRMzKzGxubDQ2NIyOjCQiJCwqLBQWFCwuLKSipERCRERGRHR2dAwKDDw6PFRWVIyKjCQmJFRSVBwaHKyurAQGBExOTBweHFxeXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf9gACCg4IBAgMEBQYHhI2ECAkKCwwNDg8QBAOOhAQREhMUFQgWBxcHGBmbggkaGxwPB4yDB6SbBJIKHQaqtY0eHyAhsqrDgx4aCiKpqoQHAyMjJBMKJaSxzAAHIRsmJgonKA0LHSmDKiuOBywRLSQuLyEwwyoxMuiN6iUzNBXy5jU2bsgoJugABBz95uXQsUMGD3vpPPgTpKIGwx4+HMr4kW4YkCA2hAzxAQSIECI+imBTwVIFESNHerRUgc0cEiFHkjiiyYzeDiVLdvLcySSkkKGEWiZVweSGkIHMmvQosoQlkaZOjvhosvKJjIAxoOAsgpRZkQNLnvSoqspAIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actrun22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAwKDAwKBCQiHNze3AQCBBwWFDw6NPTy9PTy/Dw2NKyytOTi3LS2tMTKzMzOxLy+tLy+vBQODNze5NTS1JyalIyCbIx6VIRyVISGfJyelOTq7EQ+NMTGxKyurGxeRLyKPOSmROSuVOy2XOSiTLzCzNTOzDw+NCwqLHxuVOy6bPzGfOSuXNTW1LSyrMSWRNymTOSmTKSCTPTGjPzSnPzWnMyaVBQSDMTCxPz+/KyahNSeRHxeLJRyTPzmtPzarOy6fJyajNza1Ly6vLyulFRCJPzirPTOlMS2pNTSzMTCvJyenBQWFNzKtPz6vPzyvPzqtOzGlOTe1AwGBFxWTLy6tPTm1PzSpPzutPz2xPTSnOTSxOy2dPzapPzerOzm5IR+dPzu5Pzu1PzqxPzy5Pz+9GRiXGxuZKympHR2bOTm5Pz6/MzSzBwaFJSSjCQmHPz2/AwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeEAQKIjIIDBAQDjYMFBoMHCAkKgwYFhwULDAUKCg0ODxCkBQgRnoUSExMUDxUWFxgZGpAbFIuGHB0eHyAhIiMkIB8lJieIKCUpJCTGIyorLCktKIUDpC4YLzAxIjIyMzQ1NhgdpJI3ODktJTowOyM8Ejc9Pj9AQUIEclAocCMIBQhDiOwgoaKIoCI+jBxBkkSJkCWemIyq0GSHCBVHihRx8gRKFCmpKhGaQqWKFYZXsGR5kkXLFgRUXBUqkCGCFS5AjnTx0sXKlyA6CRVgAAHMAilhxIwhU6ZFkBY5kgKYUoXBAzMKzixZ4AJNGgVm1KxhM0WpmQpUMtooaOPGxAM3Nw60oYLGjNYCbzYJOgAnRzNBJ95oPYQCgpJtkwzFoULlRuRPiy9fNhAIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actstop22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAASC/CQKDBwKDCwODNyKjPzq7My+vIxiXAQCBOSOjPz6/OSelNySjNyGhMR+fLRaTGQ2LPz+/Nx+dNR2bNRybMxuZMxeXMxiZLQSFJQaHFwqJNyKhOSCfNyCfNR6dMxmXMxWVMRORLQODOR+fOSSjNR2dMQ2LJQWFMRWTLwWDNSCfMxeVLwaFKQODNR+fNx+fMxiXKQSDOSWlMRSTMxaVMQ6NMxORMQyJOTS1MxqXLwWFLRORMxKPMQaHMxKTLQWFCH5BAEAAAAALAAAAAAWABYAAAb2QIBwSCwajwGBcikIHIsDQmFKNRwQT2EgoVgsGOCG4wHBIgmRhWRCqVQsF0xGYyYGNgoGh9PpeCQfICEic3UAAWgLIxwRJBsbHSUREyYYJ3RDAQULexGejhueESgpl3WaCxsqJKKsChEUKywtmFoFDC4vCayikzCyMbWHt38NCTKiHhUfMyzBdQIFKsodob0VNDWzwppuKxMRrx6iNjcitNA4bh+iEzkwojc66JkOOxcf7G35PBE9KS1MEUGgIQOIFfk++KjRw9wJgUUIZvhRoyLDFCliQDQisUWLGCJOeNx4hKCGkyhPGnqCoKVLl1liypyZxUAQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actundo22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3PT69MTivHy+VJTWbIzKZEymJESmFESiHDyiHESqLAQCBFzKNGzWPFS2LNTmzCxqDDRqHPz+/KTGnBQqBAQOBAwaBESCHHy2XBxGDOzy7HTCTEyyJDSqFHzWTAwSBBQ6BIy+dESKJFySPFSSNAwiBCRGFBQmDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMsBkKotMwYAwEDiXgYLhwD0gCFZiQKxNKBYMRqPh+D6G16y5AYnYIxBJAyF4AwITTAUJdBESD4gPFBV6Fn6ABBcJDIYPGEQZGhQbHAIdfx4JHw2VSBodGwWfAR4LDSALfkgYAQurBiAhICKfSSMkvQElGyYnGyi9Rxkdj4nOskUYyU9FpxnURikdGtjRKivdRKfQ2Inh5+jpRwZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actunlock22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBGxqbFxaXExOTEQ+RAQCBPz+/PTy9Ozq7Nza3NTS1KSipFRSVOTi5Hx2fJSSlKyqrJyenJyWnDw6PMzKzKyurDQyNFxWXMTCxJyanHRuLHxuLGReJFxSLFROJFxWJExCHERCHBQODISChHxyLHRqNIRyNHRmLLSqbKyiZLy6fOTarPz67Pzy3OzitKymZFxSJJySTNTSnPTy3NzSpMTChLSydKyqbKSaXJySVIyGRGReLPz23NTOnMzCjHxuPLy2vKSmpOTe5LS2tLSutHxuNHRuPMS+xFxWLIR+RDw2HFRKJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SDAQIDBAUChY2EAQYHCAkKCwyOjZANDgIEAQoPjJiDAg2iggQQp5gMBwmrDBESl6MTFKuoFQSjABYRF40CGAW8BRm7hQwNxBobHB0eHx4gISIjBdiEAhYFJBslHOHSHh4hBSHlxIUmJygpKissBiwtLi8pGjDqhBoxMjMuaNSwcSMFjhw6dnjYRyrGCh4ueviw4Q5HDB0/PjAUJCBCAwMIGiiggAEIBFk/FgYLIgRkggQkhxAJkqGExkYMFnxsIGRkSQgLHhRRWUjAggQgG8AsSWRBBiP6VrYMOfKIyaBDNwLo+HHSUplOSyDRqiEHjRkretRQkcLgxayNF0wksQGQxsSKMTIq0QpgCba/gAE7IhMIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-appbook22:app app22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBDyGhCyCfFSWlESOjDyKjDSGhCx+fGSinGSenFyanEySjHSqpHSqrGympEySlBx2dISytHyyrCR6dKTGxHyurHSurHyytGSipCR6fARmZFSalEyWlBRubAxubBRydDyKhDSChLSytPz+/MzKzIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbFQIBwSCwaj8ikMhBQIpmCQdM5ZBIKhgNiugwkFAsCI7pNMhuOxkNBgBgEiAi3GkBLJpJHYgEpaClyREwVFhcSEhgOGQoMfgMaERtcARQBFRMYExZ6HB0FUYAekkIBHxqWFmlrC1haESAfG6MBGx+VFRgKYH0hInGRklO0ppYXCwwMWQiQHkwjgrWnFRdYZHIBJCTP0LaWGAcDW9jZ2nMAw9IWTOQkJSZMRsOV49nu8E+19PbmR7TY+1TovONH5V7Ag0QMBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appbookopen22:app app22 22:photo:22 22:R0lGODlhFgAWAIYAAAQCBAQ2NPwCBHSurIS2tBx2dBweHPz+/Ozm1GxiTGyqpPz6/Pz69GSqpOzaxPzy5HxuVLSmlOTazPz27PT29NzClPTexHxuXLSmjAxqbFSinPTy9KyehNy+lPTy5Pz29HxyXNzWxKSahOzexPzy7IR2ZOTWtESenPTy7KSWfIyCbKyijAQGBDyalPTu3KSSdDSOjJyOdCSGhPzu3OzizJSGdPTq1PTq3JySdMy6lAyKhOzWtOzi1OTOrJyKbMS2nJySfMS+rAwCBNzOrNTCpNzKpJSGZKyafLSifLyylIx+ZHx6ZDSChAQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAIALAAAAAAWABYAAAf/gAABAoSFhoeHAAMAiI2IAAQFjI6EAAaJkQeTjwAICYkKBQcLm5WdBwyfhgChB66bp64HCQC1lQ2irqQCAA4PowsLEBESE4wAuLIHFAAVFr+uDBcYxRm1GrmuGxwdFh4Mrh8gGCET1gDYyhsiFSMkDAsMDCUYJhvnJ9kHKCnODwwfPlBQsULCPRYAWogK9sHFiwoOPEyQh0JFPXO1YBSYwBEFghjdHkwQOYGgwQwIZRR44GHGDBogabhAsYEEihrUMAIoUMCEDRs3HODIYQHFA6MPcJA7KICFjgw7eIzo4cOfiwc/gKwIUm2SkKdDdlDt4AABDaU/iIRwwbTSUyJFOow4S3Hkx9oNDDZgXPU0h1wcSIgEGUw4ibVET5WoWMKksePHpdxmyKADAEIWly9HJtQkQJMmlAgZCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-apppencil22:app app22 22:photo:22 22:R0lGODlhFgAWAIMAAASC/IQCBPwCBPyChMQCBPzCxAQCBPz+/MzKzISChKyqrDQyNEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARYEMhJ6wxiEMtpIAWxddwXiqRlikSQeiAbuC+wirNR322gv7zcLobzDU+9XypoBBKTR1lz+RTWDgip8nUwZK1XLyIx5XoVicX2RUAo1DVKi7GOBxjxfNwQAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-apptool22:app app22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBISChFxaXNze3NTS1Ly6vKSipNTO1Ly2vNza3Pz+/MzOzOTe5DQyNOzu7MTCxGRmZMTGxPTy9Ozm7Hx6fPTu9MzGzGxmbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAW1ICCOZGmeaEoGbBsI6joMRGEcbQwESDIrtVtAF1gwDLNaAmfKiVgLBJKgwB1KxQZrBHU0FAXmavFoQLYiB6TxFXMj5AZBwnJI2I3wcNWALyYEcgoKXxRhOHs7XxEVCwsWFgoUDRYUFwwQB25ZCxiNjo6GkwUXN2NsCxEYqhUHoQ0MEglYRQQXErcHrI55FycuB2YSmoyOBTEtB2sXuhU6XAENC2a6z9AKCwq+1tAN3E2J3ySkIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-connecting22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxOTi5AQGBNze3Ly6vISChNza3FxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAAR4EMhJqwzY6omD+MNGdR8YilNZnug0qGzrqrL1lnV1fyJBVB6VQEMoGH4ADGwQkxQPBwMiKGA2J8VEAnq0tgiKg5aL/C7C2gTjKCM0zowDQ8tuNQznNL7cKzjOUQsNfER+gguIg19+Pm6ChBZFDmWNi5M5FIyYFHQRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-connectno22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBERCBAQCBPz+/MTCxOTi5Nze3OTm5Ly6vNza3ISChFxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAARiEMhJq7046827/+AVCKE0Dh9BAGdaGISAToFGFMcBU+11I4hDYseSZQiKwwKoI/QwBIYiuFDCZseGdIlYEjUNg1SpY6w2N4cUIW6cjwW1lsFwo+MqgtZuw0/ydw5vH34lBhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-connectyes22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBKyirPz+/KymrOTi5KSipMzCzNza3OTe5Ozi7MzGzPTq9OTm5ISChMS+xFxaXNze3GReZIyCjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWLICCOZGmeaBkAQpoGg7C6JizTQT7CxPwOwFWgYPChYIXkIHC4uQKGAiKRKCyNpxxUUVViVYNFLkqtLo+DAkMMLXQPXwAy2WCTF4544FGtKuwPDhB6DnxuUmyCcXIQhV1uYoMuEAcOBxEKCHg6TzGFCJUSizuejROKOAM9OY2SnUU7nD89NCcDsLUnIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-devscreen22:dev dev22 22:photo:22 22:R0lGODlhFgAWAIcAAPwCBAQCBPTy9PTu9Ozq7OTi5Nze3OTe5Nza3NzW3NTS1MzOzMzKzMzGzMTCxMTGxOzm7AwGDBQOFBQSFCQeHCwmLCwuLDQyNDw6PERCRFROVEQ+RDQ2NLy+vKSipISChGxqbExKTOzu7OTm5Pz+/GRiZMS+xLy6vBQWFLy2vCwiHFQ+NMSmfNSyhIxmTDwuLJx+bLS2tCwmHMyyhMyqfPTqpPzyvLSWbLSWfPzitIx+ZDw2PAwKDCQiJGxWRPTmrPTerMyuhPzqtPz63PTWnPz6zNy+nIRiVDQuLKyWbOTanPz21NS2jNS6lDQqJHRaTPzmrPTSnPzyxOTClPz2xNSuhPTqxPzuvOzSpAQGDOTKnMy2jOzSrPTu1NzKnOzOnBwWHJRuXLSWdPTatPzqvNzClCwmJOzSnOTOnPTuxOzKlOzerOzarOzitJR6ZNTO1IxmXPTWrNSyjPzOjPTSpLSehHRqZOzirOTCjPS+fPzGhOy6bOzKhGROPMy2lPz+1PzmtKRyRHRiNNTCdPz+zNzCjEQ2NKySdDQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAj/AAEIHEiwoMGBARIqXMhQIUIBAwYQIFCggIEDCBIoULBgAYMGDgIIDEBAwMSKBRBk3NjxAciQIwdACBBBwgQKFSxcwJBBwwYMHBx0EAmA5EwPH0CEsCChoYgOQ0cSGCHhA4kSS5syJGDiBNEAFVGUKKEBAwWFFM6SNJHi64gDFEKE4FBBggoKK1i0cPECxokYXw0gsECYggQZM2jAqGHjBo4cOtqOxLhDAg8ePXz8ABJEyBAWRIoYOfJipEoMCZEkuaFkSAslS5jUGJKkSRAnRREo0JDwCZQoTKQAmUKlihQrVa5gKZ1lI+oAK7QM2cJlSZMuU4Z4+TJEx0iNOwKAggkjZkyOFmS8kClzpcUQLRRGbjRD4MgZNEzSqKG+ZgobI2248dUbDDDwABzcxSEHEFpgEcUcdMRRhx1fFejAAx0cgcYdSxiBRx566LEHH0d8QFRRNC3Uhx985CHEH0MAEkhCBxWkgiCDFEFIEYUYUmONMhyCRxVH/PgjBYioYJAdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editcopy22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFPz+/DQyNISChDw6PMzKzMTGxERGRIyKjFxaXMTCvKSmpHR2dPz6/Pz29PTq3MS2rPz69MTCxFxWVHx6dJyWjNzSzPz27Pzy7Pzu5PTm3NTKvIR+fJyGfHxuZHxqXNTCtPTq5PTi1PTezNS+rExOTFRORMyylPTaxOzWxOzSvNze3NTOxMy2nMyulMyqjAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbYQIBwSCwahYGkUnk0BgTQ6IAQaBKfUWhBYKhaAU+CgXAQIAyChLeJzSIQhcH6GFaM0QtGY5kstqEODw8QEQELAhJTc08KBBMEFBUWDRcBE1pca20SGBkaEBscAY5maFRIAgoLHRQRHh8gIQFlZnByqA8ZGSIQIyQjJQEmYgJ5p2ACrK4gJx4gKIZZAgdeAQ4ZI9kjKSor0AwEjeAs1S0cHAslLi4vMDDRWeRIfEsxMeET4ATyVoYLC5fizXEiAR84BeMG+pEm8EsAFhAjSlR4hR6fLxiF0AkCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-editcut22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBAwCBPz+/OTi5JyanOzq7DQyNGxqbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARbEMhJq704gxBE0Bf3cZo4kRJqBQNRfBucyudgvJS6VaxLzyMa6/bLiWA9HOg4VIIkL5vzuRkcpkvRIIAorphJLzBW84WEuRZWp6uaT7J2Sh1Hit3OY/ZO7WvsEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editdelete22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAASC/FRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanPz+/Ozu7BQSFCwqLDw+POTi5PTu7MzKxIR+fCQmJPz6/Oze1NTGvPz69Pzy7Pz29LyyrPy+vPyupPTm1BQWFIQCBPwCBMS6rPzSzNTOxPTi1NS+rPTezNzOxPTizOzWxMy2pOzaxMy2nPTaxOzOtMyynOzSvMyqjPx+fOzGpMSihPTq3OzKrOTCpNzKxNTCtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf8gACCAQIDBAUGBwgJCgsLgpCRAAwNlZYODxALEY+SkAMNEqKjEw0UD5yegqCjrRMVEqidkgWhraMWF7GptLa3EgEWFRSOnhW+vxgZEBqzkBvItxwdHryRCNGjHyAhHSLOgtgSI60c2yQjJd+eJqEnKK0hJCgnJSngAO0SF+8qEvL0VrBogW+BLX4oVKgIyMIFQU8KfDV4R+8FDBcxZBREthAFiRIsOsygsVEUh4Un3pGoUcPGjZInK65QicPlxg8oX5RwqNJGjo0hdJwQ6EIkjRM6dvDYCKIHSBc1Ztjw4eOH0oIrsgIJEqSFDBo0cuTgsdSTo7No0xYTZCcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-edit22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBISGhISChHx+fHx6fHR2dGxqbGxubGRmZGRiZFxeXFxaXFRSVIxSLPyuXMzKzMzKxMTCtExOTPzqrPz+/NTS1MS+tOSaVPyWNPz6/IxeNPzavPyKBNTW1PyCBPyGBJxmNPzOpLx6PNRqBMSCRNySTPyCDPSGBMxiBKROBHRydPSylOyydMxmBJxKBAwODPS2lPTq3OyabJxGBPTy5PTGrOyOXPR+DPz69PzmzPzevNxuPORqLMReFPzy7MyCXKxiNIRKHBQWFNTOxPzixJRaPFxONHRqVPz27PTy7PzStCwqJDQyLJSGdIx6ZPz29PTu5HRmTLSKbMSGZHROPFxKPJSKfJyShKyehMyuhDQmHEQuJJyOfLSijMSynMS6pLSefDQyNHx2bKSahLyqhLymhOzi1FRGNIR+bNzKtOTOtOTKrOTKpLyedAQCBFRWVPTq5NzOvLyunLSmlNTCrOTOrNzGrLyidMS+rLyynKyijLymjLyqjAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gAAAAQECAwQFBQYHBggJCgsLDAwADQ6CAQ8QD5ydEJ+gERKWE4ICDxSpqhWqqhYNFxMYphCtqaytGRoXGxgcggSoth25u70eH8APFR0VzMzNziAXIRjIvwAFwq3EqSLUGB/iI4LathS4JCXVJh8nKCmCKrXDFCss1eIfLS4v8ssdmgWsAGNDDBnt3s3wJ+jAtlUhaNSwccNEi4WCBBl4SAHHihw6ZOzg0QNjRgAG6KXK4CNEjBU/gDQI8kLISQAIADobAoMIzCINjLw4YvNkAno4kCRRUuNHESNLmDRxUjSjAlRPfECJImUKlSpMrFzBIqWqoKtJaWSJomULAy5XXrp4+QKGYcYFoCBEWRImi5gmY7CQyVLGriAGD2jEMHMmCxc0Xb6kUbOGTRs3N988gLM4jpw5Y+iwqcOGjZ07mE8yiGABz5c8c/Ts4cOnDJkybS7fdMO7t+/fvDMaCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editpaste22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQWFDw6FHRuFGRaBFxSBAQCBAQKBCQiBIx6HPz6/NTOfKyiXDQuFOTm5Pz+/Ozu7PTq5Pz63PTyxNTOjKSeRExGLMTGxMzKzNTS1NTW1Dw2NKSmpKyqrKSipJyanNzWlLy6ZLSuVIx6FISChIyKhJSSlCQiJLS2tDw6NDQyNCQiFCQmHBQSDGRiZHRydGxubHx6dGxqbFxeXGRmZFxaXCwuLOzq7KyurHx+fDwmFEQuFCweFCQWDBQODBwaHBweHKSinJSWlOTi5JyepHR2dDw6PBQSFNze3ERGRIyKjIyOjISGhPz29Pzy7MS2rMzOzFRWVHx2dHxybDQiFPz27Pzu5PTq3PTm1NTCtJyGdHxuZHxqXPzq3PTaxNS6pFxWVFRKRNS2nPTi1PTStNSulNzOxNSynMymhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwABAgMEBYSLggaOjgcICQoLDA2Pj4MGDg8QEZ4FDxITFBUWFxcYGRobjQ8cHR4fCQ8gCyEiFSMWJCUkJieNEB4dKB4pKissK8wrLS4vMDHBAAYQHx8dFx0fJDIzNDU0M+IyHzaNNyg43Ng5Ojs7Ojw9Pj9AMkCNDiZB/h9CSOx4QLCgihItqBkYgqIDESElitAYWJCgkQcXjjRCgi1Ihw4BB5LAQOLCgyQYHihpUU3DBw5ElpAgAYNixSRJjKjQaECDCRPZPDB5IbIGSQwKLnh4wbInLA4kmJB4oaPiAwVNnER40hRK1BIAaVatUZJEFCkmpmjgCeWDCalFe4q4oFKwSRUrEa5gycLzwq8lUnPQ4PEgSpYcUZ5o2cIlS1O/JHLEDdfjQZMIVrpgweLFy5e+M6WSmBGlxYMYYBRzCaOFi5imHWBIfOEiShLTVjaP6eyFTBmN1TA5OvLDjJksWb58OVMGDRqWjAYdmU79SIvpjqJr104nEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editshred22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBFRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanOze1Pz+/Ozu7BQSFCwqLDw+POTi5MzKxPTu7LyyrIR+fCQmJPz6/Pz69Pzy7Pz29OzaxPTu5PTq3PTm3My6pPzu5PTq5NS+rPTm1PTi1PTezOzWxPz27MyynOzSvMyulOzOtOzKrMymhOzGpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbpQIAwIBgMCAXDAZFQLBbCqJTRqFobjgdkEYFKowPJZEyeUBqVR/crHDTKZYplovZKCW84+YKZZNZSBXl6EwEEBhVPXxZihGMaGRscdkIdg4QeEnVfCH2OHyAhIhuUAAiXZSEhIyQlJqWnjiEnKCWupRWoYyEgJK0SKaUKjam0JCorLMFfC6iqx8giLa/MGAsT1wsuCyULKwssC9RSzdkfCyALKuALLQsvpeXYIQso3gsiCzALMfENC+dGcMNHUAY/f+jq3ctncMYCGggFrsvHcEGNh/EyPFmg8cmrJxAVkVO0EUDJklHoBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-edittrash22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBERGRExOTDQyNISChBQSFCQiJCwuLPT29Nze3GxqbDw6PGxubHR2dJyanLSytJSWlJSSlOzq7Pz6/Nza3Ly6vFRWVBQWFIyKjMTCxHx6fIyOjLS2tOTi5PTy9OTm5Hx+fNTW1KyurKSmpJyenExKTMzKzKSipFxeXCwqLMzOzKyqrMTGxLy+vHRydBwaHNTS1DQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb8QIBwSCwaj8KAMoA8LgUDQsFwQByay4RiwWg4GA9IRGk0SCYJSsUCsVwwGQ1EsmESD5xOp+L5gDwhBRIZDhcDdkMGDgEiIxAkJQ8Ok5MmAohDAQ1xJxUlKCUlEg0pKpiZJRoLCxmtCw1eURhOcR4rbQ8cGRwLAwgGtBYTDywtGRKjvQTARgEZLhMcKC0OrQMvAirMRc7CHCTU1g2+20TO0NIn1RwDCya/wdHT1Rnt5LToKOq79trx0tR02YPX7Jm8fRxMOIhSLhOJE/LCJSTlr5kFEBQsWDiR4UGGBgsuHDg1BEYAfTE6oEBR4AIBAiS5yWBAAAGBAyaPGAgCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-fileclose22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBERGRERCRDw6PCwqLExOTFRWVHRydGxqbGRiZCQiJISChIyKjHx6fDQyNBwaHJSWlKSipBQWFJyanPz+/JSSlCQmJAwKDCwuLBweHBQSFGxubExKTISGhDQ2NFxeXFRSVDw+PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbZQIBwSCwaj8jkMSAYDAgEJbFgOBwQCUOAoJAaFgvGonHIBhyP5BcSgUAYDWxggD4WFmx3e3HQngkSRgYMEBMUFG4MCId0BGlEAQeEhocVDYcUdBYKF0QCB3gRlJgUAQEYBBkaRAMbDZMMpAYcT46rQwMJrgsdC6QcfwoPnUMOBgkIV6SHHg6bw0QEAQYfBpggBZjPGsRD0gEchxwCIR6HChnQRQ8DIU4DTR4Em+ncRw8O+fmoXPXdRg+gQLFgIYM/KRIkoDP4QMKFf0o0aBAh4qGUixgzCrETBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-filefind22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQSFJyanLS6vLzCxISChNTe3OTu9Oz6/Nzy9Nzy/NTy/OT2/Nzi5Mzu9Lzq9KTe7LTq9PT+/Pz+/Nz2/Mzu/Kzm9Jza5HzK1LTi9PTu9IzW5ITO3FxaXNT2/KTi7Iza7GzC1LzW3FRSVMzO1MTq7HTS3Fy6zFS2vKzm7Lze5MTGzHzS5FTG1Ey2xEyyvJze7JzW3ITa5FTK3EymrGS+zFxWXKymrMzi7ESirEyqvLSyrKze7MzOzMTCxKSepAz+/NzW3MzKzBwWHLzS3ERCRAzi3KyurNze3MzGzLy2vLSutCQiJAyytHRydOTe5MTGxLy6tLyqpKyelJSCdOze3NS+tLyupLSmnKSOhCwuLPzy9Pzu7Oze1OzazOTOvMyihOTi5PTm3Pzi1PTazPTWxOzOtNSunDQyNPzy7Pzu5OzKrNzSzNzGvNS6rMyynMymjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwGFhYOIiYQBAgMEAwKHiokBBQYHCAkKCwwFAZOEBQ0IDAsODxARCZ6gAAEGEhMSFBUWFxgZCJ+TjBoMEpkRERscGBGRih0BBAgeFBQOER8gISEfIruIIwEkCCUVwhcgJicoKSrZg9srCRkRGdMsLS4vMNiK2wIKMRsbMiwzXtCocSydIBs3AuCIwIFDiBMucugAoWvSiB2VNPDg0ELHwA0MkCXr4aNSggg8NoDIQOFHgBtAkgURMiDAEAFEVBCJFKCIkSMGOyDRkETJEkOFmABoUsRJQkQdnkzQACWKlBtTplBR6qopxkFRJ0ytYuWKFCxZtBBq+hRA2AlbRrh08fLlCxi1a51g+dQhDFwuYsaQKWPmDBpKXgNETaNGjJgyhNfcVdTTiWI2XpK0cePmzRk4YA5T5otGixY0qFOXbgXAQCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filenew22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBExOTERCRDw6PCwuLBwaHAwODAQCBOze1NTW1OTi5Nze3MTGxLS2tJyanPz+/Ozu7OTi3BQSFCwqLDw+PDQyNFRSVPTu7MzKxLyyrIR+fCQmJPz6/NTOxPz69Pzy7PTu5Pz29Pzu5PTq5PTm1My6pBQWFPTq3PTm3NS+rAwKDPTi1PTezOzWxMy2pPz27PTazOzSvMyynOzaxOzOtPTaxOzKrMyqjOzGpMymhPTizOTCpNzSzNTGvMymjMSihCH5BAEAAAAALAAAAAAWABYAAAboQIBwSCwaiYGAYEAgFAqGg/Q4DCASCsTiymgcHAcqQLB4mM+QiIQBppLPcMjkwQ4bB2X4maKgt4sVCHpnFhQTElNFE3mDDxcYGRp2RBuMgxwIHX9EBZZwHh8gCBmTQ52NISEiIyQlpUImng8hHyInKAgprwAqgnC0IKwrLLpGB4wctLYkwy0uuwd9Z8AnJywsLcVFx2YcL7UnJCwwLTEy0GXJoSgrCCwzNDTnxgjeH9UrKzXwNDY36LRGhEOwLx4NHDmgJbh3QoeOgv127EhojEeHDj16pEhRQoZHHzl+QJNCsqTJSXaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fileopen22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQWDCwaDDwmFPSubPzGhPzCfPy2dOSmZPzKlPzSnPzOlPzKjBQODPzChPzWnPy2bPSmXPyuZOyeXIRSLEQuFEwyHEQqFDQiFCweDKRuPFRSTPT29PTy9Ozq7OTi3Nze3NTW1MzOzMTGxMTCxLy6tLSytKyurDQyNMzKxOTm5OTi5Nza1NTS1MTCvLS2tLSyrKSmpJyenJSWlIyKjHx+fFxeXBwaHKxuPMzKzLy6vIyOjHx6fDw6NPy6dGxubLy+vISChCQmJNza3KyqrBQSFLR2RKSinJyanGxqZAwGBJSSlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeDAYqKiIeLj4wBjQCMhY+NkoiLk5qbhQIDoJyGBAUGBwgEo4MECQoLDA2pDrS1tKQPEAwHERITE77AvxKqhAQNDA8UFRYXFs8YBAQZGqGPxw0RGxwdHR4eHyAhIiMkJSYnKCgpBAYPEhcqHyssLS4kLzAxMjM0NTY3cBA4UCAHBw8gVnhgEcKFjhc7UPDj0cMHAAI/KFgY4YLFio/jRpTYsW8GDyCSCEQw2DChOHIqgsCQSEPIEEEEJFhAoUNECCJEyOk4d6KIyRtGcB7hIJKjixEjHu4oimSGEIs4d8IIUoKECnNB0ElMwkNJJgBLlJBAcQKGiR07KGAURVGViY0mhIwwSTKjr99+THjUoIg0r48hTRIrRtxkiOMhDgrZCQQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-fileprint22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBFxaXDQyNFxSTPTizOzi1FxORDw2NExKLPTi1Pzy9Pz6/FRWVPz29Pz2/PTy7PTu9OzezPzu5OzavAQCBPzy7PTm3OzazOzKrPTu5FxSRERCRGReXPTq5Pzu7ExGTMS+xKSmpOTKpPTq3JSCDNzSfHRydLyadOzCjOzOtOzSvLyyTMTCxKSipGRiZFROLPz+/KyurJyenJyWnGxmbLSabOzClOzm7LSutJSWlJSSlJyanGxqbNze3OTm5IyGjNTO1Nza3NzW3OTe5IyKjHx6fMzGzMTGxMzOzNTW1IR+hISGhKymrLy6vLSytERGRGxubKyqrLy2vLS2tDQ2NEQ+RASKBAT+BFxeXHRudAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAgOEiYqEAgQFBgcGi5MICQoLmAQDh5OEDA2YCw4ODxARApKUCaGYEAsSCRMUnQysCwoVEhYXGLOLCBCgDqK5GQUXGooCAhscBB0euBUZEAUJvQgIgx8gIR8iCSPiHuIFEREDJCXaANwhJhsnKCnWERcRKiopFCvsBywhQrRwQWGAPAz5EhpQ9wIABRgKYsiYMTEEDQocatiwkUIEP18fbkCAAcMBjhwzdOyQwYNCgBMfKJSgMItBjxs+btwgCSGGjhw/ZoRgQKGZCRMUPgABEgSIkCE3SZok8qNqkR85NtDUEcPIkaVAkCR5SrJBDCVKlmzQ6pCCiRlMTJo4YUH3K5AeMBYYWctW0BOaUH60cBJFypQmII6wyEpFQBVFMSm4UAI3hJUrOGh8oOJrklYKWIromJGDR99Ogz5j4ZGlM+pEnwmBCwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filesave22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBGxqbAQCBLy+vERCRExKTHRydIyKjMTCxFxaXGRiZFRSVFRWVPz6/Nze3Nzm5Pz+/JyanDw+PExOTHR2dMTGxBQWFLSytHx+fISChOzy9Ly6vAQGBJSWlMzKzAwODJSSlHx6fIyOjOTi5DQ2NISGhGxubCwuLOzq7ERGRFxeXNTW1CwqLPT29Dw6PGRmZKSmpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb/QIBQGBAMj8ikUDAgFAzKKCBwQCQUCcICKh0SEAhGw5EIZAmBrgCxeDQgcDJWyz0GIggJfL+XGwQJRxNgC3yGDwwUFUZDFhdthnwMGAZNQwEZFwQakXANBBQbHIIdERIBnRAOiR4ERx8gsSEMBBmGCyEGG3YGBwcgIr8UCwQHECOgG4xCtRkEJAvBJRklJgkSFBQeJ68hJiEoESkFKiEZIbkGARsLlwEGExENGhorGSkpFAYm66NDLAECpGiBYsUIFA8wLHBBQMWLVkdUCFCwaYVFBOymkVCgYEMgOykEpICBccMBAhhELFigTEqAAgIIwCiQ4eRKDyS6EAlJIAI0EpaudF4iIKDAAn9CkRT5eMROEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-foldernew22:folder folder22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBNzaTPT2FISCBCQaDPz+BExKBDwmFPSubPzChPzCfPy2dPz6BMzOTAQCBOSmZPzKlPzSnPzOlPzKjBQODPz+rPz+3PzWnPyuZPSmXNyaXPTyhISCLIRSLEQuFEwyHPy2bKRuPFRSTPT29PTy9Ozq7Pz+xJyanDQyNPzGhMzKzOTi3Nza3OTiVBQWFDwqFKxuPOTi5JSSjISChHR2dGRmZFxeXPS2dNTSzNTS1OTm5KSipLS2tLSytKyqpIyKhGRiZNze3NTW1MTGxMTCvLy6tIyKjCQmJMTCxMzOzMzKxJyenHx6fLR2RLy6vJSSlHx+fDw6NLy+vIyOjAwGBGxqZKyurCwuLBQSFJSWlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLjI2MAY6HAgOHBJYEhJCDBQaDmgcICQoLB4MGDA0OAQUBDg2cAAcPEBESE6QUuQasFRYVq5SxCRcSCggYGRjIGgYbFs8bHIMHExIJGR0eHx7cB83PFhsDDuTUEyAhIiMjJCQluwEmvsAnKAcp1x4qKyUrLLupWrByxcnFiwQIYIggEaNEiRgBZMyYQaNADRs2REA6cCODBxw5+OnQgWMHjx4+BND4MQOIg1gI0gUREkTHiplDhhApEoCGkRlHBL3I8MEHEhz+WAhJogTJySVMfthwIehAExE5jubAkYQpESc8fOx4AiXKNA8+ekhBgqSpzh5hPHcsmVLjpSAqVZBY6VGkiJMiPQKLnTvjCiEsWU4o3nGC8YksMmT8YCmC6iAXKLRc2cz5yGYtR0JjKWQgEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-mailforward22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBJR2dLyijPTixPz69Pzq3Pzy3Pzu5PTu7Ozi1LyelOzavPz+/DwqLLyafPTmvPz67Pz29Pzy7LSWlPzmzPz6/LyajPTitOTSzMyurPz25PTatPTi3KyOjPzuxAwqVDQiJHxiZPTetKySlPzqvPz27BQ6bAwmTPTexLyinNzGxDRunPzy5KySjCQ+ZNzq9KTO7JzC3Nzq/Ozu/LzW7FSm1BR6vGSWvFyq1AyGxAxytAx6vBSKxAxSjMyujLSunES+5BSi1ByGvAQCBNzCrOTaxNTOvMS6rKyelCx6rBx6tBQKDOTWvPzu1PTq1OzezAQOHAxGdBROhAQGFPzy1NzOvIRqXLyynOzarPz21Jx2XPTWrLSShAw2XKSCbPzuzAwePAQCDPzyzPzqzPTmxOzWtAwGBKyObOTSrNzGrKyGbOzatEQyNKyCZOzWrOTGpNS2lCweHCQaHCQWFBwSFBQODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBhBwgQKFSpY0HgBQwYNGzh0mDhRAAUPHziACEGBpYgRJDiUGEkSwoCQJk6opNASRQoOFETQJDkggwoOJlYApcCihQuVL2DUhBDjhIqjJmRwwDCDhswaNm5MjYHjKggOOU7o0CGTA9gdYknG2KCCBw8VJVL0uBgihAUfP+CSNGCjsI/DiBPbAMJBsEQbQYQM+UG5smUiRYw0jlvYxhEkSYyIHm1EyRLTTH40EZvAyZPOR4pAmU07ipIkUKQ0mQIhAZUqVq5gKXzkSBYtyLVEyd1ki8QFXLp4+WJFQowbYLJnD5NbzJiJCjaQnhnvpYwZM0/OPFlvQ/f3iQvQpBlvQc0aCWy4VKnCpY0Y5yQxgEYXZFjghgwZUOHGCW90YQEccUwloBwGyjAHHXUoSAMZb0xhx1QOoMHDHSfIwSEOdTjhAQ1d4MFbTQ6Q4MYacrzxhhx04JCHHhvQsMeLJPHRBxpr+LHCGnusgccfgKixQR1ATtTBlDDAEIggggxCCCGFbLGFHVFKZEdAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mailget22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQ6bCQ+ZAwePKTC5Ozu/NTi9GSWvAwSJGSu3JS+5CR+rAQOHPTy/AyKzES23AwOHCw+bOTq/BR6xES+5AwmTBw6ZMTW9Ax6tByi1BRGdAw2XAQCBDQuNDRupKzS9FSm1BR2vBym3EzC7CSGxBROhNTW1Pz+/OTm5NTO1AQGFNzW3Ozq7Ozm7IyKjJyWnMzOzNzq9Nze3OTa5Ly6vCQiJGReZISChKyqrAwqVBRWlOTi5MS6xJSWlNza3OTe5Ly2vGxmbKymrIyGjMzGzISGhKSepCQmJDw6PHR2dJSOlPTy9MTGxLy+vLS2tMzKzLSutMTCxLSytKSipJyenKyurJyanCwqLCwmLCwuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBhgIBA4SLjAABBAUGBwiNlY4FCQoLDJaNAQ0ODwsQnYwREhMUE5ylFYYRFhcYGRgaGxsDHJUdFR4SHyAhEyIjJCUcuo0cJr0nExihxgwoyYscKSnMHicOIw4lKissLdWDHC4vMCu9McYqMjMyNOUANTY3OPEoOTolDCszdrSgwaMcBxs9TMxYOCMHBx8zfPj48QNINQ5BbMBIIUShDIUoTAhR94PHPEEHbQwZckOGjBQviMxYUWQIDCMmdXE4gqRnkiFETAxR8iKFjJU2evZEdmLJkgJIbqS4wXJIUapImj5FtuSEVyRVV1IVi4RIChhEkLVAgcJHEqVwVJUmYdKkiRNkALMRecKECRG/ff8CEQJFCA5kMKJEoUHDCQ/HkB9LmWKECpUeyKoIMSLEyosen0OD7iH2xg1dV7BkqXGlBpbWNTq4Zn2khu0aAAwEAgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-mail22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBDQyNCwqLCQiJBwaHBQSFAwKDAQCBDw6PPz+/Pz69Pz27PTy7PTy5PTu5PTu3PTu1PTq1PTqzOzmzPzuvOzitPTmvOzivAQGBDw+POzevPz67Pz25Pz23Pzy1PzyzPzqvOTavERCRKSilPz21OTevIR+ZExKTOTi3JyanLS2tPz6/Pz65KyihJSKbMS6lExOTNTW1JSWlJSKZMSylNTOrNTKpFRSVPz29MTCxPTmzKymjIyCdOTWxOzexOTWrBQWFFRWVOzu7MzKxJyalOzatLSulMzKtOzmxOTarFxaXKyqnPTmtIyGdIR+bOzetOzixBweHGRiZOzm3NzWzNzSrOTetGRmZOzizOTexOzm1JSKdGxqbHRydJySdHR2dOzapHx6fKyijOTixCwuLHx+fFxeXERGRDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLAQECjwORAwSUBZYFBpkHmwgJCgsMDA0OD6UQERITFBMVFhcVGBkangq1ChsLGxwcHQ0dHR4fICEGIiMSCbS3uLq8wCQUJSYGJygpKhQJKyvLLM4Nwi0uLwUwDQsxMtmeuQveHR8UMzQ1NgU3Dgo41jk6ns0cKOzgYaOHjx9AgjTAUUvIECLZNmxoUISHkSM9KiBJQkCJA4kKEoBQoWJJAiYtmjh5AmVCsCJRpHzckKCCySlUUvBYUqUHDysSPnxIEuXKA5pPRiRwxwFLFhRaIEDYUoEChCcDuECoOWKFuwW7nHkg4WELkw8/BHRRwESpt10dU8SSHevlRxIBX6C0WBE27q8GZMkKbTADjIAwYlb4GLMYShYoPTRo6FGiSJEKPyzMIFMmzJcvXbhwkSLFjJkbQW6cOHNGhAgEAdAsmk27tm0ABgIBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mailreplyall22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBLyejPTixPz29PTu3Pzu5Pzy7Ozi1LyelPTavPz+/DwqLPz67PTetPz69ERCRLSWlPTmzPz6/OzexLyajPzqvDw+PDQ2NMyurDQiJPz23PTatJyenAQCBPTevPz25LSajOzq7HxiZPTexPz65JyanBQ6bKSmpBwuTOTi5OzaxBRCdHySvGRiZHx6fBQSFERGRNzq9IyOjHx+fGxqbPzu3BwaHFSq3Aw6XAxKfPzy3Gy63ByWzJzO7Mzi9OzavBRytAx6vCSazGRKTPzy1AQKHBRGdBRyrDy63ES+3Cym1CR6rBwWVAQSLAx+xCyCtBRmnPzuzAQWLAwePPzyzKSCbAQOJByGvOTWvPTmxBQODFQ6PPTWrPzqzOzatAwGBKyObLSWfPTivKyCZEQyNKyGZOzWrOzWtOTSrOTGpNS2lJx2XDQmJCweHCQaHCQWFBwSFBQKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpkzGjhAoYMGjZMpMghQgcNFjh4mODhA4gQGkSIHAmBwAgNJEpo8KDSxAkUGjhMSEGz5gUVIiKs2PmBRQudHiwQpUnAxYsXImB0aBqjBcuoU0fKmPGChgUNH2qIqGHjg9u3bicWIFs2rYgbNnDkyGFhb8cccQ3ouJqWQo0dPFr0WMy4h48LFj4gsKriB5AeNngEaSGks+chPnwQOXFAh4oXRYxk9nAEyY7XO2wksWHDx5ATCDIoUXEBsYclTJo4cWJhuIjhSXacSPBEiZLMQY4wgRKluvXqUpyIsDElAxUqVaxcwcGCPQuWLOixaNHCZAsXBU+oqKDSxQqULF6ifNmyn/8VMOtxwcAK36kQRhdJQIFFEmKM4eCDYGyhhYAEkqFEGSuYYcUZLaDxXRpqSNRCEu6twYaFZXTQhgRd2NCCG9918AYELTjoXgNuKAFHB2RQEUYHVbQQRwlUpPHGGFwkyQUEDsgxx4lh9BhCBy2U8UQJcrSg5JIQ0FEHG3bc0QGYK+CRhx57PEGlkhM9sAEffKTQhx9+/AEIIIGoEUgLLRRFR0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailreply22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBMSihPTixPz69PTq5Pzy1Pzu5PTq1Pzy7Pzu7Ozi1LyelPTavPz+/DwqLLSajPTetPz27LSWlPzmzPz6/PTexPz67Pz29OTSzMyurPz25LyajBRCdPzuvDQmJOzexPTevOzq5BQ6bBwuTDQiJHxiZPz23Pz65LyinPzmvBxCbHySvAQCBOTi3OTq9CweHOzaxFSq3Aw6XGy63ByWzJzO7Mzi9OzavNzq9BRytAx6vBR6tPzy3AwOHDy63Ax+xCSazCym1CR6rBwWVOzizAQSLES+3CyCtBRyrBRmnGRKTPzu1MzGtAxKfAQWLAwePPTizMy6nByGvNzWxOzWrNzOtBQKDJR2ZNS2lPTmvBQODPTatKSCbOTaxLyqlAQKHFQ6PPzyzPzqzPTu1PTivOzWtKyObPzuzOTOtLSWfPzqvAwGBKyCZPTWrPTmxNzKrEQyNOzatOTGpJx2XCQaHCQWFBwSFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYuIDBQgYNGzh08DCR4oQPIDqEmDBhJQYRIzqQIFkSAoESJCKkDGFiwgkUKTpMwECz5IASKjqsSMlSA4sWQjG4qGnzhYoQSmF0iCFjBgmWGWhQrVHCxg2sOHLo2MGjB0sLYmsWQHq1p4wdPtqemGDhB1UDQFSouKHi7oQgQmSwUMyYxcQDZQWz2EFiCJEiRoyQyLzZyGIIB47YKLwDSRAiSZSoXq1kCRHNLBK8YGKjCYskTp4ogeKkt+8oUaBImZKAAxMmVKrctqL7ihTnz7FkAT5FC4cKFbZwadIFdxcvX8KLss8iJcoUBUcq2KgAJoxyMTy4jCFTxoxEHl2GLyCDncmWM2hUIQMPY2CXhhoTfTEcA2tgVwEba7Thxhs88FdBD/ZB8MUUHMJBRhw2sAGCHBKU4UaFc1RAhxnhcdhhHUzYAUIcFdxRAh4R5KGHinu4OIVEDqTBRx81xhGHHzD8wQYQetDRI4cTAcIHGWT0EQgZa1ApCBqDcBAID1Q94IEHLtBAAyGEFGKIIWqYYQYPYNZkQEAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailsend22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAIR6fIRydHxubHRqbHRmZGxeXGxaXGRWVFxSVFxOTFRGRExCREw+PEQ6PDw2NDwuLPwCBLSijOzixPz69PTq3PTu5PTu3PTu7OTi1KyelOzavPz+/DQqLPz67LSafOzetPz27Pz29KyajPTmzPz6/NzSzLyurCwiJPz25Ozi3JyOjPzuxBRGbAwSHOzexPz23KSSlPzqvBROdISavBxSdAwaLHRiZLSinNTGxMy+vBxGZNzu9BSGrAwWJMSyrKSSjFy61ETO3BRWfPz65PTqzHTK3ByqzBSWxEzW5AQWJOTWxBRCXOTu9BSOvDzO3ByavBRKbOzaxOzizKSWlCQ2TAQCBJza7BRWdNzSxJSCbMzq9BSOtCSKrAwiPOTavPzy3LymlCySrAwmPFRKTPzy1NTGrPzu1JR+bOzatPzyzCy61ByGpOzWtJyCbPTmvPzuzIS+3FymxCSuzBR6nJyCZOTWvKSObMSujOzivAwKDOTSrNzKrJyGbDwyNOzWrMy2lIx2XBwWFBQSFBQODAwGBAQGBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYqMDxAoYMGjZwmEixg4cPGzqA6BBiAggRIzaQGEkSwgAMJCKgnNBhQogSJlKGOFHTpgYUG0TsnJBCxQoSE1i0KErAxYsOJJRuuAAjhkwZM2jUqGnDBQoUHTbciIEjx4YNOmbs4CGjB8kCZlGAALHBx4+YcTcACcJDyFSJBo6iGNIhhQkiG8BOKGLkCBK6SSQisHoWhZIbG5bMYALECI8mTZw8gTL1QJQXZ6VMiUylSpUlVpoYaXLFtm0EGmCjwJLlA2O9MrRsccKlC8kEXr7AdgEmwtkhX2SQ2BIkjBiSYzSQr/nyhUKZLIrJJOcexvlEBV7IvCBjRkmAMzHOaufhxDvJBWiQISAFxUUQQRovJNeEGmu4JxEDbKQhXxsfuFDGGW68IQMcccgxRxUkNRDhC3R8QMQIdZwXQ11JJGFbiB+QYccHaaTxhgt13OFBDGTgkUdRDrhAhx5k2JjGCB/swYcXMXwAYk190OGHHx/4wUaVepTxByAaoPEkSQ5wwMEJZAZipiCDDJIHIYV8OZEdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav1downarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBBQSFAQGBDQyNExKTHx6fGxqbFxeXGRiZFRWVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFxaXDw6PPz+/MTCxLS2tIyKjKSmpKSipJyanAwODDQ2NHRydERCRFRSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZzQIBwSCwaj8ikcslsOp/OgHRKlQoCgymRUDAcEIkwYgxWFBYERpHQcDwgEclEQmk8DhWL2kiIXDBwExMNGRoJaUkEEH8bEQ0cGgcWAksEHX8QHBKSHk1sfxMHH5ROBBsOICGkT2wiq1CIULKztLW2t0h2QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav1leftarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ5QIBwSCwaj8ikchgQLJGBgfNZDBAKBirRekBMtYGEYsHIgsWNhOO7tCrShDU18Hg/CJAIG0o4wCUQcksTFBUSCRYSEnpUFxgIGQkJGYyNGggbHBaVjR2QCxEeWkITHQ4IH3tPFwEMA2ajAKUgqlQTTbFEE7W5vUgGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav1rightarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNGReZAQCBMTCxGRiZMzGzOTm5LSytPTy9Pz+/CwqLOTi5Ly6vCwmLMzKzJyanJSSlBQWFKymrIyGjCQeJJyWnISChISGhHx2fKyurDw6PAwODHx6fHRydDw2PERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ2QIBwSCwaj8hkMRBQKgOCgRMZIBSk06XhEM0SA4iE4uoVLhCMhqLrdSAekMgYO5VM4BQ521mxIC4UFxBWdEkSERYYFxETGQGFSBKCGBEaGRuQSBwdeZaPXpsQCB6YZQMdEI6ZSgMepKusHh+wrCC0rLdlursGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav1uparrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBFxeXDw+PMTGxHRudPz+/JSSlLSytIyKjHR2dISChIyGjIyOjLSutLy6vKSepJyanISGhJSOlOzm7Ozu7MzGzKyurJyenDQyNGReZKSmpIR+hCwuLCQiJBwaHBQSFAwKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZtQIBwSCwaj8ikcslsOp9QYyAQFQYEAyr0Sihkn1fDAeHVLsOJNELxVaITC0bDUU6GH5AIQ8KYrNtFVxQVFBYWFxgRCREYdUQZGhYEDwgIGxAHCQocCgWOQhmhGR0epR8gqCFTq1Wtrq+wsUt0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav2downarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAQGBBwaHDQyNExKTHx6fGxqbFxeXGRiZFRSVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFRWVDw6PPz+/MTCxLS2tGRmZDQ2NAwODJyanKSmpKSipIyKjHRydBQSFERCRExOTFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAasQIBwSCwah4FkQKBsDpoBIqFgOCASCYRWm1AUFgRGkdBwPCARiWRCaTwOFYvYSIhcMOiJpJGZaDYcR0IEHXceEQ0fICEWIoJDhHcQHxIHgI9SEHeVG46YUh8OISOen1INCqWmUnOYTUxQAU9NUlRWWFtbCiRgrYNlZ2lriG8lYUd1khETE24gCZeCkRgeFBAQIAeNn9OTlXKrBJoYnKrcoaPmpmSpq3S+7u50QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav2leftarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAavQIBwSCwaj8gkMiBYNpeDZzEQXRIKBmPgmtUSDgipcAsWjxOKBaN7Tq+n6EbCIQ3E5+KtQk6gjwl7CX11D3sPBBARTQGFDYeJT2R8EhB0koKUfgATFBUSCRYSEoqcnqCiikMXGAgZCQkZqautr7FiFxoIGxwWqQC4ury+qh2tCxEexMbIRhMdDggfYs7Q0kcXAQwDbELY2txEziBmmx3jSRNMR+nk4e2b70ry80QGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav2rightarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTGxOzm7CwqLLy2vPTy9Pz+/Ly6vCQiJLSytLS2tLSutOTi5MzGzKSepIyKjJSOlKSmpMzKzJyanIyOjBwaHIyGjISGhJSSlISChBQSFJyenIR+hGxubDw+PHRydHR2dEQ+RHx6fERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8hkIIBcJgEBweAYnTYJUmMAa9USClniFtwlGg6IRFhoUKTXwwWj0FB3F46Hwl6UQyISfAB+EROCQgsUFRYSF3yJEIyBaxgWDBkaGRtclQwSHBIbEGEdGx4fGhcOICEDGBsWHBmqIq1CHRIWGRMMIyRTHRy6Er22tyONq8YdJRe0xkIDwr2/QwMfliMmZQADIxasZd4e4UYDIr7c59rc0eVFA+/m0EQD9PDt0flP/P3+BkEAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-nav2uparrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBGReZDQyNMTCxHx6fPz+/JyWnKyurHx2fDw6PJSSlISGhIyKjIyGjISChLy6vJyanOTm5PTy9OTi5MzKzLSytKSepMTGxMzGzLS2tLSutKymrHRydCQiJCwmLBwWHAwODLy2vHx+fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAajQIBwSCwaj8RAAMkUBgSDZdP4JBSi06TAcEAkFNLp07BgLLzY5njRcDzO3zB1C4lEGI83Wj58SiYUFRUWdg0XEXFFAwIYGRoWGxwRZQUFHZdgRAObmx4fHiChISFKpVlKWUdPaalOAlasp1sHG4myZGZ7Yltsbgu1mUhjdRF5egmxfQJ/gYOFdrZDi40iFgiSCw8jBQmYcpydn6Ego6WorUwGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-navback22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRGZAxCZGyavExmjHyatOTy9CxihISevPz+/KzO3BRylAw+XAQCBDRWbPz6/FzC3CSuzDyexJzO5Mzq9CxSdAQOFISmxNzu9HTS5BSmxAyexDSuzJTa7Mzu9Kzi7GS21CRmjAQOHHSWtLze7AyWvHzG3BRihAQKFCTO3BS+1AyixBSWvBSOtBSStAQWJBSixDzW5BTC3BSqzBS21CTC1ETW3AQSHEze7BRqlBRmjAQCDBR+pBRefBRSdCH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMqBcMpvHgGAANQYIhWdVGDAcENQtIJBQLBgNx0MQaDuQXcghIplQDhBIxXKJYiAZGhscHR4VHyAhIiNWJBklGhIbJoQnFCcTKIxFKSgbKissJi0mJi4vLiYoMEcXKDEyMzQ1Nje2NisoOEg4KDU5K6g6OwwoKAN9SCOeMmgwz884PEq9PT4NYkPLP9jZQikN3d4AKVrjKePp3gZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-navdown22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRKZDRSbBxCXJTC1Mzi7Nzq9NTm9Bx2nAQCBNzu9JzG3Hy+1HzG3IzO5BRmjPz6/LTe7Dy61AyStCTC1FzC1AyGrETS3ETC1ETa5BRulAyuzBRylAw+XMTe7Gy+3CSqzAyexBTC3DR+nIS21KTW5Nzu/KzO3FzC3Pz+/ByixEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaRQIBwSCwaj8ikcnkMBAQDgjPAFAYKhsMBkVBUAYEFo+F4QLzVQEQyoVTOX/XBcsHA0+vMRbNBMwkRDhxuHX5GTlIeHh8gISIjFAEeiVRECiQlDAUmgxQjIhwiJHdFlycoKSIUFCEjGiGkRpcqCxYijxorsUezcxYsuoZJsxLAu0qXB7DCTJfHVQrMX9PU1Uh0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-navforward22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBBxCXDR+nIS21Aw+XJTC1Nzu/KzO3Pz+/Nzq9Pz6/MTe7KTW5FzC1Nzu9CRKZMzi7IzK3Lzi7LTe7HzG3Gy+3AyuzAyexFzC3DRSbHy+1Dy61CSqzAySvAyStLze7IzO5AyGrETa5ByixBRmjCTC1ETS3BTC3Bx2nAyWvEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaYQIBwSCwaj8hkMqBsBgTN5IAAjRoDBaq1aDggtMuAWDzoJhTgY+CwYLgZDccDwkgXI5IJZVGxXDAZGnR2QxsLHB0PHRgeHyAZDyFfVUQDCyIgIyCPIB+QJCUmlEMBEiInKCQnKSkeKSQeomoqJrUmKiArKSwZsmoCwMEBGCyxo1EGHr3HUQEEvltCBtDRAAbMW0zV29xDBkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-navhome22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQiJNze3ERCROTi5MzGzLy6vDw6PKyqrKyurBQSFGRiZGxqbGRmZISChEQ+RExKTExOTHRydDQyNOTe5FROVLSurCwqLMTCxPT29Pz6/LSutFxeXLyytLSytPz+/JSWlKympPTq7KSipNzW3BwaHHx6fKx2VJRWNHQmBFweDOzq7Ly+vNTW1JxWNLSajPTe1Ny6pKxWJNTS1IyOjJRmbPTi3OzKrNSSXMSGVHQiBHx+fJSSlPzy9IxOVOzWxOSyjNSCPLxeDJyWnIRGTOTGtMxmDLRWBHwqBIxGTLRSDDQuNNSunKxKBGwyNMSafMxqHMReDKRGDPTu9LxuPLxaDJQ+DIR+hGQqNIQyBGQiBNTO1EQKBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAYSIiYQCAwQCiokEhwACBQYHBAiQhAiHlQYJCgkEC5uCkp8MDQ4NDwylmwgQlgQRERIEBBOkmxQVBgQWFwUFFxEEDLyJGAUZtQoFGhsFHLYdyoOVHsEf0SAbIAUex8mwlAUhtSIFG+3uIyTWvAIGJMEkJe76GyXbEeWUBJg4USKaBhQpVKzYoIFFiwYUBBJa8MAFCw0vYMSQMWOhBhoTKCQSUKMEiw02buDIoWOHBg0GeIhEFKAHDR8afgAJImSIioYliMws1MPkhiJGchxBkmTDCBo1hg4KQMTiBiUyhBxZ8pNFiR5MEtU0WqSJVidJNDyNKraHC5xPNKBEkTLlJ5WvUgWNvfikyhArV34+7ZEXQAAsB2iUyHLlihYtW0pwOYAFgyJDmDNr7jIIWiAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-navup22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBHSWtBRmjAQOHISmxNzu9BSmxBRihHyatPz6/Lze7CTO3BSixHTS5BTC3DzW5ByyzPz+/OTy9AyexEze7ByixGyavKzO3FzC3AyWvBS+1BR+pAQKFCRGZExmjCxihBRylCSuzBSWvBS21BSOtBRSdAw+XAxCZDyexDSyzCTC1JzO5JTa7DSuzETW3BRqlAQWJDRWbOT2/Mzq9HzG3JzS5Kzi7BSStGS21CxSdCRmjAQOFAQSHAAAACH5BAEAAAAALAAAAAAWABYAAAaeQIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbUGFAtGw0GFfheHByQi4S6/E8pDUoFYLm5kAEPJaBAVGxIcER0JHlEfICEiIxUkGyUmIgknKIhXASkonCorgSwmKQGcKE9IAi0uLxUwMTJWMzQ1NiYwBLBQHws1N7avXgs4NjkcCblMATU6KhvGyG87PAnUKV1MAj0+2zIFp1bg4eJJdkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-playeject22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAwKDJSWlFRSVBQSFKymrOzq7HRydERCRPz+/MzGzISGhJyenKSmpGxqbJyWnJSOlKSepLy2vIyOjGRiZPTu9IyGjLSutFxaXExOTHx2fGReZAQCBAQGBBwaHCQiJLSytKyurJSSlFxeXNze3LS2tIyKjFxWXHRudAwGDBQOFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbVKFQsGItBdBhpgh4PxIJvRC8cA4oiMy8bvQhJhMAYTFBVOURAWEw0QFxcMERAYCBluVxobDxkVHJocmBwEGgmEQx0dHh0CpKmkH6odVlanBR8FtAIFtiCkSB0LISEiGCIGIxAPDySuRwIOBwrOzwoHJRHJRh0jJgMj2gMnERQUCNVFHQQoCBvo6CkICATjRB0qp7b1K6qv+foyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-playend22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTCxGReZBQSFOzm7AwKDKymrJSSlFRSVCwqLLy6vPTy9OTe5Ozq7CQiJLSytOTi5BwaHPz+/HRydMzKzKSepJSOlKSipJyanIyGjIyKjKyurISGhMzGzJyWnHR2dISChIyOjLSutDw+PERCRHx6fJSWlIR+hJyenGRmZHx2fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8ikMBBQKgOCgRMZIBSkxYHWoDVWD9EigpBQLLBERsPxCA8NDUhjgTBGJJNGG02RVBQWdUV3FxgZe0IGfoAGdhoXGxwdiAYef4FGFBoeHB8dGSBRihUhIo1FBhkbIyMkJRYmAwYal4JEBh2RChIWJ1IIGxUZFqdECCgkHR6wWAYpFR2YWSobvL5vFgfDaEMDIivMRBEsD9HcQgMWvecDLB0tZ0btsfJa9vLXU/X6/P3+b0EAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-playpause22:play play22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBAwODMTCxKSmpJSWlFRSVAQGBBwaHLSutOzq7Ly6vCQeJPz+/Hx2fBQWFGxubLSytJSOlBQOFAwKDJSSlJyWnIyOjHRydNze3GRiZAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWBICCOZGmeaKqubOumQSDEgRjPMSoMRGEcol3vh0IkFAtDDWBEKlGMRKPgEIii0yrqIS1ArADu9KuLNCSOSdCMVp8ohEZFC4DL6SaBpXGh6/l4JX8XZACDhXkYCn1LAoqMUBAZEhBLDJKUSyYBGmhPAJyemiU0NDaloy+qq6ytI8whACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-playstart22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExOTAwKDAQGBJSSlHx+fBQSFMTCxKymrFRSVOzu7GxqbLSytLy6vJyanPz+/GReZBwaHHRydKSepKSipGRiZJyWnAwODLSutKSmpISChPTu9ISGhFxaXJSWlIyGjJSOlERCRIyKjDw2PIyOjLy2vOzm7Dw6PLS2tCQmJOTe5GxmbDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa7QIBwSCwaj8ik0hgQLJGBgbMoqBIKU2LAcMgOEQmFYeEFbBmNMgDhYDwWBC0k4pCoJ46IgRIXBioRCRYXamwRGBQIfgaBFhiERhkaenxmCoEbBhyQRYaIGVsdghgem4UWegcEBB8UHhsgIaZGBBgRIpUIIxQhChginEQIIBEklWslFyYnBsFfFCi4WQgpFBwqFxNGKxcsxl4IAS0NZEYCF3vlwgEfUuZV8JEuI2pPAARN9kcE9fr+SwaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-playstop22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAwKDBQSFBwaHCQmJJSSlISChJSOlJSWlGxqbGRiZNTS1PTy9Pz+/Ozm7OTi5FRSVIyKjOTe5MTCxIR+hExOTHR2dLy6vLSytLy2vHRydFxWXIyGjIyOjPz2/FRWVHx6fExKTMzOzJyanKSmpKyqrKSipAQGBLSutHx2fDw6PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcslsAgKCAWEQjQ4KgSwyYDAcugZEQqFYYJECA6PhaLcfEEUkgJZAGJB8fkKpWOhHAxcOGBQZGBoaGQgbHIBGAhUOGR0SBxISBh4Xf0iCHxQSlRIIXhsgj0UCIaCXmJgHGyKpRJ+hmB5dHQqOaCENIx0epBIkBhdzngoPGCQlJifQJBvJRygRKRcKGxcXGypys1srEREc5SLnICLiR1koLFVUWfRO9vf4+UwyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-textblock22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUWzvNzo33GfFl5jVlonlTrr1DbvFi9vjeeNUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textbold22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIxhI+py+0Powm0VnknjVkH2AEhE45LZ55Wqn6e65TsMc5eYosbksswubJIhsSiccgvAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-textcenter22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUbz3Sh7yIWfFHKjVl4nmFrr1Lpr7LwkjeeIUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textitalic22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py+0P4wqUSlQvttrkDnyaOHIdeaGRupplAIauVM3xjeeOUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textleft22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+pyw0Bo5zB2UXz3Sp7yG2fFJajVjonmIor2TJvfL0wjecIXQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textright22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUfz3SZ7yIXdF4kWqZkbCqoMO7kXLC+wVOe6YRQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text22:text text22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBBwaHAwKDBQSFLy+vLS2tJSWlBQWFKyqrFRSVCwqLDQyNNTS1GxqbFxaXJyanIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAVcICCOZGmKQSoMaZsShBsQBdAapHvgaIDUqUPJlRjSbAoT0fRDKgODRbF0PLUYjZO2F2Bst9evNix+dsvDlGKK5jraudQb7qbX6a2HEJ+ycyF+LRE8ZTI+fX5oGCEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textunder22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIvhI+py+0PowmUnhpeVVnb1DkbCI1I2JhX+Z0sOr2cTHpwK7a4rUr+hAnufsTirwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewchoose22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz69PTq5Pz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq70466Cl+AMxBVwnFIVRAmQHCIeBrC1L3tQgJ/SaEbeeC1PLBHE2ybFI9A1HzstHEIK6YCmhDTmBybQaHYJn7QC5zKeytIQe1+pKNE6P2yMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewdetailed22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAQ+EMhJq7046817+MLQUQFRGMc4lQaSAkcMx3QltMmrDrSu/sCgEPgJhIiFk89DaL1qPRnlhsgBebWhdstVESIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewicon22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz69PTq5AQCBPz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARWEMhJq7046z2DF0PlBeAVEERhiKhqHgWyUgEsX0KczFOO7JeBYciTCImc5ITIXDKHyqhU9AnRqq9UEVDTvmLbGhin2/qAliOUot5OLc81IO5+2+8WewQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewmag-22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbKQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/avno2BBf/MCClSob4iBIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewmag22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbIQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/cunr9S8gAIRFhTCLAgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewmag+22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbQQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/4zT766vRI+fvHD4CPgwcJ9qg0UB85JA0dDjEQBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewmulticolumn22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq7046813+MJQfUF4BURhHGO6noSBsEcNoDJtS4KcsJQe4ncZ1HYT47HDbDqfUAnJRJmKLIGCCjjJbmE5wBI3EyOFxKCPS1EiJW52dE6vZyIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewtext22:view view22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIkhI+py+0Po2ShBlOxzbP7n2yaJoLm+ZTcxqHuC6hXzML2HVEFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewtree22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz+/Pz69Pzu5PTq5OzaxBQOFOzKpFRWVFxWXOzexPTexCH5BAEAAAAALAAAAAAWABYAAARPEMhJq704g6A779kHCORAgNskFMYhakE8FkjyBcoWv+JwJItXaELYCTFHlCSpZKKcoB5jYHpOGgUadLKbIRw3jhEzQDyCSuI4zW673yhDBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actattach16:act act16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBPz+/AQCBAAAACH5BAEAAAAALAAAAAAQABAAAAI2hAOCxg2h0nJHyEshi9HpxU1GOCLdZoKpQ15nibUoprKp9lh2oucUxsBRXsJh4Hjs/QTMpr8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actbookmark16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actbookmarknew16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy6vERGRFRWVDQyNKSipAQCBMTGxKyurISChJSSlJyanHR2dIyKjPz+xISGhPz+BGxubMTCBHx+fPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVfICACwWieY1CibCCsrBkMb0zchTEcNYsIiYHiwIOdEAvigdFQGE0Ix4NBbSAgsWjk+jBIAlcUYrJASChnSXZSoUDelKfoKpFALJA61ueGI2IAZmhogGFmCGGAgXsifiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actcheck16:act act16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBMT+xATCBASCBARCBAQCBEQCBAAAACH5BAEAAAAALAAAAAAQABAAAAM2CLrc/itAF8RkdVyVye4FpzUgJwijORCGUhDDOZbLG6Nd2xjwibIQ2y80sRGIl4IBuWk6Af4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actcross16:act act16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/PwCBMQCBEQCBIQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMuCLrc/hCGFyYLQjQsquLDQ2ScEEJjZkYfyQKlJa2j7AQnMM7NfucLze1FLD78CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actexit16:act act16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBDQyNHR2dCH5BAEAAAAALAAAAAAQABAAAAI4hI+pFrHb3nEg1iWiDiINCwYDko0V9XUTda6I1TIsUMpGinyzbB6ZeGuoEr+GUDL4CXqSphPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+acthelp16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQ6XAQCBCyCvARSjAQ+ZGSm1ARCbEyWzESOxIy63ARalAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ/EEgQqhUz00GEJx2WFUY3BZw5HYh4cu6mSkEy06B72LHkiYFST0NRLIaa4I0oQyZhTKInSq2eAlaaMAuYEv0RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actitemadd16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBARCZPz+/Mzq9BTC3ITC1HSyzGSivAw+XBSStIS6zHy2zAQCDFyatAQOHFSStEyOtAQSJBSq1DR2nCxunCRmlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICCOQTmeaCAMRIC+AVu47xkTBl2Ld16XQNYBQTQBVIOkMHFQJBeMI4tAbSSu2IRDSnhAvFfI97sFRM6RwOMacbjLKckVvgvIJ5EdSU7J648VgXQ7Dmd/hyJ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actitemdelete16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBARCZPz+/Mzq9BTC3AQCDAQOHFSStAQSJAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQwEMhJq704681n+GAISoEwnGg6EAUQrEQsz4ThEkeu77kNIAagMEj0dY7IpHI58UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actlock16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJEQ+FExGHCQiDBwaDGxiLHxyNHRuPIR+TIyGZJSSfFxaRFxWJGRiLJyaXNzWpNTOnMzGnLy2hJSKTGReLKyqjPTu1NzarMS+jLSyfKyibJySXIyGVCQeDLSytPT29Ozu7OTi5NTS1KyurJSSjGxqVFxaXLS2tKSebOzuzLSufJSOXExGLGRiTExONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwGCgGhkhkQDBoEpLKQoBACAyOUID1qTVwoQGvMPxNFgVjAxp6QCQUicSCwVgkG44HJCKRRCYUCAxIFRYXhxgZGhYbHINEHR4fGCAhIiMkFSVKJicoKSoFKwMsLZtDLison6GjLA92qCueoAUvpC2xQhWqrLYDErmEMDEXlDIwMxAHukI0NS01EzY2NAmPAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actredo16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxOHBxSHBRGHKzCtNzu3MTSzBQ2FLzSxIzCjCSKFCyeHDzCLAxGHAwuFDSCNBxKLES+NHSmfBQ6FBxWJAQaDAQWFAw+HDSyLJzOnISyjMTexAQOBAwmDAw+FMzizAQODDymNKzWrAQKDAwaDEy6TFTGTFSyXDyKTAQCBAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ2QIBwSCwaj0hAICBICgcDQsEgaB4PiIRiW0AEiE3sdsFgcK2CBsCheEAcjgYjoigwJRM2pUK0XDAKGRobDRwKHUcegAsfExUdIEcVCgshImojfEUkCiUmJygHACkqHEQpqKkpogAgK5FOQywtprFDKRwptrZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actreload16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCRaJBxWJBxOHBRGBCxeLLTatCSKFCymJBQ6BAwmBNzu3AQCBAQOBCRSJKzWrGy+ZDy+NBxSHFSmTBxWHLTWtCyaHCSSFCx6PETKNBQ+FBwaHCRKJMTixLy6vExOTKyqrFxaXDQyNDw+PBQSFHx6fCwuLJyenDQ2NISChLSytJSSlFxeXAwODCQmJBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIBQGBAMBALCcCksGA4IQkJBUDIDC6gVwGhshY5HlMn9DiCRL1MyYE8iiapaSKlALBdMRiPckDkdeXt9HgxkGhWDXB4fH4ZMGnxcICEiI45kQiQkDCUmJZskmUIiJyiPQgyoQwwpH35LqqgMKiEjq5obqh8rLCMtowAkLqovuH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actrun16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/ISChKSipMTCxLS2tLy+vMzOzMTGxNTS1AAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARlEMgJQqDYyiDGrR8oWJxnCcQXDMU4GEYqFN4UEHB+FEhtv7EBIYEohkjBkwJBqggEMB+ncHhaBsDUZmbAXq67EecQ02x2CMWzkAs504gCO3qcDZjkl11FMJVIN0cqHSpuGYYSfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actstop16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/Gw6NGQuLHQ6NGQmJFweHFQaFPTm5PTa3PTW1Oy+vOS6tNSinKReVDQWFPz+/Nx6fNyCfNyGhNR+dMxybMRiXLxGRIwWFNx2dNx+fNx2bMxuZLQWFBwWFPTu7Pzy9NRqZNRuZMRSVLwmJGwWFNR2dMQiHPTKxMxmXMQyLMxmZNx6dMxiXMRSRMRaVKxybMxaVEQWFMQuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaaQIAQEBAMCAWDYcgkHhAJxYLRcDQBggckIplQKpaLdRh4YDIaSWa94Vw6woAHgv6AMKGPaMQhwQMJJRkfhHmEJhdvRCcgGSCEkCgpbnAECiorGYYfLCItlAAFCygQj5AfbYlwBQwVE5AukG6KBi8tMC0fLi0pHxyzcAAxFxwmMny/wEwOxMm/qlcdJCSJ1H5XQh3a28HY3kx+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actundo16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxSHBxOHMTSzNzu3KzCtBRGHCSKFIzCjLzSxBQ2FAxGHDzCLCyeHBQ+FHSmfAwuFBxKLDSCNMzizISyjJzOnDSyLAw+FAQSDAQeDBxWJAwmDAQOBKzWrDymNAQaDAQODAwaDDyKTFSyXFTGTEy6TAQCBAQKDAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ1QIBwSCwaj0hiQCBICpcDQsFgGAaIguhhi0gohIsrQEDYMhiNrRfgeAQC5fMCAolIDhD2hFI5WC4YRBkaBxsOE2l/RxsHHA4dHmkfRyAbIQ4iIyQlB5NFGCAACiakpSZEJyinTgAcKSesACorgU4mJ6uxR35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actunlock16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJExGHEQ+FCQiDBwaDBweDGxiLHxyNHRuPIR+RIyGZJSSfFxaRGxmLJyaXNzWpNTOnMzGnMS+jJSKTGReLKyqjPTu1NzarLSufKyibJySXIyGVGxiNFxaXLSytPT29Ozu7OTi5NTS1KyurGxqVCQeDJSSjLS2tNTW1KSmpGRiLKSebOzuzJSOXExONExGLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaVQIBwOAwYA8SkMCAYOAnKYiFAIAQGyOgVCggYuEovVxztMpdnwAGRSCgUCwOjIeQ6HpCIZDKRUNYMRBUWF4UYGRoWGxyBRR0eHxgaICEiIyR0QyUmJygpKgUrAxMsLUQlKyieoKIuEAunK52fBS8DLiywQySpnjC1Mbi6QjIzNBeSIBY1EQfDQgosLAEUNjY3Co1DfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appbook16:app app16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBDyKhDSChGSinFSWlEySjCx+fHSqrGSipESOjCR6dKTGxISytIy6vFSalBxydAQeHHyurAxubARmZCR+fBx2dDyKjPz+/MzKzLTS1IyOjAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVkICCOZGmKQXCWqTCoa0oUxnDAZIrsSaEMCxwgwGggHI3E47eA4AKRogQxcy0mFFhgEW3MCoOKBZsdUrhFxSUMyT7P3bAlhcnk4BoHvb4RBuABGHwpJn+BGX1CLAGJKzmKjpF+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appbookopen16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExCNGSenHRmVCwqJPTq1GxeTHRqXPz+/DwyJPTq3Ny+lOzexPzy5HRuVFSWlNzClPTexIR2ZOzevPz29AxqbPz6/IR+ZDyKjPTy5IyCZPz27ESOjJySfDSGhPTm1PTizJSKdDSChNzWxMS2nIR6ZKyijNzOrOzWtIx+bLSifNTGrMy6lIx+ZCRWRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQEAAQCwWBYJiYEAoGAFIw0E5QCScAIVikUgQqNargtFwdB9KSDhxiEjMiUlgHlB3E48IpdKdLCxzEAQJFxUTblwJGH9zGQgVGhUbbhxdG4wBHQQaCwaTb10emB8EBiAhInp8CSKYIw8kDRSfDiUmJ4xCIxMoKSoRJRMrJyy5uhMtLisTLCQkC8bHGBMj1daARgEjLyN03kPZc09FfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appboxes16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+xAT+BASCBATCBMT+/AT+/ASChATCxPz+xPz+BISCBMTCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgZwrwYBCFqvhs3DNYXjChRlWBRjIRqGN4UuEUczMZxsDeXykdEsDQVVSLhQxhBCkVlmXA+KVHFYhFYOoHbMGN6pTQaW8YYiQmcG+q16a0+Zipw+4e9B/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+appbox16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+xISCBMTCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANECKoR6ys2IVqokF08yMTA1gwkYX5WQK5ma4VceTYPxXnBWdtY6+0834/Bowgzm6APWRQcH4TiMhPK2WYRiZWW7XK7/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appbrowser16:app app16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxONCROfCRKfKx6LNy+bNTOpGSS1DRupAwyXBRSnPTSjPTqvOzqzMzSvHSSlKy6ZDxutAxCpBQ2XBxepLTKvPzqzPzy5OTShLS2dLSqRFR2jBRerBQ+jOTixOzetNS2XHx6XDR2tCRexBwyTDyKzOTavPzq1OzKdCx23BRKtCQ6VCQmHFSa7IyirOzSnGSGpIR+bFSO1DyK7DR+5CRixBw2VDQuHFye7IS27NzGXISuhEyS5DR25BRWxBQ+lBQyXCQqPCxSfGyu7GyerKy2ZFR+rERqfCRmxBROtBQ+fBwuTBwmNDSW9JyabLyqRIx+TExSXBQ6bAQCBBQ6ZBxapDR+zBxq3LyaLJySRHxqPGxeNBxGbCRmrHRyRERONDRKNDQ2JCQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAeygACCg4SFhgABAQIDh4MBBAUGBwgDCYcKCwwNDg8QERIThRQVFhcNGBkaGxwdoYMDHhcXHxggISIjEiSvJSYXJwsoISkpIyorLIIDLS4WLzAxMjM0NSo2N8o4OS46OzwzPSk+P0BBgkI8Q0NERUZHCEhJSktMgwk4Qy1NTk9QUVJLphCiUsWKlStYsmjZQiJgIS4KuijQ4iXAFxYCDVFJwGUFmDBhMjYSw0KMyEYoBfkJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appcalc16:app app16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChPz+/AQCBCH5BAEAAAAALAAAAAAQABAAAAI4hI9pwe0Ogpi00hHF2LzzzFlTsIHD45SSx6oCeW4wjK2tl83y7t64pIsJaxrfh2bEAJIlhRPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appclock16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAALy+vAQCBPwCBMQCBIQCBISChPz+/MTCxCH5BAAAAAAALAAAAAAQABAAAANbCLHcrSLKOZcYmDSCsR1aUABAsXDDJwJGa5SBFwgaWxbCG3CWaBwG3C8Y67FawpYiNQscg65fsVkYuoAmJs1pBR522lQB6ILJLqHRwQQOZzYdZnw+dzruDIA/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appdate16:app app16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPzerPyqXMRaBIQCBISChPz+/KSipMTCxPz+BMTCBPwCBPz+xPzCxMQCBISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVxICCOQGCeJjkGwkC8RFEEavkax2G8dB0QuRyhhzoBg8MSYsncJXKJZIDZHCoWP1ogGIwGrtnSgUFmHLyNRHhrdpjRamnO/SYkromHdnxwnwkKVxByZW8DgQsQM2JcfwZXO0MBCZSVBgMuLzJaRZ0pfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+apppencil16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/IQCBMQCBPzCxAQCBPz+/MTCxISChDQyNKSipEQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARDEMhJZRBD1H2z3lMnjKCFjUJQimOgcmcbELCXzjXq0hV785WCQYcDFQjDXeloMByKG6YTAdwIDAlqSZJSVFeKLcUfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appsheet16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAT+/Pz+/KSipPz+BAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANFCBDc7iqIKUW98WkWpx1DAIphR41ouWya+YVpoBAaCKtMoRfsyue8WGC3YxBii5+RtiEWmASFdDVs6GRTKfCa7UK6AH8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+apptool16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBISChGRmZMTCxKSipLS2tHx6fPz+/OTm5FxaXOzu7DQyNMzOzAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMhAq7wYBDECKVSGBcbRfcEYauSZXgFCrEEXgDCSeIEyzKSXZoBYVCoJVIqBGByKu0Cy8QHxmgNngWCkGgqsGWFseu6oMApoXHAWhWnKrv0UqeYDe0YO10/6fhJ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+apptools16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExKTERCRAQCBOzu7Nze3MzKzLy+vCxqZBQ2NJyanKyqrGRiZDRydKza3FRWVPT29LSytDw6PMTm5EySjCxaXGRaJFSanCRSVGxqbPTmvMSqVJTW1GSurHS6vOzq7KSipISChFRKHJSGNPz23GxKFBQ6PKyurCwqLMyufJx2RAQGBJSWlEwyDIRiLNy+lLSKVDwmDJRuNOTOrLyabGRCFDx2dKSCVOzWtHzCxOTGnNSyhAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQIBwCAgIBAOiUiggFAyHASKxDAwUC8Zg0HAglA9IZPGQABoTSqJCFTIOEIsFgHBcEhhHUpKJFCwaGxYYHB0VEx4IEh8gIQwiIyQbJRMcHokmEicfDygAkCkqJQgIGG0rLElCLS4vMCWqQwMCQg0UMTIzNDVLQjaIGDE3ODQlS785CEkxKjowvEOHybG4O6JDCdNKuDUxRAmxRDHeveUAfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appuser16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MTCxISChMT+/ATCxASChFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMg5gw00yyDGIAR1YUDggeFWFIZhnSBZrsZxdIOFEGTA2oeBAHeyuGwvzxBlYdUOLROMFzDQntJPrNoqAKUBaqnV+k57ZORruykHDj2LqIzUVKp1u0iuB/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+appusers16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxISChAT+BMRaBPyqXARCBPz+/FxaXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARLEIRJa5Ui673nsGAgeKE1Bl9AUEXbiqTlFlZaGUZoszm4BzhDAVf5BYbAXI+TAR6CS2ZGSZSEiIIqYIsSIEaJ7GRrlY7J1lKA7I8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+appwp16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBKSinJyOfPz27Pzy7AwKDExOTJyWlERCRKSelPz69LyyrKymnPz+/MS2fDQyJAQCBOTazLSiXOzivMS2jKSSVOzmxPz25NzSpPTu5KyebOzixNTGjOTWpMSydMSybCwqFGReVKyaXNzSnGxeNJSCVMS2nPz23MSuZIR+bJyShLyqnOTOtGxiXIR6XOTSvIx6RMSubIyCdKSalMS6pOTWxMzKvKSabJyKTOzezHxuPGRmZKyurMTCvPTq3AAAACH5BAEAAAAALAAAAAAQABAAAAajQIBwCAgIiEhiYEA4FgwHRDKhIBAWz4OhgGQ0FAPHA7qFEBONb0Qy0ULeQ2+aUrFcMI+3GYBOZzQbHB0eHyAhIQByDREiEwMjFRIkJQImAgJ+jScjHigkKSorLC0AKg2NFSMoki4qCy+IQgITKDAxkjIzNDWkQxQoJaskMgk2Eb1DNzgoOCoHDDY5yEIwJToAOzw9ET7TQiREAhkZ3kmy5QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+cal1day16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANOCLrMEUDIOUS9AFLLhx8LIRZjKYZmMRCkaChFLHty/AIiS3y6q+QtT49wq8VotRtQJGwRf6Zmrlj7DJLQXsupTJmeEIN4TB5nII20wp8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+cal5days16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANMCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiIdMmcec7jy53q81qP9OO5VMAj8RXTFWzOZW95HDLdEEM4LA4nIE0zgp/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+cal7days16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANPCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiwcp0fucsj873qvGMv5Jw2FIACUsW4WakGW1O046I05qmGYBhTC6TM5CGWuFPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+calappointment16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxPz+BISCBISChKSipAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARbEMhJaQhA6D1E/wDGeeRgDhOhFoTBEi+REgdrIHScSEVvAD9Xr7cDqGSGpFEnQSqTv2NxCFQOiU1VEAiTZmstHFg1vQKuw+LxxfYaV/AuOQRI2O/4ewhT6Uv8EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+calbell16:cal cal16 16:photo:16 16:R0lGODlhDwAOAIIAAPwCBISCBPz+BIQCBMTCxISChPz+/AQCBCH5BAEAAAAALAAAAAAPAA4AAAM+CLrR+zCIAWsgLVRGRBhOVQiG94WPVAbHaZHYAWqRYLbge88RsbInGuBCEhRYrZYm4xk4nYdoKzKIbiKHawIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+callist16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/KSipPzerMRaBEQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARDEMhJaQhA6D1E/wDGeeRgDhOhruyatjBRSIRxxOsMEAdC0BUZDcfSEYvDo3Bn++2Cxt7RqFxWhZiCdsvdhjCVsMQfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+calmonth16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANSCLrMEUDIOUS9AFLLhx8LIRZjKYbiRxLFIBpK0Q6z7MkwkJIe8b0KEeuWchFysuStVsjtfMbeMQitWpG25YfmNK1WU53XNIUYzug0OgNpuBX+BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+caltoday16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxKSipPyCBMRaBPyqXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARTEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyIQhFfiBIAfuFzaAioBIJBCummRYPCaDPh3vhwsOZdihNfa8Ub/AJXemFZPPNBvGwG672yFMZS7xRwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+caltodo16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBAT+BAQC/AQCjPz+/MTCxPzCxKSipPwCBMQCBIQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARaEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyMYhFXiuFwZiA6qZYbbqJX5BIw2RAPxwAAWCyWMCCsiXFGEEErKz6LQZfOqiTR1YJiGq1rFyyHmo2+/1EKbCl/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+connecting16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZbihUiz60FPnfaA0iBpBVGdHEYWxToEoSHBRHHM9AgSEQRcj+AYkYAJxIPKQFUJiOdTJQFIDU6dYzKKFhTCM+E5g4mXaDAyrlogEG+DGTecA7wsP8EcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+connectno16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBAQCBERCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARPEMhJq704axBEHoPUEdhQGMNYFuwxkKInDYjBniEnwMCQIIebSzXx/WwsFK+YMABZikWuYlrUCtZpEYv4WRPaHhb064YB41kCfJFSQBh/BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+connectyes16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/KSipDQyNMTCxMTGxISChFxaXMzGzAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZxCjgsAtDtUlCOA1gJQ4kl/IDatAoF7xxkS6GgEBr6jAobCyBX42SQBxMOx6A8MhiGASR8YDgrYsNEeJ0zaEGZY7uoH2oB6nOUwtbdLaVOeTUwo/8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+devcdmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tOzOvNTqvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/LzKvMTCxDQyNASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAa0QIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTBqUiuUCVmAeiYzmsKlwOt/AAKFIFAIIFx4WHyAhUwIDIgsZFyMkFxchJSYmiBkSBBoIJJwIGgOhiCYFJSEnFyQjFwNZewABISAfFiYnCAEmCREIrwAIFhwVGwcaBAkPGApsQsAVFA0GBQMRbxBTKM0ODQwTEq192ClDgROkBHvYKuNJUu5CKCorX1RDKCkpUn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+devcdunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tNzmvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/MTCxLy6vDQyNOTm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAapQIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTLqUigWsuDwSmMxBQ9lwvoEBQpEoBBAWHRseHyBTAgMhCxgWIiMWFiASJCSHEgQSGQgjmwglGKCHBQUSICYWIyIWAwshIVMBIB8eFSQmCAEFCREIekIIFRsUGgcZEgkPFydrvxUUDg0GBSEREGJfv9AMEySsJxDYQ4DcEhh64UpS6lTs7QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+devdiskmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKROzSrOzKpOTGnLSafLySZKxuLMSOVPTWvPzixLSehNyibOzOrGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTOpHxOJKyKXFw+HKSipISChMTCxFxaXIRiPNSWXExOTOS2hLR+PLRyLPTWtMyOTASCBARCBPz+/DTSJIyKjIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwrA3HQ7scQAqFAcEQOUi0zAkFUSFYLghMBloUCDQNGxwdHhwHekcfICEhICIfIxkLJBABJUYCICABIhAOBiYnKJaXmH4CGSkYCCqkSAEfTKenrkOwsrQll0IrS7G5uwArLLaxLbXCLsTFLyDBKy4wZEVHvCwsRn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+devdiskunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKRPTWtOzKpOTGnLSafLySZKxuLMSOVOzOrPzm1LSehNyibGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTWvHxOJKyKXFw+HPTOpKSipISChMTCxFxaXIRiPHxaNLRyLNSWXExOTPzixOS2hLR+PMyOTPz+/IyKjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaIQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwGgiD46FdDiCFwoDQAEe0TMkEQSFULIcLBloUCDIaDRscHRsNHhhHHyAhISAiHyMkJSYQASdGAiAgASIQKA0pKguXmJl+AiQGFwgrpUgBH0yoqK9DsbO1J5hbsrq8SrgstlJFHy0gwMVFR1J+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+devfloppymount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVrICCOQBCQKBkIw5mqLFG47zoQ+FwbN57TosDhgPD5dMEEIqE04kwlBWKBUEiNVYFpyqAyGEUCgqEtERiNNMLhQKzLQYJg7n7Y4aMAwbCUPvAQeWNgfzQQETAIhSMQEogwgBITQEGGEREmfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+devfloppyunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVCH5BAEAAAAALAAAAAAQABAAAARcEMgJQqCYBjFu1hxReN82EOhYGieaklJwHIjrqnGCJLqNWhUFYoFQCG1FgWXIIDIYNQKCoawQGI0swuFAbKsxgmDsfZjBkwDBsNM90Jot9A3DbBD0Dwiur9QnfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+devnetwork16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBISChPz+/Nza3ARaZESanCyKlARudARGTLy+vNzq7ARmbMTCxARufAROVMzOzKSipARyfOzq7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVmICAGZFmKQiACweCSBImq41AYB5IodLq2hwWO0ejRWDac48Gb/QKNqNRoqspmrVcAUuIJBANS8sBIFCORUgooPEh4J8B67NgdsVBp9C5XWfl9LRMTCyReX19hARNojWlWLH+AAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+devpc16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBISChHx+fPz+/AQCBAQC/AT+/AQCxAQChAT+BLy+vAR+BAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARYEIAgqK1YzsG754QUDERpmkEpkkXrtoK6EcVgHIibhnNx564Yb0TDvQq7FQ34EiqPOhnREqhWSUPsyZSQAbbg7GcMEgwUiYVivTa1R+y4XEGoWO/4AMAfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+devscanner16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MT+/ASChARCRATCxMTCxFxaXKSipDQyNAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEMgJgqWBVivEldkUdKSXhVjZfenommglDERh3Tc4E4ZRHAGgkEPr9X6H5AHBERSMRyWzkug8jQXFEhWoOo8dRYxqLXSmGjIJnVaz29Q3fAP3RwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+devscreen16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXFRSVPz+/PT29OTm5OTi5DQyNDw+PERGRExKTHx+fISChIyKjHRydFxeXDQ2NCQmJBQSFAQCBERCRMTGxHR2dGRiZExOTDw6PCQiJAwODCwuLFRWVOzu7BweHAwKDCwqLHx6fBQWFGxqbGRmZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAanQIBwSCwKAwKkMslEAgSDqDRKqBYKhkNgcDggEorkMrDQchkNhuOhgEQkk0l5S2lUGpYLJqPZTAwMHB0DCmhqAW0Rfh5zAxgOkBcCFAcfIBMECxwBBAEPFw8dChkhcBMDDAcdnQqtFKSWcQMimx4dGRkQBxGxsg6bBQEawx8jl3GnJFoFHRNXVVNRJYIFDAsL1tgiDiQXFx0HABwcXeQH5OjkRutEfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+devspeaker16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXAT+/DQyNATCxMTCxPz+/AQCBKSipASChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMgJQqCXziDG2JoUEENhZBkmHIWJVptAmqcIW/Js1MiF56TBzkckAAcHoa9nMRKeA4TyJk0knsHhTeK5khBaH2VwLYVh40TJhQ6RzeIQV32Quz8hfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editcopy16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAFxaXPwCBNze3GxubERCRPz+/Pz29Pzy5OTe3LS2tAQCBPTq3PTizLyulKyqrOzexLymhLy+vPTy9OzWvLyifMTCxHRydOzSrLyihPz6/OTKpLyabOzu7OTm5MS2nMSqjKSipDQyNJyenLSytOTi5NTS1JyanNTW1JSWlLy6vKyurAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAaUQIBwCAgYj0eAYLkcEJBIZWFaGBie0ICUOnBiowKq4YBIKIbJcGG8YDQUDoHTKGU/HhBFpHrVIiQHbQ8TFAoVBRZeSoEIgxcYhhkSAmZKghcXGht6EhwdDmcRHh4NHxgbmwkcCwIgZwqwsbAhCR0CCiIKWQAOCQkjJAolJrpQShK2wicoxVEJKSMqDiAizLuysiF+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editcut16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAIwhI9pwaHrGFRBNDdPlYB3bWHQ1YXPtYln+iCpmqCDp6El7Ylsp6ssR1uYSKuW0V8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+editdelete16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPT29GxubMzOzDQyNIyKjHRydERCROTi3IyKhPz29Ox6bPzCxPzy7PTm3NS6rIQCBMxCNPTq3PTi1PTezMyynPTm1PTaxOzWvMyulOzGrMymhPTq5OzOtNTKxNTOzNTCtNS+rMSehAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaKQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhSEQkFgrBAcr1URiPhKAsDD3QB8RhA3FM0IlLHnyUTVBMSFBUWfl0XGBMTGBcZGodmcQWKjpAbHIgIBY2LHRoempOdjooTGx8giIOPFYofISJ+DyMXI6AfFySyfiUmJSUnKBYcICIpfgELzM3OZX5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+edit16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaVMR+RPzKjNze3AQCBMR6RPzGjPyODPz+/MzOzPyKDPyKBPz29OTWzPyGDPyGBOx6BOza1OR2BKROBNSOXKRKBBwOBOzu7PTWxPzizOySZPyCDFxaXOy2lNRyRMxmJCQOBPTm1OzStPTKrMR+XIRWLFxGNCQSBDQyNIRSNDQuJERGRLyqlNzSvIx6ZKRuVEw6LLSyrLymhKSShBwaFFROTJyWjMS+vNzW1OTazNzKrHRqXOzezOTOpPTq3OzWvOTStLyedMS+rLy2pMSynMSulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAewgAAAAYSFhoQCA4IBBI2OjgUGBwiLBAmXlpcKkgsMlZcJBA0JDpIPEBGVjwkSBgOnExSfmBIVBxAMExYXswkYGRobHLq8gh2PHhoeHyAWIYKzIiMkJSYnKCnQg5YNHtQqKywtK9qMBC4vMDEBMjIz2dCMDTQ1Njc4OToz5PEEOzw3ZPToMcLHO23HfogQ0QMIkCA+hPBbhAPHECJFjMyYIUQIvEUpUqwQOXKkSEF+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editpaste16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQiFHRqNIx+LFxSBDw6PKSaRPz+/NTOjKyiZDw+POTe3AQCBIR2HPT23Ly2dIR2FMTCxLS2tCQmJKSipExGLHx+fHR2dJyenJyanJSSlERCRGRmZNTW1ERGRNze3GxubBweHMzOzJSWlIyOjHRydPz29MzKzIyKjPTq3Ly2rLy+vISGhPzy5LymhISChPTizOzWvKyurPTexOzSrDQyNHx6fCwuLGxqbOzKpMSabAQGBMS2nLyulMSidAAAACH5BAEAAAAALAAAAAAQABAAAAa7QIBQGBAMCMMkoMAsGA6IBKFZECoWDEbDgXgYIIRIRDJZMigUMKHCrlgul7KCgcloNJu8fsMpFzoZgRoeHx0fHwsgGyEACiIjIxokhAeVByUmG0snkpIbC5YHF4obBREkJCgon5YmKQsqDAUrqiwsrAcmLSkpLrISLC/CrCYOKTAxvgUywhYvGx+6xzM0vjUSNhdvn7zIMdUMNxw4IByKH8fINDk6DABZWTsbYzw9Li4+7UoAHvD+4X6CAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editshred16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbGxubMzOzPz69DQyNIyKjERCRPz29PT29OTi3IyKhPz27PTu5PTy5Pz6/Pzy7PTq3OzexLyqlPTm1PTizOzavLyqjOzWvOzaxLyifOzizOTOpAQCBOzezAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaEQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhWEQkFYYHkeqkMxKFBFpq9jgdkEGlPqwrJhCIY2N8FFRYUFxcYGX9dgRKEGhiHiYEOhBcbGBwdiQEOARcBGwEeAZllAgEUnQEfoQEgmp4hrCKtrwEYsrRlTiMBJAG8syN/IyMAxMXHSH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+edittrash16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipFxaXPz+/MTCxISChDQyNCH5BAEAAAAALAAAAAAQABAAAANQCKrRsZA5EYZ7K5BdugkdlQVCsRHdoGLMRwqw8UWvIKvGwTICQdmGgY7W+92GEJKPdNwBlMYgMlNkSp3QgOxKXAKFWE0UHHlObI3yyFH2JwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+fileclose16:file file16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCQiJBwaHAQCBDQyNDw6PFxaXFRSVERGRCwqLAwODGRiZHx6fPz+/GxqbAwKDCQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVaICCOZGmeqBgEwjCkRGEcSKK4JrEcBrMgAdeLVDg0GguGsYEbBQyGYyN6FDoPDIf0+LCKBIgetQERDgGDBGIpNY8GioAU0m6KXFw883w3+/l9f4AkfimGIn4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+filedocument16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJSWjPz+/Ozq7GxqbJyanPT29HRydMzOzDQyNIyKjERCROTi3Pz69PTy7Pzy7PTu5Ozm3LyqlJyWlJSSjJSOhOzi1LyulPz27PTq3PTm1OzezLyqjIyKhJSKfOzaxPz29OzizLyidIyGdIyCdOTOpLymhOzavOTStMTCtMS+rMS6pMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaQQIAQECgajcNkQMBkDgKEQFK4LFgLhkMBIVUKroWEYlEgMLxbBKLQUBwc52HgAQ4LBo049atWQyIPA3pEdFcQEhMUFYNVagQWFxgZGoxfYRsTHB0eH5UJCJAYICEinUoPIxIcHCQkIiIllQYEGCEhJicoKYwPmiQeKisrKLFKLCwtLi8wHyUlMYwM0tPUDH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+filefind16:file file16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBCQmJDw+PBQSFAQCBMza3NTm5MTW1HyChOT29Ozq7MTq7Kze5Kzm7Oz6/NTy9Iza5GzGzKzS1Nzy9Nz29Kzq9HTGzHTK1Lza3AwKDLzu9JTi7HTW5GTCzITO1Mzq7Hza5FTK1ESyvHzKzKzW3DQyNDyqtDw6PIzW5HzGzAT+/Dw+RKyurNTOzMTGxMS+tJSGdATCxHRydLSqpLymnLSijBweHERCRNze3Pz69PTy9Oze1OTSxOTGrMSqlLy+vPTu5OzSvMymjNTGvNS+tMy2pMyunMSefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCAAECA4OIiAIEBQYHBAKJgwIICQoLDA0IkZIECQ4PCxARCwSSAxITFA8VEBYXGBmJAQYLGhUbHB0eH7KIGRIMEBAgISIjJKaIJQQLFxERIialkieUGigpKRoIBCqJKyyLBwvJAioEyoICLS4v6QQwMQQyLuqLli8zNDU2BCf1lN3AkUPHDh49fAQAAEnGD1MCCALZEaSHkIUMBQS8wWMIkSJGhBzBmFEGgRsBUqpMiSgdAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+filenew16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz6/GxubNTKxDQyNIyKhHRydERCROTi3PT29Pz29Pzy7PTq3My2pPzu5PTi1NS+rPTq5PTezMyynPTm1Pz69OzWvMyqjPTu5PTm3OzOtOzGrMSehNTCtNS+tAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ/QAAgQCwWhUhhQMBkDgKEQFIpKFgLhgMiOl1eC4iEYrtIer+MxsFRRgYe3wLkMWC0qXE5/T6sfiMSExR8Z1YRFRMWF4RwYIcYFhkahH6AGBuRk2YCCBwSFZgdHR6UgB8gkR0hpJsSGCAZoiEiI4QKtyQlFBQeHrVmC8HCw21+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fileopen16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBOSmZPzSnPzChPzGhPyuZEwyHExOTFROTFxaVFRSTMSGTPT29Ozu7Nze3NTS1MzKzMTGxLy6vLS2tLSytDQyNOTm5OTi5Ly+vKyqrKSmpIyOjLR+RNTW1MzOzJyenGxqZBweHKSinJSWlExKTMTCxKyurGxubBQSFAwKDJyanERCRERGRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaRQIBwGCgGhkhkEWA8HpNPojFJFU6ryitTiw0IBgRBkxsYFAiGtDodDZwPCERCEV8sEk0CI9FoOB4BEBESExQVFgEEBw8PFxcYEBIZGhscCEwdCxAPGA8eHxkUGyAhIkwHEREQqxEZExUjJCVWCBAZJhEmGRUnoygpQioZGxsnxsQrHByzQiJxz3EsLSwWpkJ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fileprint16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFRKNAQCBPz+/MTCxExKLPTq5Pz29Pz6/OzezPT29PTu7PTy7NzClOzm1PTu5LSabJyanPTm3FxaXOzCjOTKrOzi1OzaxOTSvJyenGRmZLyyTKSipDQyNERCROTi5Hx+fMzKzJSSlIyOjISChLS2tAT+BDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaYQIBwKAwIBMTkMDAYEApIpVBgOCAOg4RRGlAoEAuGIdGITgWOq4LxcCQgZkEkIHksHgYJOR6ZQCgVFhYJFxgTBVMZihoCfxUYDWUbUBGKGREcjBoQEB2TAB4CAx+Vl5WMhyACHiEhH6IfIiMktCQgE0cZJQStr6O2t6EARxO6vK6iEx4dZsMCxbsmBB4nzUTEutVSSUdmfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filesave16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBFRSVMTCxKyurPz+/JSWlFRWVJyenKSipJSSlOzu7ISChISGhIyOjHR2dJyanIyKjHx6fMzOzGRiZAQGBFxeXGRmZHRydGxqbAwODOTm5ExOTERGRExKTHx+fGxubNza3Dw+PDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaAQIAQECgOj0jBgFAoBpBHpaFAbRqRh0F1a30ClAhuNZHwZhViqgFhJizSjIZXQCAoHOKHYw5xRBiAElQTFAoVQgINFBYXGBkZFxYHGRqIDBQbmRwdHgKeH2YgHpmkIR0HAhFeTqSZIhwCFIdIrBsjAgcPXlBERZ4Gu7xCRZVDfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folderhtml16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBERGRBQWFMzKzOzq7CwqLDw6NARqnAQ+XHR2dKyqrOTm5ExKTERCRHRydMTi7NTu9HS+1KSmpBweHDy67DyixHS61ITG3AxypByu7DxinBw+ZERmdIySjITC3ARypExOTDRurIR2RPTSdJyulEyGvBw+bFSyzJTK3LzKvPzivOTixNTChLSybGyCfCRSnBQqRASGtFyuzDw+PCRShPzy5OzerOTShKyaTEx6pCxerGRufBR+rOTezPTShNy6bER+1BxCfBQuRAxelFSixBw2VISq3GySrPTWlHyanIyitFSO3IymtCRujAxWhCRqlCQ6XGyWvNS2bFyGvDxuvCRSpLy+vMS+vGxqbFyO1GSi3EyO1FRaVCQuPLS2tDxyzKyWNFxaNCQyPGxubCxajERSVExKNJyenAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAECg4eIAAMEBQICBomDBwgJCgsEDA0BDg8BhwYQERKUDxOYDAyeghQVFhehGBmVlwwOqxobHB0eH6EfIAkPIYIiIyQlJhsnKBcpvrYiKissLS4vMDEyFjOvNAA1LDY3ODk6Oyc8PTIyFzQ1Jj42P0A6QTtCQ0REIEUORkdIkihZwsSekBhNnDyBciCKiSNSplDRUcWKkRhXCGDJYgiGli1cpuTocsILjytfFmRpACAGRTBhRogZgzHlAjKGWnIoY+bMgRgBDHRBo/LAIZoxuhwKatRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+folderlocked16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQSFMzKzOTm5CwuLERCRARqnAQ+XHR2dKSmpOzm5GxqbCQiJMTi7NTu9HS+1HRydOTm1Ozq7Dy67DyixHS61ITC3AxypERGRBweHByu7ASGtFyy1DSOtDRmfExOTBSazBR+rCwqLAxWhAxelByGtDSaxAwODHy+1Dw+PPT29IyqvCxujOzu7NTW1Nza3ExGJJyebKyqfMTCpFRSPOTi5DQqHOTezDw2NMTGxKyqhMTGrGxmXDQ2NMTCxMTGpHx6bHx2bBQWFIyOXDQuDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQICBomDBwgJCgsEDAKFDQGHDg8QEZQSlxMUDJ2CDhUWF6AYGZWXFBqCGxwdFh4XGK8fIAohtiIIIx25EZwBDREHgiQjJSYmGScoKSoRKQ8rggIsDC0uJS4oGygoAyjdAAcsLxQUMDEyMzQ1EzapBy8MDDc36tFwgONFjlQ6dgCEEZBHDx8+ctRIRehHAyAwZASZIGRIEBoUBwUwIGMCiwFEaBQJichIjo9FZLBsacRIAB0A/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+foldernew16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBPz+hPz+BOSmZPzSnPzChFxaXMTCBPyuZPz+xPzGhEwyHExOTPz+/MSGTFROTPT29OTm5KyurDQyNNza3Ozq5Nze3LR+RLy+vJyenMzKzNTS1Ly6vJSWlFRSTMzOzMTGxLS2tKSmpGxubBQSFAwKDKSinJyanIyOjCQiJERCRERGRBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaNQIBwSCwaj8ikcokMCIqBaEDoBAQG1meAUDAQpIcBQoy1dg2JdBqhECgQ1IWB0WgcBIOBwIHXBwwPEBEREhIBbG4IExR/DBUVFhIXV2NjDVYYDY8SFU4ZVxpVAQwbGxynGxkdTh6XVh8gGSGzGSITIxokJUImGSMTwLcnKCkprgAqDSt1zCssKxQtQ35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folderopen16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOzi1Ozq7ERCRCwqLPz+/PT29Ozu7OTm5FRSVHRydIR+fISCfMTCvAQ6XARqnJSKfIx6XPz6/MzKxJTa9Mzq9JzO5PTy7OzizJSOhIyCdOTi5Dy65FTC7HS2zMzm7OTSvNTCnIRyVNza3Dw+PASq5BSGrFyqzMyyjMzOzAR+zBRejBxqnBx+rHRmTPTy9IyqvDRylFxaXNze3DRujAQ2VLSyrDQ2NNTW1NTS1AQ6VJyenGxqbMTGxLy6vGRiZKyurKyqrKSmpDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfCgACCAAECg4eIAAMEBQYCB4mHAQgJCgsLDAEGDQGIkw4PBQkJBYwQnRESEREIoRMUE6IVChYGERcYGaoRGhsbHBQdHgu2HyAhGSK6qxsjJCUmJwARKCkpKsjKqislLNIRLS4vLykw2MkRMRAGhDIJMzTiLzDXETUQ0gAGCgU2HjM35N3AkYMdAB0EbCjcwcPCDBguevjIR0jHDwgWLACBECRIBB8GJekQMiRIjhxEIlBMFOBADR9FIhiJ5OnAEQB+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailforward16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRydHxubHxmZGxiXHRmZFxOTFxGPFxKTPwCBLymlMy+pOze3PTq3PTu5Pzy7LSmnOTaxOzm5LyqlNzOtPz69Pz27MzCtLyqrPT27IRubPzuzNTGvNTCxLSelPz25Bw+ZFxKPPzy1Pz65LyupBxKdCxWfPTm1Pz23LyinBxGbGzO5DRafBxWfBxajCymxHTS5BxSdBxKbFTK3EzG1CSGvCyKvCSSxCSavGTO5GRaVPzqzFzK5EzG3BSCtAwiPGxaVPTivPzy3NzKpBxObCRefBxqlPTmzJR2bKyahAwyRPzmvOTOpKyObNS+nPz21AQOFKyOfPzuxAQCBGRORLSadPzyzLymjMy2lOzetDwuJFRCPEw6NEQ6LEQyLEQ6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAkALAAAAAAQABAAAAfhgAABAgIDBAQFBgcIBwmOCQIKCwwNDg8OEBESjY8CDBMUFRYVFxgZDJyOGhsPChwVHR4fFSAhjwkaIiMOJBQQDRUVJSa3GicoHw4pEA8SGSorLI8tLtQu19gqLzDECTEyMzQ14zY1Njc3ODkqCTo7MjIxNCs5PD03PjctPwlAQUIihhBpQbCIihtG+CUocASFkAhIkogQ8kFJwkcFlogIkoRJEydPnkBR6GiAxiQLgiiIIkXElFQJqESoMsRKkAhXqkhhApNKFSxZggTJ4nHIEJhaDhzYwoVLFy1avHyB6ScQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mailget16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAxKdBRSfCyGvFSm1BxKfCSWzCyWzBRCXCRKfBwuRAQGDDw6PHy23Cym1CSSxByCxBxunBQSFKyurMTCxExihNza3NTW1JSSlMzKzFxaXLS2tNze3KSipCQmJGxmbNTS1KSepLy2vISGhJSWlHx+fERGRPz6/IyKjDw+POzq7JyenMzOzKSmpCwuLDQyNIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQIBwGBAIAsOkUjAgFJRQQMHgjC4PBIEVgAh4D4aEYrGAMhINxwPyiCgYSsmEUmk82grLRZJkYCgXaAEKFxYZcEISGhsZFxwFeY0WHR5CDB8dGCAXG5shGxQicBIMpSMUGxgTGSQlpQwSJicnEwwdI7gdKAwTsykpKiobr8QMKxeHDBcsGRvOzxsT0i0uL9HSHdkT2ZkoMJXF4a8AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mail16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBGxaVOTe1Oze3OTWxOTWvNzStNzKpEQ6LOTezPz+/Pzy7Pz69Pz27Pz25Pz21PzuzPzuxEQyLLyinLSmnPz67Pz23LSafKyObDwuJMzCtLSelPzy1My6nLymjNTCxLyqnPzq1LyihKyOfOzavOzetEQ6NPTq3NzOtLymnNTGxJR2bOTOpPTivNTGvLymlKSShKyahEw+NOTe3PTm1Pzu1Pzy3FRCPPz65LSadFxGPOzm3PzqzPTmzPzmvEw6NCH5BAEAAAAALAAAAAAQABAAAAaqQIBwSCwaj8ikMhloOp/QpmAgqAoIhELBUDgcEIGEYrFgNBoLx+IBiRwkgQnFoWAwKhWLhX3BZAILGhsCDXgODhwdGB5vgAofICBlDiEiIx4kJSYBJ2UoEykqHSMrLC0nLWAnFS4UCycvMAcEMR0RLTIBMwaSahw0NTYtFwclNwEdLws4eoc2DxwQOR06ASk7PBAhIRE9Pj0tLSUY1T8I5gjn6Qgy7D8SfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailreplyall16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBLymlMy6pOTa1PTq3PTu5Pz27Dw+POzi3PTm1OTWvPz25FRSVERCRLympPzuzPTu7NTGvFxaXKSmpPzu1Pz65Hx6fHxqZPzq1Pz23HR2dBw+ZHx+fISChJSWlDQmJHRydCxWfBxGbJyenExKTHRiXPzqzPzy3CQmJDRafGTO5ExOTERKTGxWVCRSfHTS5CymxBxajBxWfPTmvPzy1CyixCSaxCySxDSaxDSWxDSSvDyaxGS21PTmzPz21AwiPBRejCSavByGtCSezEzG3FzK5FzG3GzO5FTK3CQ2bPTixBxqlCRefBxSdBxSfBx2nCQ+dHxmXPzmvLSafAwmRAwyRPzyzDw6POzavNzKpAQOFPzuxBwWTBw2ZGRORLyWdMy2lOzetPTivAQCBKyObOTOpAweNBwWVEQyLEw2LEQ2LDwuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAf4gAABAgMEBQUGBwgJCguOCwEMDQ4PEBESDA4TjY8DFAwVERYXGBkRm4+QGhsMHB0eGB8bDpyOARogEBceIRgXv8COIiMkGB4lJSYnIcwoKb/DGyoXKywtKS4pHinMLzAxJDIzNDUtNjcv6B0hLzgfMh85OjstPDw99zwd7T4/LTVAgggZQqSIECNHevSAgSSJkiVMmjh5AiWKlClAiFARUeVHFSVWmLS40gNLlh5agGzh0kWDlwZfrIDREKaCAjEqrFA5MMYLmTAxlJTxYoZMozNozqRRs4ZNmy5s3LwhA0dBnDNn5MxBoAABnTp17IitowDrmQV+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailreply16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTEw+NFxKTFxGPPwCBLymnMy6pOTa1PTm1Pzy7LymlOzi3HxqZOTWvPz69Pz25My+tLympFRGRHxuZPzu1LymjNTGvNTCxBw+ZPz23PzuzPz65PTu5NzOtCxWfBxKbPzq1DRafGTO5BxGbPzy9HTS5CymxBxajHRiXPzqzCyixCSaxCySxDSaxDSSvGS21GxWVAwmRBRejCSavByGtCSezEzG3FzK5FzG3CQ2bPzuxAwiPBxqlBxKdCRefBxWfBxSdBxSfBx2nCQ+dPzy1CRqlAwyRDQmJPTmvPTixLSafOTOpAQOFPz21BwWTBw2ZPzmvNS6nPTivAQCBAweNBwWVNzKpPzyzLyihGRORLyWdMy2lOzetKyObEQyLEw6NEw2LDwuJEQ2LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfqgAABAgMEBQUGBwgJCguOCwEMDQ4PEJYRDhKNjxMPDBQVFhAXGBUSGY8LGhsQHB0VHh8gFQ6bjgEhIiMMJCUmFbS2CwMnG6IoKSorI7WpEycWFiUsLSou1yXXji8wFiopMTIzNDUz4zbZNxsbODk6Ozw9Pj8pPzEzQDdB60JDOkRFjBw5giRJDCWdlmxwIIRJExAWKDRyMgTIiydLoESRImQKlSUSF1SxUoXAlSBRsGSJoCVICIlbqlThcoBClC5eYFD4EiVIFwUyqywAE0ZMlqNjpJDpIkUBl0dlFChAYOZMmTJoyqQR5icQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mailsend16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBHxqZLyqlMy6pOze3PTq3PTu5Pz27Pzy7LyinOTaxOzi3Ozq3LymlOTOtPz69Pzy5My+tLympPzqzNTGvLSelPzy3BxGbBQ6VPzuzPz65LyupNzOtPz+/GzO5BRejPzq1Pz23LymjHTS5CyixCSavBxqlPz25LymnGTO5CymxCSaxByGtHRiXPzy1CySxCSezGxWVPzuxKyOhMy6nDSaxEzG3PTivNzKpKyOfPzu1FzK5PTmzJR2ZLyihLSWfKyObOzmzPzmvDyaxOzavLSafGRORMy2lOzetDwuJEw6NEw2LEQyLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfUgAABAgMEBQUGBwgJCguOCwwNDg8QERITFBUWjY8DFxgZGhsaHB0aD5yODB4TGB+kICEaIiOPCwEkJRcmJyYPKCIpKrWqKywTmC0SIi4vMDHEDCsyMg8zEyI0NTY3z7U4Hhs5Mx+0IyI6OyPrIzw9Gys+PxIy2EBBxAs8Qjk5Q0RFWFxAZySfgSMsilRAkiRECHQ08hHgJ0TJkCU/mECU2ISEkowUlpAQ4QTfowNPoAzJIeRJCyjm8kVRIkWIzSkXhwxJtYAKgp9VrFi5QoWKFZ5+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav1downarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PUZi0zmTtypflV0VdRJbm6fgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+nav1leftarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAP///wAAACH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxqdwoNGTmgvy9px/IEWBWRkKZ2oWrKu4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav1rightarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxCtwoNHTmpvy3rxnnwQh1mUI52o6rCu6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav1uparrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PWwhxzmetzFpxnnxfRJbmufgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+nav2downarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+pq+EPXYpxUckoO3AjbF3dJwahllXe6AFgC8d+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav2leftarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pyxf5VohmSlsxmpjTzAHeN5ak6UHpqKRi2GpwvH3Q3eT64RcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav2rightarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pq5HOAjQyVnqfhHue7oAaKH5kiW0AmnLqaHomkj02g+e6XwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav2uparrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIghI+pyxfR0HsRzNnuXVqn3mVQZWFRyIDjp65Ga5Ly4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+navback16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRSdBRObCQ2TBxObISevAQCBNzu/BRGZPz6/FzC3Pz+/HTS5ByyzJze7Mzq9ITC3AQWLAyWvBSavFyuxAwaLAwSHBRafBSOrDzW5AyixCS61ETW3CzG1AQeLAweLAxefBSStEze7CSWtCyatBSCnBRWfAwmPBRWdByixAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZiQIBwSCwah4HjUTBQFgkFg3MoKBykU0QhoUAIAuAksbpgNByPxQMSGVsVDYlkIqdUiJYLJqORbDgcHRseRR8gISIaEyMkGCVYRBEmeyAnlgaQkSgpmU4RAZ1OKqFOpFNGfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+navdown16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObCRKZBxCXAwyTKTK3Ozy/NTm9GSivAQWHNzu/FzC3IzO5CySrAQOHAyuzETS3CSWtAyOtETa5Aw2VLze7ByWtBy61BSavAxWdBRCXAwqPAQCBDR+nKTe7FS+1Eze7ByixBRmjPz+/AyexAyixAQKFBRqjAQGDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZeQIBwSCwaj0hAYCkYEJLKguGASEADigWj4bgaHpBINykwSCYRa5HCFFQsF0xGo9lwhpSOwfORYC4gISJ3RAQdIyQYJSAlImNrh4uNJkl5CoKUUBQnjlB4KJ6hokN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+navforward16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAwyTBRObAw2VDR+nCRKZOzy/KTe7Pz+/KTK3Nzu/Lze7FS+1AyexAyuzBSavAyOtBSmzOTy/BRqjNTm9IzO5ETS3ETa5By61AyixByixBRmjAQGDBxCXGSivCySrCSWtBTC3AQOHAQWHAxWdEze7AQKFBRCXAwqPAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZjQIBwSCwahYGjUjBQGgWEpHNYMBCaT4G2UDggos+EwmBYMBpf6VBgYDgeEMgjIpmoAQVKxXLBPDIXGhscRB0eHyAgDSGBGyJFASMiIiMkJYImUwAnmJqbjp4AKCmhAKSlTn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+navhome16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBDw6PBQWFCQiJAQCBFxeXMTCxJyanDwyLDQqLFRSVLSytJSSlISChCQmJERGRFRWVGxubKSmpJyenGRmZLy+vOzq7OTi5Ly6vGRiZPTy9Pz6/OTm5ExOTPT29BwaHNza3NS6tJRqRGQqBNy6pIyKjDwGBPTe1JSWlDQyNOTGrNRiBGwmBIRaLNymdLxWBHxGFNySXCwqLKyqrNR6LKxGBNTS1NTW1Jw+BEweDDQ2NAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaoQIBwCAgIiEjAgAAoGA6I5DBBUBgWjIZDqnwYGgVIoTGQQgyRiGRCgZCR1nTFcsFkHm9hBp2paDYbHAsZHW9eERkYGh4eGx4ag3gfSgMTIBshIiMkGyAlCCZTEpciJyQjGxcoKUQBEhcbIiorLB4XEltDrhcaLS4vtbcJra8bMDHAGrcyrTMXHjA0NSypEsO6EzY3IzU4OdoTzK0BCAkDMgkIOjJlAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+navup16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObAwSHBRSdISevBRWfAweLNzu/BSOrAQWLPz6/FzC3DzW5BxObHTS5ByyzAyixEze7BSStBRWdAyWvByixAQSHCQ2TAQCBBRGZJze7CS61BSavAxefMzq9ETW3CSWtAwmPPz+/CzG1ITC3FyuxBSCnAQeLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZfQIBwSCwaj8hhQJAkDggFQxMQIBwQhUSyqlgwsFpjg6BwPCARySSstC4eFAqEURlYhoMLBpPRUDYcHXt7RgUeFB8gIU0BIoiKjAcUIwiLSQUkJRsmGIwJJwmEU6OkfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+playeject16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+py+0R3IFQUtruXVqn3kkWyIARR4rqKvoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+playend16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+py8Eb3ENRggrxjRnrVIWcIoYd91FaenysMU6wTNeLXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+playpause16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+py+1vgoxzyUCxrZd18ClfmIyVyJ1lqkHuC0N+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+playstart16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pyxudwlNyguqkqRZh3h0gl43hpoElqlHt9UKw7NG27BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+playstop16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+1vgpySUWpvXXqrHmSaeJEYhKYq6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textblock16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py40Bo5SOzRvrwlgrfnkJOIkPaaaJXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textbold16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIihI+py70BowPQ1HZpwNv212Vg9IGHmIjoWa4ey5DSRNd+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+textbottom16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIVhI+py+0Po5y0hYtzrkB7zH0fN/kFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textcenter16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsnRkqtDnhu1zHfFSpjaY4PavgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textitalic16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+0BgztwUmmjBXX3jE0auHHhM5Yq4xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textleft16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsgRoqr3Vnt102fFSJjUC6nlPoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textmiddle16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIXhI+py+0PT5i01pisphjt3UmfFZYm5hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textmove16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsg2kfZvblXbwTg10WlA4rjyvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textright16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+pm+EPIZstSrqsDhhv1ylfFE5jiYwX6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textsortdec16:text text16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BPwCBAQCBAQC/FxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM5CBDM+uKp8KiMsmaAs82dtnGeCHnNp4TjNQ4jq8CbDNOroIe3ROyEx2A4vOgkOBzgFxQ6Xa0owJ8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textsortinc16:text text16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BAQC/AQCBPwCBFxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM4CAqxLm61CGBs81FMrQxgpnhKJlaXFJHUGg0w7DrDUmvtPQo8qyuEHoHW6hEVv+DQFvuhWtCFPwEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIlhI8Jwe2/AmpTynqPTXSqrnBM+I0kdmpmGmUp+K4nPMvhYx9+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+texttop16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIWhI9pwe2uYnq0yQtqxbz7D4biSIZ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+textunder16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pu+FxXoOIKpds1oBH7hlYxYxRCaIZ01lhJbHy9tTv7BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewchoose16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMzCLrcGlAs6UAYgwLdLtEcI4ygQo7VVp2oupGpG4vmaUVTemX523qlFcw0a4RqNlkx5k8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewdetailed16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMmCLrc/i1IAVkYg1Z1iRYUKCqitp1oikqBWV3ZOnhkWNagqu+qnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewicon16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrcG1AwGOQbw6qANeCEB3pCSZpO6pgowJZqLKuUGE0dnuEhf8IL1kz1shSHDX8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewmag-16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ+QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7Kmpl0CtLGLvbW2Zn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewmag16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ8QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7GLArS5Q7O1tmZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewmag+16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6cAsLECrqeys7WxpqZdtK9Ct8C0fsHAZn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewmulticolumn16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrc/ixI0WSgKoyBl+beQFACpo1AqXbKCr1wLAMWS08hGG3dSZqin4sxnBmPD38CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewtext16:view view16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIchI+py40BTQSwuovp3DXkv1ia1IHmIXLiyWJ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewtree16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBDQyNPz+/PzerAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAMuCLHcri4yGISlj4kxcANgNRBQCIbL6U1Su7bB62rXvGydG25kqpwfIGxILBr9CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actattach22:act act22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBMTCxPz+/DQyNKSipAQCBISChFxaXDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARrEMgJgqA4zzus/gLhFd5HCcZAXqsphYPUdhcYFNRcZnvdtpnDqPTbUWgAJKBYwzBlw+bRo3xmkNWoBgm0OrVLn3GC9RgCk8DhUw7c0rHPr4CDu5SYQNyEt7uSY3p/UAKFhYKDSQOLiwgFdhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actbookmark22:act act22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBCQmJCwqLMTGxAQCBBwaHMTCxLSytERGRFRWVLy+vKyqrKSmpHR2dJSSlJyanISGhGxubIyOjKyurGxqbFxeXGRmZHx+fKSipLy6vGRiZLS2tFRSVHRydJSWlHx6fCH5BAEAAAAALAAAAAAWABYAAAWWICCOZGmewamaQrq+wUC8azHINGocOI38iIRAceDNaISFYklkGHOEhoNBfUAOhuOLEJE8HoPiRKFdESiQBqViuTDIUAsEcyAeGJmyiqC5RCwJGg0YcEh9D0V3Dxt6JwQVDRYVHBUdi40mjw0PTgwQHgeYJQQJfxUXFxAOoTkFpQ0fsRSimQkWEQ0VtI62HLt7vjl7JQYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actbookmarknew22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCwqLCQiJCQmJMTGxAQCBLy+vLSytERGRFRWVKyurKyqrLS2tKSmpHR2dJSWlKSipISGhGxubIyOjGxqbIyKjFxaXGRmZHx+fPz+NGRiZPz+ZPz+HMTCBKSiHPz+jFxeXPz+XPz+tPz+zPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAamQIBwSCwaj4Gj0hgQLJ+AAaEAVQoI06pRYDhkoYgwIhEgKBTfZ2FhaBsYDS8VWnA8Go0FJIKeqyUTDw8EDHBpSwUUFQ4UFhcYDQYFfkoFFxEQDG8KEAUZlEeWGBIakw4FG1STiBoYBRwdBR4fHgUdHKBEBSCnIR8iIyIfIblFu6ceIyQjtcXGCbLKzAUKzrq+wMLEVa+xs7W31kOTk6nkWuOf6Ea5QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actexit22:act act22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBHR2dDQyNCH5BAEAAAAALAAAAAAWABYAAAJOhI+py90RnIMyRUOxhDfzJkACdoXBuEDDkQFDi5go0MrKx16kns80b7qdELCgBYaEGWwL5nG1ePFiKp9A6kuYRNuho8vxVrrZivmMRtMLACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+acthelp22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBCQuNBwiJAwiLAwaJAwSHAwSFIy+3ERynCw2PCQuPAwmPCxOZCxWdJzG3FSazBwmNAQKDAQGBDRmhBQyTDxujDR2rIy21AwWJDyGxCxmjAwmNDRihAQOFDxmhCxunBQWFAwaLCRahDR6rESGvDQ2PCRWdDRunDSGvCRSdAwWHCwuLDSOzHSmxDyKxBxCZBwqNHSu1DyOzAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAahQIBwCAgIBAPCoGAgOoeBAyKhWCwYDUf0CX1AIhLiJEGpBLiAAaRxdgYsl7Ybk8igBZoN5xmAdDxoanp8HyANISF8EBsiXBMjJBolBEQmGHFoRScbKHIKDykqK5lFAZRCnyknTaROLA8tq61OChgtKqyzQgEYEJi6UC4vI3LAASkbMBPARAEBdszR0sACEaPSMTIQM8W6KzNl3bo0NOJDdEEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actlock22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBHRudFxaXExGTERCRAwGDGxubPz+/Pz2/Ozm7Nza3NTS1KympFRSVHR2dNTO1JSSlKyqrKSipDQyNMTGxDw+PLSutKymrMTCxAQCBHRqLBQODJyanDQuFFxSJFRSJFRGJERCHExCHISChHxyLEQ6HGRaJExKHLSmbLy2fOzitPz23KSiZHxuNHxyNJSOTNTOnMTCjLSudKSaXJSKRJyOTOTetNzWpHxuPOTi5MzKzLS2tFxWXOzq7Ly6vOTe5Ix+RLSqdNzSpLyydKyqbKyiZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBAgMEBQKEjI0GBwgJCgsMDY2XjwkOAgQBDxCLl4QNCaGCBBGWooINCAqqrBKgqwATFKaDFRYVtBMXsIMNGBm0GRADjQIJxKIaGxwdHh8gISIhGyMZzIwkGholJiYfJiAfJyEZISDbg90oKCkqKwcHKyooLC0f7IIuLzD2YMSQgW8GDRri+AFoUMOGvRsxUhSsQQPHvmQSchyQtEAHhh0WJHDQcJERjwsKDvRI0BGDjwgicXhQyCOjSgUKPO6AObIkIQESfmxk6REDT4s0bfaYpDNkT4VAha5s+TLmzEYtatwIOHAiDZIKNQAJYk9IjCFEisyoocFEB4UACtBpm0t3LiF4gQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actredo22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3Pz+/JTWbHy+VHTCTMTivPT69BxGDESuJDyiHESiHEymJIzKZAQCBFS2LFzKNGzWPDRqHCxqDFSqLHy2XESCHAwaBAQOBBQqBDyWJHyqZDyKFGSiVESeJBQ6BAwSBGTGPFyWPFSSLEyOLESGJBQiDAwiBBQmDCRGFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaoQIBwSCwaj8hkMcBkKpcBwYAwEDif0YLhwEUkFItFMkAwMBoOR+PxgHwjRDggamhIJpQ8ZbKGKOQLcgEFdhUWEYgRF3sNfhELBHALAhgZFhobRBwREhQdEAIEHpIKHwsaSJwUDQgQIJINARxKESESDQ0dgCIjSpAkDAwPco+ZSJAlJicnKHIAIrNHidOIQxunT0kpCyrZSCss0d5Fj6jjRonn6uvs2QZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actreload22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBCRSFCRSHBw+DBxCFCQ6FBwyDBQWBBxGFCxyLGTChMzqzLzmvHzKjDyOTER+RERyNDSqXNzy3LzivFS+fCyCPBQmBCQiBBxKFBQqDOTy3LTitES2dDR+PCxuJOT25KTarCx+PESSTCxKHDSeVCyKRNT21ESWVDSGPBQyDAQCBBQSFDRuLDSyZDySTGzChCRiJKSmpExKTDS2ZGzGhLy+vGxqbISChDSKRMzKzGxubDQ2NIyOjCQiJCwqLBQWFCwuLKSipERCRERGRHR2dAwKDDw6PFRWVIyKjCQmJFRSVBwaHKyurAQGBExOTBweHFxeXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf9gACCg4IBAgMEBQYHhI2ECAkKCwwNDg8QBAOOhAQREhMUFQgWBxcHGBmbggkaGxwPB4yDB6SbBJIKHQaqtY0eHyAhsqrDgx4aCiKpqoQHAyMjJBMKJaSxzAAHIRsmJgonKA0LHSmDKiuOBywRLSQuLyEwwyoxMuiN6iUzNBXy5jU2bsgoJugABBz95uXQsUMGD3vpPPgTpKIGwx4+HMr4kW4YkCA2hAzxAQSIECI+imBTwVIFESNHerRUgc0cEiFHkjiiyYzeDiVLdvLcySSkkKGEWiZVweSGkIHMmvQosoQlkaZOjvhosvKJjIAxoOAsgpRZkQNLnvSoqspAIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actrun22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAwKDAwKBCQiHNze3AQCBBwWFDw6NPTy9PTy/Dw2NKyytOTi3LS2tMTKzMzOxLy+tLy+vBQODNze5NTS1JyalIyCbIx6VIRyVISGfJyelOTq7EQ+NMTGxKyurGxeRLyKPOSmROSuVOy2XOSiTLzCzNTOzDw+NCwqLHxuVOy6bPzGfOSuXNTW1LSyrMSWRNymTOSmTKSCTPTGjPzSnPzWnMyaVBQSDMTCxPz+/KyahNSeRHxeLJRyTPzmtPzarOy6fJyajNza1Ly6vLyulFRCJPzirPTOlMS2pNTSzMTCvJyenBQWFNzKtPz6vPzyvPzqtOzGlOTe1AwGBFxWTLy6tPTm1PzSpPzutPz2xPTSnOTSxOy2dPzapPzerOzm5IR+dPzu5Pzu1PzqxPzy5Pz+9GRiXGxuZKympHR2bOTm5Pz6/MzSzBwaFJSSjCQmHPz2/AwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeEAQKIjIIDBAQDjYMFBoMHCAkKgwYFhwULDAUKCg0ODxCkBQgRnoUSExMUDxUWFxgZGpAbFIuGHB0eHyAhIiMkIB8lJieIKCUpJCTGIyorLCktKIUDpC4YLzAxIjIyMzQ1NhgdpJI3ODktJTowOyM8Ejc9Pj9AQUIEclAocCMIBQhDiOwgoaKIoCI+jBxBkkSJkCWemIyq0GSHCBVHihRx8gRKFCmpKhGaQqWKFYZXsGR5kkXLFgRUXBUqkCGCFS5AjnTx0sXKlyA6CRVgAAHMAilhxIwhU6ZFkBY5kgKYUoXBAzMKzixZ4AJNGgVm1KxhM0WpmQpUMtooaOPGxAM3Nw60oYLGjNYCbzYJOgAnRzNBJ95oPYQCgpJtkwzFoULlRuRPiy9fNhAIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actstop22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAASC/CQKDBwKDCwODNyKjPzq7My+vIxiXAQCBOSOjPz6/OSelNySjNyGhMR+fLRaTGQ2LPz+/Nx+dNR2bNRybMxuZMxeXMxiZLQSFJQaHFwqJNyKhOSCfNyCfNR6dMxmXMxWVMRORLQODOR+fOSSjNR2dMQ2LJQWFMRWTLwWDNSCfMxeVLwaFKQODNR+fNx+fMxiXKQSDOSWlMRSTMxaVMQ6NMxORMQyJOTS1MxqXLwWFLRORMxKPMQaHMxKTLQWFCH5BAEAAAAALAAAAAAWABYAAAb2QIBwSCwajwGBcikIHIsDQmFKNRwQT2EgoVgsGOCG4wHBIgmRhWRCqVQsF0xGYyYGNgoGh9PpeCQfICEic3UAAWgLIxwRJBsbHSUREyYYJ3RDAQULexGejhueESgpl3WaCxsqJKKsChEUKywtmFoFDC4vCayikzCyMbWHt38NCTKiHhUfMyzBdQIFKsodob0VNDWzwppuKxMRrx6iNjcitNA4bh+iEzkwojc66JkOOxcf7G35PBE9KS1MEUGgIQOIFfk++KjRw9wJgUUIZvhRoyLDFCliQDQisUWLGCJOeNx4hKCGkyhPGnqCoKVLl1liypyZxUAQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actundo22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3PT69MTivHy+VJTWbIzKZEymJESmFESiHDyiHESqLAQCBFzKNGzWPFS2LNTmzCxqDDRqHPz+/KTGnBQqBAQOBAwaBESCHHy2XBxGDOzy7HTCTEyyJDSqFHzWTAwSBBQ6BIy+dESKJFySPFSSNAwiBCRGFBQmDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMsBkKotMwYAwEDiXgYLhwD0gCFZiQKxNKBYMRqPh+D6G16y5AYnYIxBJAyF4AwITTAUJdBESD4gPFBV6Fn6ABBcJDIYPGEQZGhQbHAIdfx4JHw2VSBodGwWfAR4LDSALfkgYAQurBiAhICKfSSMkvQElGyYnGyi9Rxkdj4nOskUYyU9FpxnURikdGtjRKivdRKfQ2Inh5+jpRwZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actunlock22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBGxqbFxaXExOTEQ+RAQCBPz+/PTy9Ozq7Nza3NTS1KSipFRSVOTi5Hx2fJSSlKyqrJyenJyWnDw6PMzKzKyurDQyNFxWXMTCxJyanHRuLHxuLGReJFxSLFROJFxWJExCHERCHBQODISChHxyLHRqNIRyNHRmLLSqbKyiZLy6fOTarPz67Pzy3OzitKymZFxSJJySTNTSnPTy3NzSpMTChLSydKyqbKSaXJySVIyGRGReLPz23NTOnMzCjHxuPLy2vKSmpOTe5LS2tLSutHxuNHRuPMS+xFxWLIR+RDw2HFRKJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SDAQIDBAUChY2EAQYHCAkKCwyOjZANDgIEAQoPjJiDAg2iggQQp5gMBwmrDBESl6MTFKuoFQSjABYRF40CGAW8BRm7hQwNxBobHB0eHx4gISIjBdiEAhYFJBslHOHSHh4hBSHlxIUmJygpKissBiwtLi8pGjDqhBoxMjMuaNSwcSMFjhw6dnjYRyrGCh4ueviw4Q5HDB0/PjAUJCBCAwMIGiiggAEIBFk/FgYLIgRkggQkhxAJkqGExkYMFnxsIGRkSQgLHhRRWUjAggQgG8AsSWRBBiP6VrYMOfKIyaBDNwLo+HHSUplOSyDRqiEHjRkretRQkcLgxayNF0wksQGQxsSKMTIq0QpgCba/gAE7IhMIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+appbook22:app app22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBDyGhCyCfFSWlESOjDyKjDSGhCx+fGSinGSenFyanEySjHSqpHSqrGympEySlBx2dISytHyyrCR6dKTGxHyurHSurHyytGSipCR6fARmZFSalEyWlBRubAxubBRydDyKhDSChLSytPz+/MzKzIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbFQIBwSCwaj8ikMhBQIpmCQdM5ZBIKhgNiugwkFAsCI7pNMhuOxkNBgBgEiAi3GkBLJpJHYgEpaClyREwVFhcSEhgOGQoMfgMaERtcARQBFRMYExZ6HB0FUYAekkIBHxqWFmlrC1haESAfG6MBGx+VFRgKYH0hInGRklO0ppYXCwwMWQiQHkwjgrWnFRdYZHIBJCTP0LaWGAcDW9jZ2nMAw9IWTOQkJSZMRsOV49nu8E+19PbmR7TY+1TovONH5V7Ag0QMBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appbookopen22:app app22 22:photo:22 22:R0lGODlhFgAWAIYAAAQCBAQ2NPwCBHSurIS2tBx2dBweHPz+/Ozm1GxiTGyqpPz6/Pz69GSqpOzaxPzy5HxuVLSmlOTazPz27PT29NzClPTexHxuXLSmjAxqbFSinPTy9KyehNy+lPTy5Pz29HxyXNzWxKSahOzexPzy7IR2ZOTWtESenPTy7KSWfIyCbKyijAQGBDyalPTu3KSSdDSOjJyOdCSGhPzu3OzizJSGdPTq1PTq3JySdMy6lAyKhOzWtOzi1OTOrJyKbMS2nJySfMS+rAwCBNzOrNTCpNzKpJSGZKyafLSifLyylIx+ZHx6ZDSChAQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAIALAAAAAAWABYAAAf/gAABAoSFhoeHAAMAiI2IAAQFjI6EAAaJkQeTjwAICYkKBQcLm5WdBwyfhgChB66bp64HCQC1lQ2irqQCAA4PowsLEBESE4wAuLIHFAAVFr+uDBcYxRm1GrmuGxwdFh4Mrh8gGCET1gDYyhsiFSMkDAsMDCUYJhvnJ9kHKCnODwwfPlBQsULCPRYAWogK9sHFiwoOPEyQh0JFPXO1YBSYwBEFghjdHkwQOYGgwQwIZRR44GHGDBogabhAsYEEihrUMAIoUMCEDRs3HODIYQHFA6MPcJA7KICFjgw7eIzo4cOfiwc/gKwIUm2SkKdDdlDt4AABDaU/iIRwwbTSUyJFOow4S3Hkx9oNDDZgXPU0h1wcSIgEGUw4ibVET5WoWMKksePHpdxmyKADAEIWly9HJtQkQJMmlAgZCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+apppencil22:app app22 22:photo:22 22:R0lGODlhFgAWAIMAAASC/IQCBPwCBPyChMQCBPzCxAQCBPz+/MzKzISChKyqrDQyNEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARYEMhJ6wxiEMtpIAWxddwXiqRlikSQeiAbuC+wirNR322gv7zcLobzDU+9XypoBBKTR1lz+RTWDgip8nUwZK1XLyIx5XoVicX2RUAo1DVKi7GOBxjxfNwQAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+apptool22:app app22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBISChFxaXNze3NTS1Ly6vKSipNTO1Ly2vNza3Pz+/MzOzOTe5DQyNOzu7MTCxGRmZMTGxPTy9Ozm7Hx6fPTu9MzGzGxmbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAW1ICCOZGmeaEoGbBsI6joMRGEcbQwESDIrtVtAF1gwDLNaAmfKiVgLBJKgwB1KxQZrBHU0FAXmavFoQLYiB6TxFXMj5AZBwnJI2I3wcNWALyYEcgoKXxRhOHs7XxEVCwsWFgoUDRYUFwwQB25ZCxiNjo6GkwUXN2NsCxEYqhUHoQ0MEglYRQQXErcHrI55FycuB2YSmoyOBTEtB2sXuhU6XAENC2a6z9AKCwq+1tAN3E2J3ySkIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+connecting22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxOTi5AQGBNze3Ly6vISChNza3FxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAAR4EMhJqwzY6omD+MNGdR8YilNZnug0qGzrqrL1lnV1fyJBVB6VQEMoGH4ADGwQkxQPBwMiKGA2J8VEAnq0tgiKg5aL/C7C2gTjKCM0zowDQ8tuNQznNL7cKzjOUQsNfER+gguIg19+Pm6ChBZFDmWNi5M5FIyYFHQRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+connectno22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBERCBAQCBPz+/MTCxOTi5Nze3OTm5Ly6vNza3ISChFxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAARiEMhJq7046827/+AVCKE0Dh9BAGdaGISAToFGFMcBU+11I4hDYseSZQiKwwKoI/QwBIYiuFDCZseGdIlYEjUNg1SpY6w2N4cUIW6cjwW1lsFwo+MqgtZuw0/ydw5vH34lBhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+connectyes22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBKyirPz+/KymrOTi5KSipMzCzNza3OTe5Ozi7MzGzPTq9OTm5ISChMS+xFxaXNze3GReZIyCjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWLICCOZGmeaBkAQpoGg7C6JizTQT7CxPwOwFWgYPChYIXkIHC4uQKGAiKRKCyNpxxUUVViVYNFLkqtLo+DAkMMLXQPXwAy2WCTF4544FGtKuwPDhB6DnxuUmyCcXIQhV1uYoMuEAcOBxEKCHg6TzGFCJUSizuejROKOAM9OY2SnUU7nD89NCcDsLUnIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+devscreen22:dev dev22 22:photo:22 22:R0lGODlhFgAWAIcAAPwCBAQCBPTy9PTu9Ozq7OTi5Nze3OTe5Nza3NzW3NTS1MzOzMzKzMzGzMTCxMTGxOzm7AwGDBQOFBQSFCQeHCwmLCwuLDQyNDw6PERCRFROVEQ+RDQ2NLy+vKSipISChGxqbExKTOzu7OTm5Pz+/GRiZMS+xLy6vBQWFLy2vCwiHFQ+NMSmfNSyhIxmTDwuLJx+bLS2tCwmHMyyhMyqfPTqpPzyvLSWbLSWfPzitIx+ZDw2PAwKDCQiJGxWRPTmrPTerMyuhPzqtPz63PTWnPz6zNy+nIRiVDQuLKyWbOTanPz21NS2jNS6lDQqJHRaTPzmrPTSnPzyxOTClPz2xNSuhPTqxPzuvOzSpAQGDOTKnMy2jOzSrPTu1NzKnOzOnBwWHJRuXLSWdPTatPzqvNzClCwmJOzSnOTOnPTuxOzKlOzerOzarOzitJR6ZNTO1IxmXPTWrNSyjPzOjPTSpLSehHRqZOzirOTCjPS+fPzGhOy6bOzKhGROPMy2lPz+1PzmtKRyRHRiNNTCdPz+zNzCjEQ2NKySdDQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAj/AAEIHEiwoMGBARIqXMhQIUIBAwYQIFCggIEDCBIoULBgAYMGDgIIDEBAwMSKBRBk3NjxAciQIwdACBBBwgQKFSxcwJBBwwYMHBx0EAmA5EwPH0CEsCChoYgOQ0cSGCHhA4kSS5syJGDiBNEAFVGUKKEBAwWFFM6SNJHi64gDFEKE4FBBggoKK1i0cPECxokYXw0gsECYggQZM2jAqGHjBo4cOtqOxLhDAg8ePXz8ABJEyBAWRIoYOfJipEoMCZEkuaFkSAslS5jUGJKkSRAnRREo0JDwCZQoTKQAmUKlihQrVa5gKZ1lI+oAK7QM2cJlSZMuU4Z4+TJEx0iNOwKAggkjZkyOFmS8kClzpcUQLRRGbjRD4MgZNEzSqKG+ZgobI2248dUbDDDwABzcxSEHEFpgEcUcdMRRhx1fFejAAx0cgcYdSxiBRx566LEHH0d8QFRRNC3Uhx985CHEH0MAEkhCBxWkgiCDFEFIEYUYUmONMhyCRxVH/PgjBYioYJAdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editcopy22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFPz+/DQyNISChDw6PMzKzMTGxERGRIyKjFxaXMTCvKSmpHR2dPz6/Pz29PTq3MS2rPz69MTCxFxWVHx6dJyWjNzSzPz27Pzy7Pzu5PTm3NTKvIR+fJyGfHxuZHxqXNTCtPTq5PTi1PTezNS+rExOTFRORMyylPTaxOzWxOzSvNze3NTOxMy2nMyulMyqjAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbYQIBwSCwahYGkUnk0BgTQ6IAQaBKfUWhBYKhaAU+CgXAQIAyChLeJzSIQhcH6GFaM0QtGY5kstqEODw8QEQELAhJTc08KBBMEFBUWDRcBE1pca20SGBkaEBscAY5maFRIAgoLHRQRHh8gIQFlZnByqA8ZGSIQIyQjJQEmYgJ5p2ACrK4gJx4gKIZZAgdeAQ4ZI9kjKSor0AwEjeAs1S0cHAslLi4vMDDRWeRIfEsxMeET4ATyVoYLC5fizXEiAR84BeMG+pEm8EsAFhAjSlR4hR6fLxiF0AkCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+editcut22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBAwCBPz+/OTi5JyanOzq7DQyNGxqbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARbEMhJq704gxBE0Bf3cZo4kRJqBQNRfBucyudgvJS6VaxLzyMa6/bLiWA9HOg4VIIkL5vzuRkcpkvRIIAorphJLzBW84WEuRZWp6uaT7J2Sh1Hit3OY/ZO7WvsEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editdelete22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAASC/FRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanPz+/Ozu7BQSFCwqLDw+POTi5PTu7MzKxIR+fCQmJPz6/Oze1NTGvPz69Pzy7Pz29LyyrPy+vPyupPTm1BQWFIQCBPwCBMS6rPzSzNTOxPTi1NS+rPTezNzOxPTizOzWxMy2pOzaxMy2nPTaxOzOtMyynOzSvMyqjPx+fOzGpMSihPTq3OzKrOTCpNzKxNTCtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf8gACCAQIDBAUGBwgJCgsLgpCRAAwNlZYODxALEY+SkAMNEqKjEw0UD5yegqCjrRMVEqidkgWhraMWF7GptLa3EgEWFRSOnhW+vxgZEBqzkBvItxwdHryRCNGjHyAhHSLOgtgSI60c2yQjJd+eJqEnKK0hJCgnJSngAO0SF+8qEvL0VrBogW+BLX4oVKgIyMIFQU8KfDV4R+8FDBcxZBREthAFiRIsOsygsVEUh4Un3pGoUcPGjZInK65QicPlxg8oX5RwqNJGjo0hdJwQ6EIkjRM6dvDYCKIHSBc1Ztjw4eOH0oIrsgIJEqSFDBo0cuTgsdSTo7No0xYTZCcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+edit22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBISGhISChHx+fHx6fHR2dGxqbGxubGRmZGRiZFxeXFxaXFRSVIxSLPyuXMzKzMzKxMTCtExOTPzqrPz+/NTS1MS+tOSaVPyWNPz6/IxeNPzavPyKBNTW1PyCBPyGBJxmNPzOpLx6PNRqBMSCRNySTPyCDPSGBMxiBKROBHRydPSylOyydMxmBJxKBAwODPS2lPTq3OyabJxGBPTy5PTGrOyOXPR+DPz69PzmzPzevNxuPORqLMReFPzy7MyCXKxiNIRKHBQWFNTOxPzixJRaPFxONHRqVPz27PTy7PzStCwqJDQyLJSGdIx6ZPz29PTu5HRmTLSKbMSGZHROPFxKPJSKfJyShKyehMyuhDQmHEQuJJyOfLSijMSynMS6pLSefDQyNHx2bKSahLyqhLymhOzi1FRGNIR+bNzKtOTOtOTKrOTKpLyedAQCBFRWVPTq5NzOvLyunLSmlNTCrOTOrNzGrLyidMS+rLyynKyijLymjLyqjAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gAAAAQECAwQFBQYHBggJCgsLDAwADQ6CAQ8QD5ydEJ+gERKWE4ICDxSpqhWqqhYNFxMYphCtqaytGRoXGxgcggSoth25u70eH8APFR0VzMzNziAXIRjIvwAFwq3EqSLUGB/iI4LathS4JCXVJh8nKCmCKrXDFCss1eIfLS4v8ssdmgWsAGNDDBnt3s3wJ+jAtlUhaNSwccNEi4WCBBl4SAHHihw6ZOzg0QNjRgAG6KXK4CNEjBU/gDQI8kLISQAIADobAoMIzCINjLw4YvNkAno4kCRRUuNHESNLmDRxUjSjAlRPfECJImUKlSpMrFzBIqWqoKtJaWSJomULAy5XXrp4+QKGYcYFoCBEWRImi5gmY7CQyVLGriAGD2jEMHMmCxc0Xb6kUbOGTRs3N988gLM4jpw5Y+iwqcOGjZ07mE8yiGABz5c8c/Ts4cOnDJkybS7fdMO7t+/fvDMaCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editpaste22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQWFDw6FHRuFGRaBFxSBAQCBAQKBCQiBIx6HPz6/NTOfKyiXDQuFOTm5Pz+/Ozu7PTq5Pz63PTyxNTOjKSeRExGLMTGxMzKzNTS1NTW1Dw2NKSmpKyqrKSipJyanNzWlLy6ZLSuVIx6FISChIyKhJSSlCQiJLS2tDw6NDQyNCQiFCQmHBQSDGRiZHRydGxubHx6dGxqbFxeXGRmZFxaXCwuLOzq7KyurHx+fDwmFEQuFCweFCQWDBQODBwaHBweHKSinJSWlOTi5JyepHR2dDw6PBQSFNze3ERGRIyKjIyOjISGhPz29Pzy7MS2rMzOzFRWVHx2dHxybDQiFPz27Pzu5PTq3PTm1NTCtJyGdHxuZHxqXPzq3PTaxNS6pFxWVFRKRNS2nPTi1PTStNSulNzOxNSynMymhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwABAgMEBYSLggaOjgcICQoLDA2Pj4MGDg8QEZ4FDxITFBUWFxcYGRobjQ8cHR4fCQ8gCyEiFSMWJCUkJieNEB4dKB4pKissK8wrLS4vMDHBAAYQHx8dFx0fJDIzNDU0M+IyHzaNNyg43Ng5Ojs7Ojw9Pj9AMkCNDiZB/h9CSOx4QLCgihItqBkYgqIDESElitAYWJCgkQcXjjRCgi1Ihw4BB5LAQOLCgyQYHihpUU3DBw5ElpAgAYNixSRJjKjQaECDCRPZPDB5IbIGSQwKLnh4wbInLA4kmJB4oaPiAwVNnER40hRK1BIAaVatUZJEFCkmpmjgCeWDCalFe4q4oFKwSRUrEa5gycLzwq8lUnPQ4PEgSpYcUZ5o2cIlS1O/JHLEDdfjQZMIVrpgweLFy5e+M6WSmBGlxYMYYBRzCaOFi5imHWBIfOEiShLTVjaP6eyFTBmN1TA5OvLDjJksWb58OVMGDRqWjAYdmU79SIvpjqJr104nEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editshred22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBFRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanOze1Pz+/Ozu7BQSFCwqLDw+POTi5MzKxPTu7LyyrIR+fCQmJPz6/Pz69Pzy7Pz29OzaxPTu5PTq3PTm3My6pPzu5PTq5NS+rPTm1PTi1PTezOzWxPz27MyynOzSvMyulOzOtOzKrMymhOzGpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbpQIAwIBgMCAXDAZFQLBbCqJTRqFobjgdkEYFKowPJZEyeUBqVR/crHDTKZYplovZKCW84+YKZZNZSBXl6EwEEBhVPXxZihGMaGRscdkIdg4QeEnVfCH2OHyAhIhuUAAiXZSEhIyQlJqWnjiEnKCWupRWoYyEgJK0SKaUKjam0JCorLMFfC6iqx8giLa/MGAsT1wsuCyULKwssC9RSzdkfCyALKuALLQsvpeXYIQso3gsiCzALMfENC+dGcMNHUAY/f+jq3ctncMYCGggFrsvHcEGNh/EyPFmg8cmrJxAVkVO0EUDJklHoBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+edittrash22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBERGRExOTDQyNISChBQSFCQiJCwuLPT29Nze3GxqbDw6PGxubHR2dJyanLSytJSWlJSSlOzq7Pz6/Nza3Ly6vFRWVBQWFIyKjMTCxHx6fIyOjLS2tOTi5PTy9OTm5Hx+fNTW1KyurKSmpJyenExKTMzKzKSipFxeXCwqLMzOzKyqrMTGxLy+vHRydBwaHNTS1DQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb8QIBwSCwaj8KAMoA8LgUDQsFwQByay4RiwWg4GA9IRGk0SCYJSsUCsVwwGQ1EsmESD5xOp+L5gDwhBRIZDhcDdkMGDgEiIxAkJQ8Ok5MmAohDAQ1xJxUlKCUlEg0pKpiZJRoLCxmtCw1eURhOcR4rbQ8cGRwLAwgGtBYTDywtGRKjvQTARgEZLhMcKC0OrQMvAirMRc7CHCTU1g2+20TO0NIn1RwDCya/wdHT1Rnt5LToKOq79trx0tR02YPX7Jm8fRxMOIhSLhOJE/LCJSTlr5kFEBQsWDiR4UGGBgsuHDg1BEYAfTE6oEBR4AIBAiS5yWBAAAGBAyaPGAgCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+fileclose22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBERGRERCRDw6PCwqLExOTFRWVHRydGxqbGRiZCQiJISChIyKjHx6fDQyNBwaHJSWlKSipBQWFJyanPz+/JSSlCQmJAwKDCwuLBweHBQSFGxubExKTISGhDQ2NFxeXFRSVDw+PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbZQIBwSCwaj8jkMSAYDAgEJbFgOBwQCUOAoJAaFgvGonHIBhyP5BcSgUAYDWxggD4WFmx3e3HQngkSRgYMEBMUFG4MCId0BGlEAQeEhocVDYcUdBYKF0QCB3gRlJgUAQEYBBkaRAMbDZMMpAYcT46rQwMJrgsdC6QcfwoPnUMOBgkIV6SHHg6bw0QEAQYfBpggBZjPGsRD0gEchxwCIR6HChnQRQ8DIU4DTR4Em+ncRw8O+fmoXPXdRg+gQLFgIYM/KRIkoDP4QMKFf0o0aBAh4qGUixgzCrETBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+filefind22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQSFJyanLS6vLzCxISChNTe3OTu9Oz6/Nzy9Nzy/NTy/OT2/Nzi5Mzu9Lzq9KTe7LTq9PT+/Pz+/Nz2/Mzu/Kzm9Jza5HzK1LTi9PTu9IzW5ITO3FxaXNT2/KTi7Iza7GzC1LzW3FRSVMzO1MTq7HTS3Fy6zFS2vKzm7Lze5MTGzHzS5FTG1Ey2xEyyvJze7JzW3ITa5FTK3EymrGS+zFxWXKymrMzi7ESirEyqvLSyrKze7MzOzMTCxKSepAz+/NzW3MzKzBwWHLzS3ERCRAzi3KyurNze3MzGzLy2vLSutCQiJAyytHRydOTe5MTGxLy6tLyqpKyelJSCdOze3NS+tLyupLSmnKSOhCwuLPzy9Pzu7Oze1OzazOTOvMyihOTi5PTm3Pzi1PTazPTWxOzOtNSunDQyNPzy7Pzu5OzKrNzSzNzGvNS6rMyynMymjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwGFhYOIiYQBAgMEAwKHiokBBQYHCAkKCwwFAZOEBQ0IDAsODxARCZ6gAAEGEhMSFBUWFxgZCJ+TjBoMEpkRERscGBGRih0BBAgeFBQOER8gISEfIruIIwEkCCUVwhcgJicoKSrZg9srCRkRGdMsLS4vMNiK2wIKMRsbMiwzXtCocSydIBs3AuCIwIFDiBMucugAoWvSiB2VNPDg0ELHwA0MkCXr4aNSggg8NoDIQOFHgBtAkgURMiDAEAFEVBCJFKCIkSMGOyDRkETJEkOFmABoUsRJQkQdnkzQACWKlBtTplBR6qopxkFRJ0ytYuWKFCxZtBBq+hRA2AlbRrh08fLlCxi1a51g+dQhDFwuYsaQKWPmDBpKXgNETaNGjJgyhNfcVdTTiWI2XpK0cePmzRk4YA5T5otGixY0qFOXbgXAQCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filenew22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBExOTERCRDw6PCwuLBwaHAwODAQCBOze1NTW1OTi5Nze3MTGxLS2tJyanPz+/Ozu7OTi3BQSFCwqLDw+PDQyNFRSVPTu7MzKxLyyrIR+fCQmJPz6/NTOxPz69Pzy7PTu5Pz29Pzu5PTq5PTm1My6pBQWFPTq3PTm3NS+rAwKDPTi1PTezOzWxMy2pPz27PTazOzSvMyynOzaxOzOtPTaxOzKrMyqjOzGpMymhPTizOTCpNzSzNTGvMymjMSihCH5BAEAAAAALAAAAAAWABYAAAboQIBwSCwaiYGAYEAgFAqGg/Q4DCASCsTiymgcHAcqQLB4mM+QiIQBppLPcMjkwQ4bB2X4maKgt4sVCHpnFhQTElNFE3mDDxcYGRp2RBuMgxwIHX9EBZZwHh8gCBmTQ52NISEiIyQlpUImng8hHyInKAgprwAqgnC0IKwrLLpGB4wctLYkwy0uuwd9Z8AnJywsLcVFx2YcL7UnJCwwLTEy0GXJoSgrCCwzNDTnxgjeH9UrKzXwNDY36LRGhEOwLx4NHDmgJbh3QoeOgv127EhojEeHDj16pEhRQoZHHzl+QJNCsqTJSXaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fileopen22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQWDCwaDDwmFPSubPzGhPzCfPy2dOSmZPzKlPzSnPzOlPzKjBQODPzChPzWnPy2bPSmXPyuZOyeXIRSLEQuFEwyHEQqFDQiFCweDKRuPFRSTPT29PTy9Ozq7OTi3Nze3NTW1MzOzMTGxMTCxLy6tLSytKyurDQyNMzKxOTm5OTi5Nza1NTS1MTCvLS2tLSyrKSmpJyenJSWlIyKjHx+fFxeXBwaHKxuPMzKzLy6vIyOjHx6fDw6NPy6dGxubLy+vISChCQmJNza3KyqrBQSFLR2RKSinJyanGxqZAwGBJSSlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeDAYqKiIeLj4wBjQCMhY+NkoiLk5qbhQIDoJyGBAUGBwgEo4MECQoLDA2pDrS1tKQPEAwHERITE77AvxKqhAQNDA8UFRYXFs8YBAQZGqGPxw0RGxwdHR4eHyAhIiMkJSYnKCgpBAYPEhcqHyssLS4kLzAxMjM0NTY3cBA4UCAHBw8gVnhgEcKFjhc7UPDj0cMHAAI/KFgY4YLFio/jRpTYsW8GDyCSCEQw2DChOHIqgsCQSEPIEEEEJFhAoUNECCJEyOk4d6KIyRtGcB7hIJKjixEjHu4oimSGEIs4d8IIUoKECnNB0ElMwkNJJgBLlJBAcQKGiR07KGAURVGViY0mhIwwSTKjr99+THjUoIg0r48hTRIrRtxkiOMhDgrZCQQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+fileprint22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBFxaXDQyNFxSTPTizOzi1FxORDw2NExKLPTi1Pzy9Pz6/FRWVPz29Pz2/PTy7PTu9OzezPzu5OzavAQCBPzy7PTm3OzazOzKrPTu5FxSRERCRGReXPTq5Pzu7ExGTMS+xKSmpOTKpPTq3JSCDNzSfHRydLyadOzCjOzOtOzSvLyyTMTCxKSipGRiZFROLPz+/KyurJyenJyWnGxmbLSabOzClOzm7LSutJSWlJSSlJyanGxqbNze3OTm5IyGjNTO1Nza3NzW3OTe5IyKjHx6fMzGzMTGxMzOzNTW1IR+hISGhKymrLy6vLSytERGRGxubKyqrLy2vLS2tDQ2NEQ+RASKBAT+BFxeXHRudAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAgOEiYqEAgQFBgcGi5MICQoLmAQDh5OEDA2YCw4ODxARApKUCaGYEAsSCRMUnQysCwoVEhYXGLOLCBCgDqK5GQUXGooCAhscBB0euBUZEAUJvQgIgx8gIR8iCSPiHuIFEREDJCXaANwhJhsnKCnWERcRKiopFCvsBywhQrRwQWGAPAz5EhpQ9wIABRgKYsiYMTEEDQocatiwkUIEP18fbkCAAcMBjhwzdOyQwYNCgBMfKJSgMItBjxs+btwgCSGGjhw/ZoRgQKGZCRMUPgABEgSIkCE3SZok8qNqkR85NtDUEcPIkaVAkCR5SrJBDCVKlmzQ6pCCiRlMTJo4YUH3K5AeMBYYWctW0BOaUH60cBJFypQmII6wyEpFQBVFMSm4UAI3hJUrOGh8oOJrklYKWIromJGDR99Ogz5j4ZGlM+pEnwmBCwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filesave22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBGxqbAQCBLy+vERCRExKTHRydIyKjMTCxFxaXGRiZFRSVFRWVPz6/Nze3Nzm5Pz+/JyanDw+PExOTHR2dMTGxBQWFLSytHx+fISChOzy9Ly6vAQGBJSWlMzKzAwODJSSlHx6fIyOjOTi5DQ2NISGhGxubCwuLOzq7ERGRFxeXNTW1CwqLPT29Dw6PGRmZKSmpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb/QIBQGBAMj8ikUDAgFAzKKCBwQCQUCcICKh0SEAhGw5EIZAmBrgCxeDQgcDJWyz0GIggJfL+XGwQJRxNgC3yGDwwUFUZDFhdthnwMGAZNQwEZFwQakXANBBQbHIIdERIBnRAOiR4ERx8gsSEMBBmGCyEGG3YGBwcgIr8UCwQHECOgG4xCtRkEJAvBJRklJgkSFBQeJ68hJiEoESkFKiEZIbkGARsLlwEGExENGhorGSkpFAYm66NDLAECpGiBYsUIFA8wLHBBQMWLVkdUCFCwaYVFBOymkVCgYEMgOykEpICBccMBAhhELFigTEqAAgIIwCiQ4eRKDyS6EAlJIAI0EpaudF4iIKDAAn9CkRT5eMROEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+foldernew22:folder folder22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBNzaTPT2FISCBCQaDPz+BExKBDwmFPSubPzChPzCfPy2dPz6BMzOTAQCBOSmZPzKlPzSnPzOlPzKjBQODPz+rPz+3PzWnPyuZPSmXNyaXPTyhISCLIRSLEQuFEwyHPy2bKRuPFRSTPT29PTy9Ozq7Pz+xJyanDQyNPzGhMzKzOTi3Nza3OTiVBQWFDwqFKxuPOTi5JSSjISChHR2dGRmZFxeXPS2dNTSzNTS1OTm5KSipLS2tLSytKyqpIyKhGRiZNze3NTW1MTGxMTCvLy6tIyKjCQmJMTCxMzOzMzKxJyenHx6fLR2RLy6vJSSlHx+fDw6NLy+vIyOjAwGBGxqZKyurCwuLBQSFJSWlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLjI2MAY6HAgOHBJYEhJCDBQaDmgcICQoLB4MGDA0OAQUBDg2cAAcPEBESE6QUuQasFRYVq5SxCRcSCggYGRjIGgYbFs8bHIMHExIJGR0eHx7cB83PFhsDDuTUEyAhIiMjJCQluwEmvsAnKAcp1x4qKyUrLLupWrByxcnFiwQIYIggEaNEiRgBZMyYQaNADRs2REA6cCODBxw5+OnQgWMHjx4+BND4MQOIg1gI0gUREkTHiplDhhApEoCGkRlHBL3I8MEHEhz+WAhJogTJySVMfthwIehAExE5jubAkYQpESc8fOx4AiXKNA8+ekhBgqSpzh5hPHcsmVLjpSAqVZBY6VGkiJMiPQKLnTvjCiEsWU4o3nGC8YksMmT8YCmC6iAXKLRc2cz5yGYtR0JjKWQgEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+mailforward22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBJR2dLyijPTixPz69Pzq3Pzy3Pzu5PTu7Ozi1LyelOzavPz+/DwqLLyafPTmvPz67Pz29Pzy7LSWlPzmzPz6/LyajPTitOTSzMyurPz25PTatPTi3KyOjPzuxAwqVDQiJHxiZPTetKySlPzqvPz27BQ6bAwmTPTexLyinNzGxDRunPzy5KySjCQ+ZNzq9KTO7JzC3Nzq/Ozu/LzW7FSm1BR6vGSWvFyq1AyGxAxytAx6vBSKxAxSjMyujLSunES+5BSi1ByGvAQCBNzCrOTaxNTOvMS6rKyelCx6rBx6tBQKDOTWvPzu1PTq1OzezAQOHAxGdBROhAQGFPzy1NzOvIRqXLyynOzarPz21Jx2XPTWrLSShAw2XKSCbPzuzAwePAQCDPzyzPzqzPTmxOzWtAwGBKyObOTSrNzGrKyGbOzatEQyNKyCZOzWrOTGpNS2lCweHCQaHCQWFBwSFBQODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBhBwgQKFSpY0HgBQwYNGzh0mDhRAAUPHziACEGBpYgRJDiUGEkSwoCQJk6opNASRQoOFETQJDkggwoOJlYApcCihQuVL2DUhBDjhIqjJmRwwDCDhswaNm5MjYHjKggOOU7o0CGTA9gdYknG2KCCBw8VJVL0uBgihAUfP+CSNGCjsI/DiBPbAMJBsEQbQYQM+UG5smUiRYw0jlvYxhEkSYyIHm1EyRLTTH40EZvAyZPOR4pAmU07ipIkUKQ0mQIhAZUqVq5gKXzkSBYtyLVEyd1ki8QFXLp4+WJFQowbYLJnD5NbzJiJCjaQnhnvpYwZM0/OPFlvQ/f3iQvQpBlvQc0aCWy4VKnCpY0Y5yQxgEYXZFjghgwZUOHGCW90YQEccUwloBwGyjAHHXUoSAMZb0xhx1QOoMHDHSfIwSEOdTjhAQ1d4MFbTQ6Q4MYacrzxhhx04JCHHhvQsMeLJPHRBxpr+LHCGnusgccfgKixQR1ATtTBlDDAEIggggxCCCGFbLGFHVFKZEdAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mailget22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQ6bCQ+ZAwePKTC5Ozu/NTi9GSWvAwSJGSu3JS+5CR+rAQOHPTy/AyKzES23AwOHCw+bOTq/BR6xES+5AwmTBw6ZMTW9Ax6tByi1BRGdAw2XAQCBDQuNDRupKzS9FSm1BR2vBym3EzC7CSGxBROhNTW1Pz+/OTm5NTO1AQGFNzW3Ozq7Ozm7IyKjJyWnMzOzNzq9Nze3OTa5Ly6vCQiJGReZISChKyqrAwqVBRWlOTi5MS6xJSWlNza3OTe5Ly2vGxmbKymrIyGjMzGzISGhKSepCQmJDw6PHR2dJSOlPTy9MTGxLy+vLS2tMzKzLSutMTCxLSytKSipJyenKyurJyanCwqLCwmLCwuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBhgIBA4SLjAABBAUGBwiNlY4FCQoLDJaNAQ0ODwsQnYwREhMUE5ylFYYRFhcYGRgaGxsDHJUdFR4SHyAhEyIjJCUcuo0cJr0nExihxgwoyYscKSnMHicOIw4lKissLdWDHC4vMCu9McYqMjMyNOUANTY3OPEoOTolDCszdrSgwaMcBxs9TMxYOCMHBx8zfPj48QNINQ5BbMBIIUShDIUoTAhR94PHPEEHbQwZckOGjBQviMxYUWQIDCMmdXE4gqRnkiFETAxR8iKFjJU2evZEdmLJkgJIbqS4wXJIUapImj5FtuSEVyRVV1IVi4RIChhEkLVAgcJHEqVwVJUmYdKkiRNkALMRecKECRG/ff8CEQJFCA5kMKJEoUHDCQ/HkB9LmWKECpUeyKoIMSLEyosen0OD7iH2xg1dV7BkqXGlBpbWNTq4Zn2khu0aAAwEAgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+mail22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBDQyNCwqLCQiJBwaHBQSFAwKDAQCBDw6PPz+/Pz69Pz27PTy7PTy5PTu5PTu3PTu1PTq1PTqzOzmzPzuvOzitPTmvOzivAQGBDw+POzevPz67Pz25Pz23Pzy1PzyzPzqvOTavERCRKSilPz21OTevIR+ZExKTOTi3JyanLS2tPz6/Pz65KyihJSKbMS6lExOTNTW1JSWlJSKZMSylNTOrNTKpFRSVPz29MTCxPTmzKymjIyCdOTWxOzexOTWrBQWFFRWVOzu7MzKxJyalOzatLSulMzKtOzmxOTarFxaXKyqnPTmtIyGdIR+bOzetOzixBweHGRiZOzm3NzWzNzSrOTetGRmZOzizOTexOzm1JSKdGxqbHRydJySdHR2dOzapHx6fKyijOTixCwuLHx+fFxeXERGRDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLAQECjwORAwSUBZYFBpkHmwgJCgsMDA0OD6UQERITFBMVFhcVGBkangq1ChsLGxwcHQ0dHR4fICEGIiMSCbS3uLq8wCQUJSYGJygpKhQJKyvLLM4Nwi0uLwUwDQsxMtmeuQveHR8UMzQ1NgU3Dgo41jk6ns0cKOzgYaOHjx9AgjTAUUvIECLZNmxoUISHkSM9KiBJQkCJA4kKEoBQoWJJAiYtmjh5AmVCsCJRpHzckKCCySlUUvBYUqUHDysSPnxIEuXKA5pPRiRwxwFLFhRaIEDYUoEChCcDuECoOWKFuwW7nHkg4WELkw8/BHRRwESpt10dU8SSHevlRxIBX6C0WBE27q8GZMkKbTADjIAwYlb4GLMYShYoPTRo6FGiSJEKPyzMIFMmzJcvXbhwkSLFjJkbQW6cOHNGhAgEAdAsmk27tm0ABgIBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mailreplyall22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBLyejPTixPz29PTu3Pzu5Pzy7Ozi1LyelPTavPz+/DwqLPz67PTetPz69ERCRLSWlPTmzPz6/OzexLyajPzqvDw+PDQ2NMyurDQiJPz23PTatJyenAQCBPTevPz25LSajOzq7HxiZPTexPz65JyanBQ6bKSmpBwuTOTi5OzaxBRCdHySvGRiZHx6fBQSFERGRNzq9IyOjHx+fGxqbPzu3BwaHFSq3Aw6XAxKfPzy3Gy63ByWzJzO7Mzi9OzavBRytAx6vCSazGRKTPzy1AQKHBRGdBRyrDy63ES+3Cym1CR6rBwWVAQSLAx+xCyCtBRmnPzuzAQWLAwePPzyzKSCbAQOJByGvOTWvPTmxBQODFQ6PPTWrPzqzOzatAwGBKyObLSWfPTivKyCZEQyNKyGZOzWrOzWtOTSrOTGpNS2lJx2XDQmJCweHCQaHCQWFBwSFBQKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpkzGjhAoYMGjZMpMghQgcNFjh4mODhA4gQGkSIHAmBwAgNJEpo8KDSxAkUGjhMSEGz5gUVIiKs2PmBRQudHiwQpUnAxYsXImB0aBqjBcuoU0fKmPGChgUNH2qIqGHjg9u3bicWIFs2rYgbNnDkyGFhb8cccQ3ouJqWQo0dPFr0WMy4h48LFj4gsKriB5AeNngEaSGks+chPnwQOXFAh4oXRYxk9nAEyY7XO2wksWHDx5ATCDIoUXEBsYclTJo4cWJhuIjhSXacSPBEiZLMQY4wgRKluvXqUpyIsDElAxUqVaxcwcGCPQuWLOixaNHCZAsXBU+oqKDSxQqULF6ifNmyn/8VMOtxwcAK36kQRhdJQIFFEmKM4eCDYGyhhYAEkqFEGSuYYcUZLaDxXRpqSNRCEu6twYaFZXTQhgRd2NCCG9918AYELTjoXgNuKAFHB2RQEUYHVbQQRwlUpPHGGFwkyQUEDsgxx4lh9BhCBy2U8UQJcrSg5JIQ0FEHG3bc0QGYK+CRhx57PEGlkhM9sAEffKTQhx9+/AEIIIGoEUgLLRRFR0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailreply22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBMSihPTixPz69PTq5Pzy1Pzu5PTq1Pzy7Pzu7Ozi1LyelPTavPz+/DwqLLSajPTetPz27LSWlPzmzPz6/PTexPz67Pz29OTSzMyurPz25LyajBRCdPzuvDQmJOzexPTevOzq5BQ6bBwuTDQiJHxiZPz23Pz65LyinPzmvBxCbHySvAQCBOTi3OTq9CweHOzaxFSq3Aw6XGy63ByWzJzO7Mzi9OzavNzq9BRytAx6vBR6tPzy3AwOHDy63Ax+xCSazCym1CR6rBwWVOzizAQSLES+3CyCtBRyrBRmnGRKTPzu1MzGtAxKfAQWLAwePPTizMy6nByGvNzWxOzWrNzOtBQKDJR2ZNS2lPTmvBQODPTatKSCbOTaxLyqlAQKHFQ6PPzyzPzqzPTu1PTivOzWtKyObPzuzOTOtLSWfPzqvAwGBKyCZPTWrPTmxNzKrEQyNOzatOTGpJx2XCQaHCQWFBwSFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYuIDBQgYNGzh08DCR4oQPIDqEmDBhJQYRIzqQIFkSAoESJCKkDGFiwgkUKTpMwECz5IASKjqsSMlSA4sWQjG4qGnzhYoQSmF0iCFjBgmWGWhQrVHCxg2sOHLo2MGjB0sLYmsWQHq1p4wdPtqemGDhB1UDQFSouKHi7oQgQmSwUMyYxcQDZQWz2EFiCJEiRoyQyLzZyGIIB47YKLwDSRAiSZSoXq1kCRHNLBK8YGKjCYskTp4ogeKkt+8oUaBImZKAAxMmVKrctqL7ihTnz7FkAT5FC4cKFbZwadIFdxcvX8KLss8iJcoUBUcq2KgAJoxyMTy4jCFTxoxEHl2GLyCDncmWM2hUIQMPY2CXhhoTfTEcA2tgVwEba7Thxhs88FdBD/ZB8MUUHMJBRhw2sAGCHBKU4UaFc1RAhxnhcdhhHUzYAUIcFdxRAh4R5KGHinu4OIVEDqTBRx81xhGHHzD8wQYQetDRI4cTAcIHGWT0EQgZa1ApCBqDcBAID1Q94IEHLtBAAyGEFGKIIWqYYQYPYNZkQEAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailsend22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAIR6fIRydHxubHRqbHRmZGxeXGxaXGRWVFxSVFxOTFRGRExCREw+PEQ6PDw2NDwuLPwCBLSijOzixPz69PTq3PTu5PTu3PTu7OTi1KyelOzavPz+/DQqLPz67LSafOzetPz27Pz29KyajPTmzPz6/NzSzLyurCwiJPz25Ozi3JyOjPzuxBRGbAwSHOzexPz23KSSlPzqvBROdISavBxSdAwaLHRiZLSinNTGxMy+vBxGZNzu9BSGrAwWJMSyrKSSjFy61ETO3BRWfPz65PTqzHTK3ByqzBSWxEzW5AQWJOTWxBRCXOTu9BSOvDzO3ByavBRKbOzaxOzizKSWlCQ2TAQCBJza7BRWdNzSxJSCbMzq9BSOtCSKrAwiPOTavPzy3LymlCySrAwmPFRKTPzy1NTGrPzu1JR+bOzatPzyzCy61ByGpOzWtJyCbPTmvPzuzIS+3FymxCSuzBR6nJyCZOTWvKSObMSujOzivAwKDOTSrNzKrJyGbDwyNOzWrMy2lIx2XBwWFBQSFBQODAwGBAQGBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYqMDxAoYMGjZwmEixg4cPGzqA6BBiAggRIzaQGEkSwgAMJCKgnNBhQogSJlKGOFHTpgYUG0TsnJBCxQoSE1i0KErAxYsOJJRuuAAjhkwZM2jUqGnDBQoUHTbciIEjx4YNOmbs4CGjB8kCZlGAALHBx4+YcTcACcJDyFSJBo6iGNIhhQkiG8BOKGLkCBK6SSQisHoWhZIbG5bMYALECI8mTZw8gTL1QJQXZ6VMiUylSpUlVpoYaXLFtm0EGmCjwJLlA2O9MrRsccKlC8kEXr7AdgEmwtkhX2SQ2BIkjBiSYzSQr/nyhUKZLIrJJOcexvlEBV7IvCBjRkmAMzHOaufhxDvJBWiQISAFxUUQQRovJNeEGmu4JxEDbKQhXxsfuFDGGW68IQMcccgxRxUkNRDhC3R8QMQIdZwXQ11JJGFbiB+QYccHaaTxhgt13OFBDGTgkUdRDrhAhx5k2JjGCB/swYcXMXwAYk190OGHHx/4wUaVepTxByAaoPEkSQ5wwMEJZAZipiCDDJIHIYV8OZEdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav1downarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBBQSFAQGBDQyNExKTHx6fGxqbFxeXGRiZFRWVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFxaXDw6PPz+/MTCxLS2tIyKjKSmpKSipJyanAwODDQ2NHRydERCRFRSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZzQIBwSCwaj8ikcslsOp/OgHRKlQoCgymRUDAcEIkwYgxWFBYERpHQcDwgEclEQmk8DhWL2kiIXDBwExMNGRoJaUkEEH8bEQ0cGgcWAksEHX8QHBKSHk1sfxMHH5ROBBsOICGkT2wiq1CIULKztLW2t0h2QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav1leftarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ5QIBwSCwaj8ikchgQLJGBgfNZDBAKBirRekBMtYGEYsHIgsWNhOO7tCrShDU18Hg/CJAIG0o4wCUQcksTFBUSCRYSEnpUFxgIGQkJGYyNGggbHBaVjR2QCxEeWkITHQ4IH3tPFwEMA2ajAKUgqlQTTbFEE7W5vUgGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav1rightarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNGReZAQCBMTCxGRiZMzGzOTm5LSytPTy9Pz+/CwqLOTi5Ly6vCwmLMzKzJyanJSSlBQWFKymrIyGjCQeJJyWnISChISGhHx2fKyurDw6PAwODHx6fHRydDw2PERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ2QIBwSCwaj8hkMRBQKgOCgRMZIBSk06XhEM0SA4iE4uoVLhCMhqLrdSAekMgYO5VM4BQ521mxIC4UFxBWdEkSERYYFxETGQGFSBKCGBEaGRuQSBwdeZaPXpsQCB6YZQMdEI6ZSgMepKusHh+wrCC0rLdlursGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav1uparrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBFxeXDw+PMTGxHRudPz+/JSSlLSytIyKjHR2dISChIyGjIyOjLSutLy6vKSepJyanISGhJSOlOzm7Ozu7MzGzKyurJyenDQyNGReZKSmpIR+hCwuLCQiJBwaHBQSFAwKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZtQIBwSCwaj8ikcslsOp9QYyAQFQYEAyr0Sihkn1fDAeHVLsOJNELxVaITC0bDUU6GH5AIQ8KYrNtFVxQVFBYWFxgRCREYdUQZGhYEDwgIGxAHCQocCgWOQhmhGR0epR8gqCFTq1Wtrq+wsUt0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav2downarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAQGBBwaHDQyNExKTHx6fGxqbFxeXGRiZFRSVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFRWVDw6PPz+/MTCxLS2tGRmZDQ2NAwODJyanKSmpKSipIyKjHRydBQSFERCRExOTFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAasQIBwSCwah4FkQKBsDpoBIqFgOCASCYRWm1AUFgRGkdBwPCARiWRCaTwOFYvYSIhcMOiJpJGZaDYcR0IEHXceEQ0fICEWIoJDhHcQHxIHgI9SEHeVG46YUh8OISOen1INCqWmUnOYTUxQAU9NUlRWWFtbCiRgrYNlZ2lriG8lYUd1khETE24gCZeCkRgeFBAQIAeNn9OTlXKrBJoYnKrcoaPmpmSpq3S+7u50QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav2leftarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAavQIBwSCwaj8gkMiBYNpeDZzEQXRIKBmPgmtUSDgipcAsWjxOKBaN7Tq+n6EbCIQ3E5+KtQk6gjwl7CX11D3sPBBARTQGFDYeJT2R8EhB0koKUfgATFBUSCRYSEoqcnqCiikMXGAgZCQkZqautr7FiFxoIGxwWqQC4ury+qh2tCxEexMbIRhMdDggfYs7Q0kcXAQwDbELY2txEziBmmx3jSRNMR+nk4e2b70ry80QGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav2rightarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTGxOzm7CwqLLy2vPTy9Pz+/Ly6vCQiJLSytLS2tLSutOTi5MzGzKSepIyKjJSOlKSmpMzKzJyanIyOjBwaHIyGjISGhJSSlISChBQSFJyenIR+hGxubDw+PHRydHR2dEQ+RHx6fERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8hkIIBcJgEBweAYnTYJUmMAa9USClniFtwlGg6IRFhoUKTXwwWj0FB3F46Hwl6UQyISfAB+EROCQgsUFRYSF3yJEIyBaxgWDBkaGRtclQwSHBIbEGEdGx4fGhcOICEDGBsWHBmqIq1CHRIWGRMMIyRTHRy6Er22tyONq8YdJRe0xkIDwr2/QwMfliMmZQADIxasZd4e4UYDIr7c59rc0eVFA+/m0EQD9PDt0flP/P3+BkEAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+nav2uparrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBGReZDQyNMTCxHx6fPz+/JyWnKyurHx2fDw6PJSSlISGhIyKjIyGjISChLy6vJyanOTm5PTy9OTi5MzKzLSytKSepMTGxMzGzLS2tLSutKymrHRydCQiJCwmLBwWHAwODLy2vHx+fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAajQIBwSCwaj8RAAMkUBgSDZdP4JBSi06TAcEAkFNLp07BgLLzY5njRcDzO3zB1C4lEGI83Wj58SiYUFRUWdg0XEXFFAwIYGRoWGxwRZQUFHZdgRAObmx4fHiChISFKpVlKWUdPaalOAlasp1sHG4myZGZ7Yltsbgu1mUhjdRF5egmxfQJ/gYOFdrZDi40iFgiSCw8jBQmYcpydn6Ego6WorUwGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+navback22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRGZAxCZGyavExmjHyatOTy9CxihISevPz+/KzO3BRylAw+XAQCBDRWbPz6/FzC3CSuzDyexJzO5Mzq9CxSdAQOFISmxNzu9HTS5BSmxAyexDSuzJTa7Mzu9Kzi7GS21CRmjAQOHHSWtLze7AyWvHzG3BRihAQKFCTO3BS+1AyixBSWvBSOtBSStAQWJBSixDzW5BTC3BSqzBS21CTC1ETW3AQSHEze7BRqlBRmjAQCDBR+pBRefBRSdCH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMqBcMpvHgGAANQYIhWdVGDAcENQtIJBQLBgNx0MQaDuQXcghIplQDhBIxXKJYiAZGhscHR4VHyAhIiNWJBklGhIbJoQnFCcTKIxFKSgbKissJi0mJi4vLiYoMEcXKDEyMzQ1Nje2NisoOEg4KDU5K6g6OwwoKAN9SCOeMmgwz884PEq9PT4NYkPLP9jZQikN3d4AKVrjKePp3gZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+navdown22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRKZDRSbBxCXJTC1Mzi7Nzq9NTm9Bx2nAQCBNzu9JzG3Hy+1HzG3IzO5BRmjPz6/LTe7Dy61AyStCTC1FzC1AyGrETS3ETC1ETa5BRulAyuzBRylAw+XMTe7Gy+3CSqzAyexBTC3DR+nIS21KTW5Nzu/KzO3FzC3Pz+/ByixEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaRQIBwSCwaj8ikcnkMBAQDgjPAFAYKhsMBkVBUAYEFo+F4QLzVQEQyoVTOX/XBcsHA0+vMRbNBMwkRDhxuHX5GTlIeHh8gISIjFAEeiVRECiQlDAUmgxQjIhwiJHdFlycoKSIUFCEjGiGkRpcqCxYijxorsUezcxYsuoZJsxLAu0qXB7DCTJfHVQrMX9PU1Uh0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+navforward22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBBxCXDR+nIS21Aw+XJTC1Nzu/KzO3Pz+/Nzq9Pz6/MTe7KTW5FzC1Nzu9CRKZMzi7IzK3Lzi7LTe7HzG3Gy+3AyuzAyexFzC3DRSbHy+1Dy61CSqzAySvAyStLze7IzO5AyGrETa5ByixBRmjCTC1ETS3BTC3Bx2nAyWvEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaYQIBwSCwaj8hkMqBsBgTN5IAAjRoDBaq1aDggtMuAWDzoJhTgY+CwYLgZDccDwkgXI5IJZVGxXDAZGnR2QxsLHB0PHRgeHyAZDyFfVUQDCyIgIyCPIB+QJCUmlEMBEiInKCQnKSkeKSQeomoqJrUmKiArKSwZsmoCwMEBGCyxo1EGHr3HUQEEvltCBtDRAAbMW0zV29xDBkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+navhome22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQiJNze3ERCROTi5MzGzLy6vDw6PKyqrKyurBQSFGRiZGxqbGRmZISChEQ+RExKTExOTHRydDQyNOTe5FROVLSurCwqLMTCxPT29Pz6/LSutFxeXLyytLSytPz+/JSWlKympPTq7KSipNzW3BwaHHx6fKx2VJRWNHQmBFweDOzq7Ly+vNTW1JxWNLSajPTe1Ny6pKxWJNTS1IyOjJRmbPTi3OzKrNSSXMSGVHQiBHx+fJSSlPzy9IxOVOzWxOSyjNSCPLxeDJyWnIRGTOTGtMxmDLRWBHwqBIxGTLRSDDQuNNSunKxKBGwyNMSafMxqHMReDKRGDPTu9LxuPLxaDJQ+DIR+hGQqNIQyBGQiBNTO1EQKBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAYSIiYQCAwQCiokEhwACBQYHBAiQhAiHlQYJCgkEC5uCkp8MDQ4NDwylmwgQlgQRERIEBBOkmxQVBgQWFwUFFxEEDLyJGAUZtQoFGhsFHLYdyoOVHsEf0SAbIAUex8mwlAUhtSIFG+3uIyTWvAIGJMEkJe76GyXbEeWUBJg4USKaBhQpVKzYoIFFiwYUBBJa8MAFCw0vYMSQMWOhBhoTKCQSUKMEiw02buDIoWOHBg0GeIhEFKAHDR8afgAJImSIioYliMws1MPkhiJGchxBkmTDCBo1hg4KQMTiBiUyhBxZ8pNFiR5MEtU0WqSJVidJNDyNKraHC5xPNKBEkTLlJ5WvUgWNvfikyhArV34+7ZEXQAAsB2iUyHLlihYtW0pwOYAFgyJDmDNr7jIIWiAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+navup22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBHSWtBRmjAQOHISmxNzu9BSmxBRihHyatPz6/Lze7CTO3BSixHTS5BTC3DzW5ByyzPz+/OTy9AyexEze7ByixGyavKzO3FzC3AyWvBS+1BR+pAQKFCRGZExmjCxihBRylCSuzBSWvBS21BSOtBRSdAw+XAxCZDyexDSyzCTC1JzO5JTa7DSuzETW3BRqlAQWJDRWbOT2/Mzq9HzG3JzS5Kzi7BSStGS21CxSdCRmjAQOFAQSHAAAACH5BAEAAAAALAAAAAAWABYAAAaeQIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbUGFAtGw0GFfheHByQi4S6/E8pDUoFYLm5kAEPJaBAVGxIcER0JHlEfICEiIxUkGyUmIgknKIhXASkonCorgSwmKQGcKE9IAi0uLxUwMTJWMzQ1NiYwBLBQHws1N7avXgs4NjkcCblMATU6KhvGyG87PAnUKV1MAj0+2zIFp1bg4eJJdkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+playeject22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAwKDJSWlFRSVBQSFKymrOzq7HRydERCRPz+/MzGzISGhJyenKSmpGxqbJyWnJSOlKSepLy2vIyOjGRiZPTu9IyGjLSutFxaXExOTHx2fGReZAQCBAQGBBwaHCQiJLSytKyurJSSlFxeXNze3LS2tIyKjFxWXHRudAwGDBQOFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbVKFQsGItBdBhpgh4PxIJvRC8cA4oiMy8bvQhJhMAYTFBVOURAWEw0QFxcMERAYCBluVxobDxkVHJocmBwEGgmEQx0dHh0CpKmkH6odVlanBR8FtAIFtiCkSB0LISEiGCIGIxAPDySuRwIOBwrOzwoHJRHJRh0jJgMj2gMnERQUCNVFHQQoCBvo6CkICATjRB0qp7b1K6qv+foyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+playend22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTCxGReZBQSFOzm7AwKDKymrJSSlFRSVCwqLLy6vPTy9OTe5Ozq7CQiJLSytOTi5BwaHPz+/HRydMzKzKSepJSOlKSipJyanIyGjIyKjKyurISGhMzGzJyWnHR2dISChIyOjLSutDw+PERCRHx6fJSWlIR+hJyenGRmZHx2fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8ikMBBQKgOCgRMZIBSkxYHWoDVWD9EigpBQLLBERsPxCA8NDUhjgTBGJJNGG02RVBQWdUV3FxgZe0IGfoAGdhoXGxwdiAYef4FGFBoeHB8dGSBRihUhIo1FBhkbIyMkJRYmAwYal4JEBh2RChIWJ1IIGxUZFqdECCgkHR6wWAYpFR2YWSobvL5vFgfDaEMDIivMRBEsD9HcQgMWvecDLB0tZ0btsfJa9vLXU/X6/P3+b0EAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+playpause22:play play22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBAwODMTCxKSmpJSWlFRSVAQGBBwaHLSutOzq7Ly6vCQeJPz+/Hx2fBQWFGxubLSytJSOlBQOFAwKDJSSlJyWnIyOjHRydNze3GRiZAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWBICCOZGmeaKqubOumQSDEgRjPMSoMRGEcol3vh0IkFAtDDWBEKlGMRKPgEIii0yrqIS1ArADu9KuLNCSOSdCMVp8ohEZFC4DL6SaBpXGh6/l4JX8XZACDhXkYCn1LAoqMUBAZEhBLDJKUSyYBGmhPAJyemiU0NDaloy+qq6ytI8whACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+playstart22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExOTAwKDAQGBJSSlHx+fBQSFMTCxKymrFRSVOzu7GxqbLSytLy6vJyanPz+/GReZBwaHHRydKSepKSipGRiZJyWnAwODLSutKSmpISChPTu9ISGhFxaXJSWlIyGjJSOlERCRIyKjDw2PIyOjLy2vOzm7Dw6PLS2tCQmJOTe5GxmbDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa7QIBwSCwaj8ik0hgQLJGBgbMoqBIKU2LAcMgOEQmFYeEFbBmNMgDhYDwWBC0k4pCoJ46IgRIXBioRCRYXamwRGBQIfgaBFhiERhkaenxmCoEbBhyQRYaIGVsdghgem4UWegcEBB8UHhsgIaZGBBgRIpUIIxQhChginEQIIBEklWslFyYnBsFfFCi4WQgpFBwqFxNGKxcsxl4IAS0NZEYCF3vlwgEfUuZV8JEuI2pPAARN9kcE9fr+SwaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+playstop22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAwKDBQSFBwaHCQmJJSSlISChJSOlJSWlGxqbGRiZNTS1PTy9Pz+/Ozm7OTi5FRSVIyKjOTe5MTCxIR+hExOTHR2dLy6vLSytLy2vHRydFxWXIyGjIyOjPz2/FRWVHx6fExKTMzOzJyanKSmpKyqrKSipAQGBLSutHx2fDw6PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcslsAgKCAWEQjQ4KgSwyYDAcugZEQqFYYJECA6PhaLcfEEUkgJZAGJB8fkKpWOhHAxcOGBQZGBoaGQgbHIBGAhUOGR0SBxISBh4Xf0iCHxQSlRIIXhsgj0UCIaCXmJgHGyKpRJ+hmB5dHQqOaCENIx0epBIkBhdzngoPGCQlJifQJBvJRygRKRcKGxcXGypys1srEREc5SLnICLiR1koLFVUWfRO9vf4+UwyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+textblock22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUWzvNzo33GfFl5jVlonlTrr1DbvFi9vjeeNUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textbold22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIxhI+py+0Powm0VnknjVkH2AEhE45LZ55Wqn6e65TsMc5eYosbksswubJIhsSiccgvAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+textcenter22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUbz3Sh7yIWfFHKjVl4nmFrr1Lpr7LwkjeeIUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textitalic22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py+0P4wqUSlQvttrkDnyaOHIdeaGRupplAIauVM3xjeeOUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textleft22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+pyw0Bo5zB2UXz3Sp7yG2fFJajVjonmIor2TJvfL0wjecIXQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textright22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUfz3SZ7yIXdF4kWqZkbCqoMO7kXLC+wVOe6YRQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text22:text text22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBBwaHAwKDBQSFLy+vLS2tJSWlBQWFKyqrFRSVCwqLDQyNNTS1GxqbFxaXJyanIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAVcICCOZGmKQSoMaZsShBsQBdAapHvgaIDUqUPJlRjSbAoT0fRDKgODRbF0PLUYjZO2F2Bst9evNix+dsvDlGKK5jraudQb7qbX6a2HEJ+ycyF+LRE8ZTI+fX5oGCEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textunder22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIvhI+py+0PowmUnhpeVVnb1DkbCI1I2JhX+Z0sOr2cTHpwK7a4rUr+hAnufsTirwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewchoose22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz69PTq5Pz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq70466Cl+AMxBVwnFIVRAmQHCIeBrC1L3tQgJ/SaEbeeC1PLBHE2ybFI9A1HzstHEIK6YCmhDTmBybQaHYJn7QC5zKeytIQe1+pKNE6P2yMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewdetailed22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAQ+EMhJq7046817+MLQUQFRGMc4lQaSAkcMx3QltMmrDrSu/sCgEPgJhIiFk89DaL1qPRnlhsgBebWhdstVESIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewicon22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz69PTq5AQCBPz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARWEMhJq7046z2DF0PlBeAVEERhiKhqHgWyUgEsX0KczFOO7JeBYciTCImc5ITIXDKHyqhU9AnRqq9UEVDTvmLbGhin2/qAliOUot5OLc81IO5+2+8WewQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewmag-22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbKQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/avno2BBf/MCClSob4iBIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewmag22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbIQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/cunr9S8gAIRFhTCLAgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewmag+22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbQQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/4zT766vRI+fvHD4CPgwcJ9qg0UB85JA0dDjEQBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewmulticolumn22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq7046813+MJQfUF4BURhHGO6noSBsEcNoDJtS4KcsJQe4ncZ1HYT47HDbDqfUAnJRJmKLIGCCjjJbmE5wBI3EyOFxKCPS1EiJW52dE6vZyIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewtext22:view view22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIkhI+py+0Po2ShBlOxzbP7n2yaJoLm+ZTcxqHuC6hXzML2HVEFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewtree22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz+/Pz69Pzu5PTq5OzaxBQOFOzKpFRWVFxWXOzexPTexCH5BAEAAAAALAAAAAAWABYAAARPEMhJq704g6A779kHCORAgNskFMYhakE8FkjyBcoWv+JwJItXaELYCTFHlCSpZKKcoB5jYHpOGgUadLKbIRw3jhEzQDyCSuI4zW673yhDBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
diff --git a/lib/site/Tk/trans_cur.mask b/lib/site/Tk/trans_cur.mask
index 91974586a..590be1f76 100644
--- a/lib/site/Tk/trans_cur.mask
+++ b/lib/site/Tk/trans_cur.mask
@@ -1,4 +1,4 @@
-#define trans_cur_width 8
-#define trans_cur_height 8
-static unsigned char trans_cur_bits[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+#define trans_cur_width 8
+#define trans_cur_height 8
+static unsigned char trans_cur_bits[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/lib/site/Tk/trans_cur.xbm b/lib/site/Tk/trans_cur.xbm
index 3c846eae7..731258b06 100644
--- a/lib/site/Tk/trans_cur.xbm
+++ b/lib/site/Tk/trans_cur.xbm
@@ -1,6 +1,6 @@
-#define trans_cur_width 8
-#define trans_cur_height 8
-#define trans_cur_x_hot 0
-#define trans_cur_y_hot 0
-static unsigned char trans_cur_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+#define trans_cur_width 8
+#define trans_cur_height 8
+#define trans_cur_x_hot 0
+#define trans_cur_y_hot 0
+static unsigned char trans_cur_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/lib/site/Win32/TieRegistry.pm b/lib/site/Win32/TieRegistry.pm
index 9f9d00c42..0abbbddb6 100644
--- a/lib/site/Win32/TieRegistry.pm
+++ b/lib/site/Win32/TieRegistry.pm
@@ -1,3801 +1,3801 @@
-# Win32/TieRegistry.pm -- Perl module to easily use a Registry
-# (on Win32 systems so far).
-# by Tye McQueen, tye@metronet.com, see http://www.metronet.com/~tye/.
-
-#
-# Skip to "=head" line for user documentation.
-#
-
-
-package Win32::TieRegistry;
-
-
-use strict;
-use vars qw( $PACK $VERSION @ISA @EXPORT @EXPORT_OK );
-
-$PACK= "Win32::TieRegistry";	# Used in error messages.
-$VERSION= '0.26';
-
-
-use Carp;
-
-require Tie::Hash;
-@ISA= qw(Tie::Hash);
-
-# Required other modules:
-use Win32API::Registry 0.12 qw( :KEY_ :HKEY_ :REG_ );
-
-#Optional other modules:
-use vars qw( $_NoMoreItems $_FileNotFound $_TooSmall $_MoreData $_SetDualVar );
-
-if(  eval { require Win32::WinError }  ) {
-    $_NoMoreItems= Win32::WinError::constant("ERROR_NO_MORE_ITEMS",0);
-    $_FileNotFound= Win32::WinError::constant("ERROR_FILE_NOT_FOUND",0);
-    $_TooSmall= Win32::WinError::constant("ERROR_INSUFFICIENT_BUFFER",0);
-    $_MoreData= Win32::WinError::constant("ERROR_MORE_DATA",0);
-} else {
-    $_NoMoreItems= "^No more data";
-    $_FileNotFound= "cannot find the file";
-    $_TooSmall= " data area passed to ";
-    $_MoreData= "^more data is avail";
-}
-if(  $_SetDualVar= eval { require SetDualVar }  ) {
-    import SetDualVar;
-}
-
-
-#Implementation details:
-#    When opened:
-#	HANDLE		long; actual handle value
-#	MACHINE		string; name of remote machine ("" if local)
-#	PATH		list ref; machine-relative full path for this key:
-#			["LMachine","System","Disk"]
-#			["HKEY_LOCAL_MACHINE","System","Disk"]
-#	DELIM		char; delimiter used to separate subkeys (def="\\")
-#	OS_DELIM	char; always "\\" for Win32
-#	ACCESS		long; usually KEY_ALL_ACCESS, perhaps KEY_READ, etc.
-#	ROOTS		string; var name for "Lmachine"->HKEY_LOCAL_MACHINE map
-#	FLAGS		int; bits to control certain options
-#    Often:
-#	VALUES		ref to list of value names (data/type never cached)
-#	SUBKEYS		ref to list of subkey names
-#	SUBCLASSES	ref to list of subkey classes
-#	SUBTIMES	ref to list of subkey write times
-#	MEMBERS		ref to list of subkey_name.DELIM's, DELIM.value_name's
-#	MEMBHASH	hash ref to with MEMBERS as keys and 1's as values
-#    Once Key "Info" requested:
-#	Class CntSubKeys CntValues MaxSubKeyLen MaxSubClassLen
-#	MaxValNameLen MaxValDataLen SecurityLen LastWrite
-#    If is tied to a hash and iterating over key values:
-#	PREVIDX		int; index of last MEMBERS element return
-#    If is the key object returned by Load():
-#	UNLOADME	list ref; information about Load()ed key
-#    If is a subkey of a "loaded" key other than the one returned by Load():
-#	DEPENDON	obj ref; object that can't be destroyed before us
-
-
-#Package-local variables:
-
-# Option flag bits:
-use vars qw( $Flag_ArrVal $Flag_TieVal $Flag_DualTyp $Flag_DualBin
-	     $Flag_FastDel $Flag_HexDWord $Flag_Split $Flag_FixNulls );
-$Flag_ArrVal=	0x0001;
-$Flag_TieVal=	0x0002;
-$Flag_FastDel=	0x0004;
-$Flag_HexDWord=	0x0008;
-$Flag_Split=	0x0010;
-$Flag_DualTyp=	0x0020;
-$Flag_DualBin=	0x0040;
-$Flag_FixNulls=	0x0080;
-
-
-use vars qw( $RegObj %_Roots %RegHash $Registry );
-
-# Short-hand for HKEY_* constants:
-%_Roots= (
-    "Classes" =>	HKEY_CLASSES_ROOT,
-    "CUser" =>		HKEY_CURRENT_USER,
-    "LMachine" =>	HKEY_LOCAL_MACHINE,
-    "Users" =>		HKEY_USERS,
-    "PerfData" =>	HKEY_PERFORMANCE_DATA,	# Too picky to be useful
-    "CConfig" =>	HKEY_CURRENT_CONFIG,
-    "DynData" =>	HKEY_DYN_DATA,		# Too picky to be useful
-);
-
-# Basic master Registry object:
-$RegObj= {};
-@$RegObj{qw( HANDLE MACHINE PATH DELIM OS_DELIM ACCESS FLAGS ROOTS )}= (
-    "NONE", "", [], "\\", "\\",
-    KEY_READ|KEY_WRITE, $Flag_HexDWord|$Flag_FixNulls, "${PACK}::_Roots" );
-$RegObj->{FLAGS} |= $Flag_DualTyp|$Flag_DualBin   if  $_SetDualVar;
-bless $RegObj;
-
-# Fill cache for master Registry object:
-@$RegObj{qw( VALUES SUBKEYS SUBCLASSES SUBTIMES )}= (
-    [],  [ keys(%_Roots) ],  [],  []  );
-grep( s#$#$RegObj->{DELIM}#,
-  @{ $RegObj->{MEMBERS}= [ @{$RegObj->{SUBKEYS}} ] } );
-@$RegObj{qw( Class MaxSubKeyLen MaxSubClassLen MaxValNameLen
-  MaxValDataLen SecurityLen LastWrite CntSubKeys CntValues )}=
-    ( "", 0, 0, 0, 0, 0, 0, 0, 0 );
-
-# Create master Registry tied hash:
-$RegObj->Tie( \%RegHash );
-
-# Create master Registry combination object and tied hash reference:
-$Registry= \%RegHash;
-bless $Registry;
-
-
-# Preloaded methods go here.
-
-
-# Map option names to name of subroutine that controls that option:
-use vars qw( @_opt_subs %_opt_subs );
-@_opt_subs= qw( Delimiter ArrayValues TieValues SplitMultis DWordsToHex
-	FastDelete FixSzNulls DualTypes DualBinVals AllowLoad AllowSave );
-@_opt_subs{@_opt_subs}= @_opt_subs;
-
-sub import
-{
-    my $pkg= shift(@_);
-    my $level= $Exporter::ExportLevel;
-    my $expto= caller($level);
-    my @export= ();
-    my @consts= ();
-    my $registry= $Registry->Clone;
-    local( $_ );
-    while(  @_  ) {
-	$_= shift(@_);
-	if(  /^\$(\w+::)*\w+$/  ) {
-	    push( @export, "ObjVar" )   if  /^\$RegObj$/;
-	    push( @export, $_ );
-	} elsif(  /^\%(\w+::)*\w+$/  ) {
-	    push( @export, $_ );
-	} elsif(  /^[$%]/  ) {
-	    croak "${PACK}->import:  Invalid variable name ($_)";
-	} elsif(  /^:/  ||  /^(H?KEY|REG)_/  ) {
-	    push( @consts, $_ );
-	} elsif(  ! @_  ) {
-	    croak "${PACK}->import:  Missing argument after option ($_)";
-	} elsif(  exists $_opt_subs{$_}  ) {
-	    $_= $_opt_subs{$_};
-	    $registry->$_( shift(@_) );
-	} elsif(  /^TiedRef$/  ) {
-	    $_= shift(@_);
-	    if(  ! ref($_)  &&  /^(\$?)(\w+::)*\w+$/  ) {
-		$_= '$'.$_   unless  '$' eq $1;
-	    } elsif(  "SCALAR" ne ref($_)  ) {
-		croak "${PACK}->import:  Invalid var after TiedRef ($_)";
-	    }
-	    push( @export, $_ );
-	} elsif(  /^TiedHash$/  ) {
-	    $_= shift(@_);
-	    if(  ! ref($_)  &&  /^(\%?)(\w+::)*\w+$/  ) {
-		$_= '%'.$_   unless  '%' eq $1;
-	    } elsif(  "HASH" ne ref($_)  ) {
-		croak "${PACK}->import:  Invalid var after TiedHash ($_)";
-	    }
-	    push( @export, $_ );
-	} elsif(  /^ObjectRef$/  ) {
-	    $_= shift(@_);
-	    if(  ! ref($_)  &&  /^(\$?)(\w+::)*\w+$/  ) {
-		push( @export, "ObjVar" );
-		$_= '$'.$_   unless  '$' eq $1;
-	    } elsif(  "SCALAR" eq ref($_)  ) {
-		push( @export, "ObjRef" );
-	    } else {
-		croak "${PACK}->import:  Invalid var after ObjectRef ($_)";
-	    }
-	    push( @export, $_ );
-	} elsif(  /^ExportLevel$/  ) {
-	    $level= shift(@_);
-	    $expto= caller($level);
-	} elsif(  /^ExportTo$/  ) {
-	    undef $level;
-	    $expto= caller($level);
-	} else {
-	    croak "${PACK}->import:  Invalid option ($_)";
-	}
-    }
-    Win32API::Registry->export( $expto, @consts )   if  @consts;
-    @export= ('$Registry')   unless  @export;
-    while(  @export  ) {
-	$_= shift( @export );
-	if(  /^\$((?:\w+::)*)(\w+)$/  ) {
-	    my( $pack, $sym )= ( $1, $2 );
-	    $pack= $expto   unless  defined($pack)  &&  "" ne $pack;
-	    no strict 'refs';
-	    *{"${pack}::$sym"}= \${"${pack}::$sym"};
-	    ${"${pack}::$sym"}= $registry;
-	} elsif(  /^\%((?:\w+::)*)(\w+)$/  ) {
-	    my( $pack, $sym )= ( $1, $2 );
-	    $pack= $expto   unless  defined($pack)  &&  "" ne $pack;
-	    no strict 'refs';
-	    *{"${pack}::$sym"}= \%{"${pack}::$sym"};
-	    $registry->Tie( \%{"${pack}::$sym"} );
-	} elsif(  "SCALAR" eq ref($_)  ) {
-	    $$_= $registry;
-	} elsif(  "HASH" eq ref($_)  ) {
-	    $registry->Tie( $_ );
-	} elsif(  /^ObjVar$/  ) {
-	    $_= shift( @_ );
-	    /^\$((?:\w+::)*)(\w+)$/;
-	    my( $pack, $sym )= ( $1, $2 );
-	    $pack= $expto   unless  defined($pack)  &&  "" ne $pack;
-	    no strict 'refs';
-	    *{"${pack}::$sym"}= \${"${pack}::$sym"};
-	    ${"${pack}::$sym"}= $registry->ObjectRef;
-	} elsif(  /^ObjRef$/  ) {
-	    ${shift(@_)}= $registry->ObjectRef;
-	} else {
-	    die "Impossible var to export ($_)";
-	}
-    }
-}
-
-
-use vars qw( @_new_Opts %_new_Opts );
-@_new_Opts= qw( ACCESS DELIM MACHINE DEPENDON );
-@_new_Opts{@_new_Opts}= (1) x @_new_Opts;
-
-sub _new
-{
-    my $this= shift( @_ );
-    $this= tied(%$this)   if  ref($this)  &&  tied(%$this);
-    my $class= ref($this) || $this;
-    my $self= {};
-    my( $handle, $rpath, $opts )= @_;
-    if(  @_ < 2  ||  "ARRAY" ne ref($rpath)  ||  3 < @_
-     ||  3 == @_ && "HASH" ne ref($opts)  ) {
-	croak "Usage:  ${PACK}->_new( \$handle, \\\@path, {OPT=>VAL,...} );\n",
-	      "  options: @_new_Opts\nCalled";
-    }
-    @$self{qw( HANDLE PATH )}= ( $handle, $rpath );
-    @$self{qw( MACHINE ACCESS DELIM OS_DELIM ROOTS FLAGS )}=
-      ( $this->Machine, $this->Access, $this->Delimiter,
-        $this->OS_Delimiter, $this->_Roots, $this->_Flags );
-    if(  ref($opts)  ) {
-	my @err= grep( ! $_new_Opts{$_}, keys(%$opts) );
-	@err  and  croak "${PACK}->_new:  Invalid options (@err)";
-	@$self{ keys(%$opts) }= values(%$opts);
-    }
-    bless $self, $class;
-    return $self;
-}
-
-
-sub _split
-{
-    my $self= shift( @_ );
-    $self= tied(%$self)   if  tied(%$self);
-    my $path= shift( @_ );
-    my $delim= @_ ? shift(@_) : $self->Delimiter;
-    my $list= [ split( /\Q$delim/, $path ) ];
-    return $list;
-}
-
-
-sub _rootKey
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $keyPath= shift(@_);
-    my $delim= @_ ? shift(@_) : $self->Delimiter;
-    my( $root, $subPath );
-    if(  "ARRAY" eq ref($keyPath)  ) {
-	$subPath= $keyPath;
-    } else {
-	$subPath= $self->_split( $keyPath, $delim );
-    }
-    $root= shift( @$subPath );
-    if(  $root =~ /^HKEY_/  ) {
-	my $handle= Win32API::Registry::constant($root,0);
-	$handle  or  croak "Invalid HKEY_ constant ($root): $!";
-	return( $self->_new( $handle, [$root], {DELIM=>$delim} ),
-	        $subPath );
-    } elsif(  $root =~ /^([-+]|0x)?\d/  ) {
-	return( $self->_new( $root, [sprintf("0x%lX",$root)],
-			     {DELIM=>$delim} ),
-		$subPath );
-    } else {
-	my $roots= $self->Roots;
-	if(  $roots->{$root}  ) {
-	    return( $self->_new( $roots->{$root}, [$root], {DELIM=>$delim} ),
-	            $subPath );
-	}
-	croak "No such root key ($root)";
-    }
-}
-
-
-sub _open
-{
-    my $this= shift(@_);
-    $this= tied(%$this)   if  ref($this)  &&  tied(%$this);
-    my $subPath= shift(@_);
-    my $sam= @_ ? shift(@_) : $this->Access;
-    my $subKey= join( $this->OS_Delimiter, @$subPath );
-    my $handle= 0;
-    $this->RegOpenKeyEx( $subKey, 0, $sam, $handle )
-      or  return ();
-    return $this->_new( $handle, [ @{$this->_Path}, @$subPath ],
-      { ACCESS=>$sam, ( defined($this->{UNLOADME}) ? ("DEPENDON",$this)
-	: defined($this->{DEPENDON}) ? ("DEPENDON",$this->{DEPENDON}) : () )
-      } );
-}
-
-
-sub ObjectRef
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    return $self;
-}
-
-
-sub _constant
-{
-    my( $name, $desc )= @_;
-    my $value= Win32API::Registry::constant( $name, 0 );
-    my $func= (caller(1))[3];
-    if(  0 == $value  ) {
-	if(  $! =~ /invalid/i  ) {
-	    croak "$func: Invalid $desc ($name)";
-	} elsif(  0 != $!  ) {
-	    croak "$func: \u$desc ($name) not support on this platform";
-	}
-    }
-    return $value;
-}
-
-
-sub _connect
-{
-    my $this= shift(@_);
-    $this= tied(%$this)   if  ref($this)  &&  tied(%$this);
-    my $subPath= pop(@_);
-    $subPath= $this->_split( $subPath )   unless  ref($subPath);
-    my $machine= @_ ? shift(@_) : shift(@$subPath);
-    my $handle= 0;
-    my( $temp )= $this->_rootKey( [@$subPath] );
-    $temp->RegConnectRegistry( $machine, $temp->Handle, $handle )
-      or  return ();
-    my $self= $this->_new( $handle, [shift(@$subPath)], {MACHINE=>$machine} );
-    return( $self, $subPath );
-}
-
-
-use vars qw( @Connect_Opts %Connect_Opts );
-@Connect_Opts= qw(Access Delimiter);
-@Connect_Opts{@Connect_Opts}= (1) x @Connect_Opts;
-
-sub Connect
-{
-    my $this= shift(@_);
-    my $tied=  ref($this)  &&  tied(%$this);
-    $this= tied(%$this)   if  $tied;
-    my( $machine, $key, $opts )= @_;
-    my $delim= "";
-    my $sam;
-    my $subPath;
-    if(  @_ < 2  ||  3 < @_
-     ||  3 == @_ && "HASH" ne ref($opts)  ) {
-	croak "Usage:  \$obj= ${PACK}->Connect(",
-	      " \$Machine, \$subKey, { OPT=>VAL,... } );\n",
-	      "  options: @Connect_Opts\nCalled";
-    }
-    if(  ref($opts)  ) {
-	my @err= grep( ! $Connect_Opts{$_}, keys(%$opts) );
-	@err  and  croak "${PACK}->Connect:  Invalid options (@err)";
-    }
-    $delim= "$opts->{Delimiter}"   if  defined($opts->{Delimiter});
-    $delim= $this->Delimiter   if  "" eq $delim;
-    $sam= defined($opts->{Access}) ? $opts->{Access} : $this->Access;
-    $sam= _constant($sam,"key access type")   if  $sam =~ /^KEY_/;
-    ( $this, $subPath )= $this->_connect( $machine, $key );
-    return ()   unless  defined($this);
-    my $self= $this->_open( $subPath, $sam );
-    return ()   unless  defined($self);
-    $self->Delimiter( $delim );
-    $self= $self->TiedRef   if  $tied;
-    return $self;
-}
-
-
-my @_newVirtual_keys= qw( MEMBERS VALUES SUBKEYS SUBTIMES SUBCLASSES
-    Class SecurityLen LastWrite CntValues CntSubKeys
-    MaxValNameLen MaxValDataLen MaxSubKeyLen MaxSubClassLen );
-
-sub _newVirtual
-{
-    my $self= shift(@_);
-    my( $rPath, $root, $opts )= @_;
-    my $new= $self->_new( "NONE", $rPath, $opts )
-      or  return ();
-    @{$new}{@_newVirtual_keys}= @{$root->ObjectRef}{@_newVirtual_keys};
-    return $new;
-}
-
-
-#$key= new Win32::TieRegistry "LMachine/System/Disk";
-#$key= new Win32::TieRegistry "//Server1/LMachine/System/Disk";
-#Win32::TieRegistry->new( HKEY_LOCAL_MACHINE, {DELIM=>"/",ACCESS=>KEY_READ} );
-#Win32::TieRegistry->new( [ HKEY_LOCAL_MACHINE, ".../..." ], {DELIM=>$DELIM} );
-#$key->new( ... );
-
-use vars qw( @new_Opts %new_Opts );
-@new_Opts= qw(Access Delimiter);
-@new_Opts{@new_Opts}= (1) x @new_Opts;
-
-sub new
-{
-    my $this= shift( @_ );
-    $this= tied(%$this)   if  ref($this)  &&  tied(%$this);
-    if(  ! ref($this)  ) {
-	no strict "refs";
-	my $self= ${"${this}::Registry"};
-	croak "${this}->new failed since ${PACK}::new sees that ",
-	  "\$${this}::Registry is not an object."
-	  if  ! ref($self);
-	$this= $self->Clone;
-    }
-    my( $subKey, $opts )= @_;
-    my $delim= "";
-    my $dlen;
-    my $sam;
-    my $subPath;
-    if(  @_ < 1  ||  2 < @_
-     ||  2 == @_ && "HASH" ne ref($opts)  ) {
-	croak "Usage:  \$obj= ${PACK}->new( \$subKey, { OPT=>VAL,... } );\n",
-	      "  options: @new_Opts\nCalled";
-    }
-    if(  defined($opts)  ) {
-	my @err= grep( ! $new_Opts{$_}, keys(%$opts) );
-	@err  and  die "${PACK}->new:  Invalid options (@err)";
-    }
-    $delim= "$opts->{Delimiter}"   if  defined($opts->{Delimiter});
-    $delim= $this->Delimiter   if  "" eq $delim;
-    $dlen= length($delim);
-    $sam= defined($opts->{Access}) ? $opts->{Access} : $this->Access;
-    $sam= _constant($sam,"key access type")   if  $sam =~ /^KEY_/;
-    if(  "ARRAY" eq ref($subKey)  ) {
-	$subPath= $subKey;
-	if(  "NONE" eq $this->Handle  &&  @$subPath  ) {
-	    ( $this, $subPath )= $this->_rootKey( $subPath );
-	}
-    } elsif(  $delim x 2 eq substr($subKey,0,2*$dlen)  ) {
-	my $path= $this->_split( substr($subKey,2*$dlen), $delim );
-	my $mach= shift(@$path);
-	if(  ! @$path  ) {
-	    return $this->_newVirtual( $path, $Registry,
-			    {MACHINE=>$mach,DELIM=>$delim,ACCESS=>$sam} );
-	}
-	( $this, $subPath )= $this->_connect( $mach, $path );
-	return ()   if  ! defined($this);
-	if(  0 == @$subPath  ) {
-	    $this->Delimiter( $delim );
-	    return $this;
-	}
-    } elsif(  $delim eq substr($subKey,0,$dlen)  ) {
-	( $this, $subPath )= $this->_rootKey( substr($subKey,$dlen), $delim );
-    } elsif(  "NONE" eq $this->Handle  &&  "" ne $subKey  ) {
-	my( $mach )= $this->Machine;
-	if(  $mach  ) {
-	    ( $this, $subPath )= $this->_connect( $mach, $subKey );
-	} else {
-	    ( $this, $subPath )= $this->_rootKey( $subKey, $delim );
-	}
-    } else {
-	$subPath= $this->_split( $subKey, $delim );
-    }
-    return ()   unless  defined($this);
-    if(  0 == @$subPath  &&  "NONE" eq $this->Handle  ) {
-	return $this->_newVirtual( $this->_Path, $this,
-				   { DELIM=>$delim, ACCESS=>$sam } );
-    }
-    my $self= $this->_open( $subPath, $sam );
-    return ()   unless  defined($self);
-    $self->Delimiter( $delim );
-    return $self;
-}
-
-
-sub Open
-{
-    my $self= shift(@_);
-    my $tied=  ref($self)  &&  tied(%$self);
-    $self= tied(%$self)   if  $tied;
-    $self= $self->new( @_ );
-    $self= $self->TiedRef   if  defined($self)  &&  $tied;
-    return $self;
-}
-
-
-sub Clone
-{
-    my $self= shift( @_ );
-    my $new= $self->Open("");
-    return $new;
-}
-
-
-{ my @flush;
-    sub Flush
-    {
-	my $self= shift(@_);
-	$self= tied(%$self)   if  tied(%$self);
-	my( $flush )= shift(@_);
-	@_  and  croak "Usage:  \$key->Flush( \$bFlush );";
-	return 0   if  "NONE" eq $self->Handle;
-	@flush= qw( VALUES SUBKEYS SUBCLASSES SUBTIMES MEMBERS Class
-		    CntSubKeys CntValues MaxSubKeyLen MaxSubClassLen
-		    MaxValNameLen MaxValDataLen SecurityLen LastWrite PREVIDX )
-	  unless  @flush;
-	delete( @$self{@flush} );
-	if(  defined($flush)  &&  $flush  ) {
-	    return $self->RegFlushKey();
-	} else {
-	    return 1;
-	}
-    }
-}
-
-
-sub _DualVal
-{
-    my( $hRef, $num )= @_;
-    if(  $_SetDualVar  &&  $$hRef{$num}  ) {
-	&SetDualVar( $num, "$$hRef{$num}", 0+$num );
-    }
-    return $num;
-}
-
-
-use vars qw( @_RegDataTypes %_RegDataTypes );
-@_RegDataTypes= qw( REG_SZ REG_EXPAND_SZ REG_BINARY REG_LINK REG_MULTI_SZ
-		    REG_DWORD_LITTLE_ENDIAN REG_DWORD_BIG_ENDIAN REG_DWORD
-		    REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
-		    REG_RESOURCE_REQUIREMENTS_LIST REG_NONE );
-# Make sure that REG_DWORD appears _after_ other REG_DWORD_*
-# items above and that REG_NONE appears _last_.
-foreach(  @_RegDataTypes  ) {
-    $_RegDataTypes{Win32API::Registry::constant($_,0)}= $_;
-}
-
-sub GetValue
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    1 == @_  or  croak "Usage:  (\$data,\$type)= \$key->GetValue('ValName');";
-    my( $valName )= @_;
-    my( $valType, $valData, $dLen )= (0,"",0);
-    return ()   if  "NONE" eq $self->Handle;
-    $self->RegQueryValueEx( $valName, [], $valType, $valData,
-      $dLen= ( defined($self->{MaxValDataLen}) ? $self->{MaxValDataLen} : 0 )
-    )  or  return ();
-    if(  REG_DWORD == $valType  ) {
-	my $val= unpack("L",$valData);
-	$valData= sprintf "0x%08.8lX", $val   if  $self->DWordsToHex;
-	&SetDualVar( $valData, $valData, $val )   if  $self->DualBinVals
-    } elsif(  REG_BINARY == $valType  &&  length($valData) <= 4  ) {
-	&SetDualVar( $valData, $valData, hex reverse unpack("h*",$valData) )
-	  if  $self->DualBinVals;
-    } elsif(  ( REG_SZ == $valType || REG_EXPAND_SZ == $valType )
-          &&  $self->FixSzNulls  ) {
-	substr($valData,-1)= ""   if  "\0" eq substr($valData,-1);
-    } elsif(  REG_MULTI_SZ == $valType  &&  $self->SplitMultis  ) {
-	## $valData =~ s/\0\0$//;	# Why does this often fail??
-	substr($valData,-2)= ""   if  "\0\0" eq substr($valData,-2);
-	$valData= [ split( /\0/, $valData, -1 ) ]
-    }
-    if(  ! wantarray  ) {
-	return $valData;
-    } elsif(  ! $self->DualTypes  ) {
-	return( $valData, $valType );
-    } else {
-	return(  $valData,  _DualVal( \%_RegDataTypes, $valType )  );
-    }
-}
-
-
-sub _ErrNum
-{
-    # return $^E;
-    return Win32::GetLastError();
-}
-
-
-sub _ErrMsg
-{
-    # return $^E;
-    return Win32::FormatMessage( Win32::GetLastError() );
-}
-
-sub _Err
-{
-    my $err;
-    # return $^E;
-    return _ErrMsg   if  ! $_SetDualVar;
-    return &SetDualVar( $err, _ErrMsg, _ErrNum );
-}
-
-sub _NoMoreItems
-{
-    return
-      $_NoMoreItems =~ /^\d/
-        ?  _ErrNum == $_NoMoreItems
-        :  _ErrMsg =~ /$_NoMoreItems/io;
-}
-
-
-sub _FileNotFound
-{
-    return
-      $_FileNotFound =~ /^\d/
-        ?  _ErrNum == $_FileNotFound
-        :  _ErrMsg =~ /$_FileNotFound/io;
-}
-
-
-sub _TooSmall
-{
-    return
-      $_TooSmall =~ /^\d/
-        ?  _ErrNum == $_TooSmall
-        :  _ErrMsg =~ /$_TooSmall/io;
-}
-
-
-sub _MoreData
-{
-    return
-      $_MoreData =~ /^\d/
-        ?  _ErrNum == $_MoreData
-        :  _ErrMsg =~ /$_MoreData/io;
-}
-
-
-sub _enumValues
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my( @names )= ();
-    my $pos= 0;
-    my $name= "";
-    my $nlen= 1+$self->Information("MaxValNameLen");
-    while(  $self->RegEnumValue($pos++,$name,$nlen,[],[],[],[])  ) {
-	push( @names, $name );
-    }
-    if(  ! _NoMoreItems()  ) {
-	return ();
-    }
-    $self->{VALUES}= \@names;
-    return 1;
-}
-
-
-sub ValueNames
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    @_  and  croak "Usage:  \@names= \$key->ValueNames;";
-    $self->_enumValues   unless  $self->{VALUES};
-    return @{$self->{VALUES}};
-}
-
-
-sub _enumSubKeys
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my( @subkeys, @classes, @times )= ();
-    my $pos= 0;
-    my( $subkey, $class, $time )= ("","","");
-    my( $namSiz, $clsSiz )= $self->Information(
-			      qw( MaxSubKeyLen MaxSubClassLen ));
-    $namSiz++;  $clsSiz++;
-    while(  $self->RegEnumKeyEx(
-	      $pos++, $subkey, $namSiz, [], $class, $clsSiz, $time )  ) {
-	push( @subkeys, $subkey );
-	push( @classes, $class );
-	push( @times, $time );
-    }
-    if(  ! _NoMoreItems()  ) {
-	return ();
-    }
-    $self->{SUBKEYS}= \@subkeys;
-    $self->{SUBCLASSES}= \@classes;
-    $self->{SUBTIMES}= \@times;
-    return 1;
-}
-
-
-sub SubKeyNames
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    @_  and  croak "Usage:  \@names= \$key->SubKeyNames;";
-    $self->_enumSubKeys   unless  $self->{SUBKEYS};
-    return @{$self->{SUBKEYS}};
-}
-
-
-sub SubKeyClasses
-{
-    my $self= shift(@_);
-    @_  and  croak "Usage:  \@classes= \$key->SubKeyClasses;";
-    $self->_enumSubKeys   unless  $self->{SUBCLASSES};
-    return @{$self->{SUBCLASSES}};
-}
-
-
-sub SubKeyTimes
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    @_  and  croak "Usage:  \@times= \$key->SubKeyTimes;";
-    $self->_enumSubKeys   unless  $self->{SUBTIMES};
-    return @{$self->{SUBTIMES}};
-}
-
-
-sub _MemberNames
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    @_  and  croak "Usage:  \$arrayRef= \$key->_MemberNames;";
-    if(  ! $self->{MEMBERS}  ) {
-	$self->_enumValues   unless  $self->{VALUES};
-	$self->_enumSubKeys   unless  $self->{SUBKEYS};
-	my( @members )= (  map( $_.$self->{DELIM}, @{$self->{SUBKEYS}} ),
-			   map( $self->{DELIM}.$_, @{$self->{VALUES}} )  );
-	$self->{MEMBERS}= \@members;
-    }
-    return $self->{MEMBERS};
-}
-
-
-sub _MembersHash
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    @_  and  croak "Usage:  \$hashRef= \$key->_MembersHash;";
-    if(  ! $self->{MEMBHASH}  ) {
-	my $aRef= $self->_MemberNames;
-	$self->{MEMBHASH}= {};
-	@{$self->{MEMBHASH}}{@$aRef}= (1) x @$aRef;
-    }
-    return $self->{MEMBHASH};
-}
-
-
-sub MemberNames
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    @_  and  croak "Usage:  \@members= \$key->MemberNames;";
-    return @{$self->_MemberNames};
-}
-
-
-sub Information
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my( $time, $nkeys, $nvals, $xsec, $xkey, $xcls, $xname, $xdata )=
-	("",0,0,0,0,0,0,0);
-    my $clen= 8;
-    if(  ! $self->RegQueryInfoKey( [], [], $nkeys, $xkey, $xcls,
-				   $nvals, $xname, $xdata, $xsec, $time )  ) {
-	return ();
-    }
-    if(  defined($self->{Class})  ) {
-	$clen= length($self->{Class});
-    } else {
-	$self->{Class}= "";
-    }
-    while(  ! $self->RegQueryInfoKey( $self->{Class}, $clen,
-				      [],[],[],[],[],[],[],[],[])
-        &&  _MoreData  ) {
-	$clen *= 2;
-    }
-    my( %info );
-    @info{ qw( LastWrite CntSubKeys CntValues SecurityLen
-	       MaxValDataLen MaxSubKeyLen MaxSubClassLen MaxValNameLen )
-    }=       ( $time,    $nkeys,    $nvals,   $xsec,
-               $xdata,       $xkey,       $xcls,         $xname );
-    if(  @_  ) {
-	my( %check );
-	@check{keys(%info)}= keys(%info);
-	my( @err )= grep( ! $check{$_}, @_ );
-	if(  @err  ) {
-	    croak "${PACK}::Information- Invalid info requested (@err)";
-	}
-	return @info{@_};
-    } else {
-	return %info;
-    }
-}
-
-
-sub Delimiter
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    $self= $RegObj   unless  ref($self);
-    my( $oldDelim )= $self->{DELIM};
-    if(  1 == @_  &&  "" ne "$_[0]"  ) {
-	delete $self->{MEMBERS};
-	delete $self->{MEMBHASH};
-	$self->{DELIM}= "$_[0]";
-    } elsif(  0 != @_  ) {
-	croak "Usage:  \$oldDelim= \$key->Delimiter(\$newDelim);";
-    }
-    return $oldDelim;
-}
-
-
-sub Handle
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    @_  and  croak "Usage:  \$handle= \$key->Handle;";
-    $self= $RegObj   unless  ref($self);
-    return $self->{HANDLE};
-}
-
-
-sub Path
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    @_  and  croak "Usage:  \$path= \$key->Path;";
-    my $delim= $self->{DELIM};
-    $self= $RegObj   unless  ref($self);
-    if(  "" eq $self->{MACHINE}  ) {
-	return(  $delim . join( $delim, @{$self->{PATH}} ) . $delim  );
-    } else {
-	return(  $delim x 2
-	  . join( $delim, $self->{MACHINE}, @{$self->{PATH}} )
-	  . $delim  );
-    }
-}
-
-
-sub _Path
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    @_  and  croak "Usage:  \$arrRef= \$key->_Path;";
-    $self= $RegObj   unless  ref($self);
-    return $self->{PATH};
-}
-
-
-sub Machine
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    @_  and  croak "Usage:  \$machine= \$key->Machine;";
-    $self= $RegObj   unless  ref($self);
-    return $self->{MACHINE};
-}
-
-
-sub Access
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    @_  and  croak "Usage:  \$access= \$key->Access;";
-    $self= $RegObj   unless  ref($self);
-    return $self->{ACCESS};
-}
-
-
-sub OS_Delimiter
-{
-    my $self= shift(@_);
-    @_  and  croak "Usage:  \$backslash= \$key->OS_Delimiter;";
-    return $self->{OS_DELIM};
-}
-
-
-sub _Roots
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  ref($self)  &&  tied(%$self);
-    @_  and  croak "Usage:  \$varName= \$key->_Roots;";
-    $self= $RegObj   unless  ref($self);
-    return $self->{ROOTS};
-}
-
-
-sub Roots
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  ref($self)  &&  tied(%$self);
-    @_  and  croak "Usage:  \$hashRef= \$key->Roots;";
-    $self= $RegObj   unless  ref($self);
-    return eval "\\%$self->{ROOTS}";
-}
-
-
-sub TIEHASH
-{
-    my( $this )= shift(@_);
-    $this= tied(%$this)   if  ref($this)  &&  tied(%$this);
-    my( $key )= @_;
-    if(  1 == @_  &&  ref($key)  &&  "$key" =~ /=/  ) {
-	return $key;	# $key is already an object (blessed reference).
-    }
-    return $this->new( @_ );
-}
-
-
-sub Tie
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my( $hRef )= @_;
-    if(  1 != @_  ||  ! ref($hRef)  ||  "$hRef" !~ /(^|=)HASH\(/  ) {
-	croak "Usage: \$key->Tie(\\\%hash);";
-    }
-    return  tie %$hRef, ref($self), $self;
-}
-
-
-sub TiedRef
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $hRef= @_ ? shift(@_) : {};
-    return ()   if  ! defined($self);
-    $self->Tie($hRef);
-    bless $hRef, ref($self);
-    return $hRef;
-}
-
-
-sub _Flags
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $oldFlags= $self->{FLAGS};
-    if(  1 == @_  ) {
-	$self->{FLAGS}= shift(@_);
-    } elsif(  0 != @_  ) {
-	croak "Usage:  \$oldBits= \$key->_Flags(\$newBits);";
-    }
-    return $oldFlags;
-}
-
-
-sub ArrayValues
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $oldFlag= $Flag_ArrVal == ( $Flag_ArrVal & $self->{FLAGS} );
-    if(  1 == @_  ) {
-	my $bool= shift(@_);
-	if(  $bool  ) {
-	    $self->{FLAGS} |= $Flag_ArrVal;
-	} else {
-	    $self->{FLAGS} &= ~( $Flag_ArrVal | $Flag_TieVal );
-	}
-    } elsif(  0 != @_  ) {
-	croak "Usage:  \$oldBool= \$key->ArrayValues(\$newBool);";
-    }
-    return $oldFlag;
-}
-
-
-sub TieValues
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $oldFlag= $Flag_TieVal == ( $Flag_TieVal & $self->{FLAGS} );
-    if(  1 == @_  ) {
-	my $bool= shift(@_);
-	if(  $bool  ) {
-	    croak "${PACK}->TieValues cannot be enabled with this version";
-	    $self->{FLAGS} |= $Flag_TieVal;
-	} else {
-	    $self->{FLAGS} &= ~$Flag_TieVal;
-	}
-    } elsif(  0 != @_  ) {
-	croak "Usage:  \$oldBool= \$key->TieValues(\$newBool);";
-    }
-    return $oldFlag;
-}
-
-
-sub FastDelete
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $oldFlag= $Flag_FastDel == ( $Flag_FastDel & $self->{FLAGS} );
-    if(  1 == @_  ) {
-	my $bool= shift(@_);
-	if(  $bool  ) {
-	    $self->{FLAGS} |= $Flag_FastDel;
-	} else {
-	    $self->{FLAGS} &= ~$Flag_FastDel;
-	}
-    } elsif(  0 != @_  ) {
-	croak "Usage:  \$oldBool= \$key->FastDelete(\$newBool);";
-    }
-    return $oldFlag;
-}
-
-
-sub SplitMultis
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $oldFlag= $Flag_Split == ( $Flag_Split & $self->{FLAGS} );
-    if(  1 == @_  ) {
-	my $bool= shift(@_);
-	if(  $bool  ) {
-	    $self->{FLAGS} |= $Flag_Split;
-	} else {
-	    $self->{FLAGS} &= ~$Flag_Split;
-	}
-    } elsif(  0 != @_  ) {
-	croak "Usage:  \$oldBool= \$key->SplitMultis(\$newBool);";
-    }
-    return $oldFlag;
-}
-
-
-sub DWordsToHex
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $oldFlag= $Flag_HexDWord == ( $Flag_HexDWord & $self->{FLAGS} );
-    if(  1 == @_  ) {
-	my $bool= shift(@_);
-	if(  $bool  ) {
-	    $self->{FLAGS} |= $Flag_HexDWord;
-	} else {
-	    $self->{FLAGS} &= ~$Flag_HexDWord;
-	}
-    } elsif(  0 != @_  ) {
-	croak "Usage:  \$oldBool= \$key->DWordsToHex(\$newBool);";
-    }
-    return $oldFlag;
-}
-
-
-sub FixSzNulls
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $oldFlag= $Flag_FixNulls == ( $Flag_FixNulls & $self->{FLAGS} );
-    if(  1 == @_  ) {
-	my $bool= shift(@_);
-	if(  $bool  ) {
-	    $self->{FLAGS} |= $Flag_FixNulls;
-	} else {
-	    $self->{FLAGS} &= ~$Flag_FixNulls;
-	}
-    } elsif(  0 != @_  ) {
-	croak "Usage:  \$oldBool= \$key->FixSzNulls(\$newBool);";
-    }
-    return $oldFlag;
-}
-
-
-sub DualTypes
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $oldFlag= $Flag_DualTyp == ( $Flag_DualTyp & $self->{FLAGS} );
-    if(  1 == @_  ) {
-	my $bool= shift(@_);
-	if(  $bool  ) {
-	    croak "${PACK}->DualTypes cannot be enabled since ",
-		  "SetDualVar module not installed"
-	      unless  $_SetDualVar;
-	    $self->{FLAGS} |= $Flag_DualTyp;
-	} else {
-	    $self->{FLAGS} &= ~$Flag_DualTyp;
-	}
-    } elsif(  0 != @_  ) {
-	croak "Usage:  \$oldBool= \$key->DualTypes(\$newBool);";
-    }
-    return $oldFlag;
-}
-
-
-sub DualBinVals
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $oldFlag= $Flag_DualBin == ( $Flag_DualBin & $self->{FLAGS} );
-    if(  1 == @_  ) {
-	my $bool= shift(@_);
-	if(  $bool  ) {
-	    croak "${PACK}->DualBinVals cannot be enabled since ",
-		  "SetDualVar module not installed"
-	      unless  $_SetDualVar;
-	    $self->{FLAGS} |= $Flag_DualBin;
-	} else {
-	    $self->{FLAGS} &= ~$Flag_DualBin;
-	}
-    } elsif(  0 != @_  ) {
-	croak "Usage:  \$oldBool= \$key->DualBinVals(\$newBool);";
-    }
-    return $oldFlag;
-}
-
-
-sub GetOptions
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my( $opt, $meth );
-    if(  ! @_  ||  1 == @_  &&  "HASH" eq ref($_[0])  ) {
-	my $href= @_ ? $_[0] : {};
-	foreach $opt (  grep !/^Allow/, @_opt_subs  ) {
-	    $meth= $_opt_subs{$opt};
-	    $href->{$opt}=  $self->$meth();
-	}
-	return @_ ? $self : $href;
-    }
-    my @old;
-    foreach $opt (  @_  ) {
-	$meth= $_opt_subs{$opt};
-	if(  defined $meth  ) {
-	    if(  $opt eq "AllowLoad"  ||  $opt eq "AllowSave"  ) {
-		croak "${PACK}->GetOptions:  Getting current setting of $opt ",
-		      "not supported in this release";
-	    }
-	    push(  @old,  $self->$meth()  );
-	} else {
-	    croak "${PACK}->GetOptions:  Invalid option ($opt) ",
-		  "not one of ( ", join(" ",grep !/^Allow/, @_opt_subs), " )";
-	}
-    }
-    return wantarray ? @old : $old[-1];
-}
-
-
-sub SetOptions
-{
-    my $self= shift(@_);
-    # Don't get object if hash ref so "ref" returns original ref.
-    my( $opt, $meth, @old );
-    while(  @_  ) {
-	$opt= shift(@_);
-	$meth= $_opt_subs{$opt};
-	if(  ! @_  ) {
-	    croak "${PACK}->SetOptions:  Option value missing ",
-		  "after option name ($opt)";
-	} elsif(  defined $meth  ) {
-	    push(  @old,  $self->$meth( shift(@_) )  );
-	} elsif(  $opt eq substr("reference",0,length($opt))  ) {
-	    shift(@_)   if  @_;
-	    push(  @old,  $self  );
-	} else {
-	    croak "${PACK}->SetOptions:  Invalid option ($opt) ",
-		  "not one of ( @_opt_subs )";
-	}
-    }
-    return wantarray ? @old : $old[-1];
-}
-
-
-sub _parseTiedEnt
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $ent= shift(@_);
-    my $delim= shift(@_);
-    my $dlen= length( $delim );
-    my $parent= @_ ? shift(@_) : 0;
-    my $off;
-    if(  $delim x 2 eq substr($ent,0,2*$dlen)  &&  "NONE" eq $self->Handle  ) {
-	if(  0 <= ( $off= index( $ent, $delim x 2, 2*$dlen ) )  ) {
-	    return(  substr( $ent, 0, $off ),  substr( $ent, 2*$dlen+$off )  );
-	} elsif(  $delim eq substr($ent,-$dlen)  ) {
-	    return( substr($ent,0,-$dlen) );
-	} elsif(  2*$dlen <= ( $off= rindex( $ent, $delim ) )  ) {
-	    return(  substr( $ent, 0, $off ),
-	      undef,  substr( $ent, $dlen+$off )  );
-	} elsif(  $parent  ) {
-	    return();
-	} else {
-	    return( $ent );
-	}
-    } elsif(  $delim eq substr($ent,0,$dlen)  &&  "NONE" ne $self->Handle  ) {
-	return( undef, substr($ent,$dlen) );
-    } elsif(  $self->{MEMBERS}  &&  $self->_MembersHash->{$ent}  ) {
-	return( substr($ent,0,-$dlen) );
-    } elsif(  0 <= ( $off= index( $ent, $delim x 2 ) )  ) {
-	return(  substr( $ent, 0, $off ),  substr( $ent, 2*$dlen+$off ) );
-    } elsif(  $delim eq substr($ent,-$dlen)  ) {
-	if(  $parent
-	 &&  0 <= ( $off= rindex( $ent, $delim, length($ent)-2*$dlen ) )  ) {
-	    return(  substr($ent,0,$off),
-	      undef,  undef,  substr($ent,$dlen+$off,-$dlen)  );
-	} else {
-	    return( substr($ent,0,-$dlen) );
-	}
-    } elsif(  0 <= ( $off= rindex( $ent, $delim ) )  ) {
-	return(
-	  substr( $ent, 0, $off ),  undef,  substr( $ent, $dlen+$off )  );
-    } else {
-	return( undef, undef, $ent );
-    }
-}
-
-
-sub _FetchValue
-{
-    my $self= shift( @_ );
-    my( $val, $createKey )= @_;
-    my( $data, $type );
-    if(  ( $data, $type )= $self->GetValue( $val )  ) {
-	return $self->ArrayValues ? [ $data, $type ]
-	       : wantarray        ? ( $data, $type )
-				  : $data;
-    } elsif(  $createKey  and  $data= $self->new($val)  ) {
-	return $data->TiedRef;
-    } else {
-	return ();
-    }
-}
-
-
-sub FETCH
-{
-    my $self= shift(@_);
-    my $ent= shift(@_);
-    my $delim= $self->Delimiter;
-    my( $key, $val, $ambig )= $self->_parseTiedEnt( $ent, $delim, 0 );
-    my $sub;
-    if(  defined($key)  ) {
-	if(  defined($self->{MEMBHASH})
-	 &&  $self->{MEMBHASH}->{$key.$delim}
-	 &&  0 <= index($key,$delim)  ) {
-	    return ()
-	      unless  $sub= $self->new( $key,
-			      {"Delimiter"=>$self->OS_Delimiter} );
-	    $sub->Delimiter($delim);
-	} else {
-	    return ()
-	      unless  $sub= $self->new( $key );
-	}
-    } else {
-	$sub= $self;
-    }
-    if(  defined($val)  ) {
-	return $sub->_FetchValue( $val );
-    } elsif(  ! defined($ambig)  ) {
-	return $sub->TiedRef;
-    } elsif(  defined($key)  ) {
-	return $sub->FETCH(  $ambig  );
-    } else {
-	return $sub->_FetchValue( $ambig, "" ne $ambig );
-    }
-}
-
-
-sub _FetchOld
-{
-    my( $self, $key )= @_;
-    my $old= $self->FETCH($key);
-    if(  $old  ) {
-	my $copy= {};
-	%$copy= %$old;
-	return $copy;
-    }
-    # return $^E;
-    return _Err;
-}
-
-
-sub DELETE
-{
-    my $self= shift(@_);
-    my $ent= shift(@_);
-    my $delim= $self->Delimiter;
-    my( $key, $val, $ambig, $subkey )= $self->_parseTiedEnt( $ent, $delim, 1 );
-    my $sub;
-    my $fast= defined(wantarray) ? $self->FastDelete : 2;
-    my $old= 1;	# Value returned if FastDelete is set.
-    if(  defined($key)
-     &&  ( defined($val) || defined($ambig) || defined($subkey) )  ) {
-	return ()
-	  unless  $sub= $self->new( $key );
-    } else {
-	$sub= $self;
-    }
-    if(  defined($val)  ) {
-	$old= $sub->GetValue($val) || _Err   unless  2 <= $fast;
-	$sub->RegDeleteValue( $val );
-    } elsif(  defined($subkey)  ) {
-	$old= $sub->_FetchOld( $subkey.$delim )   unless  $fast;
-	$sub->RegDeleteKey( $subkey );
-    } elsif(  defined($ambig)  ) {
-	if(  defined($key)  ) {
-	    $old= $sub->DELETE($ambig);
-	} else {
-	    $old= $sub->GetValue($ambig) || _Err   unless  2 <= $fast;
-	    if(  defined( $old )  ) {
-		$sub->RegDeleteValue( $ambig );
-	    } else {
-		$old= $sub->_FetchOld( $ambig.$delim )   unless  $fast;
-		$sub->RegDeleteKey( $ambig );
-	    }
-	}
-    } elsif(  defined($key)  ) {
-	$old= $sub->_FetchOld( $key.$delim )   unless  $fast;
-	$sub->RegDeleteKey( $key );
-    } else {
-	croak "${PACK}->DELETE:  Key ($ent) can never be deleted";
-    }
-    return $old;
-}
-
-
-sub SetValue
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    my $name= shift(@_);
-    my $data= shift(@_);
-    my( $type )= @_;
-    my $size;
-    if(  ! defined($type)  ) {
-	if(  "ARRAY" eq ref($data)  ) {
-	    croak "${PACK}->SetValue:  Value is array reference but ",
-		  "no data type given"
-	      unless  2 == @$data;
-	    ( $data, $type )= @$data;
-	} else {
-	    $type= REG_SZ;
-	}
-    }
-    $type= _constant($type,"registry value data type")   if  $type =~ /^REG_/;
-    if(  REG_MULTI_SZ == $type  &&  "ARRAY" eq ref($data)  ) {
-	$data= join( "\0", @$data ) . "\0\0";
-	## $data= pack(  "a*" x (1+@$data),  map( $_."\0", @$data, "" )  );
-    } elsif(  ( REG_SZ == $type || REG_EXPAND_SZ == $type )
-          &&  $self->FixSzNulls  ) {
-	$data .= "\0"    unless  "\0" eq substr($data,0,-1);
-    } elsif(  REG_DWORD == $type  &&  $data =~ /^0x[0-9a-fA-F]{3,}$/  ) {
-	$data= pack( "L", hex($data) );
-	# We could to $data=pack("L",$data) for REG_DWORD but I see
-	# no nice way to always destinguish when to do this or not.
-    }
-    return $self->RegSetValueEx( $name, 0, $type, $data, length($data) );
-}
-
-
-sub StoreKey
-{
-    my $this= shift(@_);
-    $this= tied(%$this)   if  ref($this)  &&  tied(%$this);
-    my $subKey= shift(@_);
-    my $data= shift(@_);
-    my $ent;
-    my $self;
-    if(  ! ref($data)  ||  "$data" !~ /(^|=)HASH/  ) {
-	croak "${PACK}->StoreKey:  For ", $this->Path.$subKey, ",\n",
-	      "  subkey data must be a HASH reference";
-    }
-    if(  defined( $$data{""} )  &&  "HASH" eq ref($$data{""})  ) {
-	$self= $this->CreateKey( $subKey, delete $$data{""} );
-    } else {
-	$self= $this->CreateKey( $subKey );
-    }
-    return ()   if  ! defined($self);
-    foreach $ent (  keys(%$data)  ) {
-	return ()
-	  unless  $self->STORE( $ent, $$data{$ent} );
-    }
-    return $self;
-}
-
-
-# = { "" => {OPT=>VAL}, "val"=>[], "key"=>{} } creates a new key
-# = "string" creates a new REG_SZ value
-# = [ data, type ] creates a new value
-sub STORE
-{
-    my $self= shift(@_);
-    my $ent= shift(@_);
-    my $data= shift(@_);
-    my $delim= $self->Delimiter;
-    my( $key, $val, $ambig, $subkey )= $self->_parseTiedEnt( $ent, $delim, 1 );
-    my $sub;
-    if(  defined($key)
-     &&  ( defined($val) || defined($ambig) || defined($subkey) )  ) {
-	return ()
-	  unless  $sub= $self->new( $key );
-    } else {
-	$sub= $self;
-    }
-    if(  defined($val)  ) {
-	croak "${PACK}->STORE:  For ", $sub->Path.$delim.$val, ",\n",
-	      "  value data cannot be a HASH reference"
-	  if  ref($data)  &&  "$data" =~ /(^|=)HASH/;
-	$sub->SetValue( $val, $data );
-    } elsif(  defined($subkey)  ) {
-	croak "${PACK}->STORE:  For ", $sub->Path.$subkey.$delim, ",\n",
-	      "  subkey data must be a HASH reference"
-	  unless  ref($data)  &&  "$data" =~ /(^|=)HASH/;
-	$sub->StoreKey( $subkey, $data );
-    } elsif(  defined($ambig)  ) {
-	if(  ref($data)  &&  "$data" =~ /(^|=)HASH/  ) {
-	    $sub->StoreKey( $ambig, $data );
-	} else {
-	    $sub->SetValue( $ambig, $data );
-	}
-    } elsif(  defined($key)  ) {
-	croak "${PACK}->STORE:  For ", $sub->Path.$key.$delim, ",\n",
-	      "  subkey data must be a HASH reference"
-	  unless  ref($data)  &&  "$data" =~ /(^|=)HASH/;
-	$sub->StoreKey( $key, $data );
-    } else {
-	croak "${PACK}->STORE:  Key ($ent) can never be created nor set";
-    }
-}
-
-
-sub EXISTS
-{
-    my $self= shift(@_);
-    my $ent= shift(@_);
-    return defined( $self->FETCH($ent) );
-}
-
-
-sub FIRSTKEY
-{
-    my $self= shift(@_);
-    my $members= $self->_MemberNames;
-    $self->{PREVIDX}= 0;
-    return @{$members} ? $members->[0] : undef;
-}
-
-
-sub NEXTKEY
-{
-    my $self= shift(@_);
-    my $prev= shift(@_);
-    my $idx= $self->{PREVIDX};
-    my $members= $self->_MemberNames;
-    if(  ! defined($idx)  ||  $prev ne $members->[$idx]  ) {
-	$idx= 0;
-	while(  $idx < @$members  &&  $prev ne $members->[$idx]  ) {
-	    $idx++;
-	}
-    }
-    $self->{PREVIDX}= ++$idx;
-    return $members->[$idx];
-}
-
-
-sub DESTROY
-{
-    my $self= shift(@_);
-    return   if  tied(%$self);
-    my $unload;
-    local $@;
-    eval { $unload= $self->{UNLOADME}; 1 }
-	or  return;
-    my $debug= $ENV{DEBUG_TIE_REGISTRY};
-    if(  defined($debug)  ) {
-	if(  1 < $debug  ) {
-	    my $hand= $self->Handle;
-	    my $dep= $self->{DEPENDON};
-	    carp "${PACK} destroying ", $self->Path, " (",
-		 "NONE" eq $hand ? $hand : sprintf("0x%lX",$hand), ")",
-		 defined($dep) ? (" [depends on ",$dep->Path,"]") : ();
-	} else {
-	    warn "${PACK} destroying ", $self->Path, ".\n";
-	}
-    }
-    $self->RegCloseKey
-      unless  "NONE" eq $self->Handle;
-    if(  defined($unload)  ) {
-	if(  defined($debug)  &&  1 < $debug  ) {
-	    my( $obj, $subKey, $file )= @$unload;
-	    warn "Unloading ", $self->Path,
-	      " (from ", $obj->Path, ", $subKey)...\n";
-	}
-	$self->UnLoad
-	  ||  warn "Couldn't unload ", $self->Path, ": ", _ErrMsg, "\n";
-	## carp "Never unloaded ${PACK}::Load($$unload[2])";
-    }
-    #delete $self->{DEPENDON};
-}
-
-
-use vars qw( @CreateKey_Opts %CreateKey_Opts %_KeyDispNames );
-@CreateKey_Opts= qw( Access Class Options Delimiter
-		     Disposition Security Volatile Backup );
-@CreateKey_Opts{@CreateKey_Opts}= (1) x @CreateKey_Opts;
-%_KeyDispNames= ( REG_CREATED_NEW_KEY() => "REG_CREATED_NEW_KEY",
-		  REG_OPENED_EXISTING_KEY() => "REG_OPENED_EXISTING_KEY" );
-
-sub CreateKey
-{
-    my $self= shift(@_);
-    my $tied= tied(%$self);
-    $self= tied(%$self)   if  $tied;
-    my( $subKey, $opts )= @_;
-    my( $sam )= $self->Access;
-    my( $delim )= $self->Delimiter;
-    my( $class )= "";
-    my( $flags )= 0;
-    my( $secure )= [];
-    my( $garb )= [];
-    my( $result )= \$garb;
-    my( $handle )= 0;
-    if(  @_ < 1  ||  2 < @_
-     ||  2 == @_ && "HASH" ne ref($opts)  ) {
-	croak "Usage:  \$new= \$old->CreateKey( \$subKey, {OPT=>VAL,...} );\n",
-	      "  options: @CreateKey_Opts\nCalled";
-    }
-    if(  defined($opts)  ) {
-	$sam= $opts->{"Access"}   if  defined($opts->{"Access"});
-	$class= $opts->{Class}   if  defined($opts->{Class});
-	$flags= $opts->{Options}   if  defined($opts->{Options});
-	$delim= $opts->{"Delimiter"}   if  defined($opts->{"Delimiter"});
-	$secure= $opts->{Security}   if  defined($opts->{Security});
-	if(  defined($opts->{Disposition})  ) {
-	    "SCALAR" eq ref($opts->{Disposition})
-	      or  croak "${PACK}->CreateKey option `Disposition'",
-			" must provide a scalar reference";
-	    $result= $opts->{Disposition};
-	}
-	if(  0 == $flags  ) {
-	    $flags |= REG_OPTION_VOLATILE
-	      if  defined($opts->{Volatile})  &&  $opts->{Volatile};
-	    $flags |= REG_OPTION_BACKUP_RESTORE
-	      if  defined($opts->{Backup})  &&  $opts->{Backup};
-	}
-    }
-    my $subPath= ref($subKey) ? $subKey : $self->_split($subKey,$delim);
-    $subKey= join( $self->OS_Delimiter, @$subPath );
-    $self->RegCreateKeyEx( $subKey, 0, $class, $flags, $sam,
-			   $secure, $handle, $$result )
-      or  return ();
-    if(  ! ref($$result)  &&  $self->DualTypes  ) {
-	$$result= _DualVal( \%_KeyDispNames, $$result );
-    }
-    my $new= $self->_new( $handle, [ @{$self->_Path}, @{$subPath} ] );
-    $new->{ACCESS}= $sam;
-    $new->{DELIM}= $delim;
-    $new= $new->TiedRef   if  $tied;
-    return $new;
-}
-
-
-use vars qw( $Load_Cnt @Load_Opts %Load_Opts );
-$Load_Cnt= 0;
-@Load_Opts= qw(NewSubKey);
-@Load_Opts{@Load_Opts}= (1) x @Load_Opts;
-
-sub Load
-{
-    my $this= shift(@_);
-    my $tied=  ref($this)  &&  tied(%$this);
-    $this= tied(%$this)   if  $tied;
-    my( $file, $subKey, $opts )= @_;
-    if(  2 == @_  &&  "HASH" eq ref($subKey)  ) {
-	$opts= $subKey;
-	undef $subKey;
-    }
-    @_ < 1  ||  3 < @_  ||  defined($opts) && "HASH" ne ref($opts)
-      and  croak "Usage:  \$key= ",
-	     "${PACK}->Load( \$fileName, [\$newSubKey,] {OPT=>VAL...} );\n",
-	     "  options: @Load_Opts @new_Opts\nCalled";
-    if(  defined($opts)  &&  exists($opts->{NewSubKey})  ) {
-	$subKey= delete $opts->{NewSubKey};
-    }
-    if(  ! defined( $subKey )  ) {
-	if(  "" ne $this->Machine  ) {
-	    ( $this )= $this->_connect( [$this->Machine,"LMachine"] );
-	} else {
-	    ( $this )= $this->_rootKey( "LMachine" );	# Could also be "Users"
-	}
-	$subKey= "PerlTie:$$." . ++$Load_Cnt;
-    }
-    $this->RegLoadKey( $subKey, $file )
-      or  return ();
-    my $self= $this->new( $subKey, defined($opts) ? $opts : () );
-    if(  ! defined( $self )  ) {
-	{ my $err= Win32::GetLastError();
-	#{ local( $^E ); #}
-	    $this->RegUnLoadKey( $subKey )  or  carp
-	      "Can't unload $subKey from ", $this->Path, ": ", _ErrMsg, "\n";
-	    Win32::SetLastError($err);
-	}
-	return ();
-    }
-    $self->{UNLOADME}= [ $this, $subKey, $file ];
-    $self= $self->TiedRef   if  $tied;
-    return $self;
-}
-
-
-sub UnLoad
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    @_  and  croak "Usage:  \$key->UnLoad;";
-    my $unload= $self->{UNLOADME};
-    "ARRAY" eq ref($unload)
-      or  croak "${PACK}->UnLoad called on a key which was not Load()ed";
-    my( $obj, $subKey, $file )= @$unload;
-    $self->RegCloseKey;
-    return Win32API::Registry::RegUnLoadKey( $obj->Handle, $subKey );
-}
-
-
-sub AllowSave
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    return $self->AllowPriv( "SeBackupPrivilege", @_ );
-}
-
-
-sub AllowLoad
-{
-    my $self= shift(@_);
-    $self= tied(%$self)   if  tied(%$self);
-    return $self->AllowPriv( "SeRestorePrivilege", @_ );
-}
-
-
-# RegNotifyChangeKeyValue( hKey, bWatchSubtree, iNotifyFilter, hEvent, bAsync )
-
-
-sub RegCloseKey { my $self= shift(@_);
-    Win32API::Registry::RegCloseKey $self->Handle, @_; }
-sub RegConnectRegistry { my $self= shift(@_);
-    Win32API::Registry::RegConnectRegistry @_; }
-sub RegCreateKey { my $self= shift(@_);
-    Win32API::Registry::RegCreateKey $self->Handle, @_; }
-sub RegCreateKeyEx { my $self= shift(@_);
-    Win32API::Registry::RegCreateKeyEx $self->Handle, @_; }
-sub RegDeleteKey { my $self= shift(@_);
-    Win32API::Registry::RegDeleteKey $self->Handle, @_; }
-sub RegDeleteValue { my $self= shift(@_);
-    Win32API::Registry::RegDeleteValue $self->Handle, @_; }
-sub RegEnumKey { my $self= shift(@_);
-    Win32API::Registry::RegEnumKey $self->Handle, @_; }
-sub RegEnumKeyEx { my $self= shift(@_);
-    Win32API::Registry::RegEnumKeyEx $self->Handle, @_; }
-sub RegEnumValue { my $self= shift(@_);
-    Win32API::Registry::RegEnumValue $self->Handle, @_; }
-sub RegFlushKey { my $self= shift(@_);
-    Win32API::Registry::RegFlushKey $self->Handle, @_; }
-sub RegGetKeySecurity { my $self= shift(@_);
-    Win32API::Registry::RegGetKeySecurity $self->Handle, @_; }
-sub RegLoadKey { my $self= shift(@_);
-    Win32API::Registry::RegLoadKey $self->Handle, @_; }
-sub RegNotifyChangeKeyValue { my $self= shift(@_);
-    Win32API::Registry::RegNotifyChangeKeyValue $self->Handle, @_; }
-sub RegOpenKey { my $self= shift(@_);
-    Win32API::Registry::RegOpenKey $self->Handle, @_; }
-sub RegOpenKeyEx { my $self= shift(@_);
-    Win32API::Registry::RegOpenKeyEx $self->Handle, @_; }
-sub RegQueryInfoKey { my $self= shift(@_);
-    Win32API::Registry::RegQueryInfoKey $self->Handle, @_; }
-sub RegQueryMultipleValues { my $self= shift(@_);
-    Win32API::Registry::RegQueryMultipleValues $self->Handle, @_; }
-sub RegQueryValue { my $self= shift(@_);
-    Win32API::Registry::RegQueryValue $self->Handle, @_; }
-sub RegQueryValueEx { my $self= shift(@_);
-    Win32API::Registry::RegQueryValueEx $self->Handle, @_; }
-sub RegReplaceKey { my $self= shift(@_);
-    Win32API::Registry::RegReplaceKey $self->Handle, @_; }
-sub RegRestoreKey { my $self= shift(@_);
-    Win32API::Registry::RegRestoreKey $self->Handle, @_; }
-sub RegSaveKey { my $self= shift(@_);
-    Win32API::Registry::RegSaveKey $self->Handle, @_; }
-sub RegSetKeySecurity { my $self= shift(@_);
-    Win32API::Registry::RegSetKeySecurity $self->Handle, @_; }
-sub RegSetValue { my $self= shift(@_);
-    Win32API::Registry::RegSetValue $self->Handle, @_; }
-sub RegSetValueEx { my $self= shift(@_);
-    Win32API::Registry::RegSetValueEx $self->Handle, @_; }
-sub RegUnLoadKey { my $self= shift(@_);
-    Win32API::Registry::RegUnLoadKey $self->Handle, @_; }
-sub AllowPriv { my $self= shift(@_);
-    Win32API::Registry::AllowPriv @_; }
-
-
-# Autoload methods go after =cut, and are processed by the autosplit program.
-
-1;
-__END__
-
-=head1 NAME
-
-Win32::TieRegistry - Powerful and easy ways to manipulate a registry
-[on Win32 for now].
-
-=head1 SYNOPSIS
-
-  use Win32::TieRegistry 0.20 ( UseOptionName=>UseOptionValue[,...] );
-
-  $Registry->SomeMethodCall(arg1,...);
-
-  $subKey= $Registry->{"Key\\SubKey\\"};
-  $valueData= $Registry->{"Key\\SubKey\\\\ValueName"};
-  $Registry->{"Key\\SubKey\\"}= { "NewSubKey" => {...} };
-  $Registry->{"Key\\SubKey\\\\ValueName"}= "NewValueData";
-  $Registry->{"\\ValueName"}= [ pack("fmt",$data), REG_DATATYPE ];
-
-=head1 EXAMPLES
-
-  use Win32::TieRegistry( Delimiter=>"#", ArrayValues=>0 );
-  $pound= $Registry->Delimiter("/");
-  $diskKey= $Registry->{"LMachine/System/Disk/"}
-    or  die "Can't read LMachine/System/Disk key: $^E\n";
-  $data= $key->{"/Information"}
-    or  die "Can't read LMachine/System/Disk//Information value: $^E\n";
-  $remoteKey= $Registry->{"//ServerA/LMachine/System/"}
-    or  die "Can't read //ServerA/LMachine/System/ key: $^E\n";
-  $remoteData= $remoteKey->{"Disk//Information"}
-    or  die "Can't read ServerA's System/Disk//Information value: $^E\n";
-  foreach $entry (  keys(%$diskKey)  ) {
-      ...
-  }
-  foreach $subKey (  $diskKey->SubKeyNames  ) {
-      ...
-  }
-  $diskKey->AllowSave( 1 );
-  $diskKey->RegSaveKey( "C:/TEMP/DiskReg", [] );
-
-=head1 DESCRIPTION
-
-The I<Win32::TieRegistry> module lets you manipulate the Registry
-via objects [as in "object oriented"] or via tied hashes.  But
-you will probably mostly use a combination reference, that is, a
-reference to a tied hash that has also been made an object so that
-you can mix both access methods [as shown above].
-
-If you did not get this module as part of L<libwin32>, you might
-want to get a recent version of L<libwin32> from CPAN which should
-include this module and the I<Win32API::Registry> module that it
-uses.
-
-Skip to the L<SUMMARY> section if you just want to dive in and start
-using the Registry from Perl.
-
-Accessing and manipulating the registry is extremely simple using
-I<Win32::TieRegistry>.  A single, simple expression can return
-you almost any bit of information stored in the Registry.
-I<Win32::TieRegistry> also gives you full access to the "raw"
-underlying API calls so that you can do anything with the Registry
-in Perl that you could do in C.  But the "simple" interface has
-been carefully designed to handle almost all operations itself
-without imposing arbitrary limits while providing sensible
-defaults so you can list only the parameters you care about.
-
-But first, an overview of the Registry itself.
-
-=head2 The Registry
-
-The Registry is a forest:  a collection of several tree structures.
-The root of each tree is a key.  These root keys are identified by
-predefined constants whose names start with "HKEY_".  Although all
-keys have a few attributes associated with each [a class, a time
-stamp, and security information], the most important aspect of keys
-is that each can contain subkeys and can contain values.
-
-Each subkey has a name:  a string which cannot be blank and cannot
-contain the delimiter character [backslash: C<'\\'>] nor nul
-[C<'\0'>].  Each subkey is also a key and so can contain subkeys
-and values [and has a class, time stamp, and security information].
-
-Each value has a name:  a string which E<can> be blank and E<can>
-contain the delimiter character [backslash: C<'\\'>] and any
-character except for null, C<'\0'>.  Each value also has data
-associated with it.  Each value's data is a contiguous chunk of
-bytes, which is exactly what a Perl string value is so Perl
-strings will usually be used to represent value data.
-
-Each value also has a data type which says how to interpret the
-value data.  The primary data types are:
-
-=over
-
-=item REG_SZ
-
-A null-terminated string.
-
-=item REG_EXPAND_SZ
-
-A null-terminated string which contains substrings consisting of a
-percent sign [C<'%'>], an environment variable name, then a percent
-sign, that should be replaced with the value associate with that
-environment variable.  The system does I<not> automatically do this
-substitution.
-
-=item REG_BINARY
-
-Some arbitrary binary value.  You can think of these as being
-"packed" into a string.
-
-If your system has the L<SetDualVar> module installed,
-the C<DualBinVals()> option wasn't turned off, and you
-fetch a C<REG_BINARY> value of 4 bytes or fewer, then
-you can use the returned value in a numeric context to
-get at the "unpacked" numeric value.  See C<GetValue()>
-for more information.
-
-=item REG_MULTI_SZ
-
-Several null-terminated strings concatenated together with an
-extra trailing C<'\0'> at the end of the list.  Note that the list
-can include empty strings so use the value's length to determine
-the end of the list, not the first occurrence of C<'\0\0'>.
-It is best to set the C<SplitMultis()> option so I<Win32::TieRegistry>
-will split these values into an array of strings for you.
-
-=item REG_DWORD
-
-A long [4-byte] integer value.  These values are expected either
-packed into a 4-character string or as a hex string of E<more than>
-4 characters [but I<not> as a numeric value, unfortunately, as there is
-no sure way to tell a numeric value from a packed 4-byte string that
-just happens to be a string containing a valid numeric value].
-
-How such values are returned depends on the C<DualBinVals()> and
-C<DWordsToHex()> options.  See C<GetValue()> for details.
-
-=back
-
-In the underlying Registry calls, most places which take a
-subkey name also allow you to pass in a subkey "path" -- a
-string of several subkey names separated by the delimiter
-character, backslash [C<'\\'>].  For example, doing
-C<RegOpenKeyEx(HKEY_LOCAL_MACHINE,"SYSTEM\\DISK",...)> is much
-like opening the C<"SYSTEM"> subkey of C<HKEY_LOCAL_MACHINE>,
-then opening its C<"DISK"> subkey, then closing the C<"SYSTEM">
-subkey.
-
-All of the I<Win32::TieRegistry> features allow you to use your
-own delimiter in place of the system's delimiter, [C<'\\'>].  In
-most of our examples we will use a forward slash [C<'/'>] as our
-delimiter as it is easier to read and less error prone to use when
-writing Perl code since you have to type two backslashes for each
-backslash you want in a string.  Note that this is true even when
-using single quotes -- C<'\\HostName\LMachine\'> is an invalid
-string and must be written as C<'\\\\HostName\\LMachine\\'>.
-
-You can also connect to the registry of other computers on your
-network.  This will be discussed more later.
-
-Although the Registry does not have a single root key, the
-I<Win32::TieRegistry> module creates a virtual root key for you
-which has all of the I<HKEY_*> keys as subkeys.
-
-=head2 Tied Hashes Documentation
-
-Before you can use a tied hash, you must create one.  One way to
-do that is via:
-
-    use Win32::TieRegistry ( TiedHash => '%RegHash' );
-
-which exports a C<%RegHash> variable into your package and ties it
-to the virtual root key of the Registry.  An alternate method is:
-
-    my %RegHash;
-    use Win32::TieRegistry ( TiedHash => \%RegHash );
-
-There are also several ways you can tie a hash variable to any
-other key of the Registry, which are discussed later.
-
-Note that you will most likely use C<$Registry> instead of using
-a tied hash.  C<$Registry> is a reference to a hash that has
-been tied to the virtual root of your computer's Registry [as if,
-C<$Registry= \%RegHash>].  So you would use C<$Registry-E<gt>{Key}>
-rather than C<$RegHash{Key}> and use C<keys %{$Registry}> rather
-than C<keys %RegHash>, for example.
-
-For each hash which has been tied to a Registry key, the Perl
-C<keys> function will return a list containing the name of each
-of the key's subkeys with a delimiter character appended to it and
-containing the name of each of the key's values with a delimiter
-prepended to it.  For example:
-
-    keys( %{ $Registry->{"HKEY_CLASSES_ROOT\\batfile\\"} } )
-
-might yield the following list value:
-
-    ( "DefaultIcon\\",  # The subkey named "DefaultIcon"
-      "shell\\",        # The subkey named "shell"
-      "shellex\\",      # The subkey named "shellex"
-      "\\",             # The default value [named ""]
-      "\\EditFlags" )   # The value named "EditFlags"
-
-For the virtual root key, short-hand subkey names are used as
-shown below.  You can use the short-hand name, the regular
-I<HKEY_*> name, or any numeric value to access these keys, but
-the short-hand names are all that will be returned by the C<keys>
-function.
-
-=over
-
-=item "Classes" for HKEY_CLASSES_ROOT
-
-Contains mappings between file name extensions and the uses
-for such files along with configuration information for COM
-[MicroSoft's Common Object Model] objects.  Usually a link to
-the C<"SOFTWARE\\Classes"> subkey of the C<HKEY_LOCAL_MACHINE>
-key.
-
-=item "CUser" for HKEY_CURRENT_USER
-
-Contains information specific to the currently logged-in user.
-Mostly software configuration information.  Usually a link to
-a subkey of the C<HKEY_USERS> key.
-
-=item "LMachine" for HKEY_LOCAL_MACHINE
-
-Contains all manner of information about the computer.
-
-=item "Users" for HKEY_USERS
-
-Contains one subkey, C<".DEFAULT">, which gets copied to a new
-subkey whenever a new user is added.  Also contains a subkey for
-each user of the system, though only those for active users
-[usually only one] are loaded at any given time.
-
-=item "PerfData" for HKEY_PERFORMANCE_DATA
-
-Used to access data about system performance.  Access via this key
-is "special" and all but the most carefully constructed calls will
-fail, usually with C<ERROR_INSUFFICIENT_BUFFER>.  For example, you
-can't enumerate key names without also enumerating values which
-require huge buffers but the exact buffer size required cannot be
-determined beforehand because C<RegQueryInfoKey()> E<always> fails
-with C<ERROR_INSUFFICIENT_BUFFER> for C<HKEY_PERFORMANCE_DATA> no
-matter how it is called.  So it is currently not very useful to
-tie a hash to this key.  You can use it to create an object to use
-for making carefully constructed calls to the underlying Reg*()
-routines.
-
-=item "CConfig" for HKEY_CURRENT_CONFIG
-
-Contains minimal information about the computer's current
-configuration that is required very early in the boot process.
-For example, setting for the display adapter such as screen
-resolution and refresh rate are found in here.
-
-=item "DynData" for HKEY_DYN_DATA
-
-Dynamic data.  We have found no documentation for this key.
-
-=back
-
-A tied hash is much like a regular hash variable in Perl -- you give
-it a key string inside braces, [C<{> and C<}>], and it gives you
-back a value [or lets you set a value].  For I<Win32::TieRegistry>
-hashes, there are two types of values that will be returned.
-
-=over
-
-=item SubKeys
-
-If you give it a string which represents a subkey, then it will
-give you back a reference to a hash which has been tied to that
-subkey.  It can't return the hash itself, so it returns a
-reference to it.  It also blesses that reference so that it is
-also an object so you can use it to call method functions.
-
-=item Values
-
-If you give it a string which is a value name, then it will give
-you back a string which is the data for that value.  Alternately,
-you can request that it give you both the data value string and
-the data value type [we discuss how to request this later].  In
-this case, it would return a reference to an array where the value
-data string is element C<[0]> and the value data type is element
-C<[1]>.
-
-=back
-
-The key string which you use in the tied hash must be interpreted
-to determine whether it is a value name or a key name or a path
-that combines several of these or even other things.  There are
-two simple rules that make this interpretation easy and
-unambiguous:
-
-    Put a delimiter after each key name.
-    Put a delimiter in front of each value name.
-
-Exactly how the key string will be intepreted is governed by the
-following cases, in the order listed.  These cases are designed
-to "do what you mean".  Most of the time you won't have to think
-about them, especially if you follow the two simple rules above.
-After the list of cases we give several examples which should be
-clear enough so feel free to skip to them unless you are worried
-about the details.
-
-=over
-
-=item Remote machines
-
-If the hash is tied to the virtual root of the registry [or the
-virtual root of a remote machine's registry], then we treat hash
-key strings which start with the delimiter character specially.
-
-If the hash key string starts with two delimiters in a row, then
-those should be immediately followed by the name of a remote
-machine whose registry we wish to connect to.  That can be
-followed by a delimiter and more subkey names, etc.  If the
-machine name is not following by anything, then a virtual root
-for the remote machine's registry is created, a hash is tied to
-it, and a reference to that hash it is returned.
-
-=item Hash key string starts with the delimiter
-
-If the hash is tied to a virtual root key, then the leading
-delimiter is ignored.  It should be followed by a valid Registry
-root key name [either a short-hand name like C<"LMachine">, an
-I<HKEY_*> value, or a numeric value].   This alternate notation is
-allowed in order to be more consistant with the C<Open()> method
-function.
-
-For all other Registry keys, the leading delimiter indicates
-that the rest of the string is a value name.  The leading
-delimiter is stripped and the rest of the string [which can
-be empty and can contain more delimiters] is used as a value
-name with no further parsing.
-
-=item Exact match with direct subkey name followed by delimiter
-
-If you have already called the Perl C<keys> function on the tied
-hash [or have already called C<MemberNames> on the object] and the
-hash key string exactly matches one of the strings returned, then
-no further parsing is done.  In other words, if the key string
-exactly matches the name of a direct subkey with a delimiter
-appended, then a reference to a hash tied to that subkey is
-returned [but only if C<keys> or C<MemberNames> has already
-been called for that tied hash].
-
-This is only important if you have selected a delimiter other than
-the system default delimiter and one of the subkey names contains
-the delimiter you have chosen.  This rule allows you to deal with
-subkeys which contain your chosen delimiter in their name as long
-as you only traverse subkeys one level at a time and always
-enumerate the list of members before doing so.
-
-The main advantage of this is that Perl code which recursively
-traverses a hash will work on hashes tied to Registry keys even if
-a non-default delimiter has been selected.
-
-=item Hash key string contains two delimiters in a row
-
-If the hash key string contains two [or more] delimiters in a row,
-then the string is split between the first pair of delimiters.
-The first part is interpreted as a subkey name or a path of subkey
-names separated by delimiters and with a trailing delimiter.  The
-second part is interpreted as a value name with one leading
-delimiter [any extra delimiters are considered part of the value
-name].
-
-=item Hash key string ends with a delimiter
-
-If the key string ends with a delimiter, then it is treated
-as a subkey name or path of subkey names separated by delimiters.
-
-=item Hash key string contains a delimiter
-
-If the key string contains a delimiter, then it is split after
-the last delimiter.  The first part is treated as a subkey name or
-path of subkey names separated by delimiters.  The second part
-is ambiguous and is treated as outlined in the next item.
-
-=item Hash key string contains no delimiters
-
-If the hash key string contains no delimiters, then it is ambiguous.
-
-If you are reading from the hash [fetching], then we first use the
-key string as a value name.  If there is a value with a matching
-name in the Registry key which the hash is tied to, then the value
-data string [and possibly the value data type] is returned.
-Otherwise, we retry by using the hash key string as a subkey name.
-If there is a subkey with a matching name, then we return a
-reference to a hash tied to that subkey.  Otherwise we return
-C<undef>.
-
-If you are writing to the hash [storing], then we use the key
-string as a subkey name only if the value you are storing is a
-reference to a hash value.  Otherwise we use the key string as
-a value name.
-
-=back
-
-=head3 Examples
-
-Here are some examples showing different ways of accessing Registry
-information using references to tied hashes:
-
-=over
-
-=item Canonical value fetch
-
-    $tip18= $Registry->{"HKEY_LOCAL_MACHINE\\Software\\Microsoft\\"
-               . 'Windows\\CurrentVersion\\Explorer\\Tips\\\\18'};
-
-Should return the text of important tip number 18.  Note that two
-backslashes, C<"\\">, are required to get a single backslash into
-a Perl double-quoted or single-qouted string.  Note that C<"\\">
-is appended to each key name [C<"HKEY_LOCAL_MACHINE"> through
-C<"Tips">] and C<"\\"> is prepended to the value name, C<"18">.
-
-=item Changing your delimiter
-
-    $Registry->Delimiter("/");
-    $tip18= $Registry->{"HKEY_LOCAL_MACHINE/Software/Microsoft/"
-               . 'Windows/CurrentVersion/Explorer/Tips//18'};
-
-This usually makes things easier to read when working in Perl.
-All remaining examples will assume the delimiter has been changed
-as above.
-
-=item Using intermediate keys
-
-    $ms= $Registry->{"LMachine/Software/Microsoft/"};
-    $tips= $ms->{"Windows/CurrentVersion/Explorer/Tips/"};
-    $tip18= $winlogon->{"/18"};
-
-Same as above but opens more keys into the Registry which lets you
-efficiently re-access those intermediate keys.  This is slightly
-less efficient if you never reuse those intermediate keys.
-
-=item Chaining in a single statement
-
-    $tip18= $Registry->{"LMachine/Software/Microsoft/"}->
-              {"Windows/CurrentVersion/Explorer/Tips/"}->{"/18"};
-
-Like above, this creates intermediate key objects then uses
-them to access other data.  Once this statement finishes, the
-intermediate key objects are destroyed.  Several handles into
-the Registry are opened and closed by this statement so it is
-less efficient but there are times when this will be useful.
-
-=item Even less efficient example of chaining
-
-    $tip18= $Registry->{"LMachine/Software/Microsoft"}->
-              {"Windows/CurrentVersion/Explorer/Tips"}->{"/18"};
-
-Because we left off the trailing delimiters, I<Win32::TieRegistry>
-doesn't know whether final names, C<"Microsoft"> and C<"Tips">,
-are subkey names or value names.  So this statement ends up
-executing the same code as the next one.
-
-=item What the above really does
-
-    $tip18= $Registry->{"LMachine/Software/"}->{"Microsoft"}->
-              {"Windows/CurrentVersion/Explorer/"}->{"Tips"}->{"/18"};
-
-With more chains to go through, more temporary objects are created
-and later destroyed than in our first chaining example.  Also,
-when C<"Microsoft"> is looked up, I<Win32::TieRegistry> first
-tries to open it as a value and fails then tries it as a subkey.
-The same is true for when it looks up C<"Tips">.
-
-=item Getting all of the tips
-
-    $tips= $Registry->{"LMachine/Software/Microsoft/"}->
-              {"Windows/CurrentVersion/Explorer/Tips/"}
-      or  die "Can't find the Windows tips: $^E\n";
-    foreach(  keys %$tips  ) {
-        print "$_: ", $tips->{$_}, "\n";
-    }
-
-First notice that we actually check for failure for the first
-time.  We are assuming that the C<"Tips"> key contains no subkeys. 
-Otherwise the C<print> statement would show something like
-C<"Win32::TieRegistry=HASH(0xc03ebc)"> for each subkey.
-
-The output from the above code will start something like:
-
-    /0: If you don't know how to do something,[...]
-
-=back
-
-=head3 Deleting items
-
-You can use the Perl C<delete> function to delete a value from a
-Registry key or to delete a subkey as long that subkey contains
-no subkeys of its own.  See L<More Examples>, below, for more
-information.
-
-=head3 Storing items
-
-You can use the Perl assignment operator [C<=>] to create new
-keys, create new values, or replace values.  The values you store
-should be in the same format as the values you would fetch from a
-tied hash.  For example, you can use a single assignment statement
-to copy an entire Registry tree.  The following statement:
-
-    $Registry->{"LMachine/Software/Classes/Tie_Registry/"}=
-      $Registry->{"LMachine/Software/Classes/batfile/"};
-
-creates a C<"Tie_Registry"> subkey under the C<"Software\\Classes">
-subkey of the C<HKEY_LOCAL_MACHINE> key.  Then it populates it
-with copies of all of the subkeys and values in the C<"batfile">
-subkey and all of its subkeys.  Note that you need to have
-called C<$Registry-E<gt>ArrayValues(1)> for the proper value data
-type information to be copied.  Note also that this release of
-I<Win32::TieRegistry> does not copy key attributes such as class
-name and security information [this is planned for a future release].
-
-The following statement creates a whole subtree in the Registry:
-
-    $Registry->{"LMachine/Software/FooCorp/"}= {
-        "FooWriter/" => {
-            "/Version" => "4.032",
-            "Startup/" => {
-                "/Title" => "Foo Writer Deluxe ][",
-                "/WindowSize" => [ pack("LL",$wid,$ht), "REG_BINARY" ],
-                "/TaskBarIcon" => [ "0x0001", "REG_DWORD" ],
-            },
-            "Compatibility/" => {
-                "/AutoConvert" => "Always",
-                "/Default Palette" => "Windows Colors",
-            },
-        },
-        "/License", => "0123-9C8EF1-09-FC",
-    };
-
-Note that all but the last Registry key used on the left-hand
-side of the assignment [that is, "LMachine/Software/" but not
-"FooCorp/"] must already exist for this statement to succeed.
-
-By using the leading a trailing delimiters on each subkey name and
-value name, I<Win32::TieRegistry> will tell you if you try to assign
-subkey information to a value or visa-versa.
-
-=head3 More examples
-
-=over
-
-=item Adding a new tip
-
-    $tips= $Registry->{"LMachine/Software/Microsoft/"}->
-              {"Windows/CurrentVersion/Explorer/Tips/"}
-      or  die "Can't find the Windows tips: $^E\n";
-    $tips{'/186'}= "Be very careful when making changes to the Registry!";
-
-=item Deleting our new tip
-
-    $tips= $Registry->{"LMachine/Software/Microsoft/"}->
-              {"Windows/CurrentVersion/Explorer/Tips/"}
-      or  die "Can't find the Windows tips: $^E\n";
-    $tip186= delete $tips{'/186'};
-
-Note that Perl's C<delete> function returns the value that was deleted.
-
-=item Adding a new tip differently
-
-    $Registry->{"LMachine/Software/Microsoft/" .
-                "Windows/CurrentVersion/Explorer/Tips//186"}=
-      "Be very careful when making changes to the Registry!";
-
-=item Deleting differently
-
-    $tip186= delete $Registry->{"LMachine/Software/Microsoft/Windows/" .
-                                "CurrentVersion/Explorer/Tips//186"};
-
-Note that this only deletes the tail of what we looked up, the
-C<"186"> value, not any of the keys listed.
-
-=item Deleting a key
-
-WARNING:  The following code will delete all information about the
-current user's tip preferences.  Actually executing this command
-would probably cause the user to see the Welcome screen the next
-time they log in and may cause more serious problems.  This
-statement is shown as an example only and should not be used when
-experimenting.
-
-    $tips= delete $Registry->{"CUser/Software/Microsoft/Windows/" .
-                              "CurrentVersion/Explorer/Tips/"};
-
-This deletes the C<"Tips"> key and the values it contains.  The
-C<delete> function will return a reference to a hash [not a tied
-hash] containing the value names and value data that were deleted.
-
-The information to be returned is copied from the Registry into a
-regular Perl hash before the key is deleted.  If the key has many
-subkeys, this copying could take a significant amount of memory
-and/or processor time.  So you can disable this process by calling
-the C<FastDelete> member function:
-
-    $prevSetting= $regKey->FastDelete(1);
-
-which will cause all subsequent delete operations via C<$regKey>
-to simply return a true value if they succeed.  This optimization
-is automatically done if you use C<delete> in a void context.
-
-=item Technical notes on deleting
-
-If you use C<delete> to delete a Registry key or value and use
-the return value, then I<Win32::TieRegistry> usually looks up the
-current contents of that key or value so they can be returned if
-the deletion is successful.  If the deletion succeeds but the
-attempt to lookup the old contents failed, then the return value
-of C<delete> will be C<$^E> from the failed part of the operation.
-
-=item Undeleting a key
-
-    $Registry->{"LMachine/Software/Microsoft/Windows/" .
-                "CurrentVersion/Explorer/Tips/"}= $tips;
-
-This adds back what we just deleted.  Note that this version of
-I<Win32::TieRegistry> will use defaults for the key attributes
-[such as class name and security] and will not restore the
-previous attributes.
-
-=item Not deleting a key
-
-WARNING:  Actually executing the following code could cause
-serious problems.  This statement is shown as an example only and
-should not be used when experimenting.
-
-    $res= delete $Registry->{"CUser/Software/Microsoft/Windows/"}
-    defined($res)  ||  die "Can't delete URL key: $^E\n";
-
-Since the "Windows" key should contain subkeys, that C<delete>
-statement should make no changes to the Registry, return C<undef>,
-and set C<$^E> to "Access is denied".
-
-=item Not deleting again
-
-    $tips= $Registry->{"CUser/Software/Microsoft/Windows/" .
-                       "CurrentVersion/Explorer/Tips/"};
-    delete $tips;
-
-The Perl C<delete> function requires that its argument be an
-expression that ends in a hash element lookup [or hash slice],
-which is not the case here.  The C<delete> function doesn't
-know which hash $tips came from and so can't delete it.
-
-=back
-
-=head2 Objects Documentation
-
-The following member functions are defined for use on
-I<Win32::TieRegistry> objects:
-
-=over
-
-=item new
-
-The C<new> method creates a new I<Win32::TieRegistry> object.
-C<new> is mostly a synonym for C<Open()> so see C<Open()> below for
-information on what arguments to pass in.  Examples:
-
-    $machKey= new Win32::TieRegistry "LMachine"
-      or  die "Can't access HKEY_LOCAL_MACHINE key: $^E\n";
-    $userKey= Win32::TieRegistry->new("CUser")
-      or  die "Can't access HKEY_CURRENT_USER key: $^E\n";
-
-Note that calling C<new> via a reference to a tied hash returns
-a simple object, not a reference to a tied hash.
-
-=item Open
-
-=item $subKey= $key->Open( $sSubKey, $rhOptions )
-
-The C<Open> method opens a Registry key and returns a new
-I<Win32::TieRegistry> object associated with that Registry key.
-If C<Open> is called via a reference to a tied hash, then C<Open>
-returns another reference to a tied hash.  Otherwise C<Open>
-returns a simple object and you should then use C<TiedRef> to get
-a reference to a tied hash.
-
-C<$sSubKey> is a string specifying a subkey to be opened.
-Alternately C<$sSubKey> can be a reference to an array value
-containing the list of increasingly deep subkeys specifying the
-path to the subkey to be opened.
-
-C<$rhOptions> is an optional reference to a hash containing extra
-options.  The C<Open> method supports two options, C<"Delimiter">
-and C<"Access">, and C<$rhOptions> should have only have zero or
-more of these strings as keys.  See the "Examples" section below
-for more information.
-
-The C<"Delimiter"> option specifies what string [usually a single
-character] will be used as the delimiter to be appended to subkey
-names and prepended to value names.  If this option is not specified,
-the new key [C<$subKey>] inherits the delimiter of the old key
-[C<$key>].
-
-The C<"Access"> option specifies what level of access to the
-Registry key you wish to have once it has been opened.  If this
-option is not specified, the new key [C<$subKey>] is opened with
-the same access level used when the old key [C<$key>] was opened.
-The virtual root of the Registry pretends it was opened with
-access C<KEY_READ()|KEY_WRITE()> so this is the default access when
-opening keys directory via C<$Registry>.  If you don't plan on
-modifying a key, you should open it with C<KEY_READ> access as
-you may not have C<KEY_WRITE> access to it or some of its subkeys.
-
-If the C<"Access"> option value is a string that starts with
-C<"KEY_">, then it should match E<one> of the predefined access
-levels [probably C<"KEY_READ">, C<"KEY_WRITE">, or
-C<"KEY_ALL_ACCESS">] exported by the I<Win32API::Registry> module.
-Otherwise, a numeric value is expected.  For maximum flexibility,
-include C<use Win32::TieRegistry qw(:KEY_);>, for example, near
-the top of your script so you can specify more complicated access
-levels such as C<KEY_READ()|KEY_WRITE()>.
-
-If C<$sSubKey> does not begin with the delimiter [or C<$sSubKey>
-is an array reference], then the path to the subkey to be opened
-will be relative to the path of the original key [C<$key>].  If
-C<$sSubKey> begins with a single delimiter, then the path to the
-subkey to be opened will be relative to the virtual root of the
-Registry on whichever machine the original key resides.  If
-C<$sSubKey> begins with two consectutive delimiters, then those
-must be followed by a machine name which causes the C<Connect()>
-method function to be called.
-
-Examples:
-
-    $machKey= $Registry->Open( "LMachine", {Access=>KEY_READ(),Delimiter=>"/"} )
-      or  die "Can't open HKEY_LOCAL_MACHINE key: $^E\n";
-    $swKey= $machKey->Open( "Software" );
-    $logonKey= $swKey->Open( "Microsoft/Windows NT/CurrentVersion/Winlogon/" );
-    $NTversKey= $swKey->Open( ["Microsoft","Windows NT","CurrentVersion"] );
-    $versKey= $swKey->Open( qw(Microsoft Windows CurrentVersion) );
-
-    $remoteKey= $Registry->Open( "//HostA/LMachine/System/", {Delimiter=>"/"} )
-      or  die "Can't connect to HostA or can't open subkey: $^E\n";
-
-=item Clone
-
-=item $copy= $key->Clone
-
-Creates a new object that is associated with the same Registry key
-as the invoking object.
-
-=item Connect
-
-=item $remoteKey= $Registry->Connect( $sMachineName, $sKeyPath, $rhOptions )
-
-The C<Connect> method connects to the Registry of a remote machine,
-and opens a key within it, then returns a new I<Win32::TieRegistry>
-object associated with that remote Registry key.  If C<Connect>
-was called using a reference to a tied hash, then the return value
-will also be a reference to a tied hash [or C<undef>].  Otherwise,
-if you wish to use the returned object as a tied hash [not just as
-an object], then use the C<TiedRef> method function after C<Connect>.
-
-C<$sMachineName> is the name of the remote machine.  You don't have
-to preceed the machine name with two delimiter characters.
-
-C<$sKeyPath> is a string specifying the remote key to be opened.
-Alternately C<$sKeyPath> can be a reference to an array value
-containing the list of increasingly deep keys specifying the path
-to the key to be opened.
-
-C<$rhOptions> is an optional reference to a hash containing extra
-options.  The C<Connect> method supports two options, C<"Delimiter">
-and C<"Access">.  See the C<Open> method documentation for more
-information on these options.
-
-C<$sKeyPath> is already relative to the virtual root of the Registry
-of the remote machine.  A single leading delimiter on C<sKeyPath>
-will be ignored and is not required.
-
-C<$sKeyPath> can be empty in which case C<Connect> will return an
-object representing the virtual root key of the remote Registry.
-Each subsequent use of C<Open> on this virtual root key will call
-the system C<RegConnectRegistry> function.
-
-The C<Connect> method can be called via any I<Win32::TieRegistry>
-object, not just C<$Registry>.  Attributes such as the desired
-level of access and the delimiter will be inherited from the
-object used but the C<$sKeyPath> will always be relative to the
-virtual root of the remote machine's registry.
-
-Examples:
-
-    $remMachKey= $Registry->Connect( "HostA", "LMachine", {Delimiter->"/"} )
-      or  die "Can't connect to HostA's HKEY_LOCAL_MACHINE key: $^E\n";
-
-    $remVersKey= $remMachKey->Connect( "www.microsoft.com",
-                   "LMachine/Software/Microsoft/Inetsrv/CurrentVersion/",
-                   { Access=>KEY_READ, Delimiter=>"/" } )
-      or  die "Can't check what version of IIS Microsoft is running: $^E\n";
-
-    $remVersKey= $remMachKey->Connect( "www",
-                   qw(LMachine Software Microsoft Inetsrv CurrentVersion) )
-      or  die "Can't check what version of IIS we are running: $^E\n";
-
-=item ObjectRef
-
-=item $object_ref= $obj_or_hash_ref->ObjectRef
-
-For a simple object, just returns itself [C<$obj == $obj->ObjectRef>].
-
-For a reference to a tied hash [if it is also an object], C<ObjectRef>
-returns the simple object that the hash is tied to.
-
-This is primarilly useful when debugging since typing C<x $Registry>
-will try to display your I<entire> registry contents to your screen.
-But the debugger command C<x $Registry->ObjectRef> will just dump
-the implementation details of the underlying object to your screen.
-
-=item Flush( $bFlush )
-
-Flushes all cached information about the Registry key so that future
-uses will get fresh data from the Registry.
-
-If the optional C<$bFlush> is specified and a true value, then
-C<RegFlushKey()> will be called, which is almost never necessary.
-
-=item GetValue
-
-=item $ValueData= $key->GetValue( $sValueName )
-
-=item ($ValueData,$ValueType)= $key->GetValue( $sValueName )
-
-Gets a Registry value's data and data type.
-
-C<$ValueData> is usually just a Perl string that contains the
-value data [packed into it].  For certain types of data, however,
-C<$ValueData> may be processed as described below.
-
-C<$ValueType> is the C<REG_*> constant describing the type of value
-data stored in C<$ValueData>.  If the C<DualTypes()> option is on,
-then C<$ValueType> will be a dual value.  That is, when used in a
-numeric context, C<$ValueType> will give the numeric value of a
-C<REG_*> constant.  However, when used in a non-numeric context,
-C<$ValueType> will return the name of the C<REG_*> constant, for
-example C<"REG_SZ"> [note the quotes].  So both of the following
-can be true at the same time:
-
-    $ValueType == REG_SZ()
-    $ValueType eq "REG_SZ"
-
-=over
-
-=item REG_SZ and REG_EXPAND_SZ
-
-If the C<FixSzNulls()> option is on, then the trailing C<'\0'> will be
-stripped [unless there isn't one] before values of type C<REG_SZ>
-and C<REG_EXPAND_SZ> are returned.  Note that C<SetValue()> will add
-a trailing C<'\0'> under similar circumstances.
-
-=item REG_MULTI_SZ
-
-If the C<SplitMultis()> option is on, then values of this type are
-returned as a reference to an array containing the strings.  For
-example, a value that, with C<SplitMultis()> off, would be returned as:
-
-    "Value1\000Value2\000\000"
-
-would be returned, with C<SplitMultis()> on, as:
-
-    [ "Value1", "Value2" ]
-
-=item REG_DWORD
-
-If the C<DualBinVals()> option is on, then the value is returned
-as a scalar containing both a string and a number [much like
-the C<$!> variable -- see the L<SetDualVar> module for more
-information] where the number part is the "unpacked" value.
-Use the returned value in a numeric context to access this part
-of the value.  For example:
-
-    $num= 0 + $Registry->{"CUser/Console//ColorTable01"};
-
-If the C<DWordsToHex()> option is off, the string part of the
-returned value is a packed, 4-byte string [use C<unpack("L",$value)>
-to get the numeric value.
-
-If C<DWordsToHex()> is on, the string part of the returned value is
-a 10-character hex strings [with leading "0x"].  You can use
-C<hex($value)> to get the numeric value.
-
-Note that C<SetValue()> will properly understand each of these
-returned value formats no matter how C<DualBinVals()> is set.
-
-=back
-
-=item ValueNames
-
-=item @names= $key->ValueNames
-
-Returns the list of value names stored directly in a Registry key.
-Note that the names returned do I<not> have a delimiter prepended
-to them like with C<MemberNames()> and tied hashes.
-
-Once you request this information, it is cached in the object and
-future requests will always return the same list unless C<Flush()>
-has been called.
-
-=item SubKeyNames
-
-=item @key_names= $key->SubKeyNames
-
-Returns the list of subkey names stored directly in a Registry key.
-Note that the names returned do I<not> have a delimiter appended
-to them like with C<MemberNames()> and tied hashes.
-
-Once you request this information, it is cached in the object and
-future requests will always return the same list unless C<Flush()>
-has been called.
-
-=item SubKeyClasses
-
-=item @classes= $key->SubKeyClasses
-
-Returns the list of classes for subkeys stored directly in a
-Registry key.  The classes are returned in the same order as
-the subkey names returned by C<SubKeyNames()>.
-
-=item SubKeyTimes
-
-=item @times= $key->SubKeyTimes
-
-Returns the list of last-modified times for subkeys stored
-directly in a Registry key.  The times are returned in the same
-order as the subkey names returned by C<SubKeyNames()>.  Each
-time is a C<FILETIME> structure packed into a Perl string.
-
-Once you request this information, it is cached in the object and
-future requests will always return the same list unless C<Flush()>
-has been called.
-
-=item MemberNames
-
-=item @members= $key->MemberNames
-
-Returns the list of subkey names and value names stored directly
-in a Registry key.  Subkey names have a delimiter appended to the
-end and value names have a delimiter prepended to the front.
-
-Note that a value name could end in a delimiter [or could be C<"">
-so that the member name returned is just a delimiter] so the
-presence or absence of the leading delimiter is what should be
-used to determine whether a particular name is for a subkey or a
-value, not the presence or absence of a trailing delimiter.
-
-Once you request this information, it is cached in the object and
-future requests will always return the same list unless C<Flush()>
-has been called.
-
-=item Information
-
-=item %info= $key->Information
-
-=item @items= $key->Information( @itemNames );
-
-Returns the following information about a Registry key:
-
-=over
-
-=item LastWrite
-
-A C<FILETIME> structure indicating when the key was last modified
-and packed into a Perl string.
-
-=item CntSubKeys
-
-The number of subkeys stored directly in this key.
-
-=item CntValues
-
-The number of values stored directly in this key.
-
-=item SecurityLen
-
-The length [in bytes] of the largest[?] C<SECURITY_DESCRIPTOR>
-associated with the Registry key.
-
-=item MaxValDataLen
-
-The length [in bytes] of the longest value data associated with
-a value stored in this key.
-
-=item MaxSubKeyLen
-
-The length [in chars] of the longest subkey name associated with
-a subkey stored in this key.
-
-=item MaxSubClassLen
-
-The length [in chars] of the longest class name associated with
-a subkey stored directly in this key.
-
-=item MaxValNameLen
-
-The length [in chars] of the longest value name associated with
-a value stored in this key.
-
-=back
-
-With no arguments, returns a hash [not a reference to a hash] where
-the keys are the names for the items given above and the values
-are the information describe above.  For example:
-
-    %info= ( "CntValues" => 25,         # Key contains 25 values.
-             "MaxValNameLen" => 20,     # One of which has a 20-char name.
-             "MaxValDataLen" => 42,     # One of which has a 42-byte value.
-             "CntSubKeys" => 1,         # Key has 1 immediate subkey.
-             "MaxSubKeyLen" => 13,      # One of which has a 12-char name.
-             "MaxSubClassLen" => 0,     # All of which have class names of "".
-             "SecurityLen" => 232,      # One SECURITY_DESCRIPTOR is 232 bytes.
-             "LastWrite" => "\x90mZ\cX{\xA3\xBD\cA\c@\cA"
-                           # Key was last modifed 1998/06/01 16:29:32 GMT
-           );
-
-With arguments, each one must be the name of a item given above.
-The return value is the information associated with the listed
-names.  In other words:
-
-    return $key->Information( @names );
-
-returns the same list as:
-
-    %info= $key->Information;
-    return @info{@names};
-
-=item Delimiter
-
-=item $oldDelim= $key->Delimiter
-
-=item $oldDelim= $key->Delimiter( $newDelim )
-
-Gets and possibly changes the delimiter used for this object.  The
-delimiter is appended to subkey names and prepended to value names
-in many return values.  It is also used when parsing keys passed
-to tied hashes.
-
-The delimiter defaults to backslash (C<'\\'>) but is inherited from
-the object used to create a new object and can be specified by an
-option when a new object is created.
-
-=item Handle
-
-=item $handle= $key->Handle
-
-Returns the raw C<HKEY> handle for the associated Registry key as
-an integer value.  This value can then be used to Reg*() calls
-from I<Win32API::Registry>.  However, it is usually easier to just
-call the I<Win32API::Registry> calls directly via:
-
-    $key->RegNotifyChangeKeyValue( ... );
-
-For the virtual root of the local or a remote Registry,
-C<Handle()> return C<"NONE">.
-
-=item Path
-
-=item $path= $key->Path
-
-Returns a string describing the path of key names to this
-Registry key.  The string is built so that if it were passed
-to C<$Registry->Open()>, it would reopen the same Registry key
-[except in the rare case where one of the key names contains
-C<$key->Delimiter>].
-
-=item Machine
-
-=item $computerName= $key->Machine
-
-Returns the name of the computer [or "machine"] on which this Registry
-key resides.  Returns C<""> for local Registry keys.
-
-=item Access
-
-Returns the numeric value of the bit mask used to specify the
-types of access requested when this Registry key was opened.  Can
-be compared to C<KEY_*> values.
-
-=item OS_Delimiter
-
-Returns the delimiter used by the operating system's RegOpenKeyEx()
-call.  For Win32, this is always backslash (C<"\\">).
-
-=item Roots
-
-Returns the mapping from root key names like C<"LMachine"> to their
-associated C<HKEY_*> constants.  Primarily for internal use and
-subject to change.
-
-=item Tie
-
-=item $key->Tie( \%hash );
-
-Ties the referenced hash to that Registry key.  Pretty much the
-same as
-
-    tie %hash, ref($key), $key;
-
-Since C<ref($key)> is the class [package] to tie the hash to and
-C<TIEHASH()> just returns its argument, C<$key>, [without calling
-C<new()>] when it sees that it is already a blessed object.
-
-=item TiedRef
-
-=item $TiedHashRef= $hash_or_obj_ref->TiedRef
-
-For a simple object, returns a reference to a hash tied to the
-object.  Used to promote a simple object into a combined object
-and hash ref.
-
-If already a reference to a tied hash [that is also an object],
-it just returns itself [C<$ref == $ref->TiedRef>].
-
-Mostly used internally.
-
-=item ArrayValues
-
-=item $oldBool= $key->ArrayValues
-
-=item $oldBool= $key->ArrayValues( $newBool )
-
-Gets the current setting of the C<ArrayValues> option and possibly
-turns it on or off.
-
-When off, Registry values fetched via a tied hash are returned as
-just a value scalar [the same as C<GetValue()> in a scalar context].
-When on, they are returned as a reference to an array containing
-the value data as the C<[0]> element and the data type as the C<[1]>
-element.
-
-=item TieValues
-
-=item $oldBool= TieValues
-
-=item $oldBool= TieValues( $newBool )
-
-Gets the current setting of the C<TieValues> option and possibly
-turns it on or off.
-
-Turning this option on is not yet supported in this release of
-I<Win32::TieRegistry>.  In a future release, turning this option
-on will cause Registry values returned from a tied hash to be
-a tied array that you can use to modify the value in the Registry.
-
-=item FastDelete
-
-=item $oldBool= $key->FastDelete
-
-=item $oldBool= $key->FastDelete( $newBool )
-
-Gets the current setting of the C<FastDelete> option and possibly
-turns it on or off.
-
-When on, successfully deleting a Registry key [via a tied hash]
-simply returns C<1>.
-
-When off, successfully deleting a Registry key [via a tied hash
-and not in a void context] returns a reference to a hash that
-contains the values present in the key when it was deleted.  This
-hash is just like that returned when referencing the key before it
-was deleted except that it is an ordinary hash, not one tied to
-the I<Win32::TieRegistry> package.
-
-Note that deleting either a Registry key or value via a tied hash
-I<in a void context> prevents any overhead in trying to build an
-appropriate return value.
-
-Note that deleting a Registry I<value> via a tied hash [not in
-a void context] returns the value data even if <FastDelete> is on.
-
-=item SplitMultis
-
-=item $oldBool= $key->SplitMultis
-
-=item $oldBool= $key->SplitMultis( $newBool )
-
-Gets the current setting of the C<SplitMultis> option and possibly
-turns it on or off.
-
-If on, Registry values of type C<REG_MULTI_SZ> are returned as
-a reference to an array of strings.  See C<GetValue()> for more
-information.
-
-=item DWordsToHex
-
-=item $oldBool= $key->DWordsToHex
-
-=item $oldBool= $key->DWordsToHex( $newBool )
-
-Gets the current setting of the C<DWordsToHex> option and possibly
-turns it on or off.
-
-If on, Registry values of type C<REG_DWORD> are returned as a hex
-string with leading C<"0x"> and longer than 4 characters.  See
-C<GetValue()> for more information.
-
-=item FixSzNulls
-
-=item $oldBool= $key->FixSzNulls
-
-=item $oldBool= $key->FixSzNulls( $newBool )
-
-Gets the current setting of the C<FixSzNulls> option and possibly
-turns it on or off.
-
-If on, Registry values of type C<REG_SZ> and C<REG_EXPAND_SZ> have
-trailing C<'\0'>s added before they are set and stripped before
-they are returned.  See C<GetValue()> and C<SetValue()> for more
-information.
-
-=item DualTypes
-
-=item $oldBool= $key->DualTypes
-
-=item $oldBool= $key->DualTypes( $newBool )
-
-Gets the current setting of the C<DualTypes> option and possibly
-turns it on or off.
-
-If on, data types are returned as a combined numeric/string value
-holding both the numeric value of a C<REG_*> constant and the
-string value of the constant's name.  See C<GetValue()> for
-more information.
-
-=item DualBinVals
-
-=item $oldBool= $key->DualBinVals
-
-=item $oldBool= $key->DualBinVals( $newBool )
-
-Gets the current setting of the C<DualBinVals> option and possibly
-turns it on or off.
-
-If on, Registry value data of type C<REG_BINARY> and no more than
-4 bytes long and Registry values of type C<REG_DWORD> are returned
-as a combined numeric/string value where the numeric value is the
-"unpacked" binary value as returned by:
-
-        hex reverse unpack( "h*", $valData )
-
-on a "little-endian" computer.  [Would be C<hex unpack("H*",$valData)>
-on a "big-endian" computer if this module is ever ported to one.]
-
-See C<GetValue()> for more information.
-
-=item GetOptions
-
-=item @oldOptValues= $key->GetOptions( @optionNames )
-
-=item $refHashOfOldOpts= $key->GetOptions()
-
-=item $key->GetOptions( \%hashForOldOpts )
-
-Returns the current setting of any of the following options:
-
-    Delimiter     FixSzNulls    DWordsToHex
-    ArrayValues   SplitMultis   DualBinVals
-    TieValues     FastDelete    DualTypes
-
-Pass in one or more of the above names (as strings) to get back
-an array of the corresponding current settings in the same order:
-
-  my( $fastDel, $delim )= $key->GetOptions("FastDelete","Delimiter");
-
-Pass in no arguments to get back a reference to a hash where
-the above option names are the keys and the values are
-the corresponding current settings for each option:
-
-  my $href= $key->GetOptions();
-  my $delim= $href->{Delimiter};
-
-Pass in a single reference to a hash to have the above key/value
-pairs I<added> to the referenced hash.  For this case, the
-return value is the original object so further methods can be
-chained after the call to GetOptions:
-
-  my %oldOpts;
-  $key->GetOptions( \%oldOpts )->SetOptions( Delimiter => "/" );
-
-=item SetOptions
-
-=item @oldOpts= $key->SetOptions( optNames=>$optValue,... )
-
-Changes the current setting of any of the following options,
-returning the previous setting(s):
-
-    Delimiter     FixSzNulls    DWordsToHex   AllowLoad
-    ArrayValues   SplitMultis   DualBinVals   AllowSave
-    TieValues     FastDelete    DualTypes
-
-For C<AllowLoad> and C<AllowSave>, instead of the previous
-setting, C<SetOptions> returns whether or not the change was
-successful.
-
-In a scalar context, returns only the last item.  The last
-option can also be specified as C<"ref"> or C<"r"> [which doesn't
-need to be followed by a value] to allow chaining:
-
-    $key->SetOptions(AllowSave=>1,"ref")->RegSaveKey(...)
-
-=item SetValue
-
-=item $okay= $key->SetValue( $ValueName, $ValueData );
-
-=item $okay= $key->SetValue( $ValueName, $ValueData, $ValueType );
-
-Adds or replaces a Registry value.  Returns a true value if
-successfully, false otherwise.
-
-C<$ValueName> is the name of the value to add or replace and
-should I<not> have a delimiter prepended to it.  Case is ignored.
-
-C<$ValueType> is assumed to be C<REG_SZ> if it is omitted.  Otherwise,
-it should be one the C<REG_*> constants.
-
-C<$ValueData> is the data to be stored in the value, probably packed
-into a Perl string.  Other supported formats for value data are
-listed below for each posible C<$ValueType>.
-
-=over
-
-=item REG_SZ or REG_EXPAND_SZ
-
-The only special processing for these values is the addition of
-the required trailing C<'\0'> if it is missing.  This can be
-turned off by disabling the C<FixSzNulls> option.
-
-=item REG_MULTI_SZ
-
-These values can also be specified as a reference to a list of
-strings.  For example, the following two lines are equivalent:
-
-    $key->SetValue( "Val1\000Value2\000LastVal\000\000", "REG_MULTI_SZ" );
-    $key->SetValue( ["Val1","Value2","LastVal"], "REG_MULTI_SZ" );
-
-Note that if the required two trailing nulls (C<"\000\000">) are
-missing, then this release of C<SetValue()> will I<not> add them.
-
-=item REG_DWORD
-
-These values can also be specified as a hex value with the leading
-C<"0x"> included and totaling I<more than> 4 bytes.  These will be
-packed into a 4-byte string via:
-
-    $data= pack( "L", hex($data) );
-
-=item REG_BINARY
-
-This value type is listed just to emphasize that no alternate
-format is supported for it.  In particular, you should I<not> pass
-in a numeric value for this type of data.  C<SetValue()> cannot
-distinguish such from a packed string that just happens to match
-a numeric value and so will treat it as a packed string.
-
-=back
-
-An alternate calling format:
-
-    $okay= $key->SetValue( $ValueName, [ $ValueData, $ValueType ] );
-
-[two arguments, the second of which is a reference to an array
-containing the value data and value type] is supported to ease
-using tied hashes with C<SetValue()>.
-
-=item CreateKey
-
-=item $newKey= $key->CreateKey( $subKey );
-
-=item $newKey= $key->CreateKey( $subKey, { Option=>OptVal,... } );
-
-Creates a Registry key or just updates attributes of one.  Calls
-C<RegCreateKeyEx()> then, if it succeeded, creates an object
-associated with the [possibly new] subkey.
-
-C<$subKey> is the name of a subkey [or a path to one] to be
-created or updated.  It can also be a reference to an array
-containing a list of subkey names.
-
-The second argument, if it exists, should be a reference to a
-hash specifying options either to be passed to C<RegCreateKeyEx()>
-or to be used when creating the associated object.  The following
-items are the supported keys for this options hash:
-
-=over
-
-=item Delimiter
-
-Specifies the delimiter to be used to parse C<$subKey> and to be
-used in the new object.  Defaults to C<$key->Delimiter>.
-
-=item Access
-
-Specifies the types of access requested when the subkey is opened.
-Should be a numeric bit mask that combines one or more C<KEY_*>
-constant values.
-
-=item Class
-
-The name to assign as the class of the new or updated subkey.
-Defaults to C<""> as we have never seen a use for this information.
-
-=item Disposition
-
-Lets you specify a reference to a scalar where, upon success, will be
-stored either C<REG_CREATED_NEW_KEY()> or C<REG_OPENED_EXISTING_KEY()>
-depending on whether a new key was created or an existing key was
-opened.
-
-If you, for example, did C<use Win32::TieRegistry qw(REG_CREATED_NEW_KEY)>
-then you can use C<REG_CREATED_NEW_KEY()> to compare against the numeric
-value stored in the referenced scalar.
-
-If the C<DualTypes> option is enabled, then in addition to the
-numeric value described above, the referenced scalar will also
-have a string value equal to either C<"REG_CREATED_NEW_KEY"> or
-C<"REG_OPENED_EXISTING_KEY">, as appropriate.
-
-=item Security
-
-Lets you specify a C<SECURITY_ATTRIBUTES> structure packed into a
-Perl string.  See C<Win32API::Registry::RegCreateKeyEx()> for more
-information.
-
-=item Volatile
-
-If true, specifies that the new key should be volatile, that is,
-stored only in memory and not backed by a hive file [and not saved
-if the computer is rebooted].  This option is ignored under
-Windows 95.  Specifying C<Volatile=E<GT>1>  is the same as
-specifying C<Options=E<GT>REG_OPTION_VOLATILE>.
-
-=item Backup
-
-If true, specifies that the new key should be opened for
-backup/restore access.  The C<Access> option is ignored.  If the
-calling process has enabled C<"SeBackupPrivilege">, then the
-subkey is opened with C<KEY_READ> access as the C<"LocalSystem">
-user which should have access to all subkeys.  If the calling
-process has enabled C<"SeRestorePrivilege">, then the subkey is
-opened with C<KEY_WRITE> access as the C<"LocalSystem"> user which
-should have access to all subkeys.
-
-This option is ignored under Windows 95.  Specifying C<Backup=E<GT>1>
-is the same as specifying C<Options=E<GT>REG_OPTION_BACKUP_RESTORE>.
-
-=item Options
-
-Lets you specify options to the C<RegOpenKeyEx()> call.  The value
-for this option should be a numeric value combining zero or more
-of the C<REG_OPTION_*> bit masks.  You may with to used the
-C<Volatile> and/or C<Backup> options instead of this one.
-
-=back
-
-=item StoreKey
-
-=item $newKey= $key->StoreKey( $subKey, \%Contents );
-
-Primarily for internal use.
-
-Used to create or update a Registry key and any number of subkeys
-or values under it or its subkeys.
-
-C<$subKey> is the name of a subkey to be created [or a path of
-subkey names separated by delimiters].  If that subkey already
-exists, then it is updated.
-
-C<\%Contents> is a reference to a hash containing pairs of
-value names with value data and/or subkey names with hash
-references similar to C<\%Contents>.  Each of these cause
-a value or subkey of C<$subKey> to be created or updated.
-
-If C<$Contents{""}> exists and is a reference to a hash, then
-it used as the options argument when C<CreateKey()> is called
-for C<$subKey>.  This allows you to specify ...
-
-    if(  defined( $$data{""} )  &&  "HASH" eq ref($$data{""})  ) {
-        $self= $this->CreateKey( $subKey, delete $$data{""} );
-
-=item Load
-
-=item $newKey= $key->Load( $file )
-
-=item $newKey= $key->Load( $file, $newSubKey )
-
-=item $newKey= $key->Load( $file, $newSubKey, { Option=>OptVal... } )
-
-=item $newKey= $key->Load( $file, { Option=>OptVal... } )
-
-Loads a hive file into a Registry.  That is, creates a new subkey
-and associates a hive file with it.
-
-C<$file> is a hive file, that is a file created by calling
-C<RegSaveKey()>.  The C<$file> path is interpreted relative to
-C<%SystemRoot%/System32/config> on the machine where C<$key>
-resides.
-
-C<$newSubKey> is the name to be given to the new subkey.  If
-C<$newSubKey> is specified, then C<$key> must be
-C<HKEY_LOCAL_MACHINE> or C<HKEY_USERS> of the local computer
-or a remote computer and C<$newSubKey> should not contain any
-occurrences of either the delimiter or the OS delimiter.
-
-If C<$newSubKey> is not specified, then it is as if C<$key>
-was C<$Registry-E<GT>{LMachine}> and C<$newSubKey> is
-C<"PerlTie:999"> where C<"999"> is actually a sequence number
-incremented each time this process calls C<Load()>.
-
-You can specify as the last argument a reference to a hash
-containing options.  You can specify the same options that you
-can specify to C<Open()>.  See C<Open()> for more information on
-those.  In addition, you can specify the option C<"NewSubKey">.
-The value of this option is interpretted exactly as if it was
-specified as the C<$newSubKey> parameter and overrides the
-C<$newSubKey> if one was specified.
-
-The hive is automatically unloaded when the returned object
-[C<$newKey>] is destroyed.  Registry key objects opened within
-the hive will keep a reference to the C<$newKey> object so that
-it will not be destroyed before these keys are closed.
-
-=item UnLoad
-
-=item $okay= $key->UnLoad
-
-Unloads a hive that was loaded via C<Load()>.  Cannot unload other
-hives.  C<$key> must be the return from a previous call to C<Load()>.
-C<$key> is closed and then the hive is unloaded.
-
-=item AllowSave
-
-=item $okay= AllowSave( $bool )
-
-Enables or disables the C<"ReBackupPrivilege"> privilege for the
-current process.  You will probably have to enable this privilege
-before you can use C<RegSaveKey()>.
-
-The return value indicates whether the operation succeeded, not
-whether the privilege was previously enabled.
-
-=item AllowLoad
-
-=item $okay= AllowLoad( $bool )
-
-Enables or disables the C<"ReRestorePrivilege"> privilege for the
-current process.  You will probably have to enable this privilege
-before you can use C<RegLoadKey()>, C<RegUnLoadKey()>,
-C<RegReplaceKey()>, or C<RegRestoreKey> and thus C<Load()> and
-C<UnLoad()>.
-
-The return value indicates whether the operation succeeded, not
-whether the privilege was previously enabled.
-
-=back
-
-=head2 Exports [C<use> and C<import()>]
-
-To have nothing imported into your package, use something like:
-
-    use Win32::TieRegistry 0.20 ();
-
-which would verify that you have at least version 0.20 but wouldn't
-call C<import()>.  The F<Changes> file can be useful in figuring out
-which, if any, prior versions of I<Win32::TieRegistry> you want to
-support in your script.
-
-The code
-
-    use Win32::TieRegistry;
-
-imports the variable C<$Registry> into your package and sets it
-to be a reference to a hash tied to a copy of the master Registry
-virtual root object with the default options.  One disadvantage
-to this "default" usage is that Perl does not support checking
-the module version when you use it.
-
-Alternately, you can specify a list of arguments on the C<use>
-line that will be passed to the C<Win32::TieRegistry->import()>
-method to control what items to import into your package.  These
-arguments fall into the following broad categories:
-
-=over
-
-=item Import a reference to a hash tied to a Registry virtual root
-
-You can request that a scalar variable be imported (possibly)
-and set to be a reference to a hash tied to a Registry virtual root
-using any of the following types of arguments or argument pairs:
-
-=over
-
-=item "TiedRef", '$scalar'
-
-=item "TiedRef", '$pack::scalar'
-
-=item "TiedRef", 'scalar'
-
-=item "TiedRef", 'pack::scalar'
-
-All of the above import a scalar named C<$scalar> into your package
-(or the package named "pack") and then sets it.
-
-=item '$scalar'
-
-=item '$pack::scalar'
-
-These are equivalent to the previous items to support a more
-traditional appearance to the list of exports.  Note that the
-scalar name cannot be "RegObj" here.
-
-=item "TiedRef", \$scalar
-
-=item \$scalar
-
-These versions don't import anything but set the referenced C<$scalar>.
-
-=back
-
-=item Import a hash tied to the Registry virtual root
-
-You can request that a hash variable be imported (possibly)
-and tied to a Registry virtual root using any of the following
-types of arguments or argument pairs:
-
-=over
-
-=item "TiedHash", '%hash'
-
-=item "TiedHash", '%pack::hash'
-
-=item "TiedHash", 'hash'
-
-=item "TiedHash", 'pack::hash'
-
-All of the above import a hash named C<%hash> into your package
-(or the package named "pack") and then sets it.
-
-=item '%hash'
-
-=item '%pack::hash'
-
-These are equivalent to the previous items to support a more
-traditional appearance to the list of exports.
-
-=item "TiedHash", \%hash
-
-=item \%hash
-
-These versions don't import anything but set the referenced C<%hash>.
-
-=back
-
-=item Import a Registry virtual root object
-
-You can request that a scalar variable be imported (possibly)
-and set to be a Registry virtual root object using any of the
-following types of arguments or argument pairs:
-
-=over
-
-=item "ObjectRef", '$scalar'
-
-=item "ObjectRef", '$pack::scalar'
-
-=item "ObjectRef", 'scalar'
-
-=item "ObjectRef", 'pack::scalar'
-
-All of the above import a scalar named C<$scalar> into your package
-(or the package named "pack") and then sets it.
-
-=item '$RegObj'
-
-This is equivalent to the previous items for backward compatibility.
-
-=item "ObjectRef", \$scalar
-
-This version doesn't import anything but sets the referenced C<$scalar>.
-
-=back
-
-=item Import constant(s) exported by I<Win32API::Registry>
-
-You can list any constants that are exported by I<Win32API::Registry>
-to have them imported into your package.  These constants have names
-starting with "KEY_" or "REG_" (or even "HKEY_").
-
-You can also specify C<":KEY_">, C<":REG_">, and even C<":HKEY_"> to
-import a whole set of constants.
-
-See I<Win32API::Registry> documentation for more information.
-
-=item Options
-
-You can list any option names that can be listed in the C<SetOptions()>
-method call, each folowed by the value to use for that option.
-A Registry virtual root object is created, all of these options are
-set for it, then each variable to be imported/set is associated with
-this object.
-
-In addition, the following special options are supported:
-
-=over
-
-=item ExportLevel
-
-Whether to import variables into your package or some
-package that uses your package.  Defaults to the value of
-C<$Exporter::ExportLevel> and has the same meaning.  See
-the L<Exporter> module for more information.
-
-=item ExportTo
-
-The name of the package to import variables and constants into.
-Overrides I<ExportLevel>.
-
-=back
-
-=back
-
-=head3 Specifying constants in your Perl code
-
-This module was written with a strong emphasis on the convenience of
-the module user.  Therefore, most places where you can specify a
-constant like C<REG_SZ()> also allow you to specify a string
-containing the name of the constant, C<"REG_SZ">.  This is convenient
-because you may not have imported that symbolic constant.
-
-Perl also emphasizes programmer convenience so the code C<REG_SZ>
-can be used to mean C<REG_SZ()> or C<"REG_SZ"> or be illegal.
-Note that using C<&REG_SZ> (as we've seen in much Win32 Perl code)
-is not a good idea since it passes the current C<@_> to the
-C<constant()> routine of the module which, at the least, can give
-you a warning under B<-w>.
-
-Although greatly a matter of style, the "safest" practice is probably
-to specifically list all constants in the C<use Win32::TieRegistry>
-statement, specify C<use strict> [or at least C<use strict qw(subs)>],
-and use bare constant names when you want the numeric value.  This will
-detect mispelled constant names at compile time.
-
-    use strict;
-    my $Registry;
-    use Win32::TieRegistry 0.20 (
-        TiedRef => \$Registry,  Delimiter => "/",  ArrayValues => 1,
-	SplitMultis => 1,  AllowLoad => 1,
-        qw( REG_SZ REG_EXPAND_SZ REG_DWORD REG_BINARY REG_MULTI_SZ
-	    KEY_READ KEY_WRITE KEY_ALL_ACCESS ),
-    );
-    $Registry->{"LMachine/Software/FooCorp/"}= {
-        "FooWriter/" => {
-            "/Fonts" => [ ["Times","Courier","Lucinda"], REG_MULTI_SZ ],
-	    "/WindowSize" => [ pack("LL",24,80), REG_BINARY ],
-	    "/TaskBarIcon" => [ "0x0001", REG_DWORD ],
-	},
-    }  or  die "Can't create Software/FooCorp/: $^E\n";
-
-If you don't want to C<use strict qw(subs)>, the second safest practice
-is similar to the above but use the C<REG_SZ()> form for constants
-when possible and quoted constant names when required.  Note that
-C<qw()> is a form of quoting.
-
-    use Win32::TieRegistry 0.20 qw(
-        TiedRef $Registry
-        Delimiter /  ArrayValues 1  SplitMultis 1  AllowLoad 1
-        REG_SZ REG_EXPAND_SZ REG_DWORD REG_BINARY REG_MULTI_SZ
-        KEY_READ KEY_WRITE KEY_ALL_ACCESS
-    );
-    $Registry->{"LMachine/Software/FooCorp/"}= {
-        "FooWriter/" => {
-            "/Fonts" => [ ["Times","Courier","Lucinda"], REG_MULTI_SZ() ],
-	    "/WindowSize" => [ pack("LL",24,80), REG_BINARY() ],
-	    "/TaskBarIcon" => [ "0x0001", REG_DWORD() ],
-	},
-    }  or  die "Can't create Software/FooCorp/: $^E\n";
-
-The examples in this document mostly use quoted constant names
-(C<"REG_SZ">) since that works regardless of which constants
-you imported and whether or not you have C<use strict> in your
-script.  It is not the best choice for you to use for real
-scripts (vs. examples) because it is less efficient and is not
-supported by most other similar modules.
-
-=head1 SUMMARY
-
-Most things can be done most easily via tied hashes.  Skip down to the
-the L<Tied Hashes Summary> to get started quickly.
-
-=head2 Objects Summary
-
-Here are quick examples that document the most common functionality
-of all of the method functions [except for a few almost useless ones].
-
-    # Just another way of saying Open():
-    $key= new Win32::TieRegistry "LMachine\\Software\\",
-      { Access=>KEY_READ()|KEY_WRITE(), Delimiter=>"\\" };
-
-    # Open a Registry key:
-    $subKey= $key->Open( "SubKey/SubSubKey/",
-      { Access=>KEY_ALL_ACCESS, Delimiter=>"/" } );
-
-    # Connect to a remote Registry key:
-    $remKey= $Registry->Connect( "MachineName", "LMachine/",
-      { Access=>KEY_READ, Delimiter=>"/" } );
-
-    # Get value data:
-    $valueString= $key->GetValue("ValueName");
-    ( $valueString, $valueType )= $key->GetValue("ValueName");
-
-    # Get list of value names:
-    @valueNames= $key->ValueNames;
-
-    # Get list of subkey names:
-    @subKeyNames= $key->SubKeyNames;
-
-    # Get combined list of value names (with leading delimiters)
-    # and subkey names (with trailing delimiters):
-    @memberNames= $key->MemberNames;
-
-    # Get all information about a key:
-    %keyInfo= $key->Information;
-    # keys(%keyInfo)= qw( Class LastWrite SecurityLen
-    #   CntSubKeys MaxSubKeyLen MaxSubClassLen
-    #   CntValues MaxValNameLen MaxValDataLen );
-
-    # Get selected information about a key:
-    ( $class, $cntSubKeys )= $key->Information( "Class", "CntSubKeys" );
-
-    # Get and/or set delimiter:
-    $delim= $key->Delimiter;
-    $oldDelim= $key->Delimiter( $newDelim );
-
-    # Get "path" for an open key:
-    $path= $key->Path;
-    # For example, "/CUser/Control Panel/Mouse/"
-    # or "//HostName/LMachine/System/DISK/".
-
-    # Get name of machine where key is from:
-    $mach= $key->Machine;
-    # Will usually be "" indicating key is on local machine.
-
-    # Control different options (see main documentation for descriptions):
-    $oldBool= $key->ArrayValues( $newBool );
-    $oldBool= $key->FastDelete( $newBool );
-    $oldBool= $key->FixSzNulls( $newBool );
-    $oldBool= $key->SplitMultis( $newBool );
-    $oldBool= $key->DWordsToHex( $newBool );
-    $oldBool= $key->DualBinVals( $newBool );
-    $oldBool= $key->DualTypes( $newBool );
-    @oldBools= $key->SetOptions( ArrayValues=>1, FastDelete=>1, FixSzNulls=>0,
-      Delimiter=>"/", AllowLoad=>1, AllowSave=>1 );
-    @oldBools= $key->GetOptions( ArrayValues, FastDelete, FixSzNulls );
-
-    # Add or set a value:
-    $key->SetValue( "ValueName", $valueDataString );
-    $key->SetValue( "ValueName", pack($format,$valueData), "REG_BINARY" );
-
-    # Add or set a key:
-    $key->CreateKey( "SubKeyName" );
-    $key->CreateKey( "SubKeyName",
-      { Access=>"KEY_ALL_ACCESS", Class=>"ClassName",
-        Delimiter=>"/", Volatile=>1, Backup=>1 } );
-
-    # Load an off-line Registry hive file into the on-line Registry:
-    $newKey= $Registry->Load( "C:/Path/To/Hive/FileName" );
-    $newKey= $key->Load( "C:/Path/To/Hive/FileName", "NewSubKeyName",
-                     { Access=>"KEY_READ" } );
-    # Unload a Registry hive file loaded via the Load() method:
-    $newKey->UnLoad;
-
-    # (Dis)Allow yourself to load Registry hive files:
-    $success= $Registry->AllowLoad( $bool );
-
-    # (Dis)Allow yourself to save a Registry key to a hive file:
-    $success= $Registry->AllowSave( $bool );
-
-    # Save a Registry key to a new hive file:
-    $key->RegSaveKey( "C:/Path/To/Hive/FileName", [] );
-
-=head3 Other Useful Methods
-
-See I<Win32API::Registry> for more information on these methods.
-These methods are provided for coding convenience and are
-identical to the I<Win32API::Registry> functions except that these
-don't take a handle to a Registry key, instead getting the handle
-from the invoking object [C<$key>].
-
-    $key->RegGetKeySecurity( $iSecInfo, $sSecDesc, $lenSecDesc );
-    $key->RegLoadKey( $sSubKeyName, $sPathToFile );
-    $key->RegNotifyChangeKeyValue(
-      $bWatchSubtree, $iNotifyFilter, $hEvent, $bAsync );
-    $key->RegQueryMultipleValues(
-      $structValueEnts, $cntValueEnts, $Buffer, $lenBuffer );
-    $key->RegReplaceKey( $sSubKeyName, $sPathToNewFile, $sPathToBackupFile );
-    $key->RegRestoreKey( $sPathToFile, $iFlags );
-    $key->RegSetKeySecurity( $iSecInfo, $sSecDesc );
-    $key->RegUnLoadKey( $sSubKeyName );
-
-=head2 Tied Hashes Summary
-
-For fast learners, this may be the only section you need to read.
-Always append one delimiter to the end of each Registry key name
-and prepend one delimiter to the front of each Registry value name.
-
-=head3 Opening keys
-
-    use Win32::TieRegistry ( Delimiter=>"/", ArrayValues=>1 );
-    $Registry->Delimiter("/");                  # Set delimiter to "/".
-    $swKey= $Registry->{"LMachine/Software/"};
-    $winKey= $swKey->{"Microsoft/Windows/CurrentVersion/"};
-    $userKey= $Registry->
-      {"CUser/Software/Microsoft/Windows/CurrentVersion/"};
-    $remoteKey= $Registry->{"//HostName/LMachine/"};
-
-=head3 Reading values
-
-    $progDir= $winKey->{"/ProgramFilesDir"};    # "C:\\Program Files"
-    $tip21= $winKey->{"Explorer/Tips//21"};     # Text of tip #21.
-
-    $winKey->ArrayValues(1);
-    ( $devPath, $type )= $winKey->{"/DevicePath"};
-    # $devPath eq "%SystemRoot%\\inf"
-    # $type eq "REG_EXPAND_SZ"  [if you have SetDualVar.pm installed]
-    # $type == REG_EXPAND_SZ()  [if did C<use Win32::TieRegistry qw(:REG_)>]
-
-=head3 Setting values
-
-    $winKey->{"Setup//SourcePath"}= "\\\\SwServer\\SwShare\\Windows";
-    # Simple.  Assumes data type of REG_SZ.
-
-    $winKey->{"Setup//Installation Sources"}=
-      [ "D:\x00\\\\SwServer\\SwShare\\Windows\0\0", "REG_MULTI_SZ" ];
-    # "\x00" and "\0" used to mark ends of each string and end of list.
-
-    $winKey->{"Setup//Installation Sources"}=
-      [ ["D:","\\\\SwServer\\SwShare\\Windows"], "REG_MULTI_SZ" ];
-    # Alternate method that is easier to read.
-
-    $userKey->{"Explorer/Tips//DisplayInitialTipWindow"}=
-      [ pack("L",0), "REG_DWORD" ];
-    $userKey->{"Explorer/Tips//Next"}= [ pack("S",3), "REG_BINARY" ];
-    $userKey->{"Explorer/Tips//Show"}= [ pack("L",0), "REG_BINARY" ];
-
-=head3 Adding keys
-
-    $swKey->{"FooCorp/"}= {
-        "FooWriter/" => {
-            "/Version" => "4.032",
-            "Startup/" => {
-                "/Title" => "Foo Writer Deluxe ][",
-                "/WindowSize" => [ pack("LL",$wid,$ht), "REG_BINARY" ],
-                "/TaskBarIcon" => [ "0x0001", "REG_DWORD" ],
-            },
-            "Compatibility/" => {
-                "/AutoConvert" => "Always",
-                "/Default Palette" => "Windows Colors",
-            },
-        },
-        "/License", => "0123-9C8EF1-09-FC",
-    };
-
-=head3 Listing all subkeys and values
-
-    @members= keys( %{$swKey} );
-    @subKeys= grep(  m#^/#,  keys( %{$swKey->{"Classes/batfile/"}} )  );
-    # @subKeys= ( "/", "/EditFlags" );
-    @valueNames= grep(  ! m#^/#,  keys( %{$swKey->{"Classes/batfile/"}} )  );
-    # @valueNames= ( "DefaultIcon/", "shell/", "shellex/" );
-
-=head3 Deleting values or keys with no subkeys
-
-    $oldValue= delete $userKey->{"Explorer/Tips//Next"};
-
-    $oldValues= delete $userKey->{"Explorer/Tips/"};
-    # $oldValues will be reference to hash containing deleted keys values.
-
-=head3 Closing keys
-
-    undef $swKey;               # Explicit way to close a key.
-    $winKey= "Anything else";   # Implicitly closes a key.
-    exit 0;                     # Implicitly closes all keys.
-
-=head2 Tie::Registry
-
-This module was originally called I<Tie::Registry>.  Changing code
-that used I<Tie::Registry> over to I<Win32::TieRegistry> is trivial
-as the module name should only be mentioned once, in the C<use>
-line.  However, finding all of the places that used I<Tie::Registry>
-may not be completely trivial so we have included F<Tie/Registry.pm>
-which you can install to provide backward compatibility.
-
-=head1 AUTHOR
-
-Tye McQueen.  See http://www.metronet.com/~tye/ or e-mail
-tye@metronet.com with bug reports.
-
-=head1 SEE ALSO
-
-I<Win32API::Registry> - Provides access to C<Reg*()>, C<HKEY_*>,
-C<KEY_*>, C<REG_*> [required].
-
-I<Win32::WinError> - Defines C<ERROR_*> values [optional].
-
-L<SetDualVar> - For returning C<REG_*> values as combined
-string/integer values [optional].
-
-=head1 BUGS
-
-Perl5.004_02 has bugs that make I<Win32::TieRegistry> fail in
-strange and subtle ways.
-
-Using I<Win32::TieRegistry> with versions of Perl prior to 5.005
-can be tricky or impossible.  Most notes about this have been
-removed from the documentation (they get rather complicated
-and confusing).  This includes references to C<$^E> perhaps not
-being meaningful.
-
-Because Perl hashes are case sensitive, certain lookups are also
-case sensistive.  In particular, the root keys ("Classes", "CUser",
-"LMachine", "Users", "PerfData", "CConfig", "DynData", and HKEY_*)
-must always be entered without changing between upper and lower
-case letters.  Also, the special rule for matching subkey names
-that contain the user-selected delimiter only works if case is
-matched.  All other key name and value name lookups should be case
-insensitive because the underlying Reg*() calls ignore case.
-
-Information about each key is cached when using a tied hash.
-This cache is not flushed nor updated when changes are made,
-I<even when the same tied hash is used> to make the changes.
-
-Current implementations of Perl's "global destruction" phase can
-cause objects returned by C<Load()> to be destroyed while keys
-within the hive are still open, if the objects still exist when
-the script starts to exit.  When this happens, the automatic
-C<UnLoad()> will report a failure and the hive will remain loaded
-in the Registry.
-
-Trying to C<Load()> a hive file that is located on a remote network
-share may silently delete all data from the hive.  This is a bug
-in the Win32 APIs, not any Perl code or modules.  This module does
-not try to protect you from this bug.
-
-There is no test suite.
-
-=head1 FUTURE DIRECTIONS
-
-The following items are desired by the author and may appear in a
-future release of this module.
-
-=over
-
-=item TieValues option
-
-Currently described in main documentation but no yet implemented.
-
-=item AutoRefresh option
-
-Trigger use of C<RegNotifyChangeKeyValue()> to keep tied hash
-caches up-to-date even when other programs make changes.
-
-=item Error options
-
-Allow the user to have unchecked calls (calls in a "void context")
-to automatically report errors via C<warn> or C<die>.
-
-For complex operations, such a copying an entire subtree, provide
-access to detailed information about errors (and perhaps some
-warnings) that were encountered.  Let the user control whether
-the complex operation continues in spite of errors.
-
-=back
-
-=cut
-
-# Autoload not currently supported by Perl under Windows.
+# Win32/TieRegistry.pm -- Perl module to easily use a Registry
+# (on Win32 systems so far).
+# by Tye McQueen, tye@metronet.com, see http://www.metronet.com/~tye/.
+
+#
+# Skip to "=head" line for user documentation.
+#
+
+
+package Win32::TieRegistry;
+
+
+use strict;
+use vars qw( $PACK $VERSION @ISA @EXPORT @EXPORT_OK );
+
+$PACK= "Win32::TieRegistry";	# Used in error messages.
+$VERSION= '0.26';
+
+
+use Carp;
+
+require Tie::Hash;
+@ISA= qw(Tie::Hash);
+
+# Required other modules:
+use Win32API::Registry 0.12 qw( :KEY_ :HKEY_ :REG_ );
+
+#Optional other modules:
+use vars qw( $_NoMoreItems $_FileNotFound $_TooSmall $_MoreData $_SetDualVar );
+
+if(  eval { require Win32::WinError }  ) {
+    $_NoMoreItems= Win32::WinError::constant("ERROR_NO_MORE_ITEMS",0);
+    $_FileNotFound= Win32::WinError::constant("ERROR_FILE_NOT_FOUND",0);
+    $_TooSmall= Win32::WinError::constant("ERROR_INSUFFICIENT_BUFFER",0);
+    $_MoreData= Win32::WinError::constant("ERROR_MORE_DATA",0);
+} else {
+    $_NoMoreItems= "^No more data";
+    $_FileNotFound= "cannot find the file";
+    $_TooSmall= " data area passed to ";
+    $_MoreData= "^more data is avail";
+}
+if(  $_SetDualVar= eval { require SetDualVar }  ) {
+    import SetDualVar;
+}
+
+
+#Implementation details:
+#    When opened:
+#	HANDLE		long; actual handle value
+#	MACHINE		string; name of remote machine ("" if local)
+#	PATH		list ref; machine-relative full path for this key:
+#			["LMachine","System","Disk"]
+#			["HKEY_LOCAL_MACHINE","System","Disk"]
+#	DELIM		char; delimiter used to separate subkeys (def="\\")
+#	OS_DELIM	char; always "\\" for Win32
+#	ACCESS		long; usually KEY_ALL_ACCESS, perhaps KEY_READ, etc.
+#	ROOTS		string; var name for "Lmachine"->HKEY_LOCAL_MACHINE map
+#	FLAGS		int; bits to control certain options
+#    Often:
+#	VALUES		ref to list of value names (data/type never cached)
+#	SUBKEYS		ref to list of subkey names
+#	SUBCLASSES	ref to list of subkey classes
+#	SUBTIMES	ref to list of subkey write times
+#	MEMBERS		ref to list of subkey_name.DELIM's, DELIM.value_name's
+#	MEMBHASH	hash ref to with MEMBERS as keys and 1's as values
+#    Once Key "Info" requested:
+#	Class CntSubKeys CntValues MaxSubKeyLen MaxSubClassLen
+#	MaxValNameLen MaxValDataLen SecurityLen LastWrite
+#    If is tied to a hash and iterating over key values:
+#	PREVIDX		int; index of last MEMBERS element return
+#    If is the key object returned by Load():
+#	UNLOADME	list ref; information about Load()ed key
+#    If is a subkey of a "loaded" key other than the one returned by Load():
+#	DEPENDON	obj ref; object that can't be destroyed before us
+
+
+#Package-local variables:
+
+# Option flag bits:
+use vars qw( $Flag_ArrVal $Flag_TieVal $Flag_DualTyp $Flag_DualBin
+	     $Flag_FastDel $Flag_HexDWord $Flag_Split $Flag_FixNulls );
+$Flag_ArrVal=	0x0001;
+$Flag_TieVal=	0x0002;
+$Flag_FastDel=	0x0004;
+$Flag_HexDWord=	0x0008;
+$Flag_Split=	0x0010;
+$Flag_DualTyp=	0x0020;
+$Flag_DualBin=	0x0040;
+$Flag_FixNulls=	0x0080;
+
+
+use vars qw( $RegObj %_Roots %RegHash $Registry );
+
+# Short-hand for HKEY_* constants:
+%_Roots= (
+    "Classes" =>	HKEY_CLASSES_ROOT,
+    "CUser" =>		HKEY_CURRENT_USER,
+    "LMachine" =>	HKEY_LOCAL_MACHINE,
+    "Users" =>		HKEY_USERS,
+    "PerfData" =>	HKEY_PERFORMANCE_DATA,	# Too picky to be useful
+    "CConfig" =>	HKEY_CURRENT_CONFIG,
+    "DynData" =>	HKEY_DYN_DATA,		# Too picky to be useful
+);
+
+# Basic master Registry object:
+$RegObj= {};
+@$RegObj{qw( HANDLE MACHINE PATH DELIM OS_DELIM ACCESS FLAGS ROOTS )}= (
+    "NONE", "", [], "\\", "\\",
+    KEY_READ|KEY_WRITE, $Flag_HexDWord|$Flag_FixNulls, "${PACK}::_Roots" );
+$RegObj->{FLAGS} |= $Flag_DualTyp|$Flag_DualBin   if  $_SetDualVar;
+bless $RegObj;
+
+# Fill cache for master Registry object:
+@$RegObj{qw( VALUES SUBKEYS SUBCLASSES SUBTIMES )}= (
+    [],  [ keys(%_Roots) ],  [],  []  );
+grep( s#$#$RegObj->{DELIM}#,
+  @{ $RegObj->{MEMBERS}= [ @{$RegObj->{SUBKEYS}} ] } );
+@$RegObj{qw( Class MaxSubKeyLen MaxSubClassLen MaxValNameLen
+  MaxValDataLen SecurityLen LastWrite CntSubKeys CntValues )}=
+    ( "", 0, 0, 0, 0, 0, 0, 0, 0 );
+
+# Create master Registry tied hash:
+$RegObj->Tie( \%RegHash );
+
+# Create master Registry combination object and tied hash reference:
+$Registry= \%RegHash;
+bless $Registry;
+
+
+# Preloaded methods go here.
+
+
+# Map option names to name of subroutine that controls that option:
+use vars qw( @_opt_subs %_opt_subs );
+@_opt_subs= qw( Delimiter ArrayValues TieValues SplitMultis DWordsToHex
+	FastDelete FixSzNulls DualTypes DualBinVals AllowLoad AllowSave );
+@_opt_subs{@_opt_subs}= @_opt_subs;
+
+sub import
+{
+    my $pkg= shift(@_);
+    my $level= $Exporter::ExportLevel;
+    my $expto= caller($level);
+    my @export= ();
+    my @consts= ();
+    my $registry= $Registry->Clone;
+    local( $_ );
+    while(  @_  ) {
+	$_= shift(@_);
+	if(  /^\$(\w+::)*\w+$/  ) {
+	    push( @export, "ObjVar" )   if  /^\$RegObj$/;
+	    push( @export, $_ );
+	} elsif(  /^\%(\w+::)*\w+$/  ) {
+	    push( @export, $_ );
+	} elsif(  /^[$%]/  ) {
+	    croak "${PACK}->import:  Invalid variable name ($_)";
+	} elsif(  /^:/  ||  /^(H?KEY|REG)_/  ) {
+	    push( @consts, $_ );
+	} elsif(  ! @_  ) {
+	    croak "${PACK}->import:  Missing argument after option ($_)";
+	} elsif(  exists $_opt_subs{$_}  ) {
+	    $_= $_opt_subs{$_};
+	    $registry->$_( shift(@_) );
+	} elsif(  /^TiedRef$/  ) {
+	    $_= shift(@_);
+	    if(  ! ref($_)  &&  /^(\$?)(\w+::)*\w+$/  ) {
+		$_= '$'.$_   unless  '$' eq $1;
+	    } elsif(  "SCALAR" ne ref($_)  ) {
+		croak "${PACK}->import:  Invalid var after TiedRef ($_)";
+	    }
+	    push( @export, $_ );
+	} elsif(  /^TiedHash$/  ) {
+	    $_= shift(@_);
+	    if(  ! ref($_)  &&  /^(\%?)(\w+::)*\w+$/  ) {
+		$_= '%'.$_   unless  '%' eq $1;
+	    } elsif(  "HASH" ne ref($_)  ) {
+		croak "${PACK}->import:  Invalid var after TiedHash ($_)";
+	    }
+	    push( @export, $_ );
+	} elsif(  /^ObjectRef$/  ) {
+	    $_= shift(@_);
+	    if(  ! ref($_)  &&  /^(\$?)(\w+::)*\w+$/  ) {
+		push( @export, "ObjVar" );
+		$_= '$'.$_   unless  '$' eq $1;
+	    } elsif(  "SCALAR" eq ref($_)  ) {
+		push( @export, "ObjRef" );
+	    } else {
+		croak "${PACK}->import:  Invalid var after ObjectRef ($_)";
+	    }
+	    push( @export, $_ );
+	} elsif(  /^ExportLevel$/  ) {
+	    $level= shift(@_);
+	    $expto= caller($level);
+	} elsif(  /^ExportTo$/  ) {
+	    undef $level;
+	    $expto= caller($level);
+	} else {
+	    croak "${PACK}->import:  Invalid option ($_)";
+	}
+    }
+    Win32API::Registry->export( $expto, @consts )   if  @consts;
+    @export= ('$Registry')   unless  @export;
+    while(  @export  ) {
+	$_= shift( @export );
+	if(  /^\$((?:\w+::)*)(\w+)$/  ) {
+	    my( $pack, $sym )= ( $1, $2 );
+	    $pack= $expto   unless  defined($pack)  &&  "" ne $pack;
+	    no strict 'refs';
+	    *{"${pack}::$sym"}= \${"${pack}::$sym"};
+	    ${"${pack}::$sym"}= $registry;
+	} elsif(  /^\%((?:\w+::)*)(\w+)$/  ) {
+	    my( $pack, $sym )= ( $1, $2 );
+	    $pack= $expto   unless  defined($pack)  &&  "" ne $pack;
+	    no strict 'refs';
+	    *{"${pack}::$sym"}= \%{"${pack}::$sym"};
+	    $registry->Tie( \%{"${pack}::$sym"} );
+	} elsif(  "SCALAR" eq ref($_)  ) {
+	    $$_= $registry;
+	} elsif(  "HASH" eq ref($_)  ) {
+	    $registry->Tie( $_ );
+	} elsif(  /^ObjVar$/  ) {
+	    $_= shift( @_ );
+	    /^\$((?:\w+::)*)(\w+)$/;
+	    my( $pack, $sym )= ( $1, $2 );
+	    $pack= $expto   unless  defined($pack)  &&  "" ne $pack;
+	    no strict 'refs';
+	    *{"${pack}::$sym"}= \${"${pack}::$sym"};
+	    ${"${pack}::$sym"}= $registry->ObjectRef;
+	} elsif(  /^ObjRef$/  ) {
+	    ${shift(@_)}= $registry->ObjectRef;
+	} else {
+	    die "Impossible var to export ($_)";
+	}
+    }
+}
+
+
+use vars qw( @_new_Opts %_new_Opts );
+@_new_Opts= qw( ACCESS DELIM MACHINE DEPENDON );
+@_new_Opts{@_new_Opts}= (1) x @_new_Opts;
+
+sub _new
+{
+    my $this= shift( @_ );
+    $this= tied(%$this)   if  ref($this)  &&  tied(%$this);
+    my $class= ref($this) || $this;
+    my $self= {};
+    my( $handle, $rpath, $opts )= @_;
+    if(  @_ < 2  ||  "ARRAY" ne ref($rpath)  ||  3 < @_
+     ||  3 == @_ && "HASH" ne ref($opts)  ) {
+	croak "Usage:  ${PACK}->_new( \$handle, \\\@path, {OPT=>VAL,...} );\n",
+	      "  options: @_new_Opts\nCalled";
+    }
+    @$self{qw( HANDLE PATH )}= ( $handle, $rpath );
+    @$self{qw( MACHINE ACCESS DELIM OS_DELIM ROOTS FLAGS )}=
+      ( $this->Machine, $this->Access, $this->Delimiter,
+        $this->OS_Delimiter, $this->_Roots, $this->_Flags );
+    if(  ref($opts)  ) {
+	my @err= grep( ! $_new_Opts{$_}, keys(%$opts) );
+	@err  and  croak "${PACK}->_new:  Invalid options (@err)";
+	@$self{ keys(%$opts) }= values(%$opts);
+    }
+    bless $self, $class;
+    return $self;
+}
+
+
+sub _split
+{
+    my $self= shift( @_ );
+    $self= tied(%$self)   if  tied(%$self);
+    my $path= shift( @_ );
+    my $delim= @_ ? shift(@_) : $self->Delimiter;
+    my $list= [ split( /\Q$delim/, $path ) ];
+    return $list;
+}
+
+
+sub _rootKey
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $keyPath= shift(@_);
+    my $delim= @_ ? shift(@_) : $self->Delimiter;
+    my( $root, $subPath );
+    if(  "ARRAY" eq ref($keyPath)  ) {
+	$subPath= $keyPath;
+    } else {
+	$subPath= $self->_split( $keyPath, $delim );
+    }
+    $root= shift( @$subPath );
+    if(  $root =~ /^HKEY_/  ) {
+	my $handle= Win32API::Registry::constant($root,0);
+	$handle  or  croak "Invalid HKEY_ constant ($root): $!";
+	return( $self->_new( $handle, [$root], {DELIM=>$delim} ),
+	        $subPath );
+    } elsif(  $root =~ /^([-+]|0x)?\d/  ) {
+	return( $self->_new( $root, [sprintf("0x%lX",$root)],
+			     {DELIM=>$delim} ),
+		$subPath );
+    } else {
+	my $roots= $self->Roots;
+	if(  $roots->{$root}  ) {
+	    return( $self->_new( $roots->{$root}, [$root], {DELIM=>$delim} ),
+	            $subPath );
+	}
+	croak "No such root key ($root)";
+    }
+}
+
+
+sub _open
+{
+    my $this= shift(@_);
+    $this= tied(%$this)   if  ref($this)  &&  tied(%$this);
+    my $subPath= shift(@_);
+    my $sam= @_ ? shift(@_) : $this->Access;
+    my $subKey= join( $this->OS_Delimiter, @$subPath );
+    my $handle= 0;
+    $this->RegOpenKeyEx( $subKey, 0, $sam, $handle )
+      or  return ();
+    return $this->_new( $handle, [ @{$this->_Path}, @$subPath ],
+      { ACCESS=>$sam, ( defined($this->{UNLOADME}) ? ("DEPENDON",$this)
+	: defined($this->{DEPENDON}) ? ("DEPENDON",$this->{DEPENDON}) : () )
+      } );
+}
+
+
+sub ObjectRef
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    return $self;
+}
+
+
+sub _constant
+{
+    my( $name, $desc )= @_;
+    my $value= Win32API::Registry::constant( $name, 0 );
+    my $func= (caller(1))[3];
+    if(  0 == $value  ) {
+	if(  $! =~ /invalid/i  ) {
+	    croak "$func: Invalid $desc ($name)";
+	} elsif(  0 != $!  ) {
+	    croak "$func: \u$desc ($name) not support on this platform";
+	}
+    }
+    return $value;
+}
+
+
+sub _connect
+{
+    my $this= shift(@_);
+    $this= tied(%$this)   if  ref($this)  &&  tied(%$this);
+    my $subPath= pop(@_);
+    $subPath= $this->_split( $subPath )   unless  ref($subPath);
+    my $machine= @_ ? shift(@_) : shift(@$subPath);
+    my $handle= 0;
+    my( $temp )= $this->_rootKey( [@$subPath] );
+    $temp->RegConnectRegistry( $machine, $temp->Handle, $handle )
+      or  return ();
+    my $self= $this->_new( $handle, [shift(@$subPath)], {MACHINE=>$machine} );
+    return( $self, $subPath );
+}
+
+
+use vars qw( @Connect_Opts %Connect_Opts );
+@Connect_Opts= qw(Access Delimiter);
+@Connect_Opts{@Connect_Opts}= (1) x @Connect_Opts;
+
+sub Connect
+{
+    my $this= shift(@_);
+    my $tied=  ref($this)  &&  tied(%$this);
+    $this= tied(%$this)   if  $tied;
+    my( $machine, $key, $opts )= @_;
+    my $delim= "";
+    my $sam;
+    my $subPath;
+    if(  @_ < 2  ||  3 < @_
+     ||  3 == @_ && "HASH" ne ref($opts)  ) {
+	croak "Usage:  \$obj= ${PACK}->Connect(",
+	      " \$Machine, \$subKey, { OPT=>VAL,... } );\n",
+	      "  options: @Connect_Opts\nCalled";
+    }
+    if(  ref($opts)  ) {
+	my @err= grep( ! $Connect_Opts{$_}, keys(%$opts) );
+	@err  and  croak "${PACK}->Connect:  Invalid options (@err)";
+    }
+    $delim= "$opts->{Delimiter}"   if  defined($opts->{Delimiter});
+    $delim= $this->Delimiter   if  "" eq $delim;
+    $sam= defined($opts->{Access}) ? $opts->{Access} : $this->Access;
+    $sam= _constant($sam,"key access type")   if  $sam =~ /^KEY_/;
+    ( $this, $subPath )= $this->_connect( $machine, $key );
+    return ()   unless  defined($this);
+    my $self= $this->_open( $subPath, $sam );
+    return ()   unless  defined($self);
+    $self->Delimiter( $delim );
+    $self= $self->TiedRef   if  $tied;
+    return $self;
+}
+
+
+my @_newVirtual_keys= qw( MEMBERS VALUES SUBKEYS SUBTIMES SUBCLASSES
+    Class SecurityLen LastWrite CntValues CntSubKeys
+    MaxValNameLen MaxValDataLen MaxSubKeyLen MaxSubClassLen );
+
+sub _newVirtual
+{
+    my $self= shift(@_);
+    my( $rPath, $root, $opts )= @_;
+    my $new= $self->_new( "NONE", $rPath, $opts )
+      or  return ();
+    @{$new}{@_newVirtual_keys}= @{$root->ObjectRef}{@_newVirtual_keys};
+    return $new;
+}
+
+
+#$key= new Win32::TieRegistry "LMachine/System/Disk";
+#$key= new Win32::TieRegistry "//Server1/LMachine/System/Disk";
+#Win32::TieRegistry->new( HKEY_LOCAL_MACHINE, {DELIM=>"/",ACCESS=>KEY_READ} );
+#Win32::TieRegistry->new( [ HKEY_LOCAL_MACHINE, ".../..." ], {DELIM=>$DELIM} );
+#$key->new( ... );
+
+use vars qw( @new_Opts %new_Opts );
+@new_Opts= qw(Access Delimiter);
+@new_Opts{@new_Opts}= (1) x @new_Opts;
+
+sub new
+{
+    my $this= shift( @_ );
+    $this= tied(%$this)   if  ref($this)  &&  tied(%$this);
+    if(  ! ref($this)  ) {
+	no strict "refs";
+	my $self= ${"${this}::Registry"};
+	croak "${this}->new failed since ${PACK}::new sees that ",
+	  "\$${this}::Registry is not an object."
+	  if  ! ref($self);
+	$this= $self->Clone;
+    }
+    my( $subKey, $opts )= @_;
+    my $delim= "";
+    my $dlen;
+    my $sam;
+    my $subPath;
+    if(  @_ < 1  ||  2 < @_
+     ||  2 == @_ && "HASH" ne ref($opts)  ) {
+	croak "Usage:  \$obj= ${PACK}->new( \$subKey, { OPT=>VAL,... } );\n",
+	      "  options: @new_Opts\nCalled";
+    }
+    if(  defined($opts)  ) {
+	my @err= grep( ! $new_Opts{$_}, keys(%$opts) );
+	@err  and  die "${PACK}->new:  Invalid options (@err)";
+    }
+    $delim= "$opts->{Delimiter}"   if  defined($opts->{Delimiter});
+    $delim= $this->Delimiter   if  "" eq $delim;
+    $dlen= length($delim);
+    $sam= defined($opts->{Access}) ? $opts->{Access} : $this->Access;
+    $sam= _constant($sam,"key access type")   if  $sam =~ /^KEY_/;
+    if(  "ARRAY" eq ref($subKey)  ) {
+	$subPath= $subKey;
+	if(  "NONE" eq $this->Handle  &&  @$subPath  ) {
+	    ( $this, $subPath )= $this->_rootKey( $subPath );
+	}
+    } elsif(  $delim x 2 eq substr($subKey,0,2*$dlen)  ) {
+	my $path= $this->_split( substr($subKey,2*$dlen), $delim );
+	my $mach= shift(@$path);
+	if(  ! @$path  ) {
+	    return $this->_newVirtual( $path, $Registry,
+			    {MACHINE=>$mach,DELIM=>$delim,ACCESS=>$sam} );
+	}
+	( $this, $subPath )= $this->_connect( $mach, $path );
+	return ()   if  ! defined($this);
+	if(  0 == @$subPath  ) {
+	    $this->Delimiter( $delim );
+	    return $this;
+	}
+    } elsif(  $delim eq substr($subKey,0,$dlen)  ) {
+	( $this, $subPath )= $this->_rootKey( substr($subKey,$dlen), $delim );
+    } elsif(  "NONE" eq $this->Handle  &&  "" ne $subKey  ) {
+	my( $mach )= $this->Machine;
+	if(  $mach  ) {
+	    ( $this, $subPath )= $this->_connect( $mach, $subKey );
+	} else {
+	    ( $this, $subPath )= $this->_rootKey( $subKey, $delim );
+	}
+    } else {
+	$subPath= $this->_split( $subKey, $delim );
+    }
+    return ()   unless  defined($this);
+    if(  0 == @$subPath  &&  "NONE" eq $this->Handle  ) {
+	return $this->_newVirtual( $this->_Path, $this,
+				   { DELIM=>$delim, ACCESS=>$sam } );
+    }
+    my $self= $this->_open( $subPath, $sam );
+    return ()   unless  defined($self);
+    $self->Delimiter( $delim );
+    return $self;
+}
+
+
+sub Open
+{
+    my $self= shift(@_);
+    my $tied=  ref($self)  &&  tied(%$self);
+    $self= tied(%$self)   if  $tied;
+    $self= $self->new( @_ );
+    $self= $self->TiedRef   if  defined($self)  &&  $tied;
+    return $self;
+}
+
+
+sub Clone
+{
+    my $self= shift( @_ );
+    my $new= $self->Open("");
+    return $new;
+}
+
+
+{ my @flush;
+    sub Flush
+    {
+	my $self= shift(@_);
+	$self= tied(%$self)   if  tied(%$self);
+	my( $flush )= shift(@_);
+	@_  and  croak "Usage:  \$key->Flush( \$bFlush );";
+	return 0   if  "NONE" eq $self->Handle;
+	@flush= qw( VALUES SUBKEYS SUBCLASSES SUBTIMES MEMBERS Class
+		    CntSubKeys CntValues MaxSubKeyLen MaxSubClassLen
+		    MaxValNameLen MaxValDataLen SecurityLen LastWrite PREVIDX )
+	  unless  @flush;
+	delete( @$self{@flush} );
+	if(  defined($flush)  &&  $flush  ) {
+	    return $self->RegFlushKey();
+	} else {
+	    return 1;
+	}
+    }
+}
+
+
+sub _DualVal
+{
+    my( $hRef, $num )= @_;
+    if(  $_SetDualVar  &&  $$hRef{$num}  ) {
+	&SetDualVar( $num, "$$hRef{$num}", 0+$num );
+    }
+    return $num;
+}
+
+
+use vars qw( @_RegDataTypes %_RegDataTypes );
+@_RegDataTypes= qw( REG_SZ REG_EXPAND_SZ REG_BINARY REG_LINK REG_MULTI_SZ
+		    REG_DWORD_LITTLE_ENDIAN REG_DWORD_BIG_ENDIAN REG_DWORD
+		    REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
+		    REG_RESOURCE_REQUIREMENTS_LIST REG_NONE );
+# Make sure that REG_DWORD appears _after_ other REG_DWORD_*
+# items above and that REG_NONE appears _last_.
+foreach(  @_RegDataTypes  ) {
+    $_RegDataTypes{Win32API::Registry::constant($_,0)}= $_;
+}
+
+sub GetValue
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    1 == @_  or  croak "Usage:  (\$data,\$type)= \$key->GetValue('ValName');";
+    my( $valName )= @_;
+    my( $valType, $valData, $dLen )= (0,"",0);
+    return ()   if  "NONE" eq $self->Handle;
+    $self->RegQueryValueEx( $valName, [], $valType, $valData,
+      $dLen= ( defined($self->{MaxValDataLen}) ? $self->{MaxValDataLen} : 0 )
+    )  or  return ();
+    if(  REG_DWORD == $valType  ) {
+	my $val= unpack("L",$valData);
+	$valData= sprintf "0x%08.8lX", $val   if  $self->DWordsToHex;
+	&SetDualVar( $valData, $valData, $val )   if  $self->DualBinVals
+    } elsif(  REG_BINARY == $valType  &&  length($valData) <= 4  ) {
+	&SetDualVar( $valData, $valData, hex reverse unpack("h*",$valData) )
+	  if  $self->DualBinVals;
+    } elsif(  ( REG_SZ == $valType || REG_EXPAND_SZ == $valType )
+          &&  $self->FixSzNulls  ) {
+	substr($valData,-1)= ""   if  "\0" eq substr($valData,-1);
+    } elsif(  REG_MULTI_SZ == $valType  &&  $self->SplitMultis  ) {
+	## $valData =~ s/\0\0$//;	# Why does this often fail??
+	substr($valData,-2)= ""   if  "\0\0" eq substr($valData,-2);
+	$valData= [ split( /\0/, $valData, -1 ) ]
+    }
+    if(  ! wantarray  ) {
+	return $valData;
+    } elsif(  ! $self->DualTypes  ) {
+	return( $valData, $valType );
+    } else {
+	return(  $valData,  _DualVal( \%_RegDataTypes, $valType )  );
+    }
+}
+
+
+sub _ErrNum
+{
+    # return $^E;
+    return Win32::GetLastError();
+}
+
+
+sub _ErrMsg
+{
+    # return $^E;
+    return Win32::FormatMessage( Win32::GetLastError() );
+}
+
+sub _Err
+{
+    my $err;
+    # return $^E;
+    return _ErrMsg   if  ! $_SetDualVar;
+    return &SetDualVar( $err, _ErrMsg, _ErrNum );
+}
+
+sub _NoMoreItems
+{
+    return
+      $_NoMoreItems =~ /^\d/
+        ?  _ErrNum == $_NoMoreItems
+        :  _ErrMsg =~ /$_NoMoreItems/io;
+}
+
+
+sub _FileNotFound
+{
+    return
+      $_FileNotFound =~ /^\d/
+        ?  _ErrNum == $_FileNotFound
+        :  _ErrMsg =~ /$_FileNotFound/io;
+}
+
+
+sub _TooSmall
+{
+    return
+      $_TooSmall =~ /^\d/
+        ?  _ErrNum == $_TooSmall
+        :  _ErrMsg =~ /$_TooSmall/io;
+}
+
+
+sub _MoreData
+{
+    return
+      $_MoreData =~ /^\d/
+        ?  _ErrNum == $_MoreData
+        :  _ErrMsg =~ /$_MoreData/io;
+}
+
+
+sub _enumValues
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my( @names )= ();
+    my $pos= 0;
+    my $name= "";
+    my $nlen= 1+$self->Information("MaxValNameLen");
+    while(  $self->RegEnumValue($pos++,$name,$nlen,[],[],[],[])  ) {
+	push( @names, $name );
+    }
+    if(  ! _NoMoreItems()  ) {
+	return ();
+    }
+    $self->{VALUES}= \@names;
+    return 1;
+}
+
+
+sub ValueNames
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    @_  and  croak "Usage:  \@names= \$key->ValueNames;";
+    $self->_enumValues   unless  $self->{VALUES};
+    return @{$self->{VALUES}};
+}
+
+
+sub _enumSubKeys
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my( @subkeys, @classes, @times )= ();
+    my $pos= 0;
+    my( $subkey, $class, $time )= ("","","");
+    my( $namSiz, $clsSiz )= $self->Information(
+			      qw( MaxSubKeyLen MaxSubClassLen ));
+    $namSiz++;  $clsSiz++;
+    while(  $self->RegEnumKeyEx(
+	      $pos++, $subkey, $namSiz, [], $class, $clsSiz, $time )  ) {
+	push( @subkeys, $subkey );
+	push( @classes, $class );
+	push( @times, $time );
+    }
+    if(  ! _NoMoreItems()  ) {
+	return ();
+    }
+    $self->{SUBKEYS}= \@subkeys;
+    $self->{SUBCLASSES}= \@classes;
+    $self->{SUBTIMES}= \@times;
+    return 1;
+}
+
+
+sub SubKeyNames
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    @_  and  croak "Usage:  \@names= \$key->SubKeyNames;";
+    $self->_enumSubKeys   unless  $self->{SUBKEYS};
+    return @{$self->{SUBKEYS}};
+}
+
+
+sub SubKeyClasses
+{
+    my $self= shift(@_);
+    @_  and  croak "Usage:  \@classes= \$key->SubKeyClasses;";
+    $self->_enumSubKeys   unless  $self->{SUBCLASSES};
+    return @{$self->{SUBCLASSES}};
+}
+
+
+sub SubKeyTimes
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    @_  and  croak "Usage:  \@times= \$key->SubKeyTimes;";
+    $self->_enumSubKeys   unless  $self->{SUBTIMES};
+    return @{$self->{SUBTIMES}};
+}
+
+
+sub _MemberNames
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    @_  and  croak "Usage:  \$arrayRef= \$key->_MemberNames;";
+    if(  ! $self->{MEMBERS}  ) {
+	$self->_enumValues   unless  $self->{VALUES};
+	$self->_enumSubKeys   unless  $self->{SUBKEYS};
+	my( @members )= (  map( $_.$self->{DELIM}, @{$self->{SUBKEYS}} ),
+			   map( $self->{DELIM}.$_, @{$self->{VALUES}} )  );
+	$self->{MEMBERS}= \@members;
+    }
+    return $self->{MEMBERS};
+}
+
+
+sub _MembersHash
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    @_  and  croak "Usage:  \$hashRef= \$key->_MembersHash;";
+    if(  ! $self->{MEMBHASH}  ) {
+	my $aRef= $self->_MemberNames;
+	$self->{MEMBHASH}= {};
+	@{$self->{MEMBHASH}}{@$aRef}= (1) x @$aRef;
+    }
+    return $self->{MEMBHASH};
+}
+
+
+sub MemberNames
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    @_  and  croak "Usage:  \@members= \$key->MemberNames;";
+    return @{$self->_MemberNames};
+}
+
+
+sub Information
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my( $time, $nkeys, $nvals, $xsec, $xkey, $xcls, $xname, $xdata )=
+	("",0,0,0,0,0,0,0);
+    my $clen= 8;
+    if(  ! $self->RegQueryInfoKey( [], [], $nkeys, $xkey, $xcls,
+				   $nvals, $xname, $xdata, $xsec, $time )  ) {
+	return ();
+    }
+    if(  defined($self->{Class})  ) {
+	$clen= length($self->{Class});
+    } else {
+	$self->{Class}= "";
+    }
+    while(  ! $self->RegQueryInfoKey( $self->{Class}, $clen,
+				      [],[],[],[],[],[],[],[],[])
+        &&  _MoreData  ) {
+	$clen *= 2;
+    }
+    my( %info );
+    @info{ qw( LastWrite CntSubKeys CntValues SecurityLen
+	       MaxValDataLen MaxSubKeyLen MaxSubClassLen MaxValNameLen )
+    }=       ( $time,    $nkeys,    $nvals,   $xsec,
+               $xdata,       $xkey,       $xcls,         $xname );
+    if(  @_  ) {
+	my( %check );
+	@check{keys(%info)}= keys(%info);
+	my( @err )= grep( ! $check{$_}, @_ );
+	if(  @err  ) {
+	    croak "${PACK}::Information- Invalid info requested (@err)";
+	}
+	return @info{@_};
+    } else {
+	return %info;
+    }
+}
+
+
+sub Delimiter
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    $self= $RegObj   unless  ref($self);
+    my( $oldDelim )= $self->{DELIM};
+    if(  1 == @_  &&  "" ne "$_[0]"  ) {
+	delete $self->{MEMBERS};
+	delete $self->{MEMBHASH};
+	$self->{DELIM}= "$_[0]";
+    } elsif(  0 != @_  ) {
+	croak "Usage:  \$oldDelim= \$key->Delimiter(\$newDelim);";
+    }
+    return $oldDelim;
+}
+
+
+sub Handle
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    @_  and  croak "Usage:  \$handle= \$key->Handle;";
+    $self= $RegObj   unless  ref($self);
+    return $self->{HANDLE};
+}
+
+
+sub Path
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    @_  and  croak "Usage:  \$path= \$key->Path;";
+    my $delim= $self->{DELIM};
+    $self= $RegObj   unless  ref($self);
+    if(  "" eq $self->{MACHINE}  ) {
+	return(  $delim . join( $delim, @{$self->{PATH}} ) . $delim  );
+    } else {
+	return(  $delim x 2
+	  . join( $delim, $self->{MACHINE}, @{$self->{PATH}} )
+	  . $delim  );
+    }
+}
+
+
+sub _Path
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    @_  and  croak "Usage:  \$arrRef= \$key->_Path;";
+    $self= $RegObj   unless  ref($self);
+    return $self->{PATH};
+}
+
+
+sub Machine
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    @_  and  croak "Usage:  \$machine= \$key->Machine;";
+    $self= $RegObj   unless  ref($self);
+    return $self->{MACHINE};
+}
+
+
+sub Access
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    @_  and  croak "Usage:  \$access= \$key->Access;";
+    $self= $RegObj   unless  ref($self);
+    return $self->{ACCESS};
+}
+
+
+sub OS_Delimiter
+{
+    my $self= shift(@_);
+    @_  and  croak "Usage:  \$backslash= \$key->OS_Delimiter;";
+    return $self->{OS_DELIM};
+}
+
+
+sub _Roots
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  ref($self)  &&  tied(%$self);
+    @_  and  croak "Usage:  \$varName= \$key->_Roots;";
+    $self= $RegObj   unless  ref($self);
+    return $self->{ROOTS};
+}
+
+
+sub Roots
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  ref($self)  &&  tied(%$self);
+    @_  and  croak "Usage:  \$hashRef= \$key->Roots;";
+    $self= $RegObj   unless  ref($self);
+    return eval "\\%$self->{ROOTS}";
+}
+
+
+sub TIEHASH
+{
+    my( $this )= shift(@_);
+    $this= tied(%$this)   if  ref($this)  &&  tied(%$this);
+    my( $key )= @_;
+    if(  1 == @_  &&  ref($key)  &&  "$key" =~ /=/  ) {
+	return $key;	# $key is already an object (blessed reference).
+    }
+    return $this->new( @_ );
+}
+
+
+sub Tie
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my( $hRef )= @_;
+    if(  1 != @_  ||  ! ref($hRef)  ||  "$hRef" !~ /(^|=)HASH\(/  ) {
+	croak "Usage: \$key->Tie(\\\%hash);";
+    }
+    return  tie %$hRef, ref($self), $self;
+}
+
+
+sub TiedRef
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $hRef= @_ ? shift(@_) : {};
+    return ()   if  ! defined($self);
+    $self->Tie($hRef);
+    bless $hRef, ref($self);
+    return $hRef;
+}
+
+
+sub _Flags
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $oldFlags= $self->{FLAGS};
+    if(  1 == @_  ) {
+	$self->{FLAGS}= shift(@_);
+    } elsif(  0 != @_  ) {
+	croak "Usage:  \$oldBits= \$key->_Flags(\$newBits);";
+    }
+    return $oldFlags;
+}
+
+
+sub ArrayValues
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $oldFlag= $Flag_ArrVal == ( $Flag_ArrVal & $self->{FLAGS} );
+    if(  1 == @_  ) {
+	my $bool= shift(@_);
+	if(  $bool  ) {
+	    $self->{FLAGS} |= $Flag_ArrVal;
+	} else {
+	    $self->{FLAGS} &= ~( $Flag_ArrVal | $Flag_TieVal );
+	}
+    } elsif(  0 != @_  ) {
+	croak "Usage:  \$oldBool= \$key->ArrayValues(\$newBool);";
+    }
+    return $oldFlag;
+}
+
+
+sub TieValues
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $oldFlag= $Flag_TieVal == ( $Flag_TieVal & $self->{FLAGS} );
+    if(  1 == @_  ) {
+	my $bool= shift(@_);
+	if(  $bool  ) {
+	    croak "${PACK}->TieValues cannot be enabled with this version";
+	    $self->{FLAGS} |= $Flag_TieVal;
+	} else {
+	    $self->{FLAGS} &= ~$Flag_TieVal;
+	}
+    } elsif(  0 != @_  ) {
+	croak "Usage:  \$oldBool= \$key->TieValues(\$newBool);";
+    }
+    return $oldFlag;
+}
+
+
+sub FastDelete
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $oldFlag= $Flag_FastDel == ( $Flag_FastDel & $self->{FLAGS} );
+    if(  1 == @_  ) {
+	my $bool= shift(@_);
+	if(  $bool  ) {
+	    $self->{FLAGS} |= $Flag_FastDel;
+	} else {
+	    $self->{FLAGS} &= ~$Flag_FastDel;
+	}
+    } elsif(  0 != @_  ) {
+	croak "Usage:  \$oldBool= \$key->FastDelete(\$newBool);";
+    }
+    return $oldFlag;
+}
+
+
+sub SplitMultis
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $oldFlag= $Flag_Split == ( $Flag_Split & $self->{FLAGS} );
+    if(  1 == @_  ) {
+	my $bool= shift(@_);
+	if(  $bool  ) {
+	    $self->{FLAGS} |= $Flag_Split;
+	} else {
+	    $self->{FLAGS} &= ~$Flag_Split;
+	}
+    } elsif(  0 != @_  ) {
+	croak "Usage:  \$oldBool= \$key->SplitMultis(\$newBool);";
+    }
+    return $oldFlag;
+}
+
+
+sub DWordsToHex
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $oldFlag= $Flag_HexDWord == ( $Flag_HexDWord & $self->{FLAGS} );
+    if(  1 == @_  ) {
+	my $bool= shift(@_);
+	if(  $bool  ) {
+	    $self->{FLAGS} |= $Flag_HexDWord;
+	} else {
+	    $self->{FLAGS} &= ~$Flag_HexDWord;
+	}
+    } elsif(  0 != @_  ) {
+	croak "Usage:  \$oldBool= \$key->DWordsToHex(\$newBool);";
+    }
+    return $oldFlag;
+}
+
+
+sub FixSzNulls
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $oldFlag= $Flag_FixNulls == ( $Flag_FixNulls & $self->{FLAGS} );
+    if(  1 == @_  ) {
+	my $bool= shift(@_);
+	if(  $bool  ) {
+	    $self->{FLAGS} |= $Flag_FixNulls;
+	} else {
+	    $self->{FLAGS} &= ~$Flag_FixNulls;
+	}
+    } elsif(  0 != @_  ) {
+	croak "Usage:  \$oldBool= \$key->FixSzNulls(\$newBool);";
+    }
+    return $oldFlag;
+}
+
+
+sub DualTypes
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $oldFlag= $Flag_DualTyp == ( $Flag_DualTyp & $self->{FLAGS} );
+    if(  1 == @_  ) {
+	my $bool= shift(@_);
+	if(  $bool  ) {
+	    croak "${PACK}->DualTypes cannot be enabled since ",
+		  "SetDualVar module not installed"
+	      unless  $_SetDualVar;
+	    $self->{FLAGS} |= $Flag_DualTyp;
+	} else {
+	    $self->{FLAGS} &= ~$Flag_DualTyp;
+	}
+    } elsif(  0 != @_  ) {
+	croak "Usage:  \$oldBool= \$key->DualTypes(\$newBool);";
+    }
+    return $oldFlag;
+}
+
+
+sub DualBinVals
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $oldFlag= $Flag_DualBin == ( $Flag_DualBin & $self->{FLAGS} );
+    if(  1 == @_  ) {
+	my $bool= shift(@_);
+	if(  $bool  ) {
+	    croak "${PACK}->DualBinVals cannot be enabled since ",
+		  "SetDualVar module not installed"
+	      unless  $_SetDualVar;
+	    $self->{FLAGS} |= $Flag_DualBin;
+	} else {
+	    $self->{FLAGS} &= ~$Flag_DualBin;
+	}
+    } elsif(  0 != @_  ) {
+	croak "Usage:  \$oldBool= \$key->DualBinVals(\$newBool);";
+    }
+    return $oldFlag;
+}
+
+
+sub GetOptions
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my( $opt, $meth );
+    if(  ! @_  ||  1 == @_  &&  "HASH" eq ref($_[0])  ) {
+	my $href= @_ ? $_[0] : {};
+	foreach $opt (  grep !/^Allow/, @_opt_subs  ) {
+	    $meth= $_opt_subs{$opt};
+	    $href->{$opt}=  $self->$meth();
+	}
+	return @_ ? $self : $href;
+    }
+    my @old;
+    foreach $opt (  @_  ) {
+	$meth= $_opt_subs{$opt};
+	if(  defined $meth  ) {
+	    if(  $opt eq "AllowLoad"  ||  $opt eq "AllowSave"  ) {
+		croak "${PACK}->GetOptions:  Getting current setting of $opt ",
+		      "not supported in this release";
+	    }
+	    push(  @old,  $self->$meth()  );
+	} else {
+	    croak "${PACK}->GetOptions:  Invalid option ($opt) ",
+		  "not one of ( ", join(" ",grep !/^Allow/, @_opt_subs), " )";
+	}
+    }
+    return wantarray ? @old : $old[-1];
+}
+
+
+sub SetOptions
+{
+    my $self= shift(@_);
+    # Don't get object if hash ref so "ref" returns original ref.
+    my( $opt, $meth, @old );
+    while(  @_  ) {
+	$opt= shift(@_);
+	$meth= $_opt_subs{$opt};
+	if(  ! @_  ) {
+	    croak "${PACK}->SetOptions:  Option value missing ",
+		  "after option name ($opt)";
+	} elsif(  defined $meth  ) {
+	    push(  @old,  $self->$meth( shift(@_) )  );
+	} elsif(  $opt eq substr("reference",0,length($opt))  ) {
+	    shift(@_)   if  @_;
+	    push(  @old,  $self  );
+	} else {
+	    croak "${PACK}->SetOptions:  Invalid option ($opt) ",
+		  "not one of ( @_opt_subs )";
+	}
+    }
+    return wantarray ? @old : $old[-1];
+}
+
+
+sub _parseTiedEnt
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $ent= shift(@_);
+    my $delim= shift(@_);
+    my $dlen= length( $delim );
+    my $parent= @_ ? shift(@_) : 0;
+    my $off;
+    if(  $delim x 2 eq substr($ent,0,2*$dlen)  &&  "NONE" eq $self->Handle  ) {
+	if(  0 <= ( $off= index( $ent, $delim x 2, 2*$dlen ) )  ) {
+	    return(  substr( $ent, 0, $off ),  substr( $ent, 2*$dlen+$off )  );
+	} elsif(  $delim eq substr($ent,-$dlen)  ) {
+	    return( substr($ent,0,-$dlen) );
+	} elsif(  2*$dlen <= ( $off= rindex( $ent, $delim ) )  ) {
+	    return(  substr( $ent, 0, $off ),
+	      undef,  substr( $ent, $dlen+$off )  );
+	} elsif(  $parent  ) {
+	    return();
+	} else {
+	    return( $ent );
+	}
+    } elsif(  $delim eq substr($ent,0,$dlen)  &&  "NONE" ne $self->Handle  ) {
+	return( undef, substr($ent,$dlen) );
+    } elsif(  $self->{MEMBERS}  &&  $self->_MembersHash->{$ent}  ) {
+	return( substr($ent,0,-$dlen) );
+    } elsif(  0 <= ( $off= index( $ent, $delim x 2 ) )  ) {
+	return(  substr( $ent, 0, $off ),  substr( $ent, 2*$dlen+$off ) );
+    } elsif(  $delim eq substr($ent,-$dlen)  ) {
+	if(  $parent
+	 &&  0 <= ( $off= rindex( $ent, $delim, length($ent)-2*$dlen ) )  ) {
+	    return(  substr($ent,0,$off),
+	      undef,  undef,  substr($ent,$dlen+$off,-$dlen)  );
+	} else {
+	    return( substr($ent,0,-$dlen) );
+	}
+    } elsif(  0 <= ( $off= rindex( $ent, $delim ) )  ) {
+	return(
+	  substr( $ent, 0, $off ),  undef,  substr( $ent, $dlen+$off )  );
+    } else {
+	return( undef, undef, $ent );
+    }
+}
+
+
+sub _FetchValue
+{
+    my $self= shift( @_ );
+    my( $val, $createKey )= @_;
+    my( $data, $type );
+    if(  ( $data, $type )= $self->GetValue( $val )  ) {
+	return $self->ArrayValues ? [ $data, $type ]
+	       : wantarray        ? ( $data, $type )
+				  : $data;
+    } elsif(  $createKey  and  $data= $self->new($val)  ) {
+	return $data->TiedRef;
+    } else {
+	return ();
+    }
+}
+
+
+sub FETCH
+{
+    my $self= shift(@_);
+    my $ent= shift(@_);
+    my $delim= $self->Delimiter;
+    my( $key, $val, $ambig )= $self->_parseTiedEnt( $ent, $delim, 0 );
+    my $sub;
+    if(  defined($key)  ) {
+	if(  defined($self->{MEMBHASH})
+	 &&  $self->{MEMBHASH}->{$key.$delim}
+	 &&  0 <= index($key,$delim)  ) {
+	    return ()
+	      unless  $sub= $self->new( $key,
+			      {"Delimiter"=>$self->OS_Delimiter} );
+	    $sub->Delimiter($delim);
+	} else {
+	    return ()
+	      unless  $sub= $self->new( $key );
+	}
+    } else {
+	$sub= $self;
+    }
+    if(  defined($val)  ) {
+	return $sub->_FetchValue( $val );
+    } elsif(  ! defined($ambig)  ) {
+	return $sub->TiedRef;
+    } elsif(  defined($key)  ) {
+	return $sub->FETCH(  $ambig  );
+    } else {
+	return $sub->_FetchValue( $ambig, "" ne $ambig );
+    }
+}
+
+
+sub _FetchOld
+{
+    my( $self, $key )= @_;
+    my $old= $self->FETCH($key);
+    if(  $old  ) {
+	my $copy= {};
+	%$copy= %$old;
+	return $copy;
+    }
+    # return $^E;
+    return _Err;
+}
+
+
+sub DELETE
+{
+    my $self= shift(@_);
+    my $ent= shift(@_);
+    my $delim= $self->Delimiter;
+    my( $key, $val, $ambig, $subkey )= $self->_parseTiedEnt( $ent, $delim, 1 );
+    my $sub;
+    my $fast= defined(wantarray) ? $self->FastDelete : 2;
+    my $old= 1;	# Value returned if FastDelete is set.
+    if(  defined($key)
+     &&  ( defined($val) || defined($ambig) || defined($subkey) )  ) {
+	return ()
+	  unless  $sub= $self->new( $key );
+    } else {
+	$sub= $self;
+    }
+    if(  defined($val)  ) {
+	$old= $sub->GetValue($val) || _Err   unless  2 <= $fast;
+	$sub->RegDeleteValue( $val );
+    } elsif(  defined($subkey)  ) {
+	$old= $sub->_FetchOld( $subkey.$delim )   unless  $fast;
+	$sub->RegDeleteKey( $subkey );
+    } elsif(  defined($ambig)  ) {
+	if(  defined($key)  ) {
+	    $old= $sub->DELETE($ambig);
+	} else {
+	    $old= $sub->GetValue($ambig) || _Err   unless  2 <= $fast;
+	    if(  defined( $old )  ) {
+		$sub->RegDeleteValue( $ambig );
+	    } else {
+		$old= $sub->_FetchOld( $ambig.$delim )   unless  $fast;
+		$sub->RegDeleteKey( $ambig );
+	    }
+	}
+    } elsif(  defined($key)  ) {
+	$old= $sub->_FetchOld( $key.$delim )   unless  $fast;
+	$sub->RegDeleteKey( $key );
+    } else {
+	croak "${PACK}->DELETE:  Key ($ent) can never be deleted";
+    }
+    return $old;
+}
+
+
+sub SetValue
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    my $name= shift(@_);
+    my $data= shift(@_);
+    my( $type )= @_;
+    my $size;
+    if(  ! defined($type)  ) {
+	if(  "ARRAY" eq ref($data)  ) {
+	    croak "${PACK}->SetValue:  Value is array reference but ",
+		  "no data type given"
+	      unless  2 == @$data;
+	    ( $data, $type )= @$data;
+	} else {
+	    $type= REG_SZ;
+	}
+    }
+    $type= _constant($type,"registry value data type")   if  $type =~ /^REG_/;
+    if(  REG_MULTI_SZ == $type  &&  "ARRAY" eq ref($data)  ) {
+	$data= join( "\0", @$data ) . "\0\0";
+	## $data= pack(  "a*" x (1+@$data),  map( $_."\0", @$data, "" )  );
+    } elsif(  ( REG_SZ == $type || REG_EXPAND_SZ == $type )
+          &&  $self->FixSzNulls  ) {
+	$data .= "\0"    unless  "\0" eq substr($data,0,-1);
+    } elsif(  REG_DWORD == $type  &&  $data =~ /^0x[0-9a-fA-F]{3,}$/  ) {
+	$data= pack( "L", hex($data) );
+	# We could to $data=pack("L",$data) for REG_DWORD but I see
+	# no nice way to always destinguish when to do this or not.
+    }
+    return $self->RegSetValueEx( $name, 0, $type, $data, length($data) );
+}
+
+
+sub StoreKey
+{
+    my $this= shift(@_);
+    $this= tied(%$this)   if  ref($this)  &&  tied(%$this);
+    my $subKey= shift(@_);
+    my $data= shift(@_);
+    my $ent;
+    my $self;
+    if(  ! ref($data)  ||  "$data" !~ /(^|=)HASH/  ) {
+	croak "${PACK}->StoreKey:  For ", $this->Path.$subKey, ",\n",
+	      "  subkey data must be a HASH reference";
+    }
+    if(  defined( $$data{""} )  &&  "HASH" eq ref($$data{""})  ) {
+	$self= $this->CreateKey( $subKey, delete $$data{""} );
+    } else {
+	$self= $this->CreateKey( $subKey );
+    }
+    return ()   if  ! defined($self);
+    foreach $ent (  keys(%$data)  ) {
+	return ()
+	  unless  $self->STORE( $ent, $$data{$ent} );
+    }
+    return $self;
+}
+
+
+# = { "" => {OPT=>VAL}, "val"=>[], "key"=>{} } creates a new key
+# = "string" creates a new REG_SZ value
+# = [ data, type ] creates a new value
+sub STORE
+{
+    my $self= shift(@_);
+    my $ent= shift(@_);
+    my $data= shift(@_);
+    my $delim= $self->Delimiter;
+    my( $key, $val, $ambig, $subkey )= $self->_parseTiedEnt( $ent, $delim, 1 );
+    my $sub;
+    if(  defined($key)
+     &&  ( defined($val) || defined($ambig) || defined($subkey) )  ) {
+	return ()
+	  unless  $sub= $self->new( $key );
+    } else {
+	$sub= $self;
+    }
+    if(  defined($val)  ) {
+	croak "${PACK}->STORE:  For ", $sub->Path.$delim.$val, ",\n",
+	      "  value data cannot be a HASH reference"
+	  if  ref($data)  &&  "$data" =~ /(^|=)HASH/;
+	$sub->SetValue( $val, $data );
+    } elsif(  defined($subkey)  ) {
+	croak "${PACK}->STORE:  For ", $sub->Path.$subkey.$delim, ",\n",
+	      "  subkey data must be a HASH reference"
+	  unless  ref($data)  &&  "$data" =~ /(^|=)HASH/;
+	$sub->StoreKey( $subkey, $data );
+    } elsif(  defined($ambig)  ) {
+	if(  ref($data)  &&  "$data" =~ /(^|=)HASH/  ) {
+	    $sub->StoreKey( $ambig, $data );
+	} else {
+	    $sub->SetValue( $ambig, $data );
+	}
+    } elsif(  defined($key)  ) {
+	croak "${PACK}->STORE:  For ", $sub->Path.$key.$delim, ",\n",
+	      "  subkey data must be a HASH reference"
+	  unless  ref($data)  &&  "$data" =~ /(^|=)HASH/;
+	$sub->StoreKey( $key, $data );
+    } else {
+	croak "${PACK}->STORE:  Key ($ent) can never be created nor set";
+    }
+}
+
+
+sub EXISTS
+{
+    my $self= shift(@_);
+    my $ent= shift(@_);
+    return defined( $self->FETCH($ent) );
+}
+
+
+sub FIRSTKEY
+{
+    my $self= shift(@_);
+    my $members= $self->_MemberNames;
+    $self->{PREVIDX}= 0;
+    return @{$members} ? $members->[0] : undef;
+}
+
+
+sub NEXTKEY
+{
+    my $self= shift(@_);
+    my $prev= shift(@_);
+    my $idx= $self->{PREVIDX};
+    my $members= $self->_MemberNames;
+    if(  ! defined($idx)  ||  $prev ne $members->[$idx]  ) {
+	$idx= 0;
+	while(  $idx < @$members  &&  $prev ne $members->[$idx]  ) {
+	    $idx++;
+	}
+    }
+    $self->{PREVIDX}= ++$idx;
+    return $members->[$idx];
+}
+
+
+sub DESTROY
+{
+    my $self= shift(@_);
+    return   if  tied(%$self);
+    my $unload;
+    local $@;
+    eval { $unload= $self->{UNLOADME}; 1 }
+	or  return;
+    my $debug= $ENV{DEBUG_TIE_REGISTRY};
+    if(  defined($debug)  ) {
+	if(  1 < $debug  ) {
+	    my $hand= $self->Handle;
+	    my $dep= $self->{DEPENDON};
+	    carp "${PACK} destroying ", $self->Path, " (",
+		 "NONE" eq $hand ? $hand : sprintf("0x%lX",$hand), ")",
+		 defined($dep) ? (" [depends on ",$dep->Path,"]") : ();
+	} else {
+	    warn "${PACK} destroying ", $self->Path, ".\n";
+	}
+    }
+    $self->RegCloseKey
+      unless  "NONE" eq $self->Handle;
+    if(  defined($unload)  ) {
+	if(  defined($debug)  &&  1 < $debug  ) {
+	    my( $obj, $subKey, $file )= @$unload;
+	    warn "Unloading ", $self->Path,
+	      " (from ", $obj->Path, ", $subKey)...\n";
+	}
+	$self->UnLoad
+	  ||  warn "Couldn't unload ", $self->Path, ": ", _ErrMsg, "\n";
+	## carp "Never unloaded ${PACK}::Load($$unload[2])";
+    }
+    #delete $self->{DEPENDON};
+}
+
+
+use vars qw( @CreateKey_Opts %CreateKey_Opts %_KeyDispNames );
+@CreateKey_Opts= qw( Access Class Options Delimiter
+		     Disposition Security Volatile Backup );
+@CreateKey_Opts{@CreateKey_Opts}= (1) x @CreateKey_Opts;
+%_KeyDispNames= ( REG_CREATED_NEW_KEY() => "REG_CREATED_NEW_KEY",
+		  REG_OPENED_EXISTING_KEY() => "REG_OPENED_EXISTING_KEY" );
+
+sub CreateKey
+{
+    my $self= shift(@_);
+    my $tied= tied(%$self);
+    $self= tied(%$self)   if  $tied;
+    my( $subKey, $opts )= @_;
+    my( $sam )= $self->Access;
+    my( $delim )= $self->Delimiter;
+    my( $class )= "";
+    my( $flags )= 0;
+    my( $secure )= [];
+    my( $garb )= [];
+    my( $result )= \$garb;
+    my( $handle )= 0;
+    if(  @_ < 1  ||  2 < @_
+     ||  2 == @_ && "HASH" ne ref($opts)  ) {
+	croak "Usage:  \$new= \$old->CreateKey( \$subKey, {OPT=>VAL,...} );\n",
+	      "  options: @CreateKey_Opts\nCalled";
+    }
+    if(  defined($opts)  ) {
+	$sam= $opts->{"Access"}   if  defined($opts->{"Access"});
+	$class= $opts->{Class}   if  defined($opts->{Class});
+	$flags= $opts->{Options}   if  defined($opts->{Options});
+	$delim= $opts->{"Delimiter"}   if  defined($opts->{"Delimiter"});
+	$secure= $opts->{Security}   if  defined($opts->{Security});
+	if(  defined($opts->{Disposition})  ) {
+	    "SCALAR" eq ref($opts->{Disposition})
+	      or  croak "${PACK}->CreateKey option `Disposition'",
+			" must provide a scalar reference";
+	    $result= $opts->{Disposition};
+	}
+	if(  0 == $flags  ) {
+	    $flags |= REG_OPTION_VOLATILE
+	      if  defined($opts->{Volatile})  &&  $opts->{Volatile};
+	    $flags |= REG_OPTION_BACKUP_RESTORE
+	      if  defined($opts->{Backup})  &&  $opts->{Backup};
+	}
+    }
+    my $subPath= ref($subKey) ? $subKey : $self->_split($subKey,$delim);
+    $subKey= join( $self->OS_Delimiter, @$subPath );
+    $self->RegCreateKeyEx( $subKey, 0, $class, $flags, $sam,
+			   $secure, $handle, $$result )
+      or  return ();
+    if(  ! ref($$result)  &&  $self->DualTypes  ) {
+	$$result= _DualVal( \%_KeyDispNames, $$result );
+    }
+    my $new= $self->_new( $handle, [ @{$self->_Path}, @{$subPath} ] );
+    $new->{ACCESS}= $sam;
+    $new->{DELIM}= $delim;
+    $new= $new->TiedRef   if  $tied;
+    return $new;
+}
+
+
+use vars qw( $Load_Cnt @Load_Opts %Load_Opts );
+$Load_Cnt= 0;
+@Load_Opts= qw(NewSubKey);
+@Load_Opts{@Load_Opts}= (1) x @Load_Opts;
+
+sub Load
+{
+    my $this= shift(@_);
+    my $tied=  ref($this)  &&  tied(%$this);
+    $this= tied(%$this)   if  $tied;
+    my( $file, $subKey, $opts )= @_;
+    if(  2 == @_  &&  "HASH" eq ref($subKey)  ) {
+	$opts= $subKey;
+	undef $subKey;
+    }
+    @_ < 1  ||  3 < @_  ||  defined($opts) && "HASH" ne ref($opts)
+      and  croak "Usage:  \$key= ",
+	     "${PACK}->Load( \$fileName, [\$newSubKey,] {OPT=>VAL...} );\n",
+	     "  options: @Load_Opts @new_Opts\nCalled";
+    if(  defined($opts)  &&  exists($opts->{NewSubKey})  ) {
+	$subKey= delete $opts->{NewSubKey};
+    }
+    if(  ! defined( $subKey )  ) {
+	if(  "" ne $this->Machine  ) {
+	    ( $this )= $this->_connect( [$this->Machine,"LMachine"] );
+	} else {
+	    ( $this )= $this->_rootKey( "LMachine" );	# Could also be "Users"
+	}
+	$subKey= "PerlTie:$$." . ++$Load_Cnt;
+    }
+    $this->RegLoadKey( $subKey, $file )
+      or  return ();
+    my $self= $this->new( $subKey, defined($opts) ? $opts : () );
+    if(  ! defined( $self )  ) {
+	{ my $err= Win32::GetLastError();
+	#{ local( $^E ); #}
+	    $this->RegUnLoadKey( $subKey )  or  carp
+	      "Can't unload $subKey from ", $this->Path, ": ", _ErrMsg, "\n";
+	    Win32::SetLastError($err);
+	}
+	return ();
+    }
+    $self->{UNLOADME}= [ $this, $subKey, $file ];
+    $self= $self->TiedRef   if  $tied;
+    return $self;
+}
+
+
+sub UnLoad
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    @_  and  croak "Usage:  \$key->UnLoad;";
+    my $unload= $self->{UNLOADME};
+    "ARRAY" eq ref($unload)
+      or  croak "${PACK}->UnLoad called on a key which was not Load()ed";
+    my( $obj, $subKey, $file )= @$unload;
+    $self->RegCloseKey;
+    return Win32API::Registry::RegUnLoadKey( $obj->Handle, $subKey );
+}
+
+
+sub AllowSave
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    return $self->AllowPriv( "SeBackupPrivilege", @_ );
+}
+
+
+sub AllowLoad
+{
+    my $self= shift(@_);
+    $self= tied(%$self)   if  tied(%$self);
+    return $self->AllowPriv( "SeRestorePrivilege", @_ );
+}
+
+
+# RegNotifyChangeKeyValue( hKey, bWatchSubtree, iNotifyFilter, hEvent, bAsync )
+
+
+sub RegCloseKey { my $self= shift(@_);
+    Win32API::Registry::RegCloseKey $self->Handle, @_; }
+sub RegConnectRegistry { my $self= shift(@_);
+    Win32API::Registry::RegConnectRegistry @_; }
+sub RegCreateKey { my $self= shift(@_);
+    Win32API::Registry::RegCreateKey $self->Handle, @_; }
+sub RegCreateKeyEx { my $self= shift(@_);
+    Win32API::Registry::RegCreateKeyEx $self->Handle, @_; }
+sub RegDeleteKey { my $self= shift(@_);
+    Win32API::Registry::RegDeleteKey $self->Handle, @_; }
+sub RegDeleteValue { my $self= shift(@_);
+    Win32API::Registry::RegDeleteValue $self->Handle, @_; }
+sub RegEnumKey { my $self= shift(@_);
+    Win32API::Registry::RegEnumKey $self->Handle, @_; }
+sub RegEnumKeyEx { my $self= shift(@_);
+    Win32API::Registry::RegEnumKeyEx $self->Handle, @_; }
+sub RegEnumValue { my $self= shift(@_);
+    Win32API::Registry::RegEnumValue $self->Handle, @_; }
+sub RegFlushKey { my $self= shift(@_);
+    Win32API::Registry::RegFlushKey $self->Handle, @_; }
+sub RegGetKeySecurity { my $self= shift(@_);
+    Win32API::Registry::RegGetKeySecurity $self->Handle, @_; }
+sub RegLoadKey { my $self= shift(@_);
+    Win32API::Registry::RegLoadKey $self->Handle, @_; }
+sub RegNotifyChangeKeyValue { my $self= shift(@_);
+    Win32API::Registry::RegNotifyChangeKeyValue $self->Handle, @_; }
+sub RegOpenKey { my $self= shift(@_);
+    Win32API::Registry::RegOpenKey $self->Handle, @_; }
+sub RegOpenKeyEx { my $self= shift(@_);
+    Win32API::Registry::RegOpenKeyEx $self->Handle, @_; }
+sub RegQueryInfoKey { my $self= shift(@_);
+    Win32API::Registry::RegQueryInfoKey $self->Handle, @_; }
+sub RegQueryMultipleValues { my $self= shift(@_);
+    Win32API::Registry::RegQueryMultipleValues $self->Handle, @_; }
+sub RegQueryValue { my $self= shift(@_);
+    Win32API::Registry::RegQueryValue $self->Handle, @_; }
+sub RegQueryValueEx { my $self= shift(@_);
+    Win32API::Registry::RegQueryValueEx $self->Handle, @_; }
+sub RegReplaceKey { my $self= shift(@_);
+    Win32API::Registry::RegReplaceKey $self->Handle, @_; }
+sub RegRestoreKey { my $self= shift(@_);
+    Win32API::Registry::RegRestoreKey $self->Handle, @_; }
+sub RegSaveKey { my $self= shift(@_);
+    Win32API::Registry::RegSaveKey $self->Handle, @_; }
+sub RegSetKeySecurity { my $self= shift(@_);
+    Win32API::Registry::RegSetKeySecurity $self->Handle, @_; }
+sub RegSetValue { my $self= shift(@_);
+    Win32API::Registry::RegSetValue $self->Handle, @_; }
+sub RegSetValueEx { my $self= shift(@_);
+    Win32API::Registry::RegSetValueEx $self->Handle, @_; }
+sub RegUnLoadKey { my $self= shift(@_);
+    Win32API::Registry::RegUnLoadKey $self->Handle, @_; }
+sub AllowPriv { my $self= shift(@_);
+    Win32API::Registry::AllowPriv @_; }
+
+
+# Autoload methods go after =cut, and are processed by the autosplit program.
+
+1;
+__END__
+
+=head1 NAME
+
+Win32::TieRegistry - Powerful and easy ways to manipulate a registry
+[on Win32 for now].
+
+=head1 SYNOPSIS
+
+  use Win32::TieRegistry 0.20 ( UseOptionName=>UseOptionValue[,...] );
+
+  $Registry->SomeMethodCall(arg1,...);
+
+  $subKey= $Registry->{"Key\\SubKey\\"};
+  $valueData= $Registry->{"Key\\SubKey\\\\ValueName"};
+  $Registry->{"Key\\SubKey\\"}= { "NewSubKey" => {...} };
+  $Registry->{"Key\\SubKey\\\\ValueName"}= "NewValueData";
+  $Registry->{"\\ValueName"}= [ pack("fmt",$data), REG_DATATYPE ];
+
+=head1 EXAMPLES
+
+  use Win32::TieRegistry( Delimiter=>"#", ArrayValues=>0 );
+  $pound= $Registry->Delimiter("/");
+  $diskKey= $Registry->{"LMachine/System/Disk/"}
+    or  die "Can't read LMachine/System/Disk key: $^E\n";
+  $data= $key->{"/Information"}
+    or  die "Can't read LMachine/System/Disk//Information value: $^E\n";
+  $remoteKey= $Registry->{"//ServerA/LMachine/System/"}
+    or  die "Can't read //ServerA/LMachine/System/ key: $^E\n";
+  $remoteData= $remoteKey->{"Disk//Information"}
+    or  die "Can't read ServerA's System/Disk//Information value: $^E\n";
+  foreach $entry (  keys(%$diskKey)  ) {
+      ...
+  }
+  foreach $subKey (  $diskKey->SubKeyNames  ) {
+      ...
+  }
+  $diskKey->AllowSave( 1 );
+  $diskKey->RegSaveKey( "C:/TEMP/DiskReg", [] );
+
+=head1 DESCRIPTION
+
+The I<Win32::TieRegistry> module lets you manipulate the Registry
+via objects [as in "object oriented"] or via tied hashes.  But
+you will probably mostly use a combination reference, that is, a
+reference to a tied hash that has also been made an object so that
+you can mix both access methods [as shown above].
+
+If you did not get this module as part of L<libwin32>, you might
+want to get a recent version of L<libwin32> from CPAN which should
+include this module and the I<Win32API::Registry> module that it
+uses.
+
+Skip to the L<SUMMARY> section if you just want to dive in and start
+using the Registry from Perl.
+
+Accessing and manipulating the registry is extremely simple using
+I<Win32::TieRegistry>.  A single, simple expression can return
+you almost any bit of information stored in the Registry.
+I<Win32::TieRegistry> also gives you full access to the "raw"
+underlying API calls so that you can do anything with the Registry
+in Perl that you could do in C.  But the "simple" interface has
+been carefully designed to handle almost all operations itself
+without imposing arbitrary limits while providing sensible
+defaults so you can list only the parameters you care about.
+
+But first, an overview of the Registry itself.
+
+=head2 The Registry
+
+The Registry is a forest:  a collection of several tree structures.
+The root of each tree is a key.  These root keys are identified by
+predefined constants whose names start with "HKEY_".  Although all
+keys have a few attributes associated with each [a class, a time
+stamp, and security information], the most important aspect of keys
+is that each can contain subkeys and can contain values.
+
+Each subkey has a name:  a string which cannot be blank and cannot
+contain the delimiter character [backslash: C<'\\'>] nor nul
+[C<'\0'>].  Each subkey is also a key and so can contain subkeys
+and values [and has a class, time stamp, and security information].
+
+Each value has a name:  a string which E<can> be blank and E<can>
+contain the delimiter character [backslash: C<'\\'>] and any
+character except for null, C<'\0'>.  Each value also has data
+associated with it.  Each value's data is a contiguous chunk of
+bytes, which is exactly what a Perl string value is so Perl
+strings will usually be used to represent value data.
+
+Each value also has a data type which says how to interpret the
+value data.  The primary data types are:
+
+=over
+
+=item REG_SZ
+
+A null-terminated string.
+
+=item REG_EXPAND_SZ
+
+A null-terminated string which contains substrings consisting of a
+percent sign [C<'%'>], an environment variable name, then a percent
+sign, that should be replaced with the value associate with that
+environment variable.  The system does I<not> automatically do this
+substitution.
+
+=item REG_BINARY
+
+Some arbitrary binary value.  You can think of these as being
+"packed" into a string.
+
+If your system has the L<SetDualVar> module installed,
+the C<DualBinVals()> option wasn't turned off, and you
+fetch a C<REG_BINARY> value of 4 bytes or fewer, then
+you can use the returned value in a numeric context to
+get at the "unpacked" numeric value.  See C<GetValue()>
+for more information.
+
+=item REG_MULTI_SZ
+
+Several null-terminated strings concatenated together with an
+extra trailing C<'\0'> at the end of the list.  Note that the list
+can include empty strings so use the value's length to determine
+the end of the list, not the first occurrence of C<'\0\0'>.
+It is best to set the C<SplitMultis()> option so I<Win32::TieRegistry>
+will split these values into an array of strings for you.
+
+=item REG_DWORD
+
+A long [4-byte] integer value.  These values are expected either
+packed into a 4-character string or as a hex string of E<more than>
+4 characters [but I<not> as a numeric value, unfortunately, as there is
+no sure way to tell a numeric value from a packed 4-byte string that
+just happens to be a string containing a valid numeric value].
+
+How such values are returned depends on the C<DualBinVals()> and
+C<DWordsToHex()> options.  See C<GetValue()> for details.
+
+=back
+
+In the underlying Registry calls, most places which take a
+subkey name also allow you to pass in a subkey "path" -- a
+string of several subkey names separated by the delimiter
+character, backslash [C<'\\'>].  For example, doing
+C<RegOpenKeyEx(HKEY_LOCAL_MACHINE,"SYSTEM\\DISK",...)> is much
+like opening the C<"SYSTEM"> subkey of C<HKEY_LOCAL_MACHINE>,
+then opening its C<"DISK"> subkey, then closing the C<"SYSTEM">
+subkey.
+
+All of the I<Win32::TieRegistry> features allow you to use your
+own delimiter in place of the system's delimiter, [C<'\\'>].  In
+most of our examples we will use a forward slash [C<'/'>] as our
+delimiter as it is easier to read and less error prone to use when
+writing Perl code since you have to type two backslashes for each
+backslash you want in a string.  Note that this is true even when
+using single quotes -- C<'\\HostName\LMachine\'> is an invalid
+string and must be written as C<'\\\\HostName\\LMachine\\'>.
+
+You can also connect to the registry of other computers on your
+network.  This will be discussed more later.
+
+Although the Registry does not have a single root key, the
+I<Win32::TieRegistry> module creates a virtual root key for you
+which has all of the I<HKEY_*> keys as subkeys.
+
+=head2 Tied Hashes Documentation
+
+Before you can use a tied hash, you must create one.  One way to
+do that is via:
+
+    use Win32::TieRegistry ( TiedHash => '%RegHash' );
+
+which exports a C<%RegHash> variable into your package and ties it
+to the virtual root key of the Registry.  An alternate method is:
+
+    my %RegHash;
+    use Win32::TieRegistry ( TiedHash => \%RegHash );
+
+There are also several ways you can tie a hash variable to any
+other key of the Registry, which are discussed later.
+
+Note that you will most likely use C<$Registry> instead of using
+a tied hash.  C<$Registry> is a reference to a hash that has
+been tied to the virtual root of your computer's Registry [as if,
+C<$Registry= \%RegHash>].  So you would use C<$Registry-E<gt>{Key}>
+rather than C<$RegHash{Key}> and use C<keys %{$Registry}> rather
+than C<keys %RegHash>, for example.
+
+For each hash which has been tied to a Registry key, the Perl
+C<keys> function will return a list containing the name of each
+of the key's subkeys with a delimiter character appended to it and
+containing the name of each of the key's values with a delimiter
+prepended to it.  For example:
+
+    keys( %{ $Registry->{"HKEY_CLASSES_ROOT\\batfile\\"} } )
+
+might yield the following list value:
+
+    ( "DefaultIcon\\",  # The subkey named "DefaultIcon"
+      "shell\\",        # The subkey named "shell"
+      "shellex\\",      # The subkey named "shellex"
+      "\\",             # The default value [named ""]
+      "\\EditFlags" )   # The value named "EditFlags"
+
+For the virtual root key, short-hand subkey names are used as
+shown below.  You can use the short-hand name, the regular
+I<HKEY_*> name, or any numeric value to access these keys, but
+the short-hand names are all that will be returned by the C<keys>
+function.
+
+=over
+
+=item "Classes" for HKEY_CLASSES_ROOT
+
+Contains mappings between file name extensions and the uses
+for such files along with configuration information for COM
+[MicroSoft's Common Object Model] objects.  Usually a link to
+the C<"SOFTWARE\\Classes"> subkey of the C<HKEY_LOCAL_MACHINE>
+key.
+
+=item "CUser" for HKEY_CURRENT_USER
+
+Contains information specific to the currently logged-in user.
+Mostly software configuration information.  Usually a link to
+a subkey of the C<HKEY_USERS> key.
+
+=item "LMachine" for HKEY_LOCAL_MACHINE
+
+Contains all manner of information about the computer.
+
+=item "Users" for HKEY_USERS
+
+Contains one subkey, C<".DEFAULT">, which gets copied to a new
+subkey whenever a new user is added.  Also contains a subkey for
+each user of the system, though only those for active users
+[usually only one] are loaded at any given time.
+
+=item "PerfData" for HKEY_PERFORMANCE_DATA
+
+Used to access data about system performance.  Access via this key
+is "special" and all but the most carefully constructed calls will
+fail, usually with C<ERROR_INSUFFICIENT_BUFFER>.  For example, you
+can't enumerate key names without also enumerating values which
+require huge buffers but the exact buffer size required cannot be
+determined beforehand because C<RegQueryInfoKey()> E<always> fails
+with C<ERROR_INSUFFICIENT_BUFFER> for C<HKEY_PERFORMANCE_DATA> no
+matter how it is called.  So it is currently not very useful to
+tie a hash to this key.  You can use it to create an object to use
+for making carefully constructed calls to the underlying Reg*()
+routines.
+
+=item "CConfig" for HKEY_CURRENT_CONFIG
+
+Contains minimal information about the computer's current
+configuration that is required very early in the boot process.
+For example, setting for the display adapter such as screen
+resolution and refresh rate are found in here.
+
+=item "DynData" for HKEY_DYN_DATA
+
+Dynamic data.  We have found no documentation for this key.
+
+=back
+
+A tied hash is much like a regular hash variable in Perl -- you give
+it a key string inside braces, [C<{> and C<}>], and it gives you
+back a value [or lets you set a value].  For I<Win32::TieRegistry>
+hashes, there are two types of values that will be returned.
+
+=over
+
+=item SubKeys
+
+If you give it a string which represents a subkey, then it will
+give you back a reference to a hash which has been tied to that
+subkey.  It can't return the hash itself, so it returns a
+reference to it.  It also blesses that reference so that it is
+also an object so you can use it to call method functions.
+
+=item Values
+
+If you give it a string which is a value name, then it will give
+you back a string which is the data for that value.  Alternately,
+you can request that it give you both the data value string and
+the data value type [we discuss how to request this later].  In
+this case, it would return a reference to an array where the value
+data string is element C<[0]> and the value data type is element
+C<[1]>.
+
+=back
+
+The key string which you use in the tied hash must be interpreted
+to determine whether it is a value name or a key name or a path
+that combines several of these or even other things.  There are
+two simple rules that make this interpretation easy and
+unambiguous:
+
+    Put a delimiter after each key name.
+    Put a delimiter in front of each value name.
+
+Exactly how the key string will be intepreted is governed by the
+following cases, in the order listed.  These cases are designed
+to "do what you mean".  Most of the time you won't have to think
+about them, especially if you follow the two simple rules above.
+After the list of cases we give several examples which should be
+clear enough so feel free to skip to them unless you are worried
+about the details.
+
+=over
+
+=item Remote machines
+
+If the hash is tied to the virtual root of the registry [or the
+virtual root of a remote machine's registry], then we treat hash
+key strings which start with the delimiter character specially.
+
+If the hash key string starts with two delimiters in a row, then
+those should be immediately followed by the name of a remote
+machine whose registry we wish to connect to.  That can be
+followed by a delimiter and more subkey names, etc.  If the
+machine name is not following by anything, then a virtual root
+for the remote machine's registry is created, a hash is tied to
+it, and a reference to that hash it is returned.
+
+=item Hash key string starts with the delimiter
+
+If the hash is tied to a virtual root key, then the leading
+delimiter is ignored.  It should be followed by a valid Registry
+root key name [either a short-hand name like C<"LMachine">, an
+I<HKEY_*> value, or a numeric value].   This alternate notation is
+allowed in order to be more consistant with the C<Open()> method
+function.
+
+For all other Registry keys, the leading delimiter indicates
+that the rest of the string is a value name.  The leading
+delimiter is stripped and the rest of the string [which can
+be empty and can contain more delimiters] is used as a value
+name with no further parsing.
+
+=item Exact match with direct subkey name followed by delimiter
+
+If you have already called the Perl C<keys> function on the tied
+hash [or have already called C<MemberNames> on the object] and the
+hash key string exactly matches one of the strings returned, then
+no further parsing is done.  In other words, if the key string
+exactly matches the name of a direct subkey with a delimiter
+appended, then a reference to a hash tied to that subkey is
+returned [but only if C<keys> or C<MemberNames> has already
+been called for that tied hash].
+
+This is only important if you have selected a delimiter other than
+the system default delimiter and one of the subkey names contains
+the delimiter you have chosen.  This rule allows you to deal with
+subkeys which contain your chosen delimiter in their name as long
+as you only traverse subkeys one level at a time and always
+enumerate the list of members before doing so.
+
+The main advantage of this is that Perl code which recursively
+traverses a hash will work on hashes tied to Registry keys even if
+a non-default delimiter has been selected.
+
+=item Hash key string contains two delimiters in a row
+
+If the hash key string contains two [or more] delimiters in a row,
+then the string is split between the first pair of delimiters.
+The first part is interpreted as a subkey name or a path of subkey
+names separated by delimiters and with a trailing delimiter.  The
+second part is interpreted as a value name with one leading
+delimiter [any extra delimiters are considered part of the value
+name].
+
+=item Hash key string ends with a delimiter
+
+If the key string ends with a delimiter, then it is treated
+as a subkey name or path of subkey names separated by delimiters.
+
+=item Hash key string contains a delimiter
+
+If the key string contains a delimiter, then it is split after
+the last delimiter.  The first part is treated as a subkey name or
+path of subkey names separated by delimiters.  The second part
+is ambiguous and is treated as outlined in the next item.
+
+=item Hash key string contains no delimiters
+
+If the hash key string contains no delimiters, then it is ambiguous.
+
+If you are reading from the hash [fetching], then we first use the
+key string as a value name.  If there is a value with a matching
+name in the Registry key which the hash is tied to, then the value
+data string [and possibly the value data type] is returned.
+Otherwise, we retry by using the hash key string as a subkey name.
+If there is a subkey with a matching name, then we return a
+reference to a hash tied to that subkey.  Otherwise we return
+C<undef>.
+
+If you are writing to the hash [storing], then we use the key
+string as a subkey name only if the value you are storing is a
+reference to a hash value.  Otherwise we use the key string as
+a value name.
+
+=back
+
+=head3 Examples
+
+Here are some examples showing different ways of accessing Registry
+information using references to tied hashes:
+
+=over
+
+=item Canonical value fetch
+
+    $tip18= $Registry->{"HKEY_LOCAL_MACHINE\\Software\\Microsoft\\"
+               . 'Windows\\CurrentVersion\\Explorer\\Tips\\\\18'};
+
+Should return the text of important tip number 18.  Note that two
+backslashes, C<"\\">, are required to get a single backslash into
+a Perl double-quoted or single-qouted string.  Note that C<"\\">
+is appended to each key name [C<"HKEY_LOCAL_MACHINE"> through
+C<"Tips">] and C<"\\"> is prepended to the value name, C<"18">.
+
+=item Changing your delimiter
+
+    $Registry->Delimiter("/");
+    $tip18= $Registry->{"HKEY_LOCAL_MACHINE/Software/Microsoft/"
+               . 'Windows/CurrentVersion/Explorer/Tips//18'};
+
+This usually makes things easier to read when working in Perl.
+All remaining examples will assume the delimiter has been changed
+as above.
+
+=item Using intermediate keys
+
+    $ms= $Registry->{"LMachine/Software/Microsoft/"};
+    $tips= $ms->{"Windows/CurrentVersion/Explorer/Tips/"};
+    $tip18= $winlogon->{"/18"};
+
+Same as above but opens more keys into the Registry which lets you
+efficiently re-access those intermediate keys.  This is slightly
+less efficient if you never reuse those intermediate keys.
+
+=item Chaining in a single statement
+
+    $tip18= $Registry->{"LMachine/Software/Microsoft/"}->
+              {"Windows/CurrentVersion/Explorer/Tips/"}->{"/18"};
+
+Like above, this creates intermediate key objects then uses
+them to access other data.  Once this statement finishes, the
+intermediate key objects are destroyed.  Several handles into
+the Registry are opened and closed by this statement so it is
+less efficient but there are times when this will be useful.
+
+=item Even less efficient example of chaining
+
+    $tip18= $Registry->{"LMachine/Software/Microsoft"}->
+              {"Windows/CurrentVersion/Explorer/Tips"}->{"/18"};
+
+Because we left off the trailing delimiters, I<Win32::TieRegistry>
+doesn't know whether final names, C<"Microsoft"> and C<"Tips">,
+are subkey names or value names.  So this statement ends up
+executing the same code as the next one.
+
+=item What the above really does
+
+    $tip18= $Registry->{"LMachine/Software/"}->{"Microsoft"}->
+              {"Windows/CurrentVersion/Explorer/"}->{"Tips"}->{"/18"};
+
+With more chains to go through, more temporary objects are created
+and later destroyed than in our first chaining example.  Also,
+when C<"Microsoft"> is looked up, I<Win32::TieRegistry> first
+tries to open it as a value and fails then tries it as a subkey.
+The same is true for when it looks up C<"Tips">.
+
+=item Getting all of the tips
+
+    $tips= $Registry->{"LMachine/Software/Microsoft/"}->
+              {"Windows/CurrentVersion/Explorer/Tips/"}
+      or  die "Can't find the Windows tips: $^E\n";
+    foreach(  keys %$tips  ) {
+        print "$_: ", $tips->{$_}, "\n";
+    }
+
+First notice that we actually check for failure for the first
+time.  We are assuming that the C<"Tips"> key contains no subkeys. 
+Otherwise the C<print> statement would show something like
+C<"Win32::TieRegistry=HASH(0xc03ebc)"> for each subkey.
+
+The output from the above code will start something like:
+
+    /0: If you don't know how to do something,[...]
+
+=back
+
+=head3 Deleting items
+
+You can use the Perl C<delete> function to delete a value from a
+Registry key or to delete a subkey as long that subkey contains
+no subkeys of its own.  See L<More Examples>, below, for more
+information.
+
+=head3 Storing items
+
+You can use the Perl assignment operator [C<=>] to create new
+keys, create new values, or replace values.  The values you store
+should be in the same format as the values you would fetch from a
+tied hash.  For example, you can use a single assignment statement
+to copy an entire Registry tree.  The following statement:
+
+    $Registry->{"LMachine/Software/Classes/Tie_Registry/"}=
+      $Registry->{"LMachine/Software/Classes/batfile/"};
+
+creates a C<"Tie_Registry"> subkey under the C<"Software\\Classes">
+subkey of the C<HKEY_LOCAL_MACHINE> key.  Then it populates it
+with copies of all of the subkeys and values in the C<"batfile">
+subkey and all of its subkeys.  Note that you need to have
+called C<$Registry-E<gt>ArrayValues(1)> for the proper value data
+type information to be copied.  Note also that this release of
+I<Win32::TieRegistry> does not copy key attributes such as class
+name and security information [this is planned for a future release].
+
+The following statement creates a whole subtree in the Registry:
+
+    $Registry->{"LMachine/Software/FooCorp/"}= {
+        "FooWriter/" => {
+            "/Version" => "4.032",
+            "Startup/" => {
+                "/Title" => "Foo Writer Deluxe ][",
+                "/WindowSize" => [ pack("LL",$wid,$ht), "REG_BINARY" ],
+                "/TaskBarIcon" => [ "0x0001", "REG_DWORD" ],
+            },
+            "Compatibility/" => {
+                "/AutoConvert" => "Always",
+                "/Default Palette" => "Windows Colors",
+            },
+        },
+        "/License", => "0123-9C8EF1-09-FC",
+    };
+
+Note that all but the last Registry key used on the left-hand
+side of the assignment [that is, "LMachine/Software/" but not
+"FooCorp/"] must already exist for this statement to succeed.
+
+By using the leading a trailing delimiters on each subkey name and
+value name, I<Win32::TieRegistry> will tell you if you try to assign
+subkey information to a value or visa-versa.
+
+=head3 More examples
+
+=over
+
+=item Adding a new tip
+
+    $tips= $Registry->{"LMachine/Software/Microsoft/"}->
+              {"Windows/CurrentVersion/Explorer/Tips/"}
+      or  die "Can't find the Windows tips: $^E\n";
+    $tips{'/186'}= "Be very careful when making changes to the Registry!";
+
+=item Deleting our new tip
+
+    $tips= $Registry->{"LMachine/Software/Microsoft/"}->
+              {"Windows/CurrentVersion/Explorer/Tips/"}
+      or  die "Can't find the Windows tips: $^E\n";
+    $tip186= delete $tips{'/186'};
+
+Note that Perl's C<delete> function returns the value that was deleted.
+
+=item Adding a new tip differently
+
+    $Registry->{"LMachine/Software/Microsoft/" .
+                "Windows/CurrentVersion/Explorer/Tips//186"}=
+      "Be very careful when making changes to the Registry!";
+
+=item Deleting differently
+
+    $tip186= delete $Registry->{"LMachine/Software/Microsoft/Windows/" .
+                                "CurrentVersion/Explorer/Tips//186"};
+
+Note that this only deletes the tail of what we looked up, the
+C<"186"> value, not any of the keys listed.
+
+=item Deleting a key
+
+WARNING:  The following code will delete all information about the
+current user's tip preferences.  Actually executing this command
+would probably cause the user to see the Welcome screen the next
+time they log in and may cause more serious problems.  This
+statement is shown as an example only and should not be used when
+experimenting.
+
+    $tips= delete $Registry->{"CUser/Software/Microsoft/Windows/" .
+                              "CurrentVersion/Explorer/Tips/"};
+
+This deletes the C<"Tips"> key and the values it contains.  The
+C<delete> function will return a reference to a hash [not a tied
+hash] containing the value names and value data that were deleted.
+
+The information to be returned is copied from the Registry into a
+regular Perl hash before the key is deleted.  If the key has many
+subkeys, this copying could take a significant amount of memory
+and/or processor time.  So you can disable this process by calling
+the C<FastDelete> member function:
+
+    $prevSetting= $regKey->FastDelete(1);
+
+which will cause all subsequent delete operations via C<$regKey>
+to simply return a true value if they succeed.  This optimization
+is automatically done if you use C<delete> in a void context.
+
+=item Technical notes on deleting
+
+If you use C<delete> to delete a Registry key or value and use
+the return value, then I<Win32::TieRegistry> usually looks up the
+current contents of that key or value so they can be returned if
+the deletion is successful.  If the deletion succeeds but the
+attempt to lookup the old contents failed, then the return value
+of C<delete> will be C<$^E> from the failed part of the operation.
+
+=item Undeleting a key
+
+    $Registry->{"LMachine/Software/Microsoft/Windows/" .
+                "CurrentVersion/Explorer/Tips/"}= $tips;
+
+This adds back what we just deleted.  Note that this version of
+I<Win32::TieRegistry> will use defaults for the key attributes
+[such as class name and security] and will not restore the
+previous attributes.
+
+=item Not deleting a key
+
+WARNING:  Actually executing the following code could cause
+serious problems.  This statement is shown as an example only and
+should not be used when experimenting.
+
+    $res= delete $Registry->{"CUser/Software/Microsoft/Windows/"}
+    defined($res)  ||  die "Can't delete URL key: $^E\n";
+
+Since the "Windows" key should contain subkeys, that C<delete>
+statement should make no changes to the Registry, return C<undef>,
+and set C<$^E> to "Access is denied".
+
+=item Not deleting again
+
+    $tips= $Registry->{"CUser/Software/Microsoft/Windows/" .
+                       "CurrentVersion/Explorer/Tips/"};
+    delete $tips;
+
+The Perl C<delete> function requires that its argument be an
+expression that ends in a hash element lookup [or hash slice],
+which is not the case here.  The C<delete> function doesn't
+know which hash $tips came from and so can't delete it.
+
+=back
+
+=head2 Objects Documentation
+
+The following member functions are defined for use on
+I<Win32::TieRegistry> objects:
+
+=over
+
+=item new
+
+The C<new> method creates a new I<Win32::TieRegistry> object.
+C<new> is mostly a synonym for C<Open()> so see C<Open()> below for
+information on what arguments to pass in.  Examples:
+
+    $machKey= new Win32::TieRegistry "LMachine"
+      or  die "Can't access HKEY_LOCAL_MACHINE key: $^E\n";
+    $userKey= Win32::TieRegistry->new("CUser")
+      or  die "Can't access HKEY_CURRENT_USER key: $^E\n";
+
+Note that calling C<new> via a reference to a tied hash returns
+a simple object, not a reference to a tied hash.
+
+=item Open
+
+=item $subKey= $key->Open( $sSubKey, $rhOptions )
+
+The C<Open> method opens a Registry key and returns a new
+I<Win32::TieRegistry> object associated with that Registry key.
+If C<Open> is called via a reference to a tied hash, then C<Open>
+returns another reference to a tied hash.  Otherwise C<Open>
+returns a simple object and you should then use C<TiedRef> to get
+a reference to a tied hash.
+
+C<$sSubKey> is a string specifying a subkey to be opened.
+Alternately C<$sSubKey> can be a reference to an array value
+containing the list of increasingly deep subkeys specifying the
+path to the subkey to be opened.
+
+C<$rhOptions> is an optional reference to a hash containing extra
+options.  The C<Open> method supports two options, C<"Delimiter">
+and C<"Access">, and C<$rhOptions> should have only have zero or
+more of these strings as keys.  See the "Examples" section below
+for more information.
+
+The C<"Delimiter"> option specifies what string [usually a single
+character] will be used as the delimiter to be appended to subkey
+names and prepended to value names.  If this option is not specified,
+the new key [C<$subKey>] inherits the delimiter of the old key
+[C<$key>].
+
+The C<"Access"> option specifies what level of access to the
+Registry key you wish to have once it has been opened.  If this
+option is not specified, the new key [C<$subKey>] is opened with
+the same access level used when the old key [C<$key>] was opened.
+The virtual root of the Registry pretends it was opened with
+access C<KEY_READ()|KEY_WRITE()> so this is the default access when
+opening keys directory via C<$Registry>.  If you don't plan on
+modifying a key, you should open it with C<KEY_READ> access as
+you may not have C<KEY_WRITE> access to it or some of its subkeys.
+
+If the C<"Access"> option value is a string that starts with
+C<"KEY_">, then it should match E<one> of the predefined access
+levels [probably C<"KEY_READ">, C<"KEY_WRITE">, or
+C<"KEY_ALL_ACCESS">] exported by the I<Win32API::Registry> module.
+Otherwise, a numeric value is expected.  For maximum flexibility,
+include C<use Win32::TieRegistry qw(:KEY_);>, for example, near
+the top of your script so you can specify more complicated access
+levels such as C<KEY_READ()|KEY_WRITE()>.
+
+If C<$sSubKey> does not begin with the delimiter [or C<$sSubKey>
+is an array reference], then the path to the subkey to be opened
+will be relative to the path of the original key [C<$key>].  If
+C<$sSubKey> begins with a single delimiter, then the path to the
+subkey to be opened will be relative to the virtual root of the
+Registry on whichever machine the original key resides.  If
+C<$sSubKey> begins with two consectutive delimiters, then those
+must be followed by a machine name which causes the C<Connect()>
+method function to be called.
+
+Examples:
+
+    $machKey= $Registry->Open( "LMachine", {Access=>KEY_READ(),Delimiter=>"/"} )
+      or  die "Can't open HKEY_LOCAL_MACHINE key: $^E\n";
+    $swKey= $machKey->Open( "Software" );
+    $logonKey= $swKey->Open( "Microsoft/Windows NT/CurrentVersion/Winlogon/" );
+    $NTversKey= $swKey->Open( ["Microsoft","Windows NT","CurrentVersion"] );
+    $versKey= $swKey->Open( qw(Microsoft Windows CurrentVersion) );
+
+    $remoteKey= $Registry->Open( "//HostA/LMachine/System/", {Delimiter=>"/"} )
+      or  die "Can't connect to HostA or can't open subkey: $^E\n";
+
+=item Clone
+
+=item $copy= $key->Clone
+
+Creates a new object that is associated with the same Registry key
+as the invoking object.
+
+=item Connect
+
+=item $remoteKey= $Registry->Connect( $sMachineName, $sKeyPath, $rhOptions )
+
+The C<Connect> method connects to the Registry of a remote machine,
+and opens a key within it, then returns a new I<Win32::TieRegistry>
+object associated with that remote Registry key.  If C<Connect>
+was called using a reference to a tied hash, then the return value
+will also be a reference to a tied hash [or C<undef>].  Otherwise,
+if you wish to use the returned object as a tied hash [not just as
+an object], then use the C<TiedRef> method function after C<Connect>.
+
+C<$sMachineName> is the name of the remote machine.  You don't have
+to preceed the machine name with two delimiter characters.
+
+C<$sKeyPath> is a string specifying the remote key to be opened.
+Alternately C<$sKeyPath> can be a reference to an array value
+containing the list of increasingly deep keys specifying the path
+to the key to be opened.
+
+C<$rhOptions> is an optional reference to a hash containing extra
+options.  The C<Connect> method supports two options, C<"Delimiter">
+and C<"Access">.  See the C<Open> method documentation for more
+information on these options.
+
+C<$sKeyPath> is already relative to the virtual root of the Registry
+of the remote machine.  A single leading delimiter on C<sKeyPath>
+will be ignored and is not required.
+
+C<$sKeyPath> can be empty in which case C<Connect> will return an
+object representing the virtual root key of the remote Registry.
+Each subsequent use of C<Open> on this virtual root key will call
+the system C<RegConnectRegistry> function.
+
+The C<Connect> method can be called via any I<Win32::TieRegistry>
+object, not just C<$Registry>.  Attributes such as the desired
+level of access and the delimiter will be inherited from the
+object used but the C<$sKeyPath> will always be relative to the
+virtual root of the remote machine's registry.
+
+Examples:
+
+    $remMachKey= $Registry->Connect( "HostA", "LMachine", {Delimiter->"/"} )
+      or  die "Can't connect to HostA's HKEY_LOCAL_MACHINE key: $^E\n";
+
+    $remVersKey= $remMachKey->Connect( "www.microsoft.com",
+                   "LMachine/Software/Microsoft/Inetsrv/CurrentVersion/",
+                   { Access=>KEY_READ, Delimiter=>"/" } )
+      or  die "Can't check what version of IIS Microsoft is running: $^E\n";
+
+    $remVersKey= $remMachKey->Connect( "www",
+                   qw(LMachine Software Microsoft Inetsrv CurrentVersion) )
+      or  die "Can't check what version of IIS we are running: $^E\n";
+
+=item ObjectRef
+
+=item $object_ref= $obj_or_hash_ref->ObjectRef
+
+For a simple object, just returns itself [C<$obj == $obj->ObjectRef>].
+
+For a reference to a tied hash [if it is also an object], C<ObjectRef>
+returns the simple object that the hash is tied to.
+
+This is primarilly useful when debugging since typing C<x $Registry>
+will try to display your I<entire> registry contents to your screen.
+But the debugger command C<x $Registry->ObjectRef> will just dump
+the implementation details of the underlying object to your screen.
+
+=item Flush( $bFlush )
+
+Flushes all cached information about the Registry key so that future
+uses will get fresh data from the Registry.
+
+If the optional C<$bFlush> is specified and a true value, then
+C<RegFlushKey()> will be called, which is almost never necessary.
+
+=item GetValue
+
+=item $ValueData= $key->GetValue( $sValueName )
+
+=item ($ValueData,$ValueType)= $key->GetValue( $sValueName )
+
+Gets a Registry value's data and data type.
+
+C<$ValueData> is usually just a Perl string that contains the
+value data [packed into it].  For certain types of data, however,
+C<$ValueData> may be processed as described below.
+
+C<$ValueType> is the C<REG_*> constant describing the type of value
+data stored in C<$ValueData>.  If the C<DualTypes()> option is on,
+then C<$ValueType> will be a dual value.  That is, when used in a
+numeric context, C<$ValueType> will give the numeric value of a
+C<REG_*> constant.  However, when used in a non-numeric context,
+C<$ValueType> will return the name of the C<REG_*> constant, for
+example C<"REG_SZ"> [note the quotes].  So both of the following
+can be true at the same time:
+
+    $ValueType == REG_SZ()
+    $ValueType eq "REG_SZ"
+
+=over
+
+=item REG_SZ and REG_EXPAND_SZ
+
+If the C<FixSzNulls()> option is on, then the trailing C<'\0'> will be
+stripped [unless there isn't one] before values of type C<REG_SZ>
+and C<REG_EXPAND_SZ> are returned.  Note that C<SetValue()> will add
+a trailing C<'\0'> under similar circumstances.
+
+=item REG_MULTI_SZ
+
+If the C<SplitMultis()> option is on, then values of this type are
+returned as a reference to an array containing the strings.  For
+example, a value that, with C<SplitMultis()> off, would be returned as:
+
+    "Value1\000Value2\000\000"
+
+would be returned, with C<SplitMultis()> on, as:
+
+    [ "Value1", "Value2" ]
+
+=item REG_DWORD
+
+If the C<DualBinVals()> option is on, then the value is returned
+as a scalar containing both a string and a number [much like
+the C<$!> variable -- see the L<SetDualVar> module for more
+information] where the number part is the "unpacked" value.
+Use the returned value in a numeric context to access this part
+of the value.  For example:
+
+    $num= 0 + $Registry->{"CUser/Console//ColorTable01"};
+
+If the C<DWordsToHex()> option is off, the string part of the
+returned value is a packed, 4-byte string [use C<unpack("L",$value)>
+to get the numeric value.
+
+If C<DWordsToHex()> is on, the string part of the returned value is
+a 10-character hex strings [with leading "0x"].  You can use
+C<hex($value)> to get the numeric value.
+
+Note that C<SetValue()> will properly understand each of these
+returned value formats no matter how C<DualBinVals()> is set.
+
+=back
+
+=item ValueNames
+
+=item @names= $key->ValueNames
+
+Returns the list of value names stored directly in a Registry key.
+Note that the names returned do I<not> have a delimiter prepended
+to them like with C<MemberNames()> and tied hashes.
+
+Once you request this information, it is cached in the object and
+future requests will always return the same list unless C<Flush()>
+has been called.
+
+=item SubKeyNames
+
+=item @key_names= $key->SubKeyNames
+
+Returns the list of subkey names stored directly in a Registry key.
+Note that the names returned do I<not> have a delimiter appended
+to them like with C<MemberNames()> and tied hashes.
+
+Once you request this information, it is cached in the object and
+future requests will always return the same list unless C<Flush()>
+has been called.
+
+=item SubKeyClasses
+
+=item @classes= $key->SubKeyClasses
+
+Returns the list of classes for subkeys stored directly in a
+Registry key.  The classes are returned in the same order as
+the subkey names returned by C<SubKeyNames()>.
+
+=item SubKeyTimes
+
+=item @times= $key->SubKeyTimes
+
+Returns the list of last-modified times for subkeys stored
+directly in a Registry key.  The times are returned in the same
+order as the subkey names returned by C<SubKeyNames()>.  Each
+time is a C<FILETIME> structure packed into a Perl string.
+
+Once you request this information, it is cached in the object and
+future requests will always return the same list unless C<Flush()>
+has been called.
+
+=item MemberNames
+
+=item @members= $key->MemberNames
+
+Returns the list of subkey names and value names stored directly
+in a Registry key.  Subkey names have a delimiter appended to the
+end and value names have a delimiter prepended to the front.
+
+Note that a value name could end in a delimiter [or could be C<"">
+so that the member name returned is just a delimiter] so the
+presence or absence of the leading delimiter is what should be
+used to determine whether a particular name is for a subkey or a
+value, not the presence or absence of a trailing delimiter.
+
+Once you request this information, it is cached in the object and
+future requests will always return the same list unless C<Flush()>
+has been called.
+
+=item Information
+
+=item %info= $key->Information
+
+=item @items= $key->Information( @itemNames );
+
+Returns the following information about a Registry key:
+
+=over
+
+=item LastWrite
+
+A C<FILETIME> structure indicating when the key was last modified
+and packed into a Perl string.
+
+=item CntSubKeys
+
+The number of subkeys stored directly in this key.
+
+=item CntValues
+
+The number of values stored directly in this key.
+
+=item SecurityLen
+
+The length [in bytes] of the largest[?] C<SECURITY_DESCRIPTOR>
+associated with the Registry key.
+
+=item MaxValDataLen
+
+The length [in bytes] of the longest value data associated with
+a value stored in this key.
+
+=item MaxSubKeyLen
+
+The length [in chars] of the longest subkey name associated with
+a subkey stored in this key.
+
+=item MaxSubClassLen
+
+The length [in chars] of the longest class name associated with
+a subkey stored directly in this key.
+
+=item MaxValNameLen
+
+The length [in chars] of the longest value name associated with
+a value stored in this key.
+
+=back
+
+With no arguments, returns a hash [not a reference to a hash] where
+the keys are the names for the items given above and the values
+are the information describe above.  For example:
+
+    %info= ( "CntValues" => 25,         # Key contains 25 values.
+             "MaxValNameLen" => 20,     # One of which has a 20-char name.
+             "MaxValDataLen" => 42,     # One of which has a 42-byte value.
+             "CntSubKeys" => 1,         # Key has 1 immediate subkey.
+             "MaxSubKeyLen" => 13,      # One of which has a 12-char name.
+             "MaxSubClassLen" => 0,     # All of which have class names of "".
+             "SecurityLen" => 232,      # One SECURITY_DESCRIPTOR is 232 bytes.
+             "LastWrite" => "\x90mZ\cX{\xA3\xBD\cA\c@\cA"
+                           # Key was last modifed 1998/06/01 16:29:32 GMT
+           );
+
+With arguments, each one must be the name of a item given above.
+The return value is the information associated with the listed
+names.  In other words:
+
+    return $key->Information( @names );
+
+returns the same list as:
+
+    %info= $key->Information;
+    return @info{@names};
+
+=item Delimiter
+
+=item $oldDelim= $key->Delimiter
+
+=item $oldDelim= $key->Delimiter( $newDelim )
+
+Gets and possibly changes the delimiter used for this object.  The
+delimiter is appended to subkey names and prepended to value names
+in many return values.  It is also used when parsing keys passed
+to tied hashes.
+
+The delimiter defaults to backslash (C<'\\'>) but is inherited from
+the object used to create a new object and can be specified by an
+option when a new object is created.
+
+=item Handle
+
+=item $handle= $key->Handle
+
+Returns the raw C<HKEY> handle for the associated Registry key as
+an integer value.  This value can then be used to Reg*() calls
+from I<Win32API::Registry>.  However, it is usually easier to just
+call the I<Win32API::Registry> calls directly via:
+
+    $key->RegNotifyChangeKeyValue( ... );
+
+For the virtual root of the local or a remote Registry,
+C<Handle()> return C<"NONE">.
+
+=item Path
+
+=item $path= $key->Path
+
+Returns a string describing the path of key names to this
+Registry key.  The string is built so that if it were passed
+to C<$Registry->Open()>, it would reopen the same Registry key
+[except in the rare case where one of the key names contains
+C<$key->Delimiter>].
+
+=item Machine
+
+=item $computerName= $key->Machine
+
+Returns the name of the computer [or "machine"] on which this Registry
+key resides.  Returns C<""> for local Registry keys.
+
+=item Access
+
+Returns the numeric value of the bit mask used to specify the
+types of access requested when this Registry key was opened.  Can
+be compared to C<KEY_*> values.
+
+=item OS_Delimiter
+
+Returns the delimiter used by the operating system's RegOpenKeyEx()
+call.  For Win32, this is always backslash (C<"\\">).
+
+=item Roots
+
+Returns the mapping from root key names like C<"LMachine"> to their
+associated C<HKEY_*> constants.  Primarily for internal use and
+subject to change.
+
+=item Tie
+
+=item $key->Tie( \%hash );
+
+Ties the referenced hash to that Registry key.  Pretty much the
+same as
+
+    tie %hash, ref($key), $key;
+
+Since C<ref($key)> is the class [package] to tie the hash to and
+C<TIEHASH()> just returns its argument, C<$key>, [without calling
+C<new()>] when it sees that it is already a blessed object.
+
+=item TiedRef
+
+=item $TiedHashRef= $hash_or_obj_ref->TiedRef
+
+For a simple object, returns a reference to a hash tied to the
+object.  Used to promote a simple object into a combined object
+and hash ref.
+
+If already a reference to a tied hash [that is also an object],
+it just returns itself [C<$ref == $ref->TiedRef>].
+
+Mostly used internally.
+
+=item ArrayValues
+
+=item $oldBool= $key->ArrayValues
+
+=item $oldBool= $key->ArrayValues( $newBool )
+
+Gets the current setting of the C<ArrayValues> option and possibly
+turns it on or off.
+
+When off, Registry values fetched via a tied hash are returned as
+just a value scalar [the same as C<GetValue()> in a scalar context].
+When on, they are returned as a reference to an array containing
+the value data as the C<[0]> element and the data type as the C<[1]>
+element.
+
+=item TieValues
+
+=item $oldBool= TieValues
+
+=item $oldBool= TieValues( $newBool )
+
+Gets the current setting of the C<TieValues> option and possibly
+turns it on or off.
+
+Turning this option on is not yet supported in this release of
+I<Win32::TieRegistry>.  In a future release, turning this option
+on will cause Registry values returned from a tied hash to be
+a tied array that you can use to modify the value in the Registry.
+
+=item FastDelete
+
+=item $oldBool= $key->FastDelete
+
+=item $oldBool= $key->FastDelete( $newBool )
+
+Gets the current setting of the C<FastDelete> option and possibly
+turns it on or off.
+
+When on, successfully deleting a Registry key [via a tied hash]
+simply returns C<1>.
+
+When off, successfully deleting a Registry key [via a tied hash
+and not in a void context] returns a reference to a hash that
+contains the values present in the key when it was deleted.  This
+hash is just like that returned when referencing the key before it
+was deleted except that it is an ordinary hash, not one tied to
+the I<Win32::TieRegistry> package.
+
+Note that deleting either a Registry key or value via a tied hash
+I<in a void context> prevents any overhead in trying to build an
+appropriate return value.
+
+Note that deleting a Registry I<value> via a tied hash [not in
+a void context] returns the value data even if <FastDelete> is on.
+
+=item SplitMultis
+
+=item $oldBool= $key->SplitMultis
+
+=item $oldBool= $key->SplitMultis( $newBool )
+
+Gets the current setting of the C<SplitMultis> option and possibly
+turns it on or off.
+
+If on, Registry values of type C<REG_MULTI_SZ> are returned as
+a reference to an array of strings.  See C<GetValue()> for more
+information.
+
+=item DWordsToHex
+
+=item $oldBool= $key->DWordsToHex
+
+=item $oldBool= $key->DWordsToHex( $newBool )
+
+Gets the current setting of the C<DWordsToHex> option and possibly
+turns it on or off.
+
+If on, Registry values of type C<REG_DWORD> are returned as a hex
+string with leading C<"0x"> and longer than 4 characters.  See
+C<GetValue()> for more information.
+
+=item FixSzNulls
+
+=item $oldBool= $key->FixSzNulls
+
+=item $oldBool= $key->FixSzNulls( $newBool )
+
+Gets the current setting of the C<FixSzNulls> option and possibly
+turns it on or off.
+
+If on, Registry values of type C<REG_SZ> and C<REG_EXPAND_SZ> have
+trailing C<'\0'>s added before they are set and stripped before
+they are returned.  See C<GetValue()> and C<SetValue()> for more
+information.
+
+=item DualTypes
+
+=item $oldBool= $key->DualTypes
+
+=item $oldBool= $key->DualTypes( $newBool )
+
+Gets the current setting of the C<DualTypes> option and possibly
+turns it on or off.
+
+If on, data types are returned as a combined numeric/string value
+holding both the numeric value of a C<REG_*> constant and the
+string value of the constant's name.  See C<GetValue()> for
+more information.
+
+=item DualBinVals
+
+=item $oldBool= $key->DualBinVals
+
+=item $oldBool= $key->DualBinVals( $newBool )
+
+Gets the current setting of the C<DualBinVals> option and possibly
+turns it on or off.
+
+If on, Registry value data of type C<REG_BINARY> and no more than
+4 bytes long and Registry values of type C<REG_DWORD> are returned
+as a combined numeric/string value where the numeric value is the
+"unpacked" binary value as returned by:
+
+        hex reverse unpack( "h*", $valData )
+
+on a "little-endian" computer.  [Would be C<hex unpack("H*",$valData)>
+on a "big-endian" computer if this module is ever ported to one.]
+
+See C<GetValue()> for more information.
+
+=item GetOptions
+
+=item @oldOptValues= $key->GetOptions( @optionNames )
+
+=item $refHashOfOldOpts= $key->GetOptions()
+
+=item $key->GetOptions( \%hashForOldOpts )
+
+Returns the current setting of any of the following options:
+
+    Delimiter     FixSzNulls    DWordsToHex
+    ArrayValues   SplitMultis   DualBinVals
+    TieValues     FastDelete    DualTypes
+
+Pass in one or more of the above names (as strings) to get back
+an array of the corresponding current settings in the same order:
+
+  my( $fastDel, $delim )= $key->GetOptions("FastDelete","Delimiter");
+
+Pass in no arguments to get back a reference to a hash where
+the above option names are the keys and the values are
+the corresponding current settings for each option:
+
+  my $href= $key->GetOptions();
+  my $delim= $href->{Delimiter};
+
+Pass in a single reference to a hash to have the above key/value
+pairs I<added> to the referenced hash.  For this case, the
+return value is the original object so further methods can be
+chained after the call to GetOptions:
+
+  my %oldOpts;
+  $key->GetOptions( \%oldOpts )->SetOptions( Delimiter => "/" );
+
+=item SetOptions
+
+=item @oldOpts= $key->SetOptions( optNames=>$optValue,... )
+
+Changes the current setting of any of the following options,
+returning the previous setting(s):
+
+    Delimiter     FixSzNulls    DWordsToHex   AllowLoad
+    ArrayValues   SplitMultis   DualBinVals   AllowSave
+    TieValues     FastDelete    DualTypes
+
+For C<AllowLoad> and C<AllowSave>, instead of the previous
+setting, C<SetOptions> returns whether or not the change was
+successful.
+
+In a scalar context, returns only the last item.  The last
+option can also be specified as C<"ref"> or C<"r"> [which doesn't
+need to be followed by a value] to allow chaining:
+
+    $key->SetOptions(AllowSave=>1,"ref")->RegSaveKey(...)
+
+=item SetValue
+
+=item $okay= $key->SetValue( $ValueName, $ValueData );
+
+=item $okay= $key->SetValue( $ValueName, $ValueData, $ValueType );
+
+Adds or replaces a Registry value.  Returns a true value if
+successfully, false otherwise.
+
+C<$ValueName> is the name of the value to add or replace and
+should I<not> have a delimiter prepended to it.  Case is ignored.
+
+C<$ValueType> is assumed to be C<REG_SZ> if it is omitted.  Otherwise,
+it should be one the C<REG_*> constants.
+
+C<$ValueData> is the data to be stored in the value, probably packed
+into a Perl string.  Other supported formats for value data are
+listed below for each posible C<$ValueType>.
+
+=over
+
+=item REG_SZ or REG_EXPAND_SZ
+
+The only special processing for these values is the addition of
+the required trailing C<'\0'> if it is missing.  This can be
+turned off by disabling the C<FixSzNulls> option.
+
+=item REG_MULTI_SZ
+
+These values can also be specified as a reference to a list of
+strings.  For example, the following two lines are equivalent:
+
+    $key->SetValue( "Val1\000Value2\000LastVal\000\000", "REG_MULTI_SZ" );
+    $key->SetValue( ["Val1","Value2","LastVal"], "REG_MULTI_SZ" );
+
+Note that if the required two trailing nulls (C<"\000\000">) are
+missing, then this release of C<SetValue()> will I<not> add them.
+
+=item REG_DWORD
+
+These values can also be specified as a hex value with the leading
+C<"0x"> included and totaling I<more than> 4 bytes.  These will be
+packed into a 4-byte string via:
+
+    $data= pack( "L", hex($data) );
+
+=item REG_BINARY
+
+This value type is listed just to emphasize that no alternate
+format is supported for it.  In particular, you should I<not> pass
+in a numeric value for this type of data.  C<SetValue()> cannot
+distinguish such from a packed string that just happens to match
+a numeric value and so will treat it as a packed string.
+
+=back
+
+An alternate calling format:
+
+    $okay= $key->SetValue( $ValueName, [ $ValueData, $ValueType ] );
+
+[two arguments, the second of which is a reference to an array
+containing the value data and value type] is supported to ease
+using tied hashes with C<SetValue()>.
+
+=item CreateKey
+
+=item $newKey= $key->CreateKey( $subKey );
+
+=item $newKey= $key->CreateKey( $subKey, { Option=>OptVal,... } );
+
+Creates a Registry key or just updates attributes of one.  Calls
+C<RegCreateKeyEx()> then, if it succeeded, creates an object
+associated with the [possibly new] subkey.
+
+C<$subKey> is the name of a subkey [or a path to one] to be
+created or updated.  It can also be a reference to an array
+containing a list of subkey names.
+
+The second argument, if it exists, should be a reference to a
+hash specifying options either to be passed to C<RegCreateKeyEx()>
+or to be used when creating the associated object.  The following
+items are the supported keys for this options hash:
+
+=over
+
+=item Delimiter
+
+Specifies the delimiter to be used to parse C<$subKey> and to be
+used in the new object.  Defaults to C<$key->Delimiter>.
+
+=item Access
+
+Specifies the types of access requested when the subkey is opened.
+Should be a numeric bit mask that combines one or more C<KEY_*>
+constant values.
+
+=item Class
+
+The name to assign as the class of the new or updated subkey.
+Defaults to C<""> as we have never seen a use for this information.
+
+=item Disposition
+
+Lets you specify a reference to a scalar where, upon success, will be
+stored either C<REG_CREATED_NEW_KEY()> or C<REG_OPENED_EXISTING_KEY()>
+depending on whether a new key was created or an existing key was
+opened.
+
+If you, for example, did C<use Win32::TieRegistry qw(REG_CREATED_NEW_KEY)>
+then you can use C<REG_CREATED_NEW_KEY()> to compare against the numeric
+value stored in the referenced scalar.
+
+If the C<DualTypes> option is enabled, then in addition to the
+numeric value described above, the referenced scalar will also
+have a string value equal to either C<"REG_CREATED_NEW_KEY"> or
+C<"REG_OPENED_EXISTING_KEY">, as appropriate.
+
+=item Security
+
+Lets you specify a C<SECURITY_ATTRIBUTES> structure packed into a
+Perl string.  See C<Win32API::Registry::RegCreateKeyEx()> for more
+information.
+
+=item Volatile
+
+If true, specifies that the new key should be volatile, that is,
+stored only in memory and not backed by a hive file [and not saved
+if the computer is rebooted].  This option is ignored under
+Windows 95.  Specifying C<Volatile=E<GT>1>  is the same as
+specifying C<Options=E<GT>REG_OPTION_VOLATILE>.
+
+=item Backup
+
+If true, specifies that the new key should be opened for
+backup/restore access.  The C<Access> option is ignored.  If the
+calling process has enabled C<"SeBackupPrivilege">, then the
+subkey is opened with C<KEY_READ> access as the C<"LocalSystem">
+user which should have access to all subkeys.  If the calling
+process has enabled C<"SeRestorePrivilege">, then the subkey is
+opened with C<KEY_WRITE> access as the C<"LocalSystem"> user which
+should have access to all subkeys.
+
+This option is ignored under Windows 95.  Specifying C<Backup=E<GT>1>
+is the same as specifying C<Options=E<GT>REG_OPTION_BACKUP_RESTORE>.
+
+=item Options
+
+Lets you specify options to the C<RegOpenKeyEx()> call.  The value
+for this option should be a numeric value combining zero or more
+of the C<REG_OPTION_*> bit masks.  You may with to used the
+C<Volatile> and/or C<Backup> options instead of this one.
+
+=back
+
+=item StoreKey
+
+=item $newKey= $key->StoreKey( $subKey, \%Contents );
+
+Primarily for internal use.
+
+Used to create or update a Registry key and any number of subkeys
+or values under it or its subkeys.
+
+C<$subKey> is the name of a subkey to be created [or a path of
+subkey names separated by delimiters].  If that subkey already
+exists, then it is updated.
+
+C<\%Contents> is a reference to a hash containing pairs of
+value names with value data and/or subkey names with hash
+references similar to C<\%Contents>.  Each of these cause
+a value or subkey of C<$subKey> to be created or updated.
+
+If C<$Contents{""}> exists and is a reference to a hash, then
+it used as the options argument when C<CreateKey()> is called
+for C<$subKey>.  This allows you to specify ...
+
+    if(  defined( $$data{""} )  &&  "HASH" eq ref($$data{""})  ) {
+        $self= $this->CreateKey( $subKey, delete $$data{""} );
+
+=item Load
+
+=item $newKey= $key->Load( $file )
+
+=item $newKey= $key->Load( $file, $newSubKey )
+
+=item $newKey= $key->Load( $file, $newSubKey, { Option=>OptVal... } )
+
+=item $newKey= $key->Load( $file, { Option=>OptVal... } )
+
+Loads a hive file into a Registry.  That is, creates a new subkey
+and associates a hive file with it.
+
+C<$file> is a hive file, that is a file created by calling
+C<RegSaveKey()>.  The C<$file> path is interpreted relative to
+C<%SystemRoot%/System32/config> on the machine where C<$key>
+resides.
+
+C<$newSubKey> is the name to be given to the new subkey.  If
+C<$newSubKey> is specified, then C<$key> must be
+C<HKEY_LOCAL_MACHINE> or C<HKEY_USERS> of the local computer
+or a remote computer and C<$newSubKey> should not contain any
+occurrences of either the delimiter or the OS delimiter.
+
+If C<$newSubKey> is not specified, then it is as if C<$key>
+was C<$Registry-E<GT>{LMachine}> and C<$newSubKey> is
+C<"PerlTie:999"> where C<"999"> is actually a sequence number
+incremented each time this process calls C<Load()>.
+
+You can specify as the last argument a reference to a hash
+containing options.  You can specify the same options that you
+can specify to C<Open()>.  See C<Open()> for more information on
+those.  In addition, you can specify the option C<"NewSubKey">.
+The value of this option is interpretted exactly as if it was
+specified as the C<$newSubKey> parameter and overrides the
+C<$newSubKey> if one was specified.
+
+The hive is automatically unloaded when the returned object
+[C<$newKey>] is destroyed.  Registry key objects opened within
+the hive will keep a reference to the C<$newKey> object so that
+it will not be destroyed before these keys are closed.
+
+=item UnLoad
+
+=item $okay= $key->UnLoad
+
+Unloads a hive that was loaded via C<Load()>.  Cannot unload other
+hives.  C<$key> must be the return from a previous call to C<Load()>.
+C<$key> is closed and then the hive is unloaded.
+
+=item AllowSave
+
+=item $okay= AllowSave( $bool )
+
+Enables or disables the C<"ReBackupPrivilege"> privilege for the
+current process.  You will probably have to enable this privilege
+before you can use C<RegSaveKey()>.
+
+The return value indicates whether the operation succeeded, not
+whether the privilege was previously enabled.
+
+=item AllowLoad
+
+=item $okay= AllowLoad( $bool )
+
+Enables or disables the C<"ReRestorePrivilege"> privilege for the
+current process.  You will probably have to enable this privilege
+before you can use C<RegLoadKey()>, C<RegUnLoadKey()>,
+C<RegReplaceKey()>, or C<RegRestoreKey> and thus C<Load()> and
+C<UnLoad()>.
+
+The return value indicates whether the operation succeeded, not
+whether the privilege was previously enabled.
+
+=back
+
+=head2 Exports [C<use> and C<import()>]
+
+To have nothing imported into your package, use something like:
+
+    use Win32::TieRegistry 0.20 ();
+
+which would verify that you have at least version 0.20 but wouldn't
+call C<import()>.  The F<Changes> file can be useful in figuring out
+which, if any, prior versions of I<Win32::TieRegistry> you want to
+support in your script.
+
+The code
+
+    use Win32::TieRegistry;
+
+imports the variable C<$Registry> into your package and sets it
+to be a reference to a hash tied to a copy of the master Registry
+virtual root object with the default options.  One disadvantage
+to this "default" usage is that Perl does not support checking
+the module version when you use it.
+
+Alternately, you can specify a list of arguments on the C<use>
+line that will be passed to the C<Win32::TieRegistry->import()>
+method to control what items to import into your package.  These
+arguments fall into the following broad categories:
+
+=over
+
+=item Import a reference to a hash tied to a Registry virtual root
+
+You can request that a scalar variable be imported (possibly)
+and set to be a reference to a hash tied to a Registry virtual root
+using any of the following types of arguments or argument pairs:
+
+=over
+
+=item "TiedRef", '$scalar'
+
+=item "TiedRef", '$pack::scalar'
+
+=item "TiedRef", 'scalar'
+
+=item "TiedRef", 'pack::scalar'
+
+All of the above import a scalar named C<$scalar> into your package
+(or the package named "pack") and then sets it.
+
+=item '$scalar'
+
+=item '$pack::scalar'
+
+These are equivalent to the previous items to support a more
+traditional appearance to the list of exports.  Note that the
+scalar name cannot be "RegObj" here.
+
+=item "TiedRef", \$scalar
+
+=item \$scalar
+
+These versions don't import anything but set the referenced C<$scalar>.
+
+=back
+
+=item Import a hash tied to the Registry virtual root
+
+You can request that a hash variable be imported (possibly)
+and tied to a Registry virtual root using any of the following
+types of arguments or argument pairs:
+
+=over
+
+=item "TiedHash", '%hash'
+
+=item "TiedHash", '%pack::hash'
+
+=item "TiedHash", 'hash'
+
+=item "TiedHash", 'pack::hash'
+
+All of the above import a hash named C<%hash> into your package
+(or the package named "pack") and then sets it.
+
+=item '%hash'
+
+=item '%pack::hash'
+
+These are equivalent to the previous items to support a more
+traditional appearance to the list of exports.
+
+=item "TiedHash", \%hash
+
+=item \%hash
+
+These versions don't import anything but set the referenced C<%hash>.
+
+=back
+
+=item Import a Registry virtual root object
+
+You can request that a scalar variable be imported (possibly)
+and set to be a Registry virtual root object using any of the
+following types of arguments or argument pairs:
+
+=over
+
+=item "ObjectRef", '$scalar'
+
+=item "ObjectRef", '$pack::scalar'
+
+=item "ObjectRef", 'scalar'
+
+=item "ObjectRef", 'pack::scalar'
+
+All of the above import a scalar named C<$scalar> into your package
+(or the package named "pack") and then sets it.
+
+=item '$RegObj'
+
+This is equivalent to the previous items for backward compatibility.
+
+=item "ObjectRef", \$scalar
+
+This version doesn't import anything but sets the referenced C<$scalar>.
+
+=back
+
+=item Import constant(s) exported by I<Win32API::Registry>
+
+You can list any constants that are exported by I<Win32API::Registry>
+to have them imported into your package.  These constants have names
+starting with "KEY_" or "REG_" (or even "HKEY_").
+
+You can also specify C<":KEY_">, C<":REG_">, and even C<":HKEY_"> to
+import a whole set of constants.
+
+See I<Win32API::Registry> documentation for more information.
+
+=item Options
+
+You can list any option names that can be listed in the C<SetOptions()>
+method call, each folowed by the value to use for that option.
+A Registry virtual root object is created, all of these options are
+set for it, then each variable to be imported/set is associated with
+this object.
+
+In addition, the following special options are supported:
+
+=over
+
+=item ExportLevel
+
+Whether to import variables into your package or some
+package that uses your package.  Defaults to the value of
+C<$Exporter::ExportLevel> and has the same meaning.  See
+the L<Exporter> module for more information.
+
+=item ExportTo
+
+The name of the package to import variables and constants into.
+Overrides I<ExportLevel>.
+
+=back
+
+=back
+
+=head3 Specifying constants in your Perl code
+
+This module was written with a strong emphasis on the convenience of
+the module user.  Therefore, most places where you can specify a
+constant like C<REG_SZ()> also allow you to specify a string
+containing the name of the constant, C<"REG_SZ">.  This is convenient
+because you may not have imported that symbolic constant.
+
+Perl also emphasizes programmer convenience so the code C<REG_SZ>
+can be used to mean C<REG_SZ()> or C<"REG_SZ"> or be illegal.
+Note that using C<&REG_SZ> (as we've seen in much Win32 Perl code)
+is not a good idea since it passes the current C<@_> to the
+C<constant()> routine of the module which, at the least, can give
+you a warning under B<-w>.
+
+Although greatly a matter of style, the "safest" practice is probably
+to specifically list all constants in the C<use Win32::TieRegistry>
+statement, specify C<use strict> [or at least C<use strict qw(subs)>],
+and use bare constant names when you want the numeric value.  This will
+detect mispelled constant names at compile time.
+
+    use strict;
+    my $Registry;
+    use Win32::TieRegistry 0.20 (
+        TiedRef => \$Registry,  Delimiter => "/",  ArrayValues => 1,
+	SplitMultis => 1,  AllowLoad => 1,
+        qw( REG_SZ REG_EXPAND_SZ REG_DWORD REG_BINARY REG_MULTI_SZ
+	    KEY_READ KEY_WRITE KEY_ALL_ACCESS ),
+    );
+    $Registry->{"LMachine/Software/FooCorp/"}= {
+        "FooWriter/" => {
+            "/Fonts" => [ ["Times","Courier","Lucinda"], REG_MULTI_SZ ],
+	    "/WindowSize" => [ pack("LL",24,80), REG_BINARY ],
+	    "/TaskBarIcon" => [ "0x0001", REG_DWORD ],
+	},
+    }  or  die "Can't create Software/FooCorp/: $^E\n";
+
+If you don't want to C<use strict qw(subs)>, the second safest practice
+is similar to the above but use the C<REG_SZ()> form for constants
+when possible and quoted constant names when required.  Note that
+C<qw()> is a form of quoting.
+
+    use Win32::TieRegistry 0.20 qw(
+        TiedRef $Registry
+        Delimiter /  ArrayValues 1  SplitMultis 1  AllowLoad 1
+        REG_SZ REG_EXPAND_SZ REG_DWORD REG_BINARY REG_MULTI_SZ
+        KEY_READ KEY_WRITE KEY_ALL_ACCESS
+    );
+    $Registry->{"LMachine/Software/FooCorp/"}= {
+        "FooWriter/" => {
+            "/Fonts" => [ ["Times","Courier","Lucinda"], REG_MULTI_SZ() ],
+	    "/WindowSize" => [ pack("LL",24,80), REG_BINARY() ],
+	    "/TaskBarIcon" => [ "0x0001", REG_DWORD() ],
+	},
+    }  or  die "Can't create Software/FooCorp/: $^E\n";
+
+The examples in this document mostly use quoted constant names
+(C<"REG_SZ">) since that works regardless of which constants
+you imported and whether or not you have C<use strict> in your
+script.  It is not the best choice for you to use for real
+scripts (vs. examples) because it is less efficient and is not
+supported by most other similar modules.
+
+=head1 SUMMARY
+
+Most things can be done most easily via tied hashes.  Skip down to the
+the L<Tied Hashes Summary> to get started quickly.
+
+=head2 Objects Summary
+
+Here are quick examples that document the most common functionality
+of all of the method functions [except for a few almost useless ones].
+
+    # Just another way of saying Open():
+    $key= new Win32::TieRegistry "LMachine\\Software\\",
+      { Access=>KEY_READ()|KEY_WRITE(), Delimiter=>"\\" };
+
+    # Open a Registry key:
+    $subKey= $key->Open( "SubKey/SubSubKey/",
+      { Access=>KEY_ALL_ACCESS, Delimiter=>"/" } );
+
+    # Connect to a remote Registry key:
+    $remKey= $Registry->Connect( "MachineName", "LMachine/",
+      { Access=>KEY_READ, Delimiter=>"/" } );
+
+    # Get value data:
+    $valueString= $key->GetValue("ValueName");
+    ( $valueString, $valueType )= $key->GetValue("ValueName");
+
+    # Get list of value names:
+    @valueNames= $key->ValueNames;
+
+    # Get list of subkey names:
+    @subKeyNames= $key->SubKeyNames;
+
+    # Get combined list of value names (with leading delimiters)
+    # and subkey names (with trailing delimiters):
+    @memberNames= $key->MemberNames;
+
+    # Get all information about a key:
+    %keyInfo= $key->Information;
+    # keys(%keyInfo)= qw( Class LastWrite SecurityLen
+    #   CntSubKeys MaxSubKeyLen MaxSubClassLen
+    #   CntValues MaxValNameLen MaxValDataLen );
+
+    # Get selected information about a key:
+    ( $class, $cntSubKeys )= $key->Information( "Class", "CntSubKeys" );
+
+    # Get and/or set delimiter:
+    $delim= $key->Delimiter;
+    $oldDelim= $key->Delimiter( $newDelim );
+
+    # Get "path" for an open key:
+    $path= $key->Path;
+    # For example, "/CUser/Control Panel/Mouse/"
+    # or "//HostName/LMachine/System/DISK/".
+
+    # Get name of machine where key is from:
+    $mach= $key->Machine;
+    # Will usually be "" indicating key is on local machine.
+
+    # Control different options (see main documentation for descriptions):
+    $oldBool= $key->ArrayValues( $newBool );
+    $oldBool= $key->FastDelete( $newBool );
+    $oldBool= $key->FixSzNulls( $newBool );
+    $oldBool= $key->SplitMultis( $newBool );
+    $oldBool= $key->DWordsToHex( $newBool );
+    $oldBool= $key->DualBinVals( $newBool );
+    $oldBool= $key->DualTypes( $newBool );
+    @oldBools= $key->SetOptions( ArrayValues=>1, FastDelete=>1, FixSzNulls=>0,
+      Delimiter=>"/", AllowLoad=>1, AllowSave=>1 );
+    @oldBools= $key->GetOptions( ArrayValues, FastDelete, FixSzNulls );
+
+    # Add or set a value:
+    $key->SetValue( "ValueName", $valueDataString );
+    $key->SetValue( "ValueName", pack($format,$valueData), "REG_BINARY" );
+
+    # Add or set a key:
+    $key->CreateKey( "SubKeyName" );
+    $key->CreateKey( "SubKeyName",
+      { Access=>"KEY_ALL_ACCESS", Class=>"ClassName",
+        Delimiter=>"/", Volatile=>1, Backup=>1 } );
+
+    # Load an off-line Registry hive file into the on-line Registry:
+    $newKey= $Registry->Load( "C:/Path/To/Hive/FileName" );
+    $newKey= $key->Load( "C:/Path/To/Hive/FileName", "NewSubKeyName",
+                     { Access=>"KEY_READ" } );
+    # Unload a Registry hive file loaded via the Load() method:
+    $newKey->UnLoad;
+
+    # (Dis)Allow yourself to load Registry hive files:
+    $success= $Registry->AllowLoad( $bool );
+
+    # (Dis)Allow yourself to save a Registry key to a hive file:
+    $success= $Registry->AllowSave( $bool );
+
+    # Save a Registry key to a new hive file:
+    $key->RegSaveKey( "C:/Path/To/Hive/FileName", [] );
+
+=head3 Other Useful Methods
+
+See I<Win32API::Registry> for more information on these methods.
+These methods are provided for coding convenience and are
+identical to the I<Win32API::Registry> functions except that these
+don't take a handle to a Registry key, instead getting the handle
+from the invoking object [C<$key>].
+
+    $key->RegGetKeySecurity( $iSecInfo, $sSecDesc, $lenSecDesc );
+    $key->RegLoadKey( $sSubKeyName, $sPathToFile );
+    $key->RegNotifyChangeKeyValue(
+      $bWatchSubtree, $iNotifyFilter, $hEvent, $bAsync );
+    $key->RegQueryMultipleValues(
+      $structValueEnts, $cntValueEnts, $Buffer, $lenBuffer );
+    $key->RegReplaceKey( $sSubKeyName, $sPathToNewFile, $sPathToBackupFile );
+    $key->RegRestoreKey( $sPathToFile, $iFlags );
+    $key->RegSetKeySecurity( $iSecInfo, $sSecDesc );
+    $key->RegUnLoadKey( $sSubKeyName );
+
+=head2 Tied Hashes Summary
+
+For fast learners, this may be the only section you need to read.
+Always append one delimiter to the end of each Registry key name
+and prepend one delimiter to the front of each Registry value name.
+
+=head3 Opening keys
+
+    use Win32::TieRegistry ( Delimiter=>"/", ArrayValues=>1 );
+    $Registry->Delimiter("/");                  # Set delimiter to "/".
+    $swKey= $Registry->{"LMachine/Software/"};
+    $winKey= $swKey->{"Microsoft/Windows/CurrentVersion/"};
+    $userKey= $Registry->
+      {"CUser/Software/Microsoft/Windows/CurrentVersion/"};
+    $remoteKey= $Registry->{"//HostName/LMachine/"};
+
+=head3 Reading values
+
+    $progDir= $winKey->{"/ProgramFilesDir"};    # "C:\\Program Files"
+    $tip21= $winKey->{"Explorer/Tips//21"};     # Text of tip #21.
+
+    $winKey->ArrayValues(1);
+    ( $devPath, $type )= $winKey->{"/DevicePath"};
+    # $devPath eq "%SystemRoot%\\inf"
+    # $type eq "REG_EXPAND_SZ"  [if you have SetDualVar.pm installed]
+    # $type == REG_EXPAND_SZ()  [if did C<use Win32::TieRegistry qw(:REG_)>]
+
+=head3 Setting values
+
+    $winKey->{"Setup//SourcePath"}= "\\\\SwServer\\SwShare\\Windows";
+    # Simple.  Assumes data type of REG_SZ.
+
+    $winKey->{"Setup//Installation Sources"}=
+      [ "D:\x00\\\\SwServer\\SwShare\\Windows\0\0", "REG_MULTI_SZ" ];
+    # "\x00" and "\0" used to mark ends of each string and end of list.
+
+    $winKey->{"Setup//Installation Sources"}=
+      [ ["D:","\\\\SwServer\\SwShare\\Windows"], "REG_MULTI_SZ" ];
+    # Alternate method that is easier to read.
+
+    $userKey->{"Explorer/Tips//DisplayInitialTipWindow"}=
+      [ pack("L",0), "REG_DWORD" ];
+    $userKey->{"Explorer/Tips//Next"}= [ pack("S",3), "REG_BINARY" ];
+    $userKey->{"Explorer/Tips//Show"}= [ pack("L",0), "REG_BINARY" ];
+
+=head3 Adding keys
+
+    $swKey->{"FooCorp/"}= {
+        "FooWriter/" => {
+            "/Version" => "4.032",
+            "Startup/" => {
+                "/Title" => "Foo Writer Deluxe ][",
+                "/WindowSize" => [ pack("LL",$wid,$ht), "REG_BINARY" ],
+                "/TaskBarIcon" => [ "0x0001", "REG_DWORD" ],
+            },
+            "Compatibility/" => {
+                "/AutoConvert" => "Always",
+                "/Default Palette" => "Windows Colors",
+            },
+        },
+        "/License", => "0123-9C8EF1-09-FC",
+    };
+
+=head3 Listing all subkeys and values
+
+    @members= keys( %{$swKey} );
+    @subKeys= grep(  m#^/#,  keys( %{$swKey->{"Classes/batfile/"}} )  );
+    # @subKeys= ( "/", "/EditFlags" );
+    @valueNames= grep(  ! m#^/#,  keys( %{$swKey->{"Classes/batfile/"}} )  );
+    # @valueNames= ( "DefaultIcon/", "shell/", "shellex/" );
+
+=head3 Deleting values or keys with no subkeys
+
+    $oldValue= delete $userKey->{"Explorer/Tips//Next"};
+
+    $oldValues= delete $userKey->{"Explorer/Tips/"};
+    # $oldValues will be reference to hash containing deleted keys values.
+
+=head3 Closing keys
+
+    undef $swKey;               # Explicit way to close a key.
+    $winKey= "Anything else";   # Implicitly closes a key.
+    exit 0;                     # Implicitly closes all keys.
+
+=head2 Tie::Registry
+
+This module was originally called I<Tie::Registry>.  Changing code
+that used I<Tie::Registry> over to I<Win32::TieRegistry> is trivial
+as the module name should only be mentioned once, in the C<use>
+line.  However, finding all of the places that used I<Tie::Registry>
+may not be completely trivial so we have included F<Tie/Registry.pm>
+which you can install to provide backward compatibility.
+
+=head1 AUTHOR
+
+Tye McQueen.  See http://www.metronet.com/~tye/ or e-mail
+tye@metronet.com with bug reports.
+
+=head1 SEE ALSO
+
+I<Win32API::Registry> - Provides access to C<Reg*()>, C<HKEY_*>,
+C<KEY_*>, C<REG_*> [required].
+
+I<Win32::WinError> - Defines C<ERROR_*> values [optional].
+
+L<SetDualVar> - For returning C<REG_*> values as combined
+string/integer values [optional].
+
+=head1 BUGS
+
+Perl5.004_02 has bugs that make I<Win32::TieRegistry> fail in
+strange and subtle ways.
+
+Using I<Win32::TieRegistry> with versions of Perl prior to 5.005
+can be tricky or impossible.  Most notes about this have been
+removed from the documentation (they get rather complicated
+and confusing).  This includes references to C<$^E> perhaps not
+being meaningful.
+
+Because Perl hashes are case sensitive, certain lookups are also
+case sensistive.  In particular, the root keys ("Classes", "CUser",
+"LMachine", "Users", "PerfData", "CConfig", "DynData", and HKEY_*)
+must always be entered without changing between upper and lower
+case letters.  Also, the special rule for matching subkey names
+that contain the user-selected delimiter only works if case is
+matched.  All other key name and value name lookups should be case
+insensitive because the underlying Reg*() calls ignore case.
+
+Information about each key is cached when using a tied hash.
+This cache is not flushed nor updated when changes are made,
+I<even when the same tied hash is used> to make the changes.
+
+Current implementations of Perl's "global destruction" phase can
+cause objects returned by C<Load()> to be destroyed while keys
+within the hive are still open, if the objects still exist when
+the script starts to exit.  When this happens, the automatic
+C<UnLoad()> will report a failure and the hive will remain loaded
+in the Registry.
+
+Trying to C<Load()> a hive file that is located on a remote network
+share may silently delete all data from the hive.  This is a bug
+in the Win32 APIs, not any Perl code or modules.  This module does
+not try to protect you from this bug.
+
+There is no test suite.
+
+=head1 FUTURE DIRECTIONS
+
+The following items are desired by the author and may appear in a
+future release of this module.
+
+=over
+
+=item TieValues option
+
+Currently described in main documentation but no yet implemented.
+
+=item AutoRefresh option
+
+Trigger use of C<RegNotifyChangeKeyValue()> to keep tied hash
+caches up-to-date even when other programs make changes.
+
+=item Error options
+
+Allow the user to have unchecked calls (calls in a "void context")
+to automatically report errors via C<warn> or C<die>.
+
+For complex operations, such a copying an entire subtree, provide
+access to detailed information about errors (and perhaps some
+warnings) that were encountered.  Let the user control whether
+the complex operation continues in spite of errors.
+
+=back
+
+=cut
+
+# Autoload not currently supported by Perl under Windows.
diff --git a/lib/site_win50/Win32/Registry.pm b/lib/site_win50/Win32/Registry.pm
index cd20b1e07..c83fca5a3 100644
--- a/lib/site_win50/Win32/Registry.pm
+++ b/lib/site_win50/Win32/Registry.pm
@@ -1,547 +1,547 @@
-package Win32::Registry;
-
-=head1 NAME
-
-Win32::Registry - accessing the Windows registry [obsolete, use Win32::TieRegistry]
-
-=head1 SYNOPSIS
-
-    use Win32::Registry;
-    my $tips;
-    $::HKEY_LOCAL_MACHINE->Open("SOFTWARE\\Microsoft\\Windows"
-                               ."\\CurrentVersion\\Explorer\\Tips", $tips)
-        or die "Can't open tips: $^E";
-    my ($type, $value);
-    $tips->QueryValueEx("18", $type, $value) or die "No tip #18: $^E";
-    print "Here's a tip: $value\n";
-
-=head1 DESCRIPTION
-
-    NOTE: This module provides a very klunky interface to access the
-    Windows registry, and is not currently being developed actively.  It
-    only exists for backward compatibility with old code that uses it.
-    For more powerful and flexible ways to access the registry, use
-    Win32::TieRegistry.
-
-Win32::Registry provides an object oriented interface to the Windows
-Registry.
-
-The following "root" registry objects are exported to the main:: name
-space.  Additional keys must be opened by calling the provided methods
-on one of these.
-
-    $HKEY_CLASSES_ROOT
-    $HKEY_CURRENT_USER
-    $HKEY_LOCAL_MACHINE
-    $HKEY_USERS
-    $HKEY_PERFORMANCE_DATA
-    $HKEY_CURRENT_CONFIG
-    $HKEY_DYN_DATA
-
-=cut
-
-use strict;
-require Exporter;
-require DynaLoader;
-use Win32::WinError;
-
-require Win32 unless defined &Win32::GetLastError;
-
-use vars qw($VERSION $AUTOLOAD @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
-$VERSION = '0.07';
-
-@ISA	= qw( Exporter DynaLoader );
-@EXPORT = qw(
-	HKEY_CLASSES_ROOT
-	HKEY_CURRENT_USER
-	HKEY_LOCAL_MACHINE
-	HKEY_PERFORMANCE_DATA
-	HKEY_CURRENT_CONFIG
-	HKEY_DYN_DATA
-	HKEY_USERS
-	KEY_ALL_ACCESS
-	KEY_CREATE_LINK
-	KEY_CREATE_SUB_KEY
-	KEY_ENUMERATE_SUB_KEYS
-	KEY_EXECUTE
-	KEY_NOTIFY
-	KEY_QUERY_VALUE
-	KEY_READ
-	KEY_SET_VALUE
-	KEY_WRITE
-	REG_BINARY
-	REG_CREATED_NEW_KEY
-	REG_DWORD
-	REG_DWORD_BIG_ENDIAN
-	REG_DWORD_LITTLE_ENDIAN
-	REG_EXPAND_SZ
-	REG_FULL_RESOURCE_DESCRIPTOR
-	REG_LEGAL_CHANGE_FILTER
-	REG_LEGAL_OPTION
-	REG_LINK
-	REG_MULTI_SZ
-	REG_NONE
-	REG_NOTIFY_CHANGE_ATTRIBUTES
-	REG_NOTIFY_CHANGE_LAST_SET
-	REG_NOTIFY_CHANGE_NAME
-	REG_NOTIFY_CHANGE_SECURITY
-	REG_OPENED_EXISTING_KEY
-	REG_OPTION_BACKUP_RESTORE
-	REG_OPTION_CREATE_LINK
-	REG_OPTION_NON_VOLATILE
-	REG_OPTION_RESERVED
-	REG_OPTION_VOLATILE
-	REG_REFRESH_HIVE
-	REG_RESOURCE_LIST
-	REG_RESOURCE_REQUIREMENTS_LIST
-	REG_SZ
-	REG_WHOLE_HIVE_VOLATILE
-);
-
-@EXPORT_OK = qw(
-    RegCloseKey
-    RegConnectRegistry
-    RegCreateKey
-    RegCreateKeyEx
-    RegDeleteKey
-    RegDeleteValue
-    RegEnumKey
-    RegEnumValue
-    RegFlushKey
-    RegGetKeySecurity
-    RegLoadKey
-    RegNotifyChangeKeyValue
-    RegOpenKey
-    RegOpenKeyEx
-    RegQueryInfoKey
-    RegQueryValue
-    RegQueryValueEx
-    RegReplaceKey
-    RegRestoreKey
-    RegSaveKey
-    RegSetKeySecurity
-    RegSetValue
-    RegSetValueEx
-    RegUnLoadKey
-);
-$EXPORT_TAGS{ALL}= \@EXPORT_OK;
-
-bootstrap Win32::Registry;
-
-sub import {
-    my $pkg = shift;
-    if ($_[0] && "Win32" eq $_[0]) {
-	Exporter::export($pkg, "Win32", @EXPORT_OK);
-	shift;
-    }
-    Win32::Registry->export_to_level(1+$Exporter::ExportLevel, $pkg, @_);
-}
-
-#######################################################################
-# This AUTOLOAD is used to 'autoload' constants from the constant()
-# XS function.  If a constant is not found then control is passed
-# to the AUTOLOAD in AutoLoader.
-
-sub AUTOLOAD {
-    my($constname);
-    ($constname = $AUTOLOAD) =~ s/.*:://;
-    #reset $! to zero to reset any current errors.
-    local $! = 0;
-    my $val = constant($constname, 0);
-    if ($! != 0) {
-	if ($! =~ /Invalid/) {
-	    $AutoLoader::AUTOLOAD = $AUTOLOAD;
-	    goto &AutoLoader::AUTOLOAD;
-	}
-	else {
-	    my ($pack,$file,$line) = caller;
-	    die "Unknown constant $constname in Win32::Registry "
-	       . "at $file line $line.\n";
-	}
-    }
-    eval "sub $AUTOLOAD { $val }";
-    goto &$AUTOLOAD;
-}
-
-#######################################################################
-# _new is a private constructor, not intended for public use.
-#
-
-sub _new {
-    my $self;
-    if ($_[0]) {
-	$self->{'handle'} = $_[0];
-	bless $self;
-    }
-    $self;
-}
-
-#define the basic registry objects to be exported.
-#these had to be hardwired unfortunately.
-# XXX Yuck!
-
-{
-    package main;
-    use vars qw(
-		$HKEY_CLASSES_ROOT
-		$HKEY_CURRENT_USER
-		$HKEY_LOCAL_MACHINE
-		$HKEY_USERS
-		$HKEY_PERFORMANCE_DATA
-		$HKEY_CURRENT_CONFIG
-		$HKEY_DYN_DATA
-	       );
-}
-
-$::HKEY_CLASSES_ROOT		= _new(&HKEY_CLASSES_ROOT);
-$::HKEY_CURRENT_USER		= _new(&HKEY_CURRENT_USER);
-$::HKEY_LOCAL_MACHINE		= _new(&HKEY_LOCAL_MACHINE);
-$::HKEY_USERS			= _new(&HKEY_USERS);
-$::HKEY_PERFORMANCE_DATA	= _new(&HKEY_PERFORMANCE_DATA);
-$::HKEY_CURRENT_CONFIG		= _new(&HKEY_CURRENT_CONFIG);
-$::HKEY_DYN_DATA		= _new(&HKEY_DYN_DATA);
-
-=head2 Methods
-
-The following methods are supported.  Note that subkeys can be
-specified as a path name, separated by backslashes (which may
-need to be doubled if you put them in double quotes).
-
-=over 8
-
-=item Open
-
-    $reg_obj->Open($sub_key_name, $sub_reg_obj);
-
-Opens a subkey of a registry object, returning the new registry object
-in $sub_reg_obj.
-
-=cut
-
-sub Open {
-    my $self = shift;
-    die 'usage: $obj->Open($sub_key_name, $sub_reg_obj)' if @_ != 2;
-    
-    my ($subkey) = @_;
-    my ($result,$subhandle);
-
-    $result = RegOpenKey($self->{'handle'},$subkey,$subhandle);
-    $_[1] = _new($subhandle);
-    
-    return 0 unless $_[1];
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item Close
-
-    $reg_obj->Close();
-
-Closes an open registry key.
-
-=cut
-
-sub Close {
-    my $self = shift;
-    die 'usage: $obj->Close()' if @_ != 0;
-
-    return unless exists $self->{'handle'};
-    my $result = RegCloseKey($self->{'handle'});
-    if ($result) {
-	delete $self->{'handle'};
-    }
-    else {
-	$! = Win32::GetLastError();
-    }
-    return $result;
-}
-
-sub DESTROY {
-    my $self = shift;
-    return unless exists $self->{'handle'};
-    RegCloseKey($self->{'handle'});
-    delete $self->{'handle'};
-}
-
-
-=item Connect
-
-    $reg_obj->Connect($node_name, $new_reg_obj);
-
-Connects to a remote Registry on the node specified by $node_name,
-returning it in $new_reg_obj.  Returns false if it fails.
-
-=cut
-
-sub Connect {
-    my $self = shift;
-    die 'usage: $obj->Connect($node_name, $new_reg_obj)' if @_ != 2;
-     
-    my ($node) = @_;
-    my ($result,$subhandle);
-
-    $result = RegConnectRegistry ($node, $self->{'handle'}, $subhandle);
-    $_[1] = _new($subhandle);
-
-    return 0 unless $_[1];
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}  
-
-=item Create
-
-    $reg_obj->Create($sub_key_name, $new_reg_obj);
-
-Opens the subkey specified by $sub_key_name, returning the new registry
-object in $new_reg_obj.  If the specified subkey doesn't exist, it is
-created.
-
-=cut
-
-sub Create {
-    my $self = shift;
-    die 'usage: $obj->Create($sub_key_name, $new_reg_obj)' if @_ != 2;
-
-    my ($subkey) = @_;
-    my ($result,$subhandle);
-
-    $result = RegCreateKey($self->{'handle'},$subkey,$subhandle);
-    $_[1] = _new ($subhandle);
-
-    return 0 unless $_[1];
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item SetValue
-
-    $reg_obj->SetValue($sub_key_name, $type, $value);
-
-Sets the default value for a subkey specified by $sub_key_name.
-
-=cut
-
-sub SetValue {
-    my $self = shift;
-    die 'usage: $obj->SetValue($subkey, $type, $value)' if @_ != 3;
-    my $result = RegSetValue($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item SetValueEx
-
-    $reg_obj->SetValueEx($value_name, $reserved, $type, $value);
-
-Sets the value for the value name identified by $value_name
-in the key specified by $reg_obj.
-
-=cut
-
-sub SetValueEx {
-    my $self = shift;
-    die 'usage: $obj->SetValueEx($value_name, $reserved, $type, $value)' if @_ != 4;
-    my $result = RegSetValueEx($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item QueryValue
-
-    $reg_obj->QueryValue($sub_key_name, $value);
-
-Gets the default value of the subkey specified by $sub_key_name.
-
-=cut
-
-sub QueryValue {
-    my $self = shift;
-    die 'usage: $obj->QueryValue($sub_key_name, $value)' if @_ != 2;
-    my $result = RegQueryValue($self->{'handle'}, $_[0], $_[1]);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item QueryKey
-
-    $reg_obj->QueryKey($classref, $number_of_subkeys, $number_of_values);
-
-Gets information on a key specified by $reg_obj.
-
-=cut
-
-sub QueryKey {
-    my $garbage;
-    my $self = shift;
-    die 'usage: $obj->QueryKey($classref, $number_of_subkeys, $number_of_values)'
-    	if @_ != 3;
-
-    my $result = RegQueryInfoKey($self->{'handle'}, $_[0],
-    				 $garbage, $garbage, $_[1],
-			         $garbage, $garbage, $_[2],
-			         $garbage, $garbage, $garbage, $garbage);
-
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item QueryValueEx
-
-    $reg_obj->QueryValueEx($value_name, $type, $value);
-
-Gets the value for the value name identified by $value_name
-in the key specified by $reg_obj.
-
-=cut
-
-sub QueryValueEx {
-    my $self = shift;
-    die 'usage: $obj->QueryValueEx($value_name, $type, $value)' if @_ != 3;
-    my $result = RegQueryValueEx($self->{'handle'}, $_[0], undef, $_[1], $_[2]);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item GetKeys
-
-    my @keys;
-    $reg_obj->GetKeys(\@keys);
-
-Populates the supplied array reference with the names of all the keys
-within the registry object $reg_obj.
-
-=cut
-
-sub GetKeys {
-    my $self = shift;
-    die 'usage: $obj->GetKeys($arrayref)' if @_ != 1 or ref($_[0]) ne 'ARRAY';
-
-    my ($result, $i, $keyname);
-    $keyname = "DummyVal";
-    $i = 0;
-    $result = 1;
-    
-    while ( $result ) {
-	$result = RegEnumKey( $self->{'handle'},$i++, $keyname );
-	if ($result) {
-	    push( @{$_[0]}, $keyname );
-	}
-    }
-    return(1);
-}
-
-=item GetValues
-
-    my %values;
-    $reg_obj->GetValues(\%values);
-
-Populates the supplied hash reference with entries of the form
-
-    $value_name => [ $value_name, $type, $data ]
-
-for each value in the registry object $reg_obj.
-
-=cut
-
-sub GetValues {
-    my $self = shift;
-    die 'usage: $obj->GetValues($hashref)' if @_ != 1;
-
-    my ($result,$name,$type,$data,$i);
-    $name = "DummyVal";
-    $i = 0;
-    while ( $result=RegEnumValue( $self->{'handle'},
-				  $i++,
-				  $name,
-				  undef,
-				  $type,
-				  $data ))
-    {
-	$_[0]->{$name} = [ $name, $type, $data ];
-    }
-    return(1);
-}
-
-=item DeleteKey
-
-    $reg_obj->DeleteKey($sub_key_name);
-
-Deletes a subkey specified by $sub_key_name from the registry.
-
-=cut
-
-sub DeleteKey {
-    my $self = shift;
-    die 'usage: $obj->DeleteKey($sub_key_name)' if @_ != 1;
-    my $result = RegDeleteKey($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item DeleteValue
-
-    $reg_obj->DeleteValue($value_name);
-
-Deletes a value identified by $value_name from the registry.
-
-=cut
-
-sub DeleteValue {
-    my $self = shift;
-    die 'usage: $obj->DeleteValue($value_name)' if @_ != 1;
-    my $result = RegDeleteValue($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item Save
-
-    $reg_obj->Save($filename);
-
-Saves the hive specified by $reg_obj to a file.
-
-=cut
-
-sub Save {
-    my $self = shift;
-    die 'usage: $obj->Save($filename)' if @_ != 1;
-    my $result = RegSaveKey($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item Load
-
-    $reg_obj->Load($sub_key_name, $file_name);
-
-Loads a key specified by $sub_key_name from a file.
-
-=cut
-
-sub Load {
-    my $self = shift;
-    die 'usage: $obj->Load($sub_key_name, $file_name)' if @_ != 2;
-    my $result = RegLoadKey($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item UnLoad
-
-    $reg_obj->Unload($sub_key_name);
-
-Unloads a registry hive.
-
-=cut
-
-sub UnLoad {
-    my $self = shift;
-    die 'usage: $obj->UnLoad($sub_key_name)' if @_ != 1;
-    my $result = RegUnLoadKey($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-1;
-__END__
+package Win32::Registry;
+
+=head1 NAME
+
+Win32::Registry - accessing the Windows registry [obsolete, use Win32::TieRegistry]
+
+=head1 SYNOPSIS
+
+    use Win32::Registry;
+    my $tips;
+    $::HKEY_LOCAL_MACHINE->Open("SOFTWARE\\Microsoft\\Windows"
+                               ."\\CurrentVersion\\Explorer\\Tips", $tips)
+        or die "Can't open tips: $^E";
+    my ($type, $value);
+    $tips->QueryValueEx("18", $type, $value) or die "No tip #18: $^E";
+    print "Here's a tip: $value\n";
+
+=head1 DESCRIPTION
+
+    NOTE: This module provides a very klunky interface to access the
+    Windows registry, and is not currently being developed actively.  It
+    only exists for backward compatibility with old code that uses it.
+    For more powerful and flexible ways to access the registry, use
+    Win32::TieRegistry.
+
+Win32::Registry provides an object oriented interface to the Windows
+Registry.
+
+The following "root" registry objects are exported to the main:: name
+space.  Additional keys must be opened by calling the provided methods
+on one of these.
+
+    $HKEY_CLASSES_ROOT
+    $HKEY_CURRENT_USER
+    $HKEY_LOCAL_MACHINE
+    $HKEY_USERS
+    $HKEY_PERFORMANCE_DATA
+    $HKEY_CURRENT_CONFIG
+    $HKEY_DYN_DATA
+
+=cut
+
+use strict;
+require Exporter;
+require DynaLoader;
+use Win32::WinError;
+
+require Win32 unless defined &Win32::GetLastError;
+
+use vars qw($VERSION $AUTOLOAD @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+
+$VERSION = '0.07';
+
+@ISA	= qw( Exporter DynaLoader );
+@EXPORT = qw(
+	HKEY_CLASSES_ROOT
+	HKEY_CURRENT_USER
+	HKEY_LOCAL_MACHINE
+	HKEY_PERFORMANCE_DATA
+	HKEY_CURRENT_CONFIG
+	HKEY_DYN_DATA
+	HKEY_USERS
+	KEY_ALL_ACCESS
+	KEY_CREATE_LINK
+	KEY_CREATE_SUB_KEY
+	KEY_ENUMERATE_SUB_KEYS
+	KEY_EXECUTE
+	KEY_NOTIFY
+	KEY_QUERY_VALUE
+	KEY_READ
+	KEY_SET_VALUE
+	KEY_WRITE
+	REG_BINARY
+	REG_CREATED_NEW_KEY
+	REG_DWORD
+	REG_DWORD_BIG_ENDIAN
+	REG_DWORD_LITTLE_ENDIAN
+	REG_EXPAND_SZ
+	REG_FULL_RESOURCE_DESCRIPTOR
+	REG_LEGAL_CHANGE_FILTER
+	REG_LEGAL_OPTION
+	REG_LINK
+	REG_MULTI_SZ
+	REG_NONE
+	REG_NOTIFY_CHANGE_ATTRIBUTES
+	REG_NOTIFY_CHANGE_LAST_SET
+	REG_NOTIFY_CHANGE_NAME
+	REG_NOTIFY_CHANGE_SECURITY
+	REG_OPENED_EXISTING_KEY
+	REG_OPTION_BACKUP_RESTORE
+	REG_OPTION_CREATE_LINK
+	REG_OPTION_NON_VOLATILE
+	REG_OPTION_RESERVED
+	REG_OPTION_VOLATILE
+	REG_REFRESH_HIVE
+	REG_RESOURCE_LIST
+	REG_RESOURCE_REQUIREMENTS_LIST
+	REG_SZ
+	REG_WHOLE_HIVE_VOLATILE
+);
+
+@EXPORT_OK = qw(
+    RegCloseKey
+    RegConnectRegistry
+    RegCreateKey
+    RegCreateKeyEx
+    RegDeleteKey
+    RegDeleteValue
+    RegEnumKey
+    RegEnumValue
+    RegFlushKey
+    RegGetKeySecurity
+    RegLoadKey
+    RegNotifyChangeKeyValue
+    RegOpenKey
+    RegOpenKeyEx
+    RegQueryInfoKey
+    RegQueryValue
+    RegQueryValueEx
+    RegReplaceKey
+    RegRestoreKey
+    RegSaveKey
+    RegSetKeySecurity
+    RegSetValue
+    RegSetValueEx
+    RegUnLoadKey
+);
+$EXPORT_TAGS{ALL}= \@EXPORT_OK;
+
+bootstrap Win32::Registry;
+
+sub import {
+    my $pkg = shift;
+    if ($_[0] && "Win32" eq $_[0]) {
+	Exporter::export($pkg, "Win32", @EXPORT_OK);
+	shift;
+    }
+    Win32::Registry->export_to_level(1+$Exporter::ExportLevel, $pkg, @_);
+}
+
+#######################################################################
+# This AUTOLOAD is used to 'autoload' constants from the constant()
+# XS function.  If a constant is not found then control is passed
+# to the AUTOLOAD in AutoLoader.
+
+sub AUTOLOAD {
+    my($constname);
+    ($constname = $AUTOLOAD) =~ s/.*:://;
+    #reset $! to zero to reset any current errors.
+    local $! = 0;
+    my $val = constant($constname, 0);
+    if ($! != 0) {
+	if ($! =~ /Invalid/) {
+	    $AutoLoader::AUTOLOAD = $AUTOLOAD;
+	    goto &AutoLoader::AUTOLOAD;
+	}
+	else {
+	    my ($pack,$file,$line) = caller;
+	    die "Unknown constant $constname in Win32::Registry "
+	       . "at $file line $line.\n";
+	}
+    }
+    eval "sub $AUTOLOAD { $val }";
+    goto &$AUTOLOAD;
+}
+
+#######################################################################
+# _new is a private constructor, not intended for public use.
+#
+
+sub _new {
+    my $self;
+    if ($_[0]) {
+	$self->{'handle'} = $_[0];
+	bless $self;
+    }
+    $self;
+}
+
+#define the basic registry objects to be exported.
+#these had to be hardwired unfortunately.
+# XXX Yuck!
+
+{
+    package main;
+    use vars qw(
+		$HKEY_CLASSES_ROOT
+		$HKEY_CURRENT_USER
+		$HKEY_LOCAL_MACHINE
+		$HKEY_USERS
+		$HKEY_PERFORMANCE_DATA
+		$HKEY_CURRENT_CONFIG
+		$HKEY_DYN_DATA
+	       );
+}
+
+$::HKEY_CLASSES_ROOT		= _new(&HKEY_CLASSES_ROOT);
+$::HKEY_CURRENT_USER		= _new(&HKEY_CURRENT_USER);
+$::HKEY_LOCAL_MACHINE		= _new(&HKEY_LOCAL_MACHINE);
+$::HKEY_USERS			= _new(&HKEY_USERS);
+$::HKEY_PERFORMANCE_DATA	= _new(&HKEY_PERFORMANCE_DATA);
+$::HKEY_CURRENT_CONFIG		= _new(&HKEY_CURRENT_CONFIG);
+$::HKEY_DYN_DATA		= _new(&HKEY_DYN_DATA);
+
+=head2 Methods
+
+The following methods are supported.  Note that subkeys can be
+specified as a path name, separated by backslashes (which may
+need to be doubled if you put them in double quotes).
+
+=over 8
+
+=item Open
+
+    $reg_obj->Open($sub_key_name, $sub_reg_obj);
+
+Opens a subkey of a registry object, returning the new registry object
+in $sub_reg_obj.
+
+=cut
+
+sub Open {
+    my $self = shift;
+    die 'usage: $obj->Open($sub_key_name, $sub_reg_obj)' if @_ != 2;
+    
+    my ($subkey) = @_;
+    my ($result,$subhandle);
+
+    $result = RegOpenKey($self->{'handle'},$subkey,$subhandle);
+    $_[1] = _new($subhandle);
+    
+    return 0 unless $_[1];
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item Close
+
+    $reg_obj->Close();
+
+Closes an open registry key.
+
+=cut
+
+sub Close {
+    my $self = shift;
+    die 'usage: $obj->Close()' if @_ != 0;
+
+    return unless exists $self->{'handle'};
+    my $result = RegCloseKey($self->{'handle'});
+    if ($result) {
+	delete $self->{'handle'};
+    }
+    else {
+	$! = Win32::GetLastError();
+    }
+    return $result;
+}
+
+sub DESTROY {
+    my $self = shift;
+    return unless exists $self->{'handle'};
+    RegCloseKey($self->{'handle'});
+    delete $self->{'handle'};
+}
+
+
+=item Connect
+
+    $reg_obj->Connect($node_name, $new_reg_obj);
+
+Connects to a remote Registry on the node specified by $node_name,
+returning it in $new_reg_obj.  Returns false if it fails.
+
+=cut
+
+sub Connect {
+    my $self = shift;
+    die 'usage: $obj->Connect($node_name, $new_reg_obj)' if @_ != 2;
+     
+    my ($node) = @_;
+    my ($result,$subhandle);
+
+    $result = RegConnectRegistry ($node, $self->{'handle'}, $subhandle);
+    $_[1] = _new($subhandle);
+
+    return 0 unless $_[1];
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}  
+
+=item Create
+
+    $reg_obj->Create($sub_key_name, $new_reg_obj);
+
+Opens the subkey specified by $sub_key_name, returning the new registry
+object in $new_reg_obj.  If the specified subkey doesn't exist, it is
+created.
+
+=cut
+
+sub Create {
+    my $self = shift;
+    die 'usage: $obj->Create($sub_key_name, $new_reg_obj)' if @_ != 2;
+
+    my ($subkey) = @_;
+    my ($result,$subhandle);
+
+    $result = RegCreateKey($self->{'handle'},$subkey,$subhandle);
+    $_[1] = _new ($subhandle);
+
+    return 0 unless $_[1];
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item SetValue
+
+    $reg_obj->SetValue($sub_key_name, $type, $value);
+
+Sets the default value for a subkey specified by $sub_key_name.
+
+=cut
+
+sub SetValue {
+    my $self = shift;
+    die 'usage: $obj->SetValue($subkey, $type, $value)' if @_ != 3;
+    my $result = RegSetValue($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item SetValueEx
+
+    $reg_obj->SetValueEx($value_name, $reserved, $type, $value);
+
+Sets the value for the value name identified by $value_name
+in the key specified by $reg_obj.
+
+=cut
+
+sub SetValueEx {
+    my $self = shift;
+    die 'usage: $obj->SetValueEx($value_name, $reserved, $type, $value)' if @_ != 4;
+    my $result = RegSetValueEx($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item QueryValue
+
+    $reg_obj->QueryValue($sub_key_name, $value);
+
+Gets the default value of the subkey specified by $sub_key_name.
+
+=cut
+
+sub QueryValue {
+    my $self = shift;
+    die 'usage: $obj->QueryValue($sub_key_name, $value)' if @_ != 2;
+    my $result = RegQueryValue($self->{'handle'}, $_[0], $_[1]);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item QueryKey
+
+    $reg_obj->QueryKey($classref, $number_of_subkeys, $number_of_values);
+
+Gets information on a key specified by $reg_obj.
+
+=cut
+
+sub QueryKey {
+    my $garbage;
+    my $self = shift;
+    die 'usage: $obj->QueryKey($classref, $number_of_subkeys, $number_of_values)'
+    	if @_ != 3;
+
+    my $result = RegQueryInfoKey($self->{'handle'}, $_[0],
+    				 $garbage, $garbage, $_[1],
+			         $garbage, $garbage, $_[2],
+			         $garbage, $garbage, $garbage, $garbage);
+
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item QueryValueEx
+
+    $reg_obj->QueryValueEx($value_name, $type, $value);
+
+Gets the value for the value name identified by $value_name
+in the key specified by $reg_obj.
+
+=cut
+
+sub QueryValueEx {
+    my $self = shift;
+    die 'usage: $obj->QueryValueEx($value_name, $type, $value)' if @_ != 3;
+    my $result = RegQueryValueEx($self->{'handle'}, $_[0], undef, $_[1], $_[2]);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item GetKeys
+
+    my @keys;
+    $reg_obj->GetKeys(\@keys);
+
+Populates the supplied array reference with the names of all the keys
+within the registry object $reg_obj.
+
+=cut
+
+sub GetKeys {
+    my $self = shift;
+    die 'usage: $obj->GetKeys($arrayref)' if @_ != 1 or ref($_[0]) ne 'ARRAY';
+
+    my ($result, $i, $keyname);
+    $keyname = "DummyVal";
+    $i = 0;
+    $result = 1;
+    
+    while ( $result ) {
+	$result = RegEnumKey( $self->{'handle'},$i++, $keyname );
+	if ($result) {
+	    push( @{$_[0]}, $keyname );
+	}
+    }
+    return(1);
+}
+
+=item GetValues
+
+    my %values;
+    $reg_obj->GetValues(\%values);
+
+Populates the supplied hash reference with entries of the form
+
+    $value_name => [ $value_name, $type, $data ]
+
+for each value in the registry object $reg_obj.
+
+=cut
+
+sub GetValues {
+    my $self = shift;
+    die 'usage: $obj->GetValues($hashref)' if @_ != 1;
+
+    my ($result,$name,$type,$data,$i);
+    $name = "DummyVal";
+    $i = 0;
+    while ( $result=RegEnumValue( $self->{'handle'},
+				  $i++,
+				  $name,
+				  undef,
+				  $type,
+				  $data ))
+    {
+	$_[0]->{$name} = [ $name, $type, $data ];
+    }
+    return(1);
+}
+
+=item DeleteKey
+
+    $reg_obj->DeleteKey($sub_key_name);
+
+Deletes a subkey specified by $sub_key_name from the registry.
+
+=cut
+
+sub DeleteKey {
+    my $self = shift;
+    die 'usage: $obj->DeleteKey($sub_key_name)' if @_ != 1;
+    my $result = RegDeleteKey($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item DeleteValue
+
+    $reg_obj->DeleteValue($value_name);
+
+Deletes a value identified by $value_name from the registry.
+
+=cut
+
+sub DeleteValue {
+    my $self = shift;
+    die 'usage: $obj->DeleteValue($value_name)' if @_ != 1;
+    my $result = RegDeleteValue($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item Save
+
+    $reg_obj->Save($filename);
+
+Saves the hive specified by $reg_obj to a file.
+
+=cut
+
+sub Save {
+    my $self = shift;
+    die 'usage: $obj->Save($filename)' if @_ != 1;
+    my $result = RegSaveKey($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item Load
+
+    $reg_obj->Load($sub_key_name, $file_name);
+
+Loads a key specified by $sub_key_name from a file.
+
+=cut
+
+sub Load {
+    my $self = shift;
+    die 'usage: $obj->Load($sub_key_name, $file_name)' if @_ != 2;
+    my $result = RegLoadKey($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item UnLoad
+
+    $reg_obj->Unload($sub_key_name);
+
+Unloads a registry hive.
+
+=cut
+
+sub UnLoad {
+    my $self = shift;
+    die 'usage: $obj->UnLoad($sub_key_name)' if @_ != 1;
+    my $result = RegUnLoadKey($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+1;
+__END__
diff --git a/lib/site_win50/Win32API/Registry.pm b/lib/site_win50/Win32API/Registry.pm
index a653dec52..dbf98b4e2 100644
--- a/lib/site_win50/Win32API/Registry.pm
+++ b/lib/site_win50/Win32API/Registry.pm
@@ -1,1792 +1,1792 @@
-# Registry.pm -- Low-level access to functions/constants from WINREG.h
-
-package Win32API::Registry;
-
-use strict;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); #@EXPORT_FAIL);
-$VERSION= '0.24';
-
-require Exporter;
-require DynaLoader;
-@ISA= qw(Exporter DynaLoader);
-
-@EXPORT= qw();
-%EXPORT_TAGS= (
-    Func =>	[qw(		regConstant		regLastError
-	AllowPriv		AbortSystemShutdown	InitiateSystemShutdown
-	RegCloseKey		RegConnectRegistry	RegCreateKey
-	RegCreateKeyEx		RegDeleteKey		RegDeleteValue
-	RegEnumKey		RegEnumKeyEx		RegEnumValue
-	RegFlushKey		RegGetKeySecurity	RegLoadKey
-	RegNotifyChangeKeyValue	RegOpenKey		RegOpenKeyEx
-	RegQueryInfoKey		RegQueryMultipleValues	RegQueryValue
-	RegQueryValueEx		RegReplaceKey		RegRestoreKey
-	RegSaveKey		RegSetKeySecurity	RegSetValue
-	RegSetValueEx		RegUnLoadKey )],
-    FuncA =>	[qw(
-	AbortSystemShutdownA	InitiateSystemShutdownA
-	RegConnectRegistryA	RegCreateKeyA		RegCreateKeyExA
-	RegDeleteKeyA		RegDeleteValueA		RegEnumKeyA
-	RegEnumKeyExA		RegEnumValueA		RegLoadKeyA
-	RegOpenKeyA		RegOpenKeyExA		RegQueryInfoKeyA
-	RegQueryMultipleValuesA	RegQueryValueA		RegQueryValueExA
-	RegReplaceKeyA		RegRestoreKeyA		RegSaveKeyA
-	RegSetValueA		RegSetValueExA		RegUnLoadKeyA )],
-    FuncW =>	[qw(
-	AbortSystemShutdownW	InitiateSystemShutdownW
-	RegConnectRegistryW	RegCreateKeyW		RegCreateKeyExW
-	RegDeleteKeyW		RegDeleteValueW		RegEnumKeyW
-	RegEnumKeyExW		RegEnumValueW		RegLoadKeyW
-	RegOpenKeyW		RegOpenKeyExW		RegQueryInfoKeyW
-	RegQueryMultipleValuesW	RegQueryValueW		RegQueryValueExW
-	RegReplaceKeyW		RegRestoreKeyW		RegSaveKeyW
-	RegSetValueW		RegSetValueExW		RegUnLoadKeyW )],
-    HKEY_ =>	[qw(
-	HKEY_CLASSES_ROOT	HKEY_CURRENT_CONFIG	HKEY_CURRENT_USER
-	HKEY_DYN_DATA		HKEY_LOCAL_MACHINE	HKEY_PERFORMANCE_DATA
-	HKEY_USERS )],
-    KEY_ =>	[qw(
-	KEY_QUERY_VALUE		KEY_SET_VALUE		KEY_CREATE_SUB_KEY
-	KEY_ENUMERATE_SUB_KEYS	KEY_NOTIFY		KEY_CREATE_LINK
-	KEY_READ		KEY_WRITE		KEY_EXECUTE
-	KEY_ALL_ACCESS),
-	'KEY_DELETE',		# DELETE          (0x00010000L)
-	'KEY_READ_CONTROL',	# READ_CONTROL    (0x00020000L)
-	'KEY_WRITE_DAC',	# WRITE_DAC       (0x00040000L)
-	'KEY_WRITE_OWNER',	# WRITE_OWNER     (0x00080000L)
-	'KEY_SYNCHRONIZE',	# SYNCHRONIZE     (0x00100000L) (not used)
-	],
-    REG_ =>	[qw(
-	REG_OPTION_RESERVED	REG_OPTION_NON_VOLATILE	REG_OPTION_VOLATILE
-	REG_OPTION_CREATE_LINK	REG_OPTION_BACKUP_RESTORE
-	REG_OPTION_OPEN_LINK	REG_LEGAL_OPTION	REG_CREATED_NEW_KEY
-	REG_OPENED_EXISTING_KEY	REG_WHOLE_HIVE_VOLATILE	REG_REFRESH_HIVE
-	REG_NO_LAZY_FLUSH	REG_NOTIFY_CHANGE_ATTRIBUTES
-	REG_NOTIFY_CHANGE_NAME	REG_NOTIFY_CHANGE_LAST_SET
-	REG_NOTIFY_CHANGE_SECURITY			REG_LEGAL_CHANGE_FILTER
-	REG_NONE		REG_SZ			REG_EXPAND_SZ
-	REG_BINARY		REG_DWORD		REG_DWORD_LITTLE_ENDIAN
-	REG_DWORD_BIG_ENDIAN	REG_LINK		REG_MULTI_SZ
-	REG_RESOURCE_LIST	REG_FULL_RESOURCE_DESCRIPTOR
-	REG_RESOURCE_REQUIREMENTS_LIST )],
-    SE_ =>	[qw(
-	SE_ASSIGNPRIMARYTOKEN_NAME	SE_AUDIT_NAME
-	SE_BACKUP_NAME			SE_CHANGE_NOTIFY_NAME
-	SE_CREATE_PAGEFILE_NAME		SE_CREATE_PERMANENT_NAME
-	SE_CREATE_TOKEN_NAME		SE_DEBUG_NAME
-	SE_INCREASE_QUOTA_NAME		SE_INC_BASE_PRIORITY_NAME
-	SE_LOAD_DRIVER_NAME		SE_LOCK_MEMORY_NAME
-	SE_MACHINE_ACCOUNT_NAME		SE_PROF_SINGLE_PROCESS_NAME
-	SE_REMOTE_SHUTDOWN_NAME		SE_RESTORE_NAME
-	SE_SECURITY_NAME		SE_SHUTDOWN_NAME
-	SE_SYSTEMTIME_NAME		SE_SYSTEM_ENVIRONMENT_NAME
-	SE_SYSTEM_PROFILE_NAME		SE_TAKE_OWNERSHIP_NAME
-	SE_TCB_NAME			SE_UNSOLICITED_INPUT_NAME )],
-);
-@EXPORT_OK= ();
-{ my $ref;
-    foreach $ref (  values(%EXPORT_TAGS)  ) {
-	push( @EXPORT_OK, @$ref )   unless  $ref->[0] =~ /^SE_/;
-    }
-}
-$EXPORT_TAGS{ALL}= [ @EXPORT_OK ];	# \@EXPORT_OK once SE_* settles down.
-# push( @EXPORT_OK, "JHEREG_TACOSALAD" );	# Used to test Mkconst2perl
-push( @EXPORT_OK, @{$EXPORT_TAGS{SE_}} );
-
-bootstrap Win32API::Registry $VERSION;
-
-# Preloaded methods go here.
-
-# To convert C constants to Perl code in cRegistry.pc
-# [instead of C or C++ code in cRegistry.h]:
-#    * Modify F<Makefile.PL> to add WriteMakeFile() =>
-#      CONST2PERL/postamble => [[ "Win32API::Registry" => ]] WRITE_PERL => 1.
-#    * Either comment out C<#include "cRegistry.h"> from F<Registry.xs>
-#      or make F<cRegistry.h> an empty file.
-#    * Make sure the following C<if> block is not commented out.
-#    * "nmake clean", "perl Makefile.PL", "nmake"
-
-if(  ! defined &REG_NONE  ) {
-    require "Win32API/Registry/cRegistry.pc";
-}
-
-# This would be convenient but inconsistant and hard to explain:
-#push( @{$EXPORT_TAGS{ALL}}, @{$EXPORT_TAGS{SE_}} )
-#  if  defined &SE_TCB_NAME;
-
-sub regConstant
-{
-    my( $name )= @_;
-    if(  1 != @_  ||  ! $name  ||  $name =~ /\W/  ) {
-	require Carp;
-	Carp::croak( 'Usage: ',__PACKAGE__,'::regConstant("CONST_NAME")' );
-    }
-    my $proto= prototype $name;
-    if(  defined \&$name
-     &&  defined $proto
-     &&  "" eq $proto  ) {
-	no strict 'refs';
-	return &$name;
-    }
-    return undef;
-}
-
-# We provide this for backwards compatibility:
-sub constant
-{
-    my( $name )= @_;
-    my $value= regConstant( $name );
-    if(  defined $value  ) {
-	$!= 0;
-	return $value;
-    }
-    $!= 11; # EINVAL
-    return 0;
-}
-
-# BEGIN {
-#     my $code= 'return _regLastError(@_)';
-#     local( $!, $^E )= ( 1, 1 );
-#     if(  $! ne $^E  ) {
-# 	$code= '
-# 	    local( $^E )= _regLastError(@_);
-# 	    my $ret= $^E;
-# 	    return $ret;
-# 	';
-#     }
-#     eval "sub regLastError { $code }";
-#     die "$@"   if  $@;
-# }
-
-package Win32API::Registry::_error;
-
-use overload
-    '""' => sub {
-	require Win32 unless defined &Win32::FormatMessage;
-	$_ = Win32::FormatMessage(Win32API::Registry::_regLastError());
-	tr/\r\n//d;
-	return $_;
-    },
-    '0+' => sub { Win32API::Registry::_regLastError() },
-    'fallback' => 1;
-
-sub new { return bless {}, shift }
-sub set { Win32API::Registry::_regLastError($_[1]); return $_[0] }
-
-package Win32API::Registry;
-
-my $_error = new Win32API::Registry::_error;
-
-sub regLastError {
-    require Carp;
-    Carp::croak('Usage: ',__PACKAGE__,'::regLastError( [$setWin32ErrCode] )') if @_ > 1;
-    $_error->set($_[0]) if defined $_[0];
-    return $_error;
-}
-
-# Since we ISA DynaLoader which ISA AutoLoader, we ISA AutoLoader so we
-# need this next chunk to prevent Win32API::Registry->nonesuch() from
-# looking for "nonesuch.al" and producing confusing error messages:
-use vars qw($AUTOLOAD);
-sub AUTOLOAD {
-    require Carp;
-    Carp::croak(
-      "Can't locate method $AUTOLOAD via package Win32API::Registry" );
-}
-
-# Replace "&rout;" with "goto &rout;" when that is supported on Win32.
-
-# Let user omit all buffer sizes:
-sub RegEnumKeyExA {
-    if(  6 == @_  ) {	splice(@_,4,0,[]);  splice(@_,2,0,[]);  }
-    &_RegEnumKeyExA;
-}
-sub RegEnumKeyExW {
-    if(  6 == @_  ) {	splice(@_,4,0,[]);  splice(@_,2,0,[]);  }
-    &_RegEnumKeyExW;
-}
-sub RegEnumValueA {
-    if(  6 == @_  ) {	splice(@_,2,0,[]);  push(@_,[]);  }
-    &_RegEnumValueA;
-}
-sub RegEnumValueW {
-    if(  6 == @_  ) {	splice(@_,2,0,[]);  push(@_,[]);  }
-    &_RegEnumValueW;
-}
-sub RegQueryInfoKeyA {
-    if(  11 == @_  ) {	splice(@_,2,0,[]);  }
-    &_RegQueryInfoKeyA;
-}
-sub RegQueryInfoKeyW {
-    if(  11 == @_  ) {	splice(@_,2,0,[]);  }
-    &_RegQueryInfoKeyW;
-}
-
-sub RegEnumKeyA {
-    push(@_,[])   if  3 == @_;
-    &_RegEnumKeyA;
-}
-sub RegEnumKeyW {
-    push(@_,[])   if  3 == @_;
-    &_RegEnumKeyW;
-}
-sub RegGetKeySecurity {
-    push(@_,[])   if  3 == @_;
-    &_RegGetKeySecurity;
-}
-sub RegQueryMultipleValuesA {
-    push(@_,[])   if  4 == @_;
-    &_RegQueryMultipleValuesA;
-}
-sub RegQueryMultipleValuesW {
-    push(@_,[])   if  4 == @_;
-    &_RegQueryMultipleValuesW;
-}
-sub RegQueryValueA {
-    push(@_,[])   if  3 == @_;
-    &_RegQueryValueA;
-}
-sub RegQueryValueW {
-    push(@_,[])   if  3 == @_;
-    &_RegQueryValueW;
-}
-sub RegQueryValueExA {
-    push(@_,[])   if  5 == @_;
-    &_RegQueryValueExA;
-}
-sub RegQueryValueExW {
-    push(@_,[])   if  5 == @_;
-    &_RegQueryValueExW;
-}
-sub RegSetValueA {
-    push(@_,0)   if  4 == @_;
-    &_RegSetValueA;
-}
-sub RegSetValueW {
-    push(@_,0)   if  4 == @_;
-    &_RegSetValueW;
-}
-sub RegSetValueExA {
-    push(@_,0)   if  5 == @_;
-    &_RegSetValueExA;
-}
-sub RegSetValueExW {
-    push(@_,0)   if  5 == @_;
-    &_RegSetValueExW;
-}
-
-# Aliases for non-Unicode functions:
-sub AbortSystemShutdown		{ &AbortSystemShutdownA; }
-sub InitiateSystemShutdown	{ &InitiateSystemShutdownA; }
-sub RegConnectRegistry		{ &RegConnectRegistryA; }
-sub RegCreateKey		{ &RegCreateKeyA; }
-sub RegCreateKeyEx		{ &RegCreateKeyExA; }
-sub RegDeleteKey		{ &RegDeleteKeyA; }
-sub RegDeleteValue		{ &RegDeleteValueA; }
-sub RegEnumKey			{ &RegEnumKeyA; }
-sub RegEnumKeyEx		{ &RegEnumKeyExA; }
-sub RegEnumValue		{ &RegEnumValueA; }
-sub RegLoadKey			{ &RegLoadKeyA; }
-sub RegOpenKey			{ &RegOpenKeyA; }
-sub RegOpenKeyEx		{ &RegOpenKeyExA; }
-sub RegQueryInfoKey		{ &RegQueryInfoKeyA; }
-sub RegQueryMultipleValues	{ &RegQueryMultipleValuesA; }
-sub RegQueryValue		{ &RegQueryValueA; }
-sub RegQueryValueEx		{ &RegQueryValueExA; }
-sub RegReplaceKey		{ &RegReplaceKeyA; }
-sub RegRestoreKey		{ &RegRestoreKeyA; }
-sub RegSaveKey			{ &RegSaveKeyA; }
-sub RegSetValue			{ &RegSetValueA; }
-sub RegSetValueEx		{ &RegSetValueExA; }
-sub RegUnLoadKey		{ &RegUnLoadKeyA; }
-
-1;
-__END__
-
-=head1 NAME
-
-Win32API::Registry - Low-level access to Win32 system API calls from WINREG.H
-
-=head1 SYNOPSIS
-
-  use Win32API::Registry 0.21 qw( :ALL );
-
-  RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SYSTEM\\Disk", 0, KEY_READ, $key );
-    or  die "Can't open HKEY_LOCAL_MACHINE\\SYSTEM\\Disk: ",
-	    regLastError(),"\n";
-  RegQueryValueEx( $key, "Information", [], $type, $data, [] );
-    or  die "Can't read HKEY_L*MACHINE\\SYSTEM\\Disk\\Information: ",
-	    regLastError(),"\n";
-  [...]
-  RegCloseKey( $key )
-    or  die "Can't close HKEY_LOCAL_MACHINE\\SYSTEM\\Disk: ",
-	    regLastError(),"\n";
-
-=head1 DESCRIPTION
-
-This provides fairly low-level access to the Win32 System API
-calls dealing with the Registry [mostly from WINREG.H].  This
-is mostly intended to be used by other modules such as
-C<Win32::TieRegistry> [which provides an extremely Perl-friendly
-method for using the Registry].
-
-For a description of the logical structure of the Registry, see
-the documentation for the C<Win32::TieRegistry> module.
-
-To pass in C<NULL> as the pointer to an optional buffer, pass in
-an empty list reference, C<[]>.
-
-Beyond raw access to the API calls and related constants, this module
-handles smart buffer allocation and translation of return codes.
-
-All calls return a true value for success and a false value for
-failure.  After any failure, C<$^E> should automatically be set
-to indicate the reason.  However, current versions of Perl often
-overwrite C<$^E> too quickly, so you can use C<regLastError()>
-instead, which is only set by Win32API::Registry routines.
-
-Note that C<$!> is not set by these routines except by
-C<Win32API::Registry::constant()> when a constant is not defined.
-
-=head2 Exports
-
-Nothing is exported by default.  The following tags can be used to
-have sets of symbols exported.
-
-[Note that much of the following documentation refers to the
-behavior of the underlying API calls which may vary in current
-and future versions of the Win32 API without any changes to this
-module.  Therefore you should check the Win32 API documentation
-directly when needed.]
-
-=over
-
-=item :Func
-
-The basic function names:
-
-=over
-
-=item AllowPriv
-
-=item C<AllowPriv( $sPrivName, $bEnable )>
-
-Not a Win32 API call.  Enables or disables a specific privilege for
-the current process.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.  This routine
-does not provide a way to tell if a privilege is currently enabled.
-
-C<$sPrivname> is a Win32 privilege name [see L</:SE_>].  For example,
-C<"SeBackupPrivilege"> [a.k.a. C<SE_BACKUP_NAME>] controls whether
-you can use C<RegSaveKey()> and C<"SeRestorePrivilege"> [a.k.a.
-C<SE_RESTORE_NAME>] controls whether you can use C<RegLoadKey()>.
-
-If C<$bEnable> is true, then C<AllowPriv()> tries to enable the
-privilege.  Otherwise it tries to disable the privilege.
-
-=item AbortSystemShutdown
-
-=item C<AbortSystemShutdown( $sComputerName )>
-
-Tries to abort a remote shutdown request previously made via
-C<InitiateSystemShutdown()>.  Returns a true value if successful
-and a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-=item InitiateSystemShutdown
-
-=item C<InitiateSystemShutdown( $sComputer, $sMessage, $uTimeoutSecs, $bForce, $bReboot )>
-
-Requests that a [remote] computer be shutdown or rebooted.
-Returns a true value if successful and a false value [and
-sets C<$^E>/C<regLastError()>] on failure.
-
-C<$sComputer> is the name [or address] of the computer to be
-shutdown or rebooted.  You can use C<[]> [for C<NULL>] or C<"">
-to indicate the local computer.
-
-C<$sMessage> is the message to be displayed in a pop-up window
-on the desktop of the computer to be shutdown or rebooted until
-the timeout expires or the shutdown is aborted via
-C<AbortSystemShutdown()>.  With C<$iTimeoutSecs == 0>, the
-message will never be visible.
-
-C<$iTimeoutSecs> is the number of seconds to wait before starting
-the shutdown.
-
-If C<$bForce> is false, then any applications running on the remote
-computer get a chance to prompt the remote user whether they want
-to save changes.  Also, for any applications that do not exit quickly
-enough, the operating system will prompt the user whether they wish
-to wait longer for the application to exit or force it to exit now.
-At any of these prompts the user can press B<CANCEL> to abort the
-shutdown but if no applications have unsaved data, they will likely
-all exit quickly and the shutdown will progress with the remote user
-having no option to cancel the shutdown.
-
-If C<$bForce> is true, all applications are told to exit immediately
-and so will not prompt the user even if there is unsaved data.  Any
-applications that take too long to exit will be forcibly killed after
-a short time.  The only way to abort the shutdown is to call
-C<AbortSystemShutdown()> before the timeout expires and there is no
-way to abort the shutdown once it has begun.
-
-If C<$bReboot> is true, the computer will automatically reboot once
-the shutdown is complete.  If C<$bReboot> is false, then when the
-shutdown is complete the computer will halt at a screen indicating
-that the shutdown is complete and offering a way for the user to
-start to boot the computer.
-
-You must have the C<"SeRemoteShutdownPrivilege"> privilege
-on the remote computer for this call to succeed.  If shutting
-down the local computer, then the calling process must have
-the C<"SeShutdownPrivilege"> privilege and have it enabled.
-
-=item RegCloseKey
-
-=item C<RegCloseKey( $hKey )>
-
-Closes the handle to a Registry key returned by C<RegOpenKeyEx()>,
-C<RegConnectRegistry()>, C<RegCreateKeyEx()>, or a few other
-routines.  Returns a true value if successful and a false value
-[and sets C<$^E>/C<regLastError()>] on failure.
-
-=item RegConnectRegistry
-
-=item C<RegConnectRegistry( $sComputer, $hRootKey, $ohKey )>
-
-Connects to one of the root Registry keys of a remote computer.
-Returns a true value if successful and a false value [and
-sets C<$^E>/C<regLastError()>] on failure.
-
-C<$sComputer> is the name [or address] of a remote computer
-whose Registry you wish to access.
-
-C<$hKey> must be either C<HKEY_LOCAL_MACHINE> or C<HKEY_USERS>
-and specifies which root Registry key on the remote computer
-you wish to have access to.
-
-C<$phKey> will be set to the handle to be used to access the
-remote Registry key if the call succeeds.
-
-=item regConstant
-
-=item C<$value= regConstant( $sConstantName )>
-
-Fetch the value of a constant.  Returns C<undef> if C<$sConstantName>
-is not the name of a constant supported by this module.  Never sets
-C<$!> nor C<$^E>.
-
-This function is rarely used since you will usually get the value of a
-constant by having that constant imported into your package by listing
-the constant name in the C<use Win32API::Registry> statement and then
-simply using the constant name in your code [perhaps followed by
-C<()>].  This function is useful for verifying constant names not in
-Perl code, for example, after prompting a user to type in a constant
-name.
-
-=item RegCreateKey
-
-=item C<RegCreateKey( $hKey, $sSubKey, $ohSubKey )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegCreateKeyEx()> instead.
-
-=item RegCreateKeyEx
-
-=item C<RegCreateKeyEx( $hKey, $sSubKey, $uZero, $sClass, $uOpts, $uAccess, $pSecAttr, $ohNewKey, $ouDisp )>
-
-Creates a new Registry subkey.  Returns a true value if successful and
-a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sSubKey> is the name of the new subkey to be created.
-
-C<$iZero> is reserved for future use and should always be specified
-as C<0>.
-
-C<$sClass> is a string to be used as the class for the new
-subkey.  We are not aware of any current use for Registry key
-class information so the empty string, C<"">, should usually
-be used here.
-
-C<$iOpts> is a numeric value containing bits that control options
-used while creating the new subkey.  C<REG_OPTION_NON_VOLATILE>
-is the default.  C<REG_OPTION_VOLATILE> [which is ignored on
-Windows 95] means the data stored under this key is not kept
-in a file and will not be preserved when the system reboots.
-C<REG_OPTION_BACKUP_RESTORE> [also ignored on Windows 95] means
-ignore the C<$iAccess> parameter and try to open the new key with
-the access required to backup or restore the key.
-
-C<$iAccess> is a numeric mask of bits specifying what type of
-access is desired when opening the new subkey.  See C<RegOpenKeyEx()>.
-
-C<$pSecAttr> is a C<SECURITY_ATTRIBUTES> structure packed into
-a Perl string which controls whether the returned handle can be
-inherited by child processes.  Normally you would pass C<[]> for
-this parameter to have C<NULL> passed to the underlying API
-indicating that the handle cannot be inherited.  If not under
-Windows95, then C<$pSecAttr> also allows you to specify
-C<SECURITY_DESCRIPTOR> that controls which users will have
-what type of access to the new key -- otherwise the new key
-inherits its security from its parent key.
-
-C<$phKey> will be set to the handle to be used to access the new
-subkey if the call succeeds.
-
-C<$piDisp> will be set to either C<REG_CREATED_NEW_KEY> or
-C<REG_OPENED_EXISTING_KEY> to indicate for which reason the
-call succeeded.  Can be specified as C<[]> if you don't care.
-
-If C<$phKey> and C<$piDisp> start out as integers, then they will
-probably remain unchanged if the call fails.
-
-=item RegDeleteKey
-
-=item C<RegDeleteKey( $hKey, $sSubKey )>
-
-Deletes a subkey of an open Registry key provided that the subkey
-contains no subkeys of its own [but the subkey may contain values].
-Returns a true value if successful and a false value [and sets
-C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sSubKey> is the name of the subkey to be deleted.
-
-=item RegDeleteValue
-
-=item C<RegDeleteValue( $hKey, $sValueName )>
-
-Deletes a value from an open Registry key.  Returns a true value if
-successful and a false value [and sets C<$^E>/C<regLastError()>] on
-failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sValueKey> is the name of the value to be deleted.
-
-=item RegEnumKey
-
-=item C<RegEnumKey( $hKey, $uIndex, $osName, $ilNameSize )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegEnumKeyEx()> instead.
-
-=item RegEnumKeyEx
-
-=item C<RegEnumKeyEx( $hKey, $uIndex, $osName, $iolName, $pNull, $osClass, $iolClass, $opftLastWrite )>
-
-Lets you enumerate the names of all of the subkeys directly under
-an open Registry key.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$iIndex> is the sequence number of the immediate subkey that
-you want information on.  Start with this value as C<0> then
-repeat the call incrementing this value each time until the
-call fails with C<$^E>/C<regLastError()> numerically equal to
-C<ERROR_NO_MORE_ITEMS>.
-
-C<$sName> will be set to the name of the subkey.  Can be C<[]> if
-you don't care about the name.
-
-C<$plName> initially specifies the [minimum] buffer size to be
-allocated for C<$sName>.  Will be set to the length of the subkey
-name if the requested subkey exists even if C<$sName> isn't
-successfully set to the subkey name.  See L<Buffer sizes> for
-more information.
-
-C<$pNull> is reserved for future used and should be passed as C<[]>.
-
-C<$sClass> will be set to the class name for the subkey.  Can be
-C<[]> if you don't care about the class.
-
-C<$plClass> initially specifies the [minimum] buffer size to be
-allocated for C<$sClass> and will be set to the length of the
-subkey class name if the requested subkey exists.  See L<Buffer
-sizes> for more information.
-
-C<$pftLastWrite> will be set to a C<FILETIME> structure packed
-into a Perl string and indicating when the subkey was last changed.
-Can be C<[]>.
-
-You may omit both C<$plName> and C<$plClass> to get the same effect
-as passing in C<[]> for each of them.
-
-=item RegEnumValue
-
-=item C<RegEnumValue( $hKey, $uIndex, $osValName, $iolValName, $pNull, $ouType, $opValData, $iolValData )>
-
-Lets you enumerate the names of all of the values contained in an
-open Registry key.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$iIndex> is the sequence number of the value that you want
-information on.  Start with this value as C<0> then repeat the
-call incrementing this value each time until the call fails with
-C<ERROR_NO_MORE_ITEMS>.
-
-C<$sValName> will be set to the name of the value.  Can be C<[]>
-if you don't care about the name.
-
-C<$plValName> initially specifies the [minimum] buffer size to be
-allocated for C<$sValName>.  Will be set to the length of the value
-name if the requested value exists even if C<$sValName> isn't
-successfully set to the value name.  See L<Buffer sizes> for
-more information.
-
-C<$pNull> is reserved for future used and should be passed as C<[]>.
-
-C<$piType> will be set to the type of data stored in the value data.
-If the call succeeds, it will be set to a C<REG_*> value unless
-passed in as C<[]>.
-
-C<$pValData> will be set to the data [packed into a Perl string]
-that is stored in the requested value.  Can be C<[]> if you don't
-care about the value data.
-
-C<$plValData> initially specifies the [minimum] buffer size to be
-allocated for C<$sValData> and will be set to the length of the
-value data if the requested value exists.  See L<Buffer sizes> for
-more information.
-
-You may omit both C<$plValName> and C<$plValData> to get the same
-effect as passing in C<[]> for each of them.
-
-=item RegFlushKey
-
-=item C<RegFlushKey( $hKey )>
-
-Forces the data stored under an open Registry key to be flushed
-to the disk file where the data is preserved between reboots.
-Forced flushing is not guaranteed to be efficient so this routine
-should almost never be called.  Returns a true value if successful
-and a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-=item RegGetKeySecurity
-
-=item C<RegGetKeySecurity( $hKey, $uSecInfo, $opSecDesc, $iolSecDesc )>
-
-Retrieves one of the C<SECURITY_DESCRIPTOR> structures describing
-part of the security for an open Registry key.  Returns a true value
-if successful and a false value [and sets C<$^E>/C<regLastError()>]
-on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$iSecInfo> is a numeric C<SECURITY_INFORMATION> value that
-specifies which parts of the C<SECURITY_DESCRIPTOR> structure
-to retrieve.  Should be C<OWNER_SECURITY_INFORMATION>,
-C<GROUP_SECURITY_INFORMATION>, C<DACL_SECURITY_INFORMATION>, or
-or C<SACL_SECURITY_INFORMATION> or two or more of these bits
-combined using C<|>.
-
-C<$pSecDesc> will be set to the requested C<SECURITY_DESCRIPTOR>
-structure [packed into a Perl string].
-
-C<$plSecDesc> initially specifies the [minimum] buffer size to be
-allocated for C<$sSecDesc> and will be set to the length of the
-security descriptor.  See L<Buffer sizes> for more information.
-You may omit this parameter to get the same effect as passing in
-C<[]> for it.
-
-=item regLastError
-
-=item C<$svError= regLastError();>
-
-=item C<regLastError( $uError );>
-
-Returns the last error encountered by a routine from this module. 
-It is just like C<$^E> except it isn't changed by anything except
-routines from this module.  Ideally you could just use C<$^E>, but
-current versions of Perl often overwrite C<$^E> before you get a
-chance to check it and really old versions of Perl don't really
-support C<$^E> under Win32.
-
-Just like C<$^E>, in a numeric context C<regLastError()> returns
-the numeric error value while in a string context it returns a
-text description of the error [actually it returns a Perl scalar
-that contains both values so C<$x= regLastError()> causes C<$x>
-to give different values in string vs. numeric contexts].
-
-The last form sets the error returned by future calls to
-C<regLastError()> and should not be used often.  C<$uError> must
-be a numeric error code.  Also returns the dual-valued version
-of C<$uError>.
-
-=item RegLoadKey
-
-=item C<RegLoadKey( $hKey, $sSubKey, $sFileName )>
-
-Loads a hive file.  That is, it creates a new subkey in the
-Registry and associates that subkey with a disk file that contains
-a Registry hive so that the new subkey can be used to access the
-keys and values stored in that hive.  Hives are usually created
-via C<RegSaveKey()>.  Returns a true value if successful and a
-false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key that can have hives
-loaded to it.  This must be C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>,
-or a remote version of one of these from a call to
-C<RegConnectRegistry()>.
-
-C<$sSubKey> is the name of the new subkey to created and associated
-with the hive file.
-
-C<$sFileName> is the name of the hive file to be loaded.  This
-file name is interpretted relative to the
-C<%SystemRoot%/System32/config> directory on the computer where
-the C<$hKey> key resides.  If C<$sFileName> is on a FAT file
-system, then its name must not have an extension.
-
-You must have the C<SE_RESTORE_NAME> privilege to use this routine.
-
-WARNING:  Loading of hive files via a network share may silently
-corrupt the hive and so should not be attempted [this is a problem
-in at least some versions of the underlying API which this module
-does not try to fix or avoid].  To access a hive file located on a
-remote computer, connect to the remote computer's Registry and load
-the hive via that.
-
-=item RegNotifyChangeKeyValue
-
-=item C<RegNotifyChangeKeyValue( $hKey, $bWatchSubtree, $uNotifyFilter, $hEvent, $bAsync )>
-
-Arranges for your process to be notified when part of the Registry
-is changed.  Returns a true value if successful and a false value
-[and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call] for which you wish to be notified when any changes
-are made to it.
-
-If C<$bWatchSubtree> is true, then changes to any subkey or
-descendant of C<$hKey> are also reported.
-
-C<$iNotifyFilter> controllers what types of changes are reported.  It
-is a numeric value containing one or more of the following bit masks:
-
-=over
-
-=item C<REG_NOTIFY_CHANGE_NAME>
-
-Notify if a subkey is added or deleted to a monitored key.
-
-=item C<REG_NOTIFY_CHANGE_LAST_SET>
-
-Notify if a value in a monitored key is added, deleted, or modified.
-
-=item C<REG_NOTIFY_CHANGE_SECURITY>
-
-Notify if a security descriptor of a monitored key is changed.
-
-=item C<REG_NOTIFY_CHANGE_ATTRIBUTES>
-
-Notify if any attributes of a monitored key are changed [class
-name or security descriptors].
-
-=back
-
-C<$hEvent> is ignored unless C<$bAsync> is true.  Otherwise, C<$hEvent>
-is a handle to a Win32 I<event> that will be signaled when changes are
-to be reported.
-
-If C<$bAsync> is true, then C<RegNotifyChangeKeyValue()> returns
-immediately and uses C<$hEvent> to notify your process of changes.
-If C<$bAsync> is false, then C<RegNotifyChangeKeyValue()> does
-not return until there is a change to be notified of.
-
-This routine does not work with Registry keys on remote computers.
-
-=item RegOpenKey
-
-=item C<RegOpenKey( $hKey, $sSubKey, $ohSubKey )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegOpenKeyEx()> instead.
-
-=item RegOpenKeyEx
-
-=item C<RegOpenKeyEx( $hKey, $sSubKey, $uOptions, $uAccess, $ohSubKey )>
-
-Opens an existing Registry key.  Returns a true value if successful
-and a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sSubKey> is the name of an existing subkey to be opened.
-Can be C<""> or C<[]> to open an additional handle to the
-key specified by C<$hKey>.
-
-C<$iOptions> is a numeric value containing bits that control options
-used while opening the subkey.  There are currently no supported
-options so this parameter should be specified as C<0>.
-
-C<$iAccess> is a numeric mask of bits specifying what type of
-access is desired when opening the new subkey.  Should be a
-combination of one or more of the following bit masks:
-
-=over
-
-=item C<KEY_ALL_ACCESS>
-
-    KEY_READ | KEY_WRITE | KEY_CREATE_LINK
-
-=item C<KEY_READ>
-
-    KEY_QUERY_VALUE | KEY_ENUMERATE_SUBKEYS | KEY_NOTIFY | STANDARD_RIGHTS_READ
-
-=item C<KEY_WRITE>
-
-    KEY_SET_VALUE | KEY_CREATE_SUB_KEY | STANDARD_RIGHTS_WRITE
-
-=item C<KEY_QUERY_VALUE>
-
-=item C<KEY_SET_VALUE>
-
-=item C<KEY_ENUMERATE_SUB_KEYS>
-
-=item C<KEY_CREATE_SUB_KEY>
-
-=item C<KEY_NOTIFY>
-
-Allows you to use C<RegNotifyChangeKeyValue()> on the opened key.
-
-=item C<KEY_EXECUTE>
-
-Same as C<KEY_READ>.
-
-=item C<KEY_CREATE_LINK>
-
-Gives you permission to create a symbolic link like
-C<HKEY_CLASSES_ROOT> and C<HKEY_CURRENT_USER>, though the method for
-doing so is not documented [and probably requires use of the mostly
-undocumented "native" routines, C<Nt*()> a.k.a. C<Zw*()>].
-
-=back
-
-C<$phKey> will be set to the handle to be used to access the new subkey
-if the call succeeds.
-
-=item RegQueryInfoKey
-
-=item C<RegQueryInfoKey( $hKey, $osClass, $iolClass, $pNull, $ocSubKeys, $olSubKey, $olSubClass, $ocValues, $olValName, $olValData, $olSecDesc, $opftTime )>
-
-Gets miscellaneous information about an open Registry key.
-Returns a true value if successful and a false value [and
-sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sClass> will be set to the class name for the key.  Can be
-C<[]> if you don't care about the class.
-
-C<$plClass> initially specifies the [minimum] buffer size to be
-allocated for C<$sClass> and will be set to the length of the
-key's class name.  See L<Buffer sizes> for more information.
-You may omit this parameter to get the same effect as passing in
-C<[]> for it.
-
-C<$pNull> is reserved for future use and should be passed as C<[]>.
-
-C<$pcSubKeys> will be set to the count of the number of subkeys
-directly under this key.  Can be C<[]>.
-
-C<$plSubKey> will be set to the length of the longest subkey name.
-Can be C<[]>.
-
-C<$plSubClass> will be set to the length of the longest class name
-used with an immediate subkey of this key.  Can be C<[]>.
-
-C<$pcValues> will be set to the count of the number of values in
-this key.  Can be C<[]>.
-
-C<$plValName> will be set to the length of the longest value name
-in this key.  Can be C<[]>.
-
-C<$plValData> will be set to the length of the longest value data
-in this key.  Can be C<[]>.
-
-C<$plSecDesc> will be set to the length of this key's full security
-descriptor.
-
-C<$pftTime> will be set to a C<FILETIME> structure packed
-into a Perl string and indicating when this key was last changed.
-Can be C<[]>.
-
-=item RegQueryMultipleValues
-
-=item C<RegQueryMultipleValues( $hKey, $ioarValueEnts, $icValueEnts, $opBuffer, $iolBuffer )>
-
-Allows you to use a single call to query several values from a single
-open Registry key to maximize efficiency.  Returns a true value if
-successful and a false value [and sets C<$^E>/C<regLastError()>] on
-failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$pValueEnts> should contain a list of C<VALENT> structures packed
-into a single Perl string.  Each C<VALENT> structure should have
-the C<ve_valuename> entry [the first 4 bytes] pointing to a string
-containing the name of a value stored in this key.  The remaining
-fields are set if the function succeeds.
-
-C<$cValueEnts> should contain the count of the number of C<VALENT>
-structures contained in C<$pValueEnts>.
-
-C<$pBuffer> will be set to the data from all of the requested values
-concatenated into a single Perl string.
-
-C<$plBuffer> initially specifies the [minimum] buffer size to be
-allocated for C<$sBuffer> and will be set to the total length of
-the data to be written to C<$sBuffer>.  See L<Buffer sizes> for
-more information.  You may omit this parameter to get the same
-effect as passing in C<[]> for it.
-
-Here is sample code to populate C<$pValueEnts>:
-
-    # @ValueNames= ...list of value name strings...;
-    $cValueEnts= @ValueNames;
-    $pValueEnts= pack( " p x4 x4 x4 " x $cValueEnts, @ValueNames );
-
-Here is sample code to retrieve the data type and data length
-returned in C<$pValueEnts>:
-
-    @Lengths= unpack( " x4 L x4 x4 " x $cValueEnts, $pValueEnts );
-    @Types=   unpack( " x4 x4 x4 L " x $cValueEnts, $pValueEnts );
-
-Given the above, and assuming you haven't modified C<$sBuffer> since
-the call, you can also extract the value data strings from C<$sBuffer>
-by using the pointers returned in C<$pValueEnts>:
-
-    @Data=    unpack(  join( "", map {" x4 x4 P$_ x4 "} @Lengths ),
-    		$pValueEnts  );
-
-Much better is to use the lengths and extract directly from
-C<$sBuffer> using C<unpack()> [or C<substr()>]:
-
-    @Data= unpack( join("",map("P$_",@Lengths)), $sBuffer );
-
-=item RegQueryValue
-
-=item C<RegQueryValue( $hKey, $sSubKey, $osValueData, $iolValueData )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegQueryValueEx()> instead.  This routine can only
-query unamed values [a.k.a. "default values"], that is, values with
-a name of C<"">.
-
-=item RegQueryValueEx
-
-=item C<RegQueryValueEx( $hKey, $sValueName, $pNull, $ouType, $opValueData, $iolValueData )>
-
-Lets you look up value data stored in an open Registry key by
-specifying the value name.  Returns a true value if successful
-and a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sValueName> is the name of the value whose data you wish to
-retrieve.
-
-C<$pNull> this parameter is reserved for future use and should be
-specified as C<[]>.
-
-C<$piType> will be set to indicate what type of data is stored in
-the named value.  Will be set to a C<REG_*> value if the function
-succeeds.
-
-C<$pValueData> will be set to the value data [packed into a Perl
-string] that is stored in the named value.  Can be C<[]> if you
-don't care about the value data.
-
-C<$plValueData> initially specifies the [minimum] buffer size to be
-allocated for C<$sValueData> and will be set to the size [always
-in bytes] of the data to be written to C<$sValueData>, even if
-C<$sValueData> is not successfully written to.  See L<Buffer sizes>
-for more information.
-
-=item RegReplaceKey
-
-=item C<RegReplaceKey( $hKey, $sSubKey, $sNewFile, $sOldFile )>
-
-Lets you replace an entire hive when the system is next booted. 
-Returns a true value if successful and a false value [and sets
-C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key that has hive(s)
-loaded in it.  This must be C<HKEY_LOCAL_MACHINE>,
-C<HKEY_USERS>, or a remote version of one of these from
-a call to C<RegConnectRegistry()>.
-
-C<$sSubKey> is the name of the subkey of C<$hKey> whose hive
-you wish to have replaced on the next reboot.
-
-C<$sNewFile> is the name of a file that will replace the existing
-hive file when the system reboots.
-
-C<$sOldFile> is the file name to save the current hive file to
-when the system reboots.
-
-C<$sNewFile> and C<$sOldFile> are interpretted relative to the
-C<%SystemRoot%/System32/config> directory on the computer where
-the C<$hKey> key resides [I think].  If either file is [would be]
-on a FAT file system, then its name must not have an extension.
-
-You must have the C<SE_RESTORE_NAME> privilege to use this routine.
-
-=item RegRestoreKey
-
-=item C<RegRestoreKey( $hKey, $sFileName, $uFlags )>
-
-Reads in a hive file and copies its contents over an existing
-Registry tree.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sFileName> is the name of the hive file to be read.  For each
-value and subkey in this file, a value or subkey will be added
-or replaced in C<$hKey>.
-
-C<$uFlags> is usally C<0>.  It can also be C<REG_WHOLE_HIVE_VOLATILE>
-which, rather than copying the hive over the existing key,
-replaces the existing key with a temporary, memory-only Registry
-key and then copies the hive contents into it.  This option only
-works if C<$hKey> is C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>, or a
-remote version of one of these from a call to C<RegConnectRegistry()>.
-
-C<RegRestoreKey> does I<not> delete values nor keys from the
-existing Registry tree when there is no corresponding value/key
-in the hive file.
-
-=item RegSaveKey
-
-=item C<RegSaveKey( $hKey, $sFileName, $pSecAttr )>
-
-Dumps any open Registry key and all of its subkeys and values into
-a new hive file.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sFileName> is the name of the file that the Registry tree
-should be saved to.  It is interpretted relative to the
-C<%SystemRoot%/System32/config> directory on the computer where
-the C<$hKey> key resides.  If C<$sFileName> is on a FAT file system,
-then it must not have an extension.
-
-C<$pSecAttr> contains a C<SECURITY_ATTRIBUTES> structure that specifies
-the permissions to be set on the new file that is created.  This can
-be C<[]>.
-
-You must have the C<SE_RESTORE_NAME> privilege to use this routine.
-
-=item RegSetKeySecurity
-
-=item C<RegSetKeySecurity( $hKey, $uSecInfo, $pSecDesc )>
-
-Sets [part of] the C<SECURITY_DESCRIPTOR> structure describing part
-of the security for an open Registry key.  Returns a true value if
-successful and a false value [and sets C<$^E>/C<regLastError()>] on
-failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$uSecInfo> is a numeric C<SECURITY_INFORMATION> value that
-specifies which C<SECURITY_DESCRIPTOR> structure to set.  Should
-be C<OWNER_SECURITY_INFORMATION>, C<GROUP_SECURITY_INFORMATION>,
-C<DACL_SECURITY_INFORMATION>, or C<SACL_SECURITY_INFORMATION>
-or two or more of these bits combined using C<|>.
-
-C<$pSecDesc> contains the new C<SECURITY_DESCRIPTOR> structure
-packed into a Perl string.
-
-=item RegSetValue
-
-=item C<RegSetValue( $hKey, $sSubKey, $uType, $sValueData, $lValueData )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegSetValueEx()> instead.  This routine can only
-set unamed values [a.k.a. "default values"].
-
-=item RegSetValueEx
-
-=item C<RegSetValueEx( $hKey, $sName, $uZero, $uType, $pData, $lData )>
-
-Adds or replaces a value in an open Registry key.  Returns
-a true value if successful and a false value [and sets
-C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sName> is the name of the value to be set.
-
-C<$uZero> is reserved for future use and should be specified as C<0>.
-
-C<$uType> is the type of data stored in C<$pData>.  It should
-be a C<REG_*> value.
-
-C<$pData> is the value data packed into a Perl string.
-
-C<$lData> is the length of the value data that is stored in C<$pData>.
-You will usually omit this parameter or pass in C<0> to have
-C<length($pData)> used.  In both of these cases, if C<$iType> is
-C<REG_SZ> or C<REG_EXPAND_SZ>, C<RegSetValueEx()> will append a
-trailing C<'\0'> to the end of C<$pData> [unless there is already
-one].
-
-=item RegUnLoadKey
-
-=item C<RegUnLoadKey( $hKey, $sSubKey )>
-
-Unloads a previously loaded hive file.  That is, closes the
-hive file then deletes the subkey that was providing access
-to it.  Returns a true value if successful and a false value
-[and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key that has hives
-loaded in it.  This must be C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>,
-or a remote version of one of these from a call to
-C<RegConnectRegistry()>.
-
-C<$sSubKey> is the name of the subkey whose hive you wish to
-have unloaded.
-
-=item :FuncA
-
-The ASCII-specific function names.
-
-Each of these is identical to the version listed above without the
-trailing "A":
-
-	AbortSystemShutdownA	InitiateSystemShutdownA
-	RegConnectRegistryA	RegCreateKeyA		RegCreateKeyExA
-	RegDeleteKeyA		RegDeleteValueA		RegEnumKeyA
-	RegEnumKeyExA		RegEnumValueA		RegLoadKeyA
-	RegOpenKeyA		RegOpenKeyExA		RegQueryInfoKeyA
-	RegQueryMultipleValuesA	RegQueryValueA		RegQueryValueExA
-	RegReplaceKeyA		RegRestoreKeyA		RegSaveKeyA
-	RegSetValueA		RegSetValueExA		RegUnLoadKeyA
-
-=item :FuncW
-
-The UNICODE-specific function names.  These are the same as the
-versions listed above without the trailing "W" except that string
-parameters are UNICODE strings rather than ASCII strings, as
-indicated.
-
-=item AbortSystemShutdownW
-
-=item C<AbortSystemShutdownW( $swComputerName )>
-
-C<$swComputerName> is UNICODE.
-
-=item InitiateSystemShutdownW
-
-=item C<InitiateSystemShutdownW( $swComputer, $swMessage, $uTimeoutSecs, $bForce, $bReboot )>
-
-C<$swComputer> and C<$swMessage> are UNICODE.
-
-=item RegConnectRegistryW
-
-=item C<RegConnectRegistryW( $swComputer, $hRootKey, $ohKey )>
-
-C<$swComputer> is UNICODE.
-
-=item RegCreateKeyW
-
-=item C<RegCreateKeyW( $hKey, $swSubKey, $ohSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item RegCreateKeyExW
-
-=item C<RegCreateKeyExW( $hKey, $swSubKey, $uZero, $swClass, $uOpts, $uAccess, $pSecAttr, $ohNewKey, $ouDisp )>
-
-C<$swSubKey> and C<$swClass> are UNICODE.
-
-=item RegDeleteKeyW
-
-=item C<RegDeleteKeyW( $hKey, $swSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item RegDeleteValueW
-
-=item C<RegDeleteValueW( $hKey, $swValueName )>
-
-C<$swValueName> is UNICODE.
-
-=item RegEnumKeyW
-
-=item C<RegEnumKeyW( $hKey, $uIndex, $oswName, $ilwNameSize )>
-
-C<$oswName> is UNICODE and C<$ilwNameSize> is measured as number of
-C<WCHAR>s.
-
-=item RegEnumKeyExW
-
-=item C<RegEnumKeyExW( $hKey, $uIndex, $oswName, $iolwName, $pNull, $oswClass, $iolwClass, $opftLastWrite )>
-
-C<$swName> and C<$swClass> are UNICODE and C<$iolwName> and C<$iolwClass>
-are measured as number of C<WCHAR>s.
-
-=item RegEnumValueW
-
-=item C<RegEnumValueW( $hKey, $uIndex, $oswName, $iolwName, $pNull, $ouType, $opData, $iolData )>
-
-C<$oswName> is UNICODE and C<$iolwName> is measured as number
-of C<WCHAR>s.
-
-C<$opData> is UNICODE if C<$piType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
-or C<REG_MULTI_SZ>.  Note that C<$iolData> is measured as number
-of bytes even in these cases.
-
-=item RegLoadKeyW
-
-=item C<RegLoadKeyW( $hKey, $swSubKey, $swFileName )>
-
-C<$swSubKey> and C<$swFileName> are UNICODE.
-
-=item RegOpenKeyW
-
-=item C<RegOpenKeyW( $hKey, $swSubKey, $ohSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item RegOpenKeyExW
-
-=item C<RegOpenKeyExW( $hKey, $swSubKey, $uOptions, $uAccess, $ohSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item RegQueryInfoKeyW
-
-=item C<RegQueryInfoKeyW( $hKey, $oswClass, $iolwClass, $pNull, $ocSubKeys, $olwSubKey, $olwSubClass, $ocValues, $olwValName, $olValData, $olSecDesc, $opftTime )>
-
-C<$swClass> is UNICODE.  C<$iolwClass>, C<$olwSubKey>, C<$olwSubClass>,
-and C<$olwValName> are measured as number of C<WCHAR>s.  Note that
-C<$olValData> is measured as number of bytes.
-
-=item RegQueryMultipleValuesW
-
-=item C<RegQueryMultipleValuesW( $hKey, $ioarValueEnts, $icValueEnts, $opBuffer, $iolBuffer )>
-
-The C<ve_valuename> fields of the C<VALENT> [actually C<VALENTW>]
-structures in C<$ioarValueEnts> are UNICODE.  Values of type C<REG_SZ>,
-C<REG_EXPAND_SZ>, and C<REG_MULTI_SZ> are written to C<$opBuffer>
-in UNICODE.  Note that C<$iolBuffer> and the C<ve_valuelen> fields
-of the C<VALENT> [C<VALENTW>] structures are measured as number of
-bytes.
-
-=item RegQueryValueW
-
-=item C<RegQueryValueW( $hKey, $swSubKey, $oswValueData, $iolValueData )>
-
-C<$swSubKey> and C<$oswValueData> are UNICODE.  Note that
-C<$iolValueData> is measured as number of bytes.
-
-=item RegQueryValueExW
-
-=item C<RegQueryValueExW( $hKey, $swName, $pNull, $ouType, $opData, $iolData )>
-
-C<$swName> is UNICODE.
-
-C<$opData> is UNICODE if C<$ouType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
-or C<REG_MULTI_SZ>.  Note that C<$iolData> is measured as number of
-bytes even in these cases.
-
-=item RegReplaceKeyW
-
-=item C<RegReplaceKeyW( $hKey, $swSubKey, $swNewFile, $swOldFile )>
-
-C<$swSubKey>, C<$swNewFile>, and C<$swOldFile> are UNICODE.
-
-=item RegRestoreKeyW
-
-=item C<RegRestoreKeyW( $hKey, $swFileName, $uFlags )>
-
-C<$swFileName> is UNICODE.
-
-=item RegSaveKeyW
-
-=item C<RegSaveKeyW( $hKey, $swFileName, $pSecAttr )>
-
-C<$swFileName> is UNICODE.
-
-=item RegSetValueW
-
-=item C<RegSetValueW( $hKey, $swSubKey, $uType, $swValueData, $lValueData )>
-
-C<$swSubKey> and C<$swValueData> are UNICODE.  Note that
-C<$lValueData> is measured as number of bytes even though
-C<$swValueData> is always UNICODE.
-
-=item RegSetValueExW
-
-=item C<RegSetValueExW( $hKey, $swName, $uZero, $uType, $pData, $lData )>
-
-C<$swName> is UNICODE.
-
-C<$pData> is UNICODE if C<$uType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
-or C<REG_MULTI_SZ>.  Note that C<$lData> is measured as number of
-bytes even in these cases.
-
-=item RegUnLoadKeyW
-
-=item C<RegUnLoadKeyW( $hKey, $swSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item :HKEY_
-
-All C<HKEY_*> constants:
-
-	HKEY_CLASSES_ROOT	HKEY_CURRENT_CONFIG	HKEY_CURRENT_USER
-	HKEY_DYN_DATA		HKEY_LOCAL_MACHINE	HKEY_PERFORMANCE_DATA
-	HKEY_USERS
-
-=item :KEY_
-
-All C<KEY_*> constants:
-
-	KEY_QUERY_VALUE		KEY_SET_VALUE		KEY_CREATE_SUB_KEY
-	KEY_ENUMERATE_SUB_KEYS	KEY_NOTIFY		KEY_CREATE_LINK
-	KEY_READ		KEY_WRITE		KEY_EXECUTE
-	KEY_ALL_ACCESS
-
-=item :REG_
-
-All C<REG_*> constants:
-
-	REG_CREATED_NEW_KEY		REG_OPENED_EXISTING_KEY
-
-	REG_LEGAL_CHANGE_FILTER		REG_NOTIFY_CHANGE_ATTRIBUTES
-	REG_NOTIFY_CHANGE_NAME		REG_NOTIFY_CHANGE_LAST_SET
-	REG_NOTIFY_CHANGE_SECURITY	REG_LEGAL_OPTION
-
-	REG_OPTION_BACKUP_RESTORE	REG_OPTION_CREATE_LINK
-	REG_OPTION_NON_VOLATILE		REG_OPTION_OPEN_LINK
-	REG_OPTION_RESERVED		REG_OPTION_VOLATILE
-
-	REG_WHOLE_HIVE_VOLATILE		REG_REFRESH_HIVE
-	REG_NO_LAZY_FLUSH
-
-	REG_NONE			REG_SZ
-	REG_EXPAND_SZ			REG_BINARY
-	REG_DWORD			REG_DWORD_LITTLE_ENDIAN
-	REG_DWORD_BIG_ENDIAN		REG_LINK
-	REG_MULTI_SZ			REG_RESOURCE_LIST
-	REG_FULL_RESOURCE_DESCRIPTOR	REG_RESOURCE_REQUIREMENTS_LIST
-
-=item :ALL
-
-All of the above.
-
-=item :SE_
-
-The strings for the following privilege names:
-
-	SE_ASSIGNPRIMARYTOKEN_NAME	SE_AUDIT_NAME
-	SE_BACKUP_NAME			SE_CHANGE_NOTIFY_NAME
-	SE_CREATE_PAGEFILE_NAME		SE_CREATE_PERMANENT_NAME
-	SE_CREATE_TOKEN_NAME		SE_DEBUG_NAME
-	SE_INCREASE_QUOTA_NAME		SE_INC_BASE_PRIORITY_NAME
-	SE_LOAD_DRIVER_NAME		SE_LOCK_MEMORY_NAME
-	SE_MACHINE_ACCOUNT_NAME		SE_PROF_SINGLE_PROCESS_NAME
-	SE_REMOTE_SHUTDOWN_NAME		SE_RESTORE_NAME
-	SE_SECURITY_NAME		SE_SHUTDOWN_NAME
-	SE_SYSTEMTIME_NAME		SE_SYSTEM_ENVIRONMENT_NAME
-	SE_SYSTEM_PROFILE_NAME		SE_TAKE_OWNERSHIP_NAME
-	SE_TCB_NAME			SE_UNSOLICITED_INPUT_NAME
-
-It can be difficult to successfully build this module in a way
-that makes these constants available.  So some builds of this
-module may not make them available.  For such builds, trying
-to export any of these constants will cause a fatal error.
-For this reason, none of these symbols are currently included
-in the C<":ALL"> grouping.
-
-=back
-
-=head2 The Win32API:: heirarchy
-
-This and the other Win32API:: modules are meant to expose the
-nearly raw API calls so they can be used from Perl code in any
-way they might be used from C code.  This provides the following
-advantages:
-
-=over
-
-=item Many modules can be written by people that don't have a C compiler.
-
-=item Encourages more module code to be written in Perl [not C].
-
-Perl code is often much easier to inspect, debug, customize, and
-enhance than XS code.
-
-=item Allows those already familiar with the Win32 API to get
-off to a quick start.
-
-=item Provides an interactive tool for exploring even obscure
-details of the Win32 API.
-
-It can be very useful to interactively explore ad-hoc calls into
-parts of the Win32 API using:
-
-    perl -de 0
-
-=item Ensures that native Win32 data structures can be used.
-
-This allows maximum efficiency.  It also allows data from one
-module [for example, time or security information from the
-C<Win32API::Registry> or C<Win32API::File> modules] to be used
-with other modules [for example, C<Win32API::Time> and
-C<Win32API::SecDesc>].
-
-=item Provides a single version of the XS interface to each API
-call where improvements can be collected.
-
-=back
-
-=head2 Buffer sizes
-
-For each parameter that specifies a buffer size, a value of C<0>
-can be passed.  For parameter that are pointers to buffer sizes,
-you can also pass in C<NULL> by specifying an empty list reference,
-C<[]>.  Both of these cases will ensure that the variable has
-I<some> buffer space allocated to it and pass in that buffer's
-allocated size.  Many of the calls indicate, via C<ERROR_MORE_DATA>,
-that the buffer size was not sufficient and the F<Registry.xs>
-code will automatically enlarge the buffer to the required size
-and repeat the call.
-
-Numeric buffer sizes are used as minimum initial sizes for the
-buffers.  The larger of this size and the size of space already
-allocated to the scalar will be passed to the underlying routine. 
-If that size was insufficient, and the underlying call provides
-an easy method for determining the needed buffer size, then the
-buffer will be enlarged and the call repeated as above.
-
-The underlying calls define buffer size parameter as unsigned, so
-negative buffer sizes are treated as very large positive buffer
-sizes which usually cause C<malloc()> to fail.
-
-To force the F<Registry.xs> code to pass in a specific value for
-a buffer size, preceed the size with an equals sign via C<"=".>. 
-Buffer sizes that are passed in as strings starting with an equals
-sign will have the equal sign stripped and the remainder of the string
-interpretted as a number [via C's C<strtoul()> using only base 10]
-which will be passed to the underlying routine [even if the allocated
-buffer is actually larger].  The F<Registry.xs> code will enlarge the
-buffer to the specified size, if needed, but will not enlarge the
-buffer based on the underlying routine requesting more space.
-
-Some Reg*() calls may not currently set the buffer size when they
-return C<ERROR_MORE_DATA>.  But some that are not documented as
-doing so, currently do so anyway.  So the code assumes that any
-routine I<might> do this and resizes any buffers and repeats the
-call.   We hope that eventually all routines will provide this
-feature.
-
-When you use C<[]> for a buffer size, you can still find the
-length of the data returned by using C<length($buffer)>.  Note
-that this length will be in bytes while a few of the buffer
-sizes would have been in units of wide characters.
-
-Note that the RegQueryValueEx*() and RegEnumValue*() calls
-will trim the trailing C<'\0'> [if present] from the returned data
-values of type C<REG_SZ> or C<REG_EXPAND_SZ> but only if the
-value data length parameter is omitted [or specified as C<[]>].
-
-The RegSetValueEx*() calls will add a trailing C<'\0'> [if
-missing] to the supplied data values of type C<REG_SZ> and
-C<REG_EXPAND_SZ> but only if the value data length parameter
-is omitted [or specified as C<0>].
-
-=head2 Hungarian Notation
-
-The following abbreviations are used at the start of each parameter
-name to hint at aspects of how the parameter is used.  The prefix
-is always in lower case and followed by a capital letter that starts
-the descriptive part of the parameter name.  Several of the following
-abbreviations can be combined into a single prefix.
-
-Probably not all of these prefix notations are used by this module. 
-This document section may be included in any C<Win32API> module and
-so covers some notations not used by this specific module.
-
-=over
-
-=item s
-
-A string.  In C, a C<'\0'>-terminated C<char *>.  In Perl, just a
-string except that it will be truncated at the first C<"\0">, if
-it contains one.
-
-=item sw
-
-A wide [UNICODE] string.  In C, a C<L'\0'>-terminated C<WCHAR *>.
-In Perl, a string that contains UNICODE data.  You can convert a
-string to UNICODE in Perl via:
-
-    $string= "This is an example string";
-    $unicode= pack( "S*", unpack("C*",$string), 0 );
-
-Note how C<, 0> above causes an explicit C<L'\0'> to be added since
-Perl's implicit C<'\0'> that it puts after each of its strings is not
-wide enough to terminate a UNICODE string.  So UNICODE strings are
-different than regular strings in that the Perl version of a regular
-string will not include the trialing C<'\0'> while the Perl version
-of a UNICODE string must include the trailing C<L'\0'>.
-
-If a UNICODE string contains no non-ASCII characters, then you
-can convert it back into a normal string via:
-
-    $string= pack( "C*", unpack("S*",$unicode) );
-    $string =~ s/\0$//;
-
-=item p
-
-A pointer to some buffer [usually containing some C<struct>].  In C,
-a C<void *> or some other pointer type.  In Perl, a string that is
-usually manipulated using C<pack> and C<unpack>.  The "p" is usually
-followed by more prefix character(s) to indicate what type of data is
-stored in the bufffer.
-
-=item a
-
-A packed array.  In C, an array [usually of C<struct>s].  In Perl, a
-string containing the packed data.  The "a" is usually followed by
-more prefix character(s) to indicate the data type of the elements.
-
-These packed arrays are also called "vectors" in places to avoid
-confusion with Perl arrays.
-
-=item n
-
-A generic number.   In C, any of the integer or floating point data
-types.  In Perl, a number; either an integer, unsigned, or double
-[IV, UV, or NV, respectively].  Usually an integer.
-
-=item iv
-
-A signed integral value.  In C, any of the signed integer data types. 
-In Perl, an integer [IV].
-
-=item u
-
-An unsigned integral value.  In C, any of the unsigned integer data
-types.  In Perl, an unsigned integer [UV].
-
-=item d
-
-A floating-point number.  In C, a C<float> or C<double> or, perhaps,
-a C<long double>.  In Perl, a double-precision floating-point number
-[NV].
-
-=item b
-
-A Boolean value.  In C, any integer data type, though usually via
-a type alias of C<bool> or C<BOOL>, containing either a 0 [false] or
-non-zero [true] value.  In Perl, a scalar containing a Boolean value
-[C<0>, C<"">, or C<undef> for "false" and anything else for "true"].
-
-=item c
-
-A count of items.  In C, any integer data type.  In Perl, an unsigned
-integer [UV].  Usually used in conjunction with a "vector" parameter
-[see L</a> above] to indicate the number of elements.
-
-=item l
-
-A length [in bytes].  In C, any integer data type.  In Perl, an
-unsigned integer [UV].  Usually used in conjunction with a "string"
-or "pointer" parameter [see L</s> and L</p> above] to indicate the
-buffer size or the size of the value stored in the buffer.
-
-For strings, there is no general rule as to whether the trailing
-C<'\0'> is included in such sizes.  For this reason, the C<Win32API>
-modules follow the Perl rule of always allocating one extra byte
-and reporting buffer sizes as being one smaller than allocated in
-case the C<'\0'> is not included in the size.
-
-=item lw
-
-A length measured as number of UNICODE characters.  In C, a count
-of C<WCHAR>s.  In Perl, an unsigned integer [UV] counting "shorts"
-[see "s" and "S" in C<pack> and C<unpack>].
-
-For UNICODE strings, the trailing C<L'\0'> may or may not be
-included in a length so, again, we always allocate extra room
-for one and don't report that extra space.
-
-=item h
-
-A handle.  In C, a C<HANDLE> or more-specific handle data type. 
-In Perl, an unsigned integer [UV].  In C, these handles are often
-actually some type of pointer, but Perl just treats them as opaque
-numbers, as it should.  This prefix is also used for other pointers
-that are treated as integers in Perl code.
-
-=item r
-
-A record.  In C, almost always a C<struct> or perhaps C<union>.  Note
-that C C<struct>s are rarely passed by value so the "r" is almost
-always preceeded by a "p" or "a" [see L</p> and L</a> above].  For
-the very rare unadorned "r", Perl stores the record in the same way
-as a "pr", that is, in a string.  For the very rare case where Perl
-explicitly stores a pointer to the C<struct> rather than storing the
-C<struct> directly in a Perl string, the prefix "pp" or "ppr" or even
-"par" is used.
-
-=item sv
-
-=item rv
-
-=item hv
-
-=item av
-
-=item cv
-
-A Perl data type.  Respectively, a scalar value [SV], a reference
-[RV] [usually to a scalar], a hash [HV], a Perl array [AV], or a Perl
-code reference [PVCV].  For the "hv", "av", and "cv" prefixes, a
-leading "rv" is usually assumed.  For a parameter to an XS subroutine,
-a prefix of "sv" means the parameter is a scalar and so may be a string
-or a number [or C<undef>] or even both at the same time.  So "sv"
-doesn't imply a leading "rv".
-
-=item Input or Output
-
-Whether a parameter is for input data, output data, or both is usually
-not reflected by the data type prefix.  In cases where this is not
-obvious nor reflected in the parameter name proper, we may use the
-following in front of the data type prefix.
-
-=over
-
-=item i
-
-An input parameter given to the API [usually omitted].
-
-=item o
-
-An output-only parameter taken from the API.  You should not get a
-warning if such a parameter is C<undef> when you pass it into the
-function.  You should get an error if such a parameter is read-only.
-You can [usually] pass in C<[]> for such a parameter to have the
-parameter silently ignored.
-
-The output may be written directly into the Perl variable passed
-to the subroutine, the same way the buffer parameter to Perl's
-C<sysread()>.  This method is often avoided in Perl because
-the call then lacks any visual cue that some parameters are being
-overwritten.   But this method closely matches the C API which is
-what we are trying to do.
-
-=item io
-
-Input given to the API then overwritten with output taken from the
-API.  You should get a warning [if B<-w> is in effect] if such a
-parameter is C<undef> when you pass it into the function [unless it
-is a buffer or buffer length parameter].  If the value is read-only,
-then [for most parameters] the output is silently not written.  This
-is because it is often convenient to pass in read-only constants for
-many such parameters.  You can also usually pass in C<[]> for such
-parameters.
-
-=back
-
-=item pp
-
-=item ppr
-
-=item par
-
-=item pap
-
-These are just unusual combinations of prefix characters described above.
-
-For each, a pointer is stored in a [4-byte] Perl string.  You can
-usually use C<unpack "P"> to access the real data from Perl.
-
-For "ppr" [and often for "pp"], the pointer points directly at a
-C C<struct>.  For "par", the pointer points to the first element
-of a C [packed] array of C<struct>s.  For "pap", the pointer points
-to a C [packed] array of pointers to other things.
-
-=item ap
-
-Here we have a list of pointers packed into a single Perl string.
-
-=back
-
-=head1 BUGS
-
-The old ActiveState ports of Perl for Win32 [but not, ActivePerl, the
-ActiveState distributions of standard Perl 5.004 and beyond] do not support
-the tools for building extensions and so do not support this extension.
-
-No routines are provided for using the data returned in the C<FILETIME>
-buffers.  Those are in the C<Win32API::Time> module.
-
-No routines are provided for dealing with UNICODE data effectively. 
-See L</:FuncW> above for some simple-minded UNICODE methods.
-
-Parts of the module test will fail if used on a version of Perl
-that does not yet set C<$^E> based on C<GetLastError()>.
-
-On NT 4.0 [at least], the RegEnum*() calls do not set the required
-buffer sizes when returning C<ERROR_MORE_DATA> so this module will
-not grow the buffers in such cases.  C<Win32::TieRegistry> overcomes
-this by using values from C<RegQueryInfoKey()> for buffer sizes in
-RegEnum* calls.
-
-On NT 4.0 [at least], C<RegQueryInfoKey()> on C<HKEY_PERFORMANCE_DATA>
-never succeeds.  Also, C<RegQueryValueEx()> on C<HKEY_PERFORMANCE_DATA>
-never returns the required buffer size.  To access C<HKEY_PERFORMANCE_DATA>
-you will need to keep growing the data buffer until the call succeeds.
-
-Because C<goto &subroutine> seems to be buggy under Win32 Perl,
-it is not used in the stubs in F<Registry.pm>.
-
-=head1 AUTHOR
-
-Tye McQueen, tye@metronet.com, http://www.metronet.com/~tye/.
-
-=head1 SEE ALSO
-
-=over
-
-=item L<Win32::TieRegistry>
-
-=item L<Win32::Registry>
-
-=back
-
-=cut
+# Registry.pm -- Low-level access to functions/constants from WINREG.h
+
+package Win32API::Registry;
+
+use strict;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); #@EXPORT_FAIL);
+$VERSION= '0.24';
+
+require Exporter;
+require DynaLoader;
+@ISA= qw(Exporter DynaLoader);
+
+@EXPORT= qw();
+%EXPORT_TAGS= (
+    Func =>	[qw(		regConstant		regLastError
+	AllowPriv		AbortSystemShutdown	InitiateSystemShutdown
+	RegCloseKey		RegConnectRegistry	RegCreateKey
+	RegCreateKeyEx		RegDeleteKey		RegDeleteValue
+	RegEnumKey		RegEnumKeyEx		RegEnumValue
+	RegFlushKey		RegGetKeySecurity	RegLoadKey
+	RegNotifyChangeKeyValue	RegOpenKey		RegOpenKeyEx
+	RegQueryInfoKey		RegQueryMultipleValues	RegQueryValue
+	RegQueryValueEx		RegReplaceKey		RegRestoreKey
+	RegSaveKey		RegSetKeySecurity	RegSetValue
+	RegSetValueEx		RegUnLoadKey )],
+    FuncA =>	[qw(
+	AbortSystemShutdownA	InitiateSystemShutdownA
+	RegConnectRegistryA	RegCreateKeyA		RegCreateKeyExA
+	RegDeleteKeyA		RegDeleteValueA		RegEnumKeyA
+	RegEnumKeyExA		RegEnumValueA		RegLoadKeyA
+	RegOpenKeyA		RegOpenKeyExA		RegQueryInfoKeyA
+	RegQueryMultipleValuesA	RegQueryValueA		RegQueryValueExA
+	RegReplaceKeyA		RegRestoreKeyA		RegSaveKeyA
+	RegSetValueA		RegSetValueExA		RegUnLoadKeyA )],
+    FuncW =>	[qw(
+	AbortSystemShutdownW	InitiateSystemShutdownW
+	RegConnectRegistryW	RegCreateKeyW		RegCreateKeyExW
+	RegDeleteKeyW		RegDeleteValueW		RegEnumKeyW
+	RegEnumKeyExW		RegEnumValueW		RegLoadKeyW
+	RegOpenKeyW		RegOpenKeyExW		RegQueryInfoKeyW
+	RegQueryMultipleValuesW	RegQueryValueW		RegQueryValueExW
+	RegReplaceKeyW		RegRestoreKeyW		RegSaveKeyW
+	RegSetValueW		RegSetValueExW		RegUnLoadKeyW )],
+    HKEY_ =>	[qw(
+	HKEY_CLASSES_ROOT	HKEY_CURRENT_CONFIG	HKEY_CURRENT_USER
+	HKEY_DYN_DATA		HKEY_LOCAL_MACHINE	HKEY_PERFORMANCE_DATA
+	HKEY_USERS )],
+    KEY_ =>	[qw(
+	KEY_QUERY_VALUE		KEY_SET_VALUE		KEY_CREATE_SUB_KEY
+	KEY_ENUMERATE_SUB_KEYS	KEY_NOTIFY		KEY_CREATE_LINK
+	KEY_READ		KEY_WRITE		KEY_EXECUTE
+	KEY_ALL_ACCESS),
+	'KEY_DELETE',		# DELETE          (0x00010000L)
+	'KEY_READ_CONTROL',	# READ_CONTROL    (0x00020000L)
+	'KEY_WRITE_DAC',	# WRITE_DAC       (0x00040000L)
+	'KEY_WRITE_OWNER',	# WRITE_OWNER     (0x00080000L)
+	'KEY_SYNCHRONIZE',	# SYNCHRONIZE     (0x00100000L) (not used)
+	],
+    REG_ =>	[qw(
+	REG_OPTION_RESERVED	REG_OPTION_NON_VOLATILE	REG_OPTION_VOLATILE
+	REG_OPTION_CREATE_LINK	REG_OPTION_BACKUP_RESTORE
+	REG_OPTION_OPEN_LINK	REG_LEGAL_OPTION	REG_CREATED_NEW_KEY
+	REG_OPENED_EXISTING_KEY	REG_WHOLE_HIVE_VOLATILE	REG_REFRESH_HIVE
+	REG_NO_LAZY_FLUSH	REG_NOTIFY_CHANGE_ATTRIBUTES
+	REG_NOTIFY_CHANGE_NAME	REG_NOTIFY_CHANGE_LAST_SET
+	REG_NOTIFY_CHANGE_SECURITY			REG_LEGAL_CHANGE_FILTER
+	REG_NONE		REG_SZ			REG_EXPAND_SZ
+	REG_BINARY		REG_DWORD		REG_DWORD_LITTLE_ENDIAN
+	REG_DWORD_BIG_ENDIAN	REG_LINK		REG_MULTI_SZ
+	REG_RESOURCE_LIST	REG_FULL_RESOURCE_DESCRIPTOR
+	REG_RESOURCE_REQUIREMENTS_LIST )],
+    SE_ =>	[qw(
+	SE_ASSIGNPRIMARYTOKEN_NAME	SE_AUDIT_NAME
+	SE_BACKUP_NAME			SE_CHANGE_NOTIFY_NAME
+	SE_CREATE_PAGEFILE_NAME		SE_CREATE_PERMANENT_NAME
+	SE_CREATE_TOKEN_NAME		SE_DEBUG_NAME
+	SE_INCREASE_QUOTA_NAME		SE_INC_BASE_PRIORITY_NAME
+	SE_LOAD_DRIVER_NAME		SE_LOCK_MEMORY_NAME
+	SE_MACHINE_ACCOUNT_NAME		SE_PROF_SINGLE_PROCESS_NAME
+	SE_REMOTE_SHUTDOWN_NAME		SE_RESTORE_NAME
+	SE_SECURITY_NAME		SE_SHUTDOWN_NAME
+	SE_SYSTEMTIME_NAME		SE_SYSTEM_ENVIRONMENT_NAME
+	SE_SYSTEM_PROFILE_NAME		SE_TAKE_OWNERSHIP_NAME
+	SE_TCB_NAME			SE_UNSOLICITED_INPUT_NAME )],
+);
+@EXPORT_OK= ();
+{ my $ref;
+    foreach $ref (  values(%EXPORT_TAGS)  ) {
+	push( @EXPORT_OK, @$ref )   unless  $ref->[0] =~ /^SE_/;
+    }
+}
+$EXPORT_TAGS{ALL}= [ @EXPORT_OK ];	# \@EXPORT_OK once SE_* settles down.
+# push( @EXPORT_OK, "JHEREG_TACOSALAD" );	# Used to test Mkconst2perl
+push( @EXPORT_OK, @{$EXPORT_TAGS{SE_}} );
+
+bootstrap Win32API::Registry $VERSION;
+
+# Preloaded methods go here.
+
+# To convert C constants to Perl code in cRegistry.pc
+# [instead of C or C++ code in cRegistry.h]:
+#    * Modify F<Makefile.PL> to add WriteMakeFile() =>
+#      CONST2PERL/postamble => [[ "Win32API::Registry" => ]] WRITE_PERL => 1.
+#    * Either comment out C<#include "cRegistry.h"> from F<Registry.xs>
+#      or make F<cRegistry.h> an empty file.
+#    * Make sure the following C<if> block is not commented out.
+#    * "nmake clean", "perl Makefile.PL", "nmake"
+
+if(  ! defined &REG_NONE  ) {
+    require "Win32API/Registry/cRegistry.pc";
+}
+
+# This would be convenient but inconsistant and hard to explain:
+#push( @{$EXPORT_TAGS{ALL}}, @{$EXPORT_TAGS{SE_}} )
+#  if  defined &SE_TCB_NAME;
+
+sub regConstant
+{
+    my( $name )= @_;
+    if(  1 != @_  ||  ! $name  ||  $name =~ /\W/  ) {
+	require Carp;
+	Carp::croak( 'Usage: ',__PACKAGE__,'::regConstant("CONST_NAME")' );
+    }
+    my $proto= prototype $name;
+    if(  defined \&$name
+     &&  defined $proto
+     &&  "" eq $proto  ) {
+	no strict 'refs';
+	return &$name;
+    }
+    return undef;
+}
+
+# We provide this for backwards compatibility:
+sub constant
+{
+    my( $name )= @_;
+    my $value= regConstant( $name );
+    if(  defined $value  ) {
+	$!= 0;
+	return $value;
+    }
+    $!= 11; # EINVAL
+    return 0;
+}
+
+# BEGIN {
+#     my $code= 'return _regLastError(@_)';
+#     local( $!, $^E )= ( 1, 1 );
+#     if(  $! ne $^E  ) {
+# 	$code= '
+# 	    local( $^E )= _regLastError(@_);
+# 	    my $ret= $^E;
+# 	    return $ret;
+# 	';
+#     }
+#     eval "sub regLastError { $code }";
+#     die "$@"   if  $@;
+# }
+
+package Win32API::Registry::_error;
+
+use overload
+    '""' => sub {
+	require Win32 unless defined &Win32::FormatMessage;
+	$_ = Win32::FormatMessage(Win32API::Registry::_regLastError());
+	tr/\r\n//d;
+	return $_;
+    },
+    '0+' => sub { Win32API::Registry::_regLastError() },
+    'fallback' => 1;
+
+sub new { return bless {}, shift }
+sub set { Win32API::Registry::_regLastError($_[1]); return $_[0] }
+
+package Win32API::Registry;
+
+my $_error = new Win32API::Registry::_error;
+
+sub regLastError {
+    require Carp;
+    Carp::croak('Usage: ',__PACKAGE__,'::regLastError( [$setWin32ErrCode] )') if @_ > 1;
+    $_error->set($_[0]) if defined $_[0];
+    return $_error;
+}
+
+# Since we ISA DynaLoader which ISA AutoLoader, we ISA AutoLoader so we
+# need this next chunk to prevent Win32API::Registry->nonesuch() from
+# looking for "nonesuch.al" and producing confusing error messages:
+use vars qw($AUTOLOAD);
+sub AUTOLOAD {
+    require Carp;
+    Carp::croak(
+      "Can't locate method $AUTOLOAD via package Win32API::Registry" );
+}
+
+# Replace "&rout;" with "goto &rout;" when that is supported on Win32.
+
+# Let user omit all buffer sizes:
+sub RegEnumKeyExA {
+    if(  6 == @_  ) {	splice(@_,4,0,[]);  splice(@_,2,0,[]);  }
+    &_RegEnumKeyExA;
+}
+sub RegEnumKeyExW {
+    if(  6 == @_  ) {	splice(@_,4,0,[]);  splice(@_,2,0,[]);  }
+    &_RegEnumKeyExW;
+}
+sub RegEnumValueA {
+    if(  6 == @_  ) {	splice(@_,2,0,[]);  push(@_,[]);  }
+    &_RegEnumValueA;
+}
+sub RegEnumValueW {
+    if(  6 == @_  ) {	splice(@_,2,0,[]);  push(@_,[]);  }
+    &_RegEnumValueW;
+}
+sub RegQueryInfoKeyA {
+    if(  11 == @_  ) {	splice(@_,2,0,[]);  }
+    &_RegQueryInfoKeyA;
+}
+sub RegQueryInfoKeyW {
+    if(  11 == @_  ) {	splice(@_,2,0,[]);  }
+    &_RegQueryInfoKeyW;
+}
+
+sub RegEnumKeyA {
+    push(@_,[])   if  3 == @_;
+    &_RegEnumKeyA;
+}
+sub RegEnumKeyW {
+    push(@_,[])   if  3 == @_;
+    &_RegEnumKeyW;
+}
+sub RegGetKeySecurity {
+    push(@_,[])   if  3 == @_;
+    &_RegGetKeySecurity;
+}
+sub RegQueryMultipleValuesA {
+    push(@_,[])   if  4 == @_;
+    &_RegQueryMultipleValuesA;
+}
+sub RegQueryMultipleValuesW {
+    push(@_,[])   if  4 == @_;
+    &_RegQueryMultipleValuesW;
+}
+sub RegQueryValueA {
+    push(@_,[])   if  3 == @_;
+    &_RegQueryValueA;
+}
+sub RegQueryValueW {
+    push(@_,[])   if  3 == @_;
+    &_RegQueryValueW;
+}
+sub RegQueryValueExA {
+    push(@_,[])   if  5 == @_;
+    &_RegQueryValueExA;
+}
+sub RegQueryValueExW {
+    push(@_,[])   if  5 == @_;
+    &_RegQueryValueExW;
+}
+sub RegSetValueA {
+    push(@_,0)   if  4 == @_;
+    &_RegSetValueA;
+}
+sub RegSetValueW {
+    push(@_,0)   if  4 == @_;
+    &_RegSetValueW;
+}
+sub RegSetValueExA {
+    push(@_,0)   if  5 == @_;
+    &_RegSetValueExA;
+}
+sub RegSetValueExW {
+    push(@_,0)   if  5 == @_;
+    &_RegSetValueExW;
+}
+
+# Aliases for non-Unicode functions:
+sub AbortSystemShutdown		{ &AbortSystemShutdownA; }
+sub InitiateSystemShutdown	{ &InitiateSystemShutdownA; }
+sub RegConnectRegistry		{ &RegConnectRegistryA; }
+sub RegCreateKey		{ &RegCreateKeyA; }
+sub RegCreateKeyEx		{ &RegCreateKeyExA; }
+sub RegDeleteKey		{ &RegDeleteKeyA; }
+sub RegDeleteValue		{ &RegDeleteValueA; }
+sub RegEnumKey			{ &RegEnumKeyA; }
+sub RegEnumKeyEx		{ &RegEnumKeyExA; }
+sub RegEnumValue		{ &RegEnumValueA; }
+sub RegLoadKey			{ &RegLoadKeyA; }
+sub RegOpenKey			{ &RegOpenKeyA; }
+sub RegOpenKeyEx		{ &RegOpenKeyExA; }
+sub RegQueryInfoKey		{ &RegQueryInfoKeyA; }
+sub RegQueryMultipleValues	{ &RegQueryMultipleValuesA; }
+sub RegQueryValue		{ &RegQueryValueA; }
+sub RegQueryValueEx		{ &RegQueryValueExA; }
+sub RegReplaceKey		{ &RegReplaceKeyA; }
+sub RegRestoreKey		{ &RegRestoreKeyA; }
+sub RegSaveKey			{ &RegSaveKeyA; }
+sub RegSetValue			{ &RegSetValueA; }
+sub RegSetValueEx		{ &RegSetValueExA; }
+sub RegUnLoadKey		{ &RegUnLoadKeyA; }
+
+1;
+__END__
+
+=head1 NAME
+
+Win32API::Registry - Low-level access to Win32 system API calls from WINREG.H
+
+=head1 SYNOPSIS
+
+  use Win32API::Registry 0.21 qw( :ALL );
+
+  RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SYSTEM\\Disk", 0, KEY_READ, $key );
+    or  die "Can't open HKEY_LOCAL_MACHINE\\SYSTEM\\Disk: ",
+	    regLastError(),"\n";
+  RegQueryValueEx( $key, "Information", [], $type, $data, [] );
+    or  die "Can't read HKEY_L*MACHINE\\SYSTEM\\Disk\\Information: ",
+	    regLastError(),"\n";
+  [...]
+  RegCloseKey( $key )
+    or  die "Can't close HKEY_LOCAL_MACHINE\\SYSTEM\\Disk: ",
+	    regLastError(),"\n";
+
+=head1 DESCRIPTION
+
+This provides fairly low-level access to the Win32 System API
+calls dealing with the Registry [mostly from WINREG.H].  This
+is mostly intended to be used by other modules such as
+C<Win32::TieRegistry> [which provides an extremely Perl-friendly
+method for using the Registry].
+
+For a description of the logical structure of the Registry, see
+the documentation for the C<Win32::TieRegistry> module.
+
+To pass in C<NULL> as the pointer to an optional buffer, pass in
+an empty list reference, C<[]>.
+
+Beyond raw access to the API calls and related constants, this module
+handles smart buffer allocation and translation of return codes.
+
+All calls return a true value for success and a false value for
+failure.  After any failure, C<$^E> should automatically be set
+to indicate the reason.  However, current versions of Perl often
+overwrite C<$^E> too quickly, so you can use C<regLastError()>
+instead, which is only set by Win32API::Registry routines.
+
+Note that C<$!> is not set by these routines except by
+C<Win32API::Registry::constant()> when a constant is not defined.
+
+=head2 Exports
+
+Nothing is exported by default.  The following tags can be used to
+have sets of symbols exported.
+
+[Note that much of the following documentation refers to the
+behavior of the underlying API calls which may vary in current
+and future versions of the Win32 API without any changes to this
+module.  Therefore you should check the Win32 API documentation
+directly when needed.]
+
+=over
+
+=item :Func
+
+The basic function names:
+
+=over
+
+=item AllowPriv
+
+=item C<AllowPriv( $sPrivName, $bEnable )>
+
+Not a Win32 API call.  Enables or disables a specific privilege for
+the current process.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.  This routine
+does not provide a way to tell if a privilege is currently enabled.
+
+C<$sPrivname> is a Win32 privilege name [see L</:SE_>].  For example,
+C<"SeBackupPrivilege"> [a.k.a. C<SE_BACKUP_NAME>] controls whether
+you can use C<RegSaveKey()> and C<"SeRestorePrivilege"> [a.k.a.
+C<SE_RESTORE_NAME>] controls whether you can use C<RegLoadKey()>.
+
+If C<$bEnable> is true, then C<AllowPriv()> tries to enable the
+privilege.  Otherwise it tries to disable the privilege.
+
+=item AbortSystemShutdown
+
+=item C<AbortSystemShutdown( $sComputerName )>
+
+Tries to abort a remote shutdown request previously made via
+C<InitiateSystemShutdown()>.  Returns a true value if successful
+and a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+=item InitiateSystemShutdown
+
+=item C<InitiateSystemShutdown( $sComputer, $sMessage, $uTimeoutSecs, $bForce, $bReboot )>
+
+Requests that a [remote] computer be shutdown or rebooted.
+Returns a true value if successful and a false value [and
+sets C<$^E>/C<regLastError()>] on failure.
+
+C<$sComputer> is the name [or address] of the computer to be
+shutdown or rebooted.  You can use C<[]> [for C<NULL>] or C<"">
+to indicate the local computer.
+
+C<$sMessage> is the message to be displayed in a pop-up window
+on the desktop of the computer to be shutdown or rebooted until
+the timeout expires or the shutdown is aborted via
+C<AbortSystemShutdown()>.  With C<$iTimeoutSecs == 0>, the
+message will never be visible.
+
+C<$iTimeoutSecs> is the number of seconds to wait before starting
+the shutdown.
+
+If C<$bForce> is false, then any applications running on the remote
+computer get a chance to prompt the remote user whether they want
+to save changes.  Also, for any applications that do not exit quickly
+enough, the operating system will prompt the user whether they wish
+to wait longer for the application to exit or force it to exit now.
+At any of these prompts the user can press B<CANCEL> to abort the
+shutdown but if no applications have unsaved data, they will likely
+all exit quickly and the shutdown will progress with the remote user
+having no option to cancel the shutdown.
+
+If C<$bForce> is true, all applications are told to exit immediately
+and so will not prompt the user even if there is unsaved data.  Any
+applications that take too long to exit will be forcibly killed after
+a short time.  The only way to abort the shutdown is to call
+C<AbortSystemShutdown()> before the timeout expires and there is no
+way to abort the shutdown once it has begun.
+
+If C<$bReboot> is true, the computer will automatically reboot once
+the shutdown is complete.  If C<$bReboot> is false, then when the
+shutdown is complete the computer will halt at a screen indicating
+that the shutdown is complete and offering a way for the user to
+start to boot the computer.
+
+You must have the C<"SeRemoteShutdownPrivilege"> privilege
+on the remote computer for this call to succeed.  If shutting
+down the local computer, then the calling process must have
+the C<"SeShutdownPrivilege"> privilege and have it enabled.
+
+=item RegCloseKey
+
+=item C<RegCloseKey( $hKey )>
+
+Closes the handle to a Registry key returned by C<RegOpenKeyEx()>,
+C<RegConnectRegistry()>, C<RegCreateKeyEx()>, or a few other
+routines.  Returns a true value if successful and a false value
+[and sets C<$^E>/C<regLastError()>] on failure.
+
+=item RegConnectRegistry
+
+=item C<RegConnectRegistry( $sComputer, $hRootKey, $ohKey )>
+
+Connects to one of the root Registry keys of a remote computer.
+Returns a true value if successful and a false value [and
+sets C<$^E>/C<regLastError()>] on failure.
+
+C<$sComputer> is the name [or address] of a remote computer
+whose Registry you wish to access.
+
+C<$hKey> must be either C<HKEY_LOCAL_MACHINE> or C<HKEY_USERS>
+and specifies which root Registry key on the remote computer
+you wish to have access to.
+
+C<$phKey> will be set to the handle to be used to access the
+remote Registry key if the call succeeds.
+
+=item regConstant
+
+=item C<$value= regConstant( $sConstantName )>
+
+Fetch the value of a constant.  Returns C<undef> if C<$sConstantName>
+is not the name of a constant supported by this module.  Never sets
+C<$!> nor C<$^E>.
+
+This function is rarely used since you will usually get the value of a
+constant by having that constant imported into your package by listing
+the constant name in the C<use Win32API::Registry> statement and then
+simply using the constant name in your code [perhaps followed by
+C<()>].  This function is useful for verifying constant names not in
+Perl code, for example, after prompting a user to type in a constant
+name.
+
+=item RegCreateKey
+
+=item C<RegCreateKey( $hKey, $sSubKey, $ohSubKey )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegCreateKeyEx()> instead.
+
+=item RegCreateKeyEx
+
+=item C<RegCreateKeyEx( $hKey, $sSubKey, $uZero, $sClass, $uOpts, $uAccess, $pSecAttr, $ohNewKey, $ouDisp )>
+
+Creates a new Registry subkey.  Returns a true value if successful and
+a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sSubKey> is the name of the new subkey to be created.
+
+C<$iZero> is reserved for future use and should always be specified
+as C<0>.
+
+C<$sClass> is a string to be used as the class for the new
+subkey.  We are not aware of any current use for Registry key
+class information so the empty string, C<"">, should usually
+be used here.
+
+C<$iOpts> is a numeric value containing bits that control options
+used while creating the new subkey.  C<REG_OPTION_NON_VOLATILE>
+is the default.  C<REG_OPTION_VOLATILE> [which is ignored on
+Windows 95] means the data stored under this key is not kept
+in a file and will not be preserved when the system reboots.
+C<REG_OPTION_BACKUP_RESTORE> [also ignored on Windows 95] means
+ignore the C<$iAccess> parameter and try to open the new key with
+the access required to backup or restore the key.
+
+C<$iAccess> is a numeric mask of bits specifying what type of
+access is desired when opening the new subkey.  See C<RegOpenKeyEx()>.
+
+C<$pSecAttr> is a C<SECURITY_ATTRIBUTES> structure packed into
+a Perl string which controls whether the returned handle can be
+inherited by child processes.  Normally you would pass C<[]> for
+this parameter to have C<NULL> passed to the underlying API
+indicating that the handle cannot be inherited.  If not under
+Windows95, then C<$pSecAttr> also allows you to specify
+C<SECURITY_DESCRIPTOR> that controls which users will have
+what type of access to the new key -- otherwise the new key
+inherits its security from its parent key.
+
+C<$phKey> will be set to the handle to be used to access the new
+subkey if the call succeeds.
+
+C<$piDisp> will be set to either C<REG_CREATED_NEW_KEY> or
+C<REG_OPENED_EXISTING_KEY> to indicate for which reason the
+call succeeded.  Can be specified as C<[]> if you don't care.
+
+If C<$phKey> and C<$piDisp> start out as integers, then they will
+probably remain unchanged if the call fails.
+
+=item RegDeleteKey
+
+=item C<RegDeleteKey( $hKey, $sSubKey )>
+
+Deletes a subkey of an open Registry key provided that the subkey
+contains no subkeys of its own [but the subkey may contain values].
+Returns a true value if successful and a false value [and sets
+C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sSubKey> is the name of the subkey to be deleted.
+
+=item RegDeleteValue
+
+=item C<RegDeleteValue( $hKey, $sValueName )>
+
+Deletes a value from an open Registry key.  Returns a true value if
+successful and a false value [and sets C<$^E>/C<regLastError()>] on
+failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sValueKey> is the name of the value to be deleted.
+
+=item RegEnumKey
+
+=item C<RegEnumKey( $hKey, $uIndex, $osName, $ilNameSize )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegEnumKeyEx()> instead.
+
+=item RegEnumKeyEx
+
+=item C<RegEnumKeyEx( $hKey, $uIndex, $osName, $iolName, $pNull, $osClass, $iolClass, $opftLastWrite )>
+
+Lets you enumerate the names of all of the subkeys directly under
+an open Registry key.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$iIndex> is the sequence number of the immediate subkey that
+you want information on.  Start with this value as C<0> then
+repeat the call incrementing this value each time until the
+call fails with C<$^E>/C<regLastError()> numerically equal to
+C<ERROR_NO_MORE_ITEMS>.
+
+C<$sName> will be set to the name of the subkey.  Can be C<[]> if
+you don't care about the name.
+
+C<$plName> initially specifies the [minimum] buffer size to be
+allocated for C<$sName>.  Will be set to the length of the subkey
+name if the requested subkey exists even if C<$sName> isn't
+successfully set to the subkey name.  See L<Buffer sizes> for
+more information.
+
+C<$pNull> is reserved for future used and should be passed as C<[]>.
+
+C<$sClass> will be set to the class name for the subkey.  Can be
+C<[]> if you don't care about the class.
+
+C<$plClass> initially specifies the [minimum] buffer size to be
+allocated for C<$sClass> and will be set to the length of the
+subkey class name if the requested subkey exists.  See L<Buffer
+sizes> for more information.
+
+C<$pftLastWrite> will be set to a C<FILETIME> structure packed
+into a Perl string and indicating when the subkey was last changed.
+Can be C<[]>.
+
+You may omit both C<$plName> and C<$plClass> to get the same effect
+as passing in C<[]> for each of them.
+
+=item RegEnumValue
+
+=item C<RegEnumValue( $hKey, $uIndex, $osValName, $iolValName, $pNull, $ouType, $opValData, $iolValData )>
+
+Lets you enumerate the names of all of the values contained in an
+open Registry key.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$iIndex> is the sequence number of the value that you want
+information on.  Start with this value as C<0> then repeat the
+call incrementing this value each time until the call fails with
+C<ERROR_NO_MORE_ITEMS>.
+
+C<$sValName> will be set to the name of the value.  Can be C<[]>
+if you don't care about the name.
+
+C<$plValName> initially specifies the [minimum] buffer size to be
+allocated for C<$sValName>.  Will be set to the length of the value
+name if the requested value exists even if C<$sValName> isn't
+successfully set to the value name.  See L<Buffer sizes> for
+more information.
+
+C<$pNull> is reserved for future used and should be passed as C<[]>.
+
+C<$piType> will be set to the type of data stored in the value data.
+If the call succeeds, it will be set to a C<REG_*> value unless
+passed in as C<[]>.
+
+C<$pValData> will be set to the data [packed into a Perl string]
+that is stored in the requested value.  Can be C<[]> if you don't
+care about the value data.
+
+C<$plValData> initially specifies the [minimum] buffer size to be
+allocated for C<$sValData> and will be set to the length of the
+value data if the requested value exists.  See L<Buffer sizes> for
+more information.
+
+You may omit both C<$plValName> and C<$plValData> to get the same
+effect as passing in C<[]> for each of them.
+
+=item RegFlushKey
+
+=item C<RegFlushKey( $hKey )>
+
+Forces the data stored under an open Registry key to be flushed
+to the disk file where the data is preserved between reboots.
+Forced flushing is not guaranteed to be efficient so this routine
+should almost never be called.  Returns a true value if successful
+and a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+=item RegGetKeySecurity
+
+=item C<RegGetKeySecurity( $hKey, $uSecInfo, $opSecDesc, $iolSecDesc )>
+
+Retrieves one of the C<SECURITY_DESCRIPTOR> structures describing
+part of the security for an open Registry key.  Returns a true value
+if successful and a false value [and sets C<$^E>/C<regLastError()>]
+on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$iSecInfo> is a numeric C<SECURITY_INFORMATION> value that
+specifies which parts of the C<SECURITY_DESCRIPTOR> structure
+to retrieve.  Should be C<OWNER_SECURITY_INFORMATION>,
+C<GROUP_SECURITY_INFORMATION>, C<DACL_SECURITY_INFORMATION>, or
+or C<SACL_SECURITY_INFORMATION> or two or more of these bits
+combined using C<|>.
+
+C<$pSecDesc> will be set to the requested C<SECURITY_DESCRIPTOR>
+structure [packed into a Perl string].
+
+C<$plSecDesc> initially specifies the [minimum] buffer size to be
+allocated for C<$sSecDesc> and will be set to the length of the
+security descriptor.  See L<Buffer sizes> for more information.
+You may omit this parameter to get the same effect as passing in
+C<[]> for it.
+
+=item regLastError
+
+=item C<$svError= regLastError();>
+
+=item C<regLastError( $uError );>
+
+Returns the last error encountered by a routine from this module. 
+It is just like C<$^E> except it isn't changed by anything except
+routines from this module.  Ideally you could just use C<$^E>, but
+current versions of Perl often overwrite C<$^E> before you get a
+chance to check it and really old versions of Perl don't really
+support C<$^E> under Win32.
+
+Just like C<$^E>, in a numeric context C<regLastError()> returns
+the numeric error value while in a string context it returns a
+text description of the error [actually it returns a Perl scalar
+that contains both values so C<$x= regLastError()> causes C<$x>
+to give different values in string vs. numeric contexts].
+
+The last form sets the error returned by future calls to
+C<regLastError()> and should not be used often.  C<$uError> must
+be a numeric error code.  Also returns the dual-valued version
+of C<$uError>.
+
+=item RegLoadKey
+
+=item C<RegLoadKey( $hKey, $sSubKey, $sFileName )>
+
+Loads a hive file.  That is, it creates a new subkey in the
+Registry and associates that subkey with a disk file that contains
+a Registry hive so that the new subkey can be used to access the
+keys and values stored in that hive.  Hives are usually created
+via C<RegSaveKey()>.  Returns a true value if successful and a
+false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key that can have hives
+loaded to it.  This must be C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>,
+or a remote version of one of these from a call to
+C<RegConnectRegistry()>.
+
+C<$sSubKey> is the name of the new subkey to created and associated
+with the hive file.
+
+C<$sFileName> is the name of the hive file to be loaded.  This
+file name is interpretted relative to the
+C<%SystemRoot%/System32/config> directory on the computer where
+the C<$hKey> key resides.  If C<$sFileName> is on a FAT file
+system, then its name must not have an extension.
+
+You must have the C<SE_RESTORE_NAME> privilege to use this routine.
+
+WARNING:  Loading of hive files via a network share may silently
+corrupt the hive and so should not be attempted [this is a problem
+in at least some versions of the underlying API which this module
+does not try to fix or avoid].  To access a hive file located on a
+remote computer, connect to the remote computer's Registry and load
+the hive via that.
+
+=item RegNotifyChangeKeyValue
+
+=item C<RegNotifyChangeKeyValue( $hKey, $bWatchSubtree, $uNotifyFilter, $hEvent, $bAsync )>
+
+Arranges for your process to be notified when part of the Registry
+is changed.  Returns a true value if successful and a false value
+[and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call] for which you wish to be notified when any changes
+are made to it.
+
+If C<$bWatchSubtree> is true, then changes to any subkey or
+descendant of C<$hKey> are also reported.
+
+C<$iNotifyFilter> controllers what types of changes are reported.  It
+is a numeric value containing one or more of the following bit masks:
+
+=over
+
+=item C<REG_NOTIFY_CHANGE_NAME>
+
+Notify if a subkey is added or deleted to a monitored key.
+
+=item C<REG_NOTIFY_CHANGE_LAST_SET>
+
+Notify if a value in a monitored key is added, deleted, or modified.
+
+=item C<REG_NOTIFY_CHANGE_SECURITY>
+
+Notify if a security descriptor of a monitored key is changed.
+
+=item C<REG_NOTIFY_CHANGE_ATTRIBUTES>
+
+Notify if any attributes of a monitored key are changed [class
+name or security descriptors].
+
+=back
+
+C<$hEvent> is ignored unless C<$bAsync> is true.  Otherwise, C<$hEvent>
+is a handle to a Win32 I<event> that will be signaled when changes are
+to be reported.
+
+If C<$bAsync> is true, then C<RegNotifyChangeKeyValue()> returns
+immediately and uses C<$hEvent> to notify your process of changes.
+If C<$bAsync> is false, then C<RegNotifyChangeKeyValue()> does
+not return until there is a change to be notified of.
+
+This routine does not work with Registry keys on remote computers.
+
+=item RegOpenKey
+
+=item C<RegOpenKey( $hKey, $sSubKey, $ohSubKey )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegOpenKeyEx()> instead.
+
+=item RegOpenKeyEx
+
+=item C<RegOpenKeyEx( $hKey, $sSubKey, $uOptions, $uAccess, $ohSubKey )>
+
+Opens an existing Registry key.  Returns a true value if successful
+and a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sSubKey> is the name of an existing subkey to be opened.
+Can be C<""> or C<[]> to open an additional handle to the
+key specified by C<$hKey>.
+
+C<$iOptions> is a numeric value containing bits that control options
+used while opening the subkey.  There are currently no supported
+options so this parameter should be specified as C<0>.
+
+C<$iAccess> is a numeric mask of bits specifying what type of
+access is desired when opening the new subkey.  Should be a
+combination of one or more of the following bit masks:
+
+=over
+
+=item C<KEY_ALL_ACCESS>
+
+    KEY_READ | KEY_WRITE | KEY_CREATE_LINK
+
+=item C<KEY_READ>
+
+    KEY_QUERY_VALUE | KEY_ENUMERATE_SUBKEYS | KEY_NOTIFY | STANDARD_RIGHTS_READ
+
+=item C<KEY_WRITE>
+
+    KEY_SET_VALUE | KEY_CREATE_SUB_KEY | STANDARD_RIGHTS_WRITE
+
+=item C<KEY_QUERY_VALUE>
+
+=item C<KEY_SET_VALUE>
+
+=item C<KEY_ENUMERATE_SUB_KEYS>
+
+=item C<KEY_CREATE_SUB_KEY>
+
+=item C<KEY_NOTIFY>
+
+Allows you to use C<RegNotifyChangeKeyValue()> on the opened key.
+
+=item C<KEY_EXECUTE>
+
+Same as C<KEY_READ>.
+
+=item C<KEY_CREATE_LINK>
+
+Gives you permission to create a symbolic link like
+C<HKEY_CLASSES_ROOT> and C<HKEY_CURRENT_USER>, though the method for
+doing so is not documented [and probably requires use of the mostly
+undocumented "native" routines, C<Nt*()> a.k.a. C<Zw*()>].
+
+=back
+
+C<$phKey> will be set to the handle to be used to access the new subkey
+if the call succeeds.
+
+=item RegQueryInfoKey
+
+=item C<RegQueryInfoKey( $hKey, $osClass, $iolClass, $pNull, $ocSubKeys, $olSubKey, $olSubClass, $ocValues, $olValName, $olValData, $olSecDesc, $opftTime )>
+
+Gets miscellaneous information about an open Registry key.
+Returns a true value if successful and a false value [and
+sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sClass> will be set to the class name for the key.  Can be
+C<[]> if you don't care about the class.
+
+C<$plClass> initially specifies the [minimum] buffer size to be
+allocated for C<$sClass> and will be set to the length of the
+key's class name.  See L<Buffer sizes> for more information.
+You may omit this parameter to get the same effect as passing in
+C<[]> for it.
+
+C<$pNull> is reserved for future use and should be passed as C<[]>.
+
+C<$pcSubKeys> will be set to the count of the number of subkeys
+directly under this key.  Can be C<[]>.
+
+C<$plSubKey> will be set to the length of the longest subkey name.
+Can be C<[]>.
+
+C<$plSubClass> will be set to the length of the longest class name
+used with an immediate subkey of this key.  Can be C<[]>.
+
+C<$pcValues> will be set to the count of the number of values in
+this key.  Can be C<[]>.
+
+C<$plValName> will be set to the length of the longest value name
+in this key.  Can be C<[]>.
+
+C<$plValData> will be set to the length of the longest value data
+in this key.  Can be C<[]>.
+
+C<$plSecDesc> will be set to the length of this key's full security
+descriptor.
+
+C<$pftTime> will be set to a C<FILETIME> structure packed
+into a Perl string and indicating when this key was last changed.
+Can be C<[]>.
+
+=item RegQueryMultipleValues
+
+=item C<RegQueryMultipleValues( $hKey, $ioarValueEnts, $icValueEnts, $opBuffer, $iolBuffer )>
+
+Allows you to use a single call to query several values from a single
+open Registry key to maximize efficiency.  Returns a true value if
+successful and a false value [and sets C<$^E>/C<regLastError()>] on
+failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$pValueEnts> should contain a list of C<VALENT> structures packed
+into a single Perl string.  Each C<VALENT> structure should have
+the C<ve_valuename> entry [the first 4 bytes] pointing to a string
+containing the name of a value stored in this key.  The remaining
+fields are set if the function succeeds.
+
+C<$cValueEnts> should contain the count of the number of C<VALENT>
+structures contained in C<$pValueEnts>.
+
+C<$pBuffer> will be set to the data from all of the requested values
+concatenated into a single Perl string.
+
+C<$plBuffer> initially specifies the [minimum] buffer size to be
+allocated for C<$sBuffer> and will be set to the total length of
+the data to be written to C<$sBuffer>.  See L<Buffer sizes> for
+more information.  You may omit this parameter to get the same
+effect as passing in C<[]> for it.
+
+Here is sample code to populate C<$pValueEnts>:
+
+    # @ValueNames= ...list of value name strings...;
+    $cValueEnts= @ValueNames;
+    $pValueEnts= pack( " p x4 x4 x4 " x $cValueEnts, @ValueNames );
+
+Here is sample code to retrieve the data type and data length
+returned in C<$pValueEnts>:
+
+    @Lengths= unpack( " x4 L x4 x4 " x $cValueEnts, $pValueEnts );
+    @Types=   unpack( " x4 x4 x4 L " x $cValueEnts, $pValueEnts );
+
+Given the above, and assuming you haven't modified C<$sBuffer> since
+the call, you can also extract the value data strings from C<$sBuffer>
+by using the pointers returned in C<$pValueEnts>:
+
+    @Data=    unpack(  join( "", map {" x4 x4 P$_ x4 "} @Lengths ),
+    		$pValueEnts  );
+
+Much better is to use the lengths and extract directly from
+C<$sBuffer> using C<unpack()> [or C<substr()>]:
+
+    @Data= unpack( join("",map("P$_",@Lengths)), $sBuffer );
+
+=item RegQueryValue
+
+=item C<RegQueryValue( $hKey, $sSubKey, $osValueData, $iolValueData )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegQueryValueEx()> instead.  This routine can only
+query unamed values [a.k.a. "default values"], that is, values with
+a name of C<"">.
+
+=item RegQueryValueEx
+
+=item C<RegQueryValueEx( $hKey, $sValueName, $pNull, $ouType, $opValueData, $iolValueData )>
+
+Lets you look up value data stored in an open Registry key by
+specifying the value name.  Returns a true value if successful
+and a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sValueName> is the name of the value whose data you wish to
+retrieve.
+
+C<$pNull> this parameter is reserved for future use and should be
+specified as C<[]>.
+
+C<$piType> will be set to indicate what type of data is stored in
+the named value.  Will be set to a C<REG_*> value if the function
+succeeds.
+
+C<$pValueData> will be set to the value data [packed into a Perl
+string] that is stored in the named value.  Can be C<[]> if you
+don't care about the value data.
+
+C<$plValueData> initially specifies the [minimum] buffer size to be
+allocated for C<$sValueData> and will be set to the size [always
+in bytes] of the data to be written to C<$sValueData>, even if
+C<$sValueData> is not successfully written to.  See L<Buffer sizes>
+for more information.
+
+=item RegReplaceKey
+
+=item C<RegReplaceKey( $hKey, $sSubKey, $sNewFile, $sOldFile )>
+
+Lets you replace an entire hive when the system is next booted. 
+Returns a true value if successful and a false value [and sets
+C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key that has hive(s)
+loaded in it.  This must be C<HKEY_LOCAL_MACHINE>,
+C<HKEY_USERS>, or a remote version of one of these from
+a call to C<RegConnectRegistry()>.
+
+C<$sSubKey> is the name of the subkey of C<$hKey> whose hive
+you wish to have replaced on the next reboot.
+
+C<$sNewFile> is the name of a file that will replace the existing
+hive file when the system reboots.
+
+C<$sOldFile> is the file name to save the current hive file to
+when the system reboots.
+
+C<$sNewFile> and C<$sOldFile> are interpretted relative to the
+C<%SystemRoot%/System32/config> directory on the computer where
+the C<$hKey> key resides [I think].  If either file is [would be]
+on a FAT file system, then its name must not have an extension.
+
+You must have the C<SE_RESTORE_NAME> privilege to use this routine.
+
+=item RegRestoreKey
+
+=item C<RegRestoreKey( $hKey, $sFileName, $uFlags )>
+
+Reads in a hive file and copies its contents over an existing
+Registry tree.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sFileName> is the name of the hive file to be read.  For each
+value and subkey in this file, a value or subkey will be added
+or replaced in C<$hKey>.
+
+C<$uFlags> is usally C<0>.  It can also be C<REG_WHOLE_HIVE_VOLATILE>
+which, rather than copying the hive over the existing key,
+replaces the existing key with a temporary, memory-only Registry
+key and then copies the hive contents into it.  This option only
+works if C<$hKey> is C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>, or a
+remote version of one of these from a call to C<RegConnectRegistry()>.
+
+C<RegRestoreKey> does I<not> delete values nor keys from the
+existing Registry tree when there is no corresponding value/key
+in the hive file.
+
+=item RegSaveKey
+
+=item C<RegSaveKey( $hKey, $sFileName, $pSecAttr )>
+
+Dumps any open Registry key and all of its subkeys and values into
+a new hive file.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sFileName> is the name of the file that the Registry tree
+should be saved to.  It is interpretted relative to the
+C<%SystemRoot%/System32/config> directory on the computer where
+the C<$hKey> key resides.  If C<$sFileName> is on a FAT file system,
+then it must not have an extension.
+
+C<$pSecAttr> contains a C<SECURITY_ATTRIBUTES> structure that specifies
+the permissions to be set on the new file that is created.  This can
+be C<[]>.
+
+You must have the C<SE_RESTORE_NAME> privilege to use this routine.
+
+=item RegSetKeySecurity
+
+=item C<RegSetKeySecurity( $hKey, $uSecInfo, $pSecDesc )>
+
+Sets [part of] the C<SECURITY_DESCRIPTOR> structure describing part
+of the security for an open Registry key.  Returns a true value if
+successful and a false value [and sets C<$^E>/C<regLastError()>] on
+failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$uSecInfo> is a numeric C<SECURITY_INFORMATION> value that
+specifies which C<SECURITY_DESCRIPTOR> structure to set.  Should
+be C<OWNER_SECURITY_INFORMATION>, C<GROUP_SECURITY_INFORMATION>,
+C<DACL_SECURITY_INFORMATION>, or C<SACL_SECURITY_INFORMATION>
+or two or more of these bits combined using C<|>.
+
+C<$pSecDesc> contains the new C<SECURITY_DESCRIPTOR> structure
+packed into a Perl string.
+
+=item RegSetValue
+
+=item C<RegSetValue( $hKey, $sSubKey, $uType, $sValueData, $lValueData )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegSetValueEx()> instead.  This routine can only
+set unamed values [a.k.a. "default values"].
+
+=item RegSetValueEx
+
+=item C<RegSetValueEx( $hKey, $sName, $uZero, $uType, $pData, $lData )>
+
+Adds or replaces a value in an open Registry key.  Returns
+a true value if successful and a false value [and sets
+C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sName> is the name of the value to be set.
+
+C<$uZero> is reserved for future use and should be specified as C<0>.
+
+C<$uType> is the type of data stored in C<$pData>.  It should
+be a C<REG_*> value.
+
+C<$pData> is the value data packed into a Perl string.
+
+C<$lData> is the length of the value data that is stored in C<$pData>.
+You will usually omit this parameter or pass in C<0> to have
+C<length($pData)> used.  In both of these cases, if C<$iType> is
+C<REG_SZ> or C<REG_EXPAND_SZ>, C<RegSetValueEx()> will append a
+trailing C<'\0'> to the end of C<$pData> [unless there is already
+one].
+
+=item RegUnLoadKey
+
+=item C<RegUnLoadKey( $hKey, $sSubKey )>
+
+Unloads a previously loaded hive file.  That is, closes the
+hive file then deletes the subkey that was providing access
+to it.  Returns a true value if successful and a false value
+[and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key that has hives
+loaded in it.  This must be C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>,
+or a remote version of one of these from a call to
+C<RegConnectRegistry()>.
+
+C<$sSubKey> is the name of the subkey whose hive you wish to
+have unloaded.
+
+=item :FuncA
+
+The ASCII-specific function names.
+
+Each of these is identical to the version listed above without the
+trailing "A":
+
+	AbortSystemShutdownA	InitiateSystemShutdownA
+	RegConnectRegistryA	RegCreateKeyA		RegCreateKeyExA
+	RegDeleteKeyA		RegDeleteValueA		RegEnumKeyA
+	RegEnumKeyExA		RegEnumValueA		RegLoadKeyA
+	RegOpenKeyA		RegOpenKeyExA		RegQueryInfoKeyA
+	RegQueryMultipleValuesA	RegQueryValueA		RegQueryValueExA
+	RegReplaceKeyA		RegRestoreKeyA		RegSaveKeyA
+	RegSetValueA		RegSetValueExA		RegUnLoadKeyA
+
+=item :FuncW
+
+The UNICODE-specific function names.  These are the same as the
+versions listed above without the trailing "W" except that string
+parameters are UNICODE strings rather than ASCII strings, as
+indicated.
+
+=item AbortSystemShutdownW
+
+=item C<AbortSystemShutdownW( $swComputerName )>
+
+C<$swComputerName> is UNICODE.
+
+=item InitiateSystemShutdownW
+
+=item C<InitiateSystemShutdownW( $swComputer, $swMessage, $uTimeoutSecs, $bForce, $bReboot )>
+
+C<$swComputer> and C<$swMessage> are UNICODE.
+
+=item RegConnectRegistryW
+
+=item C<RegConnectRegistryW( $swComputer, $hRootKey, $ohKey )>
+
+C<$swComputer> is UNICODE.
+
+=item RegCreateKeyW
+
+=item C<RegCreateKeyW( $hKey, $swSubKey, $ohSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item RegCreateKeyExW
+
+=item C<RegCreateKeyExW( $hKey, $swSubKey, $uZero, $swClass, $uOpts, $uAccess, $pSecAttr, $ohNewKey, $ouDisp )>
+
+C<$swSubKey> and C<$swClass> are UNICODE.
+
+=item RegDeleteKeyW
+
+=item C<RegDeleteKeyW( $hKey, $swSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item RegDeleteValueW
+
+=item C<RegDeleteValueW( $hKey, $swValueName )>
+
+C<$swValueName> is UNICODE.
+
+=item RegEnumKeyW
+
+=item C<RegEnumKeyW( $hKey, $uIndex, $oswName, $ilwNameSize )>
+
+C<$oswName> is UNICODE and C<$ilwNameSize> is measured as number of
+C<WCHAR>s.
+
+=item RegEnumKeyExW
+
+=item C<RegEnumKeyExW( $hKey, $uIndex, $oswName, $iolwName, $pNull, $oswClass, $iolwClass, $opftLastWrite )>
+
+C<$swName> and C<$swClass> are UNICODE and C<$iolwName> and C<$iolwClass>
+are measured as number of C<WCHAR>s.
+
+=item RegEnumValueW
+
+=item C<RegEnumValueW( $hKey, $uIndex, $oswName, $iolwName, $pNull, $ouType, $opData, $iolData )>
+
+C<$oswName> is UNICODE and C<$iolwName> is measured as number
+of C<WCHAR>s.
+
+C<$opData> is UNICODE if C<$piType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
+or C<REG_MULTI_SZ>.  Note that C<$iolData> is measured as number
+of bytes even in these cases.
+
+=item RegLoadKeyW
+
+=item C<RegLoadKeyW( $hKey, $swSubKey, $swFileName )>
+
+C<$swSubKey> and C<$swFileName> are UNICODE.
+
+=item RegOpenKeyW
+
+=item C<RegOpenKeyW( $hKey, $swSubKey, $ohSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item RegOpenKeyExW
+
+=item C<RegOpenKeyExW( $hKey, $swSubKey, $uOptions, $uAccess, $ohSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item RegQueryInfoKeyW
+
+=item C<RegQueryInfoKeyW( $hKey, $oswClass, $iolwClass, $pNull, $ocSubKeys, $olwSubKey, $olwSubClass, $ocValues, $olwValName, $olValData, $olSecDesc, $opftTime )>
+
+C<$swClass> is UNICODE.  C<$iolwClass>, C<$olwSubKey>, C<$olwSubClass>,
+and C<$olwValName> are measured as number of C<WCHAR>s.  Note that
+C<$olValData> is measured as number of bytes.
+
+=item RegQueryMultipleValuesW
+
+=item C<RegQueryMultipleValuesW( $hKey, $ioarValueEnts, $icValueEnts, $opBuffer, $iolBuffer )>
+
+The C<ve_valuename> fields of the C<VALENT> [actually C<VALENTW>]
+structures in C<$ioarValueEnts> are UNICODE.  Values of type C<REG_SZ>,
+C<REG_EXPAND_SZ>, and C<REG_MULTI_SZ> are written to C<$opBuffer>
+in UNICODE.  Note that C<$iolBuffer> and the C<ve_valuelen> fields
+of the C<VALENT> [C<VALENTW>] structures are measured as number of
+bytes.
+
+=item RegQueryValueW
+
+=item C<RegQueryValueW( $hKey, $swSubKey, $oswValueData, $iolValueData )>
+
+C<$swSubKey> and C<$oswValueData> are UNICODE.  Note that
+C<$iolValueData> is measured as number of bytes.
+
+=item RegQueryValueExW
+
+=item C<RegQueryValueExW( $hKey, $swName, $pNull, $ouType, $opData, $iolData )>
+
+C<$swName> is UNICODE.
+
+C<$opData> is UNICODE if C<$ouType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
+or C<REG_MULTI_SZ>.  Note that C<$iolData> is measured as number of
+bytes even in these cases.
+
+=item RegReplaceKeyW
+
+=item C<RegReplaceKeyW( $hKey, $swSubKey, $swNewFile, $swOldFile )>
+
+C<$swSubKey>, C<$swNewFile>, and C<$swOldFile> are UNICODE.
+
+=item RegRestoreKeyW
+
+=item C<RegRestoreKeyW( $hKey, $swFileName, $uFlags )>
+
+C<$swFileName> is UNICODE.
+
+=item RegSaveKeyW
+
+=item C<RegSaveKeyW( $hKey, $swFileName, $pSecAttr )>
+
+C<$swFileName> is UNICODE.
+
+=item RegSetValueW
+
+=item C<RegSetValueW( $hKey, $swSubKey, $uType, $swValueData, $lValueData )>
+
+C<$swSubKey> and C<$swValueData> are UNICODE.  Note that
+C<$lValueData> is measured as number of bytes even though
+C<$swValueData> is always UNICODE.
+
+=item RegSetValueExW
+
+=item C<RegSetValueExW( $hKey, $swName, $uZero, $uType, $pData, $lData )>
+
+C<$swName> is UNICODE.
+
+C<$pData> is UNICODE if C<$uType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
+or C<REG_MULTI_SZ>.  Note that C<$lData> is measured as number of
+bytes even in these cases.
+
+=item RegUnLoadKeyW
+
+=item C<RegUnLoadKeyW( $hKey, $swSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item :HKEY_
+
+All C<HKEY_*> constants:
+
+	HKEY_CLASSES_ROOT	HKEY_CURRENT_CONFIG	HKEY_CURRENT_USER
+	HKEY_DYN_DATA		HKEY_LOCAL_MACHINE	HKEY_PERFORMANCE_DATA
+	HKEY_USERS
+
+=item :KEY_
+
+All C<KEY_*> constants:
+
+	KEY_QUERY_VALUE		KEY_SET_VALUE		KEY_CREATE_SUB_KEY
+	KEY_ENUMERATE_SUB_KEYS	KEY_NOTIFY		KEY_CREATE_LINK
+	KEY_READ		KEY_WRITE		KEY_EXECUTE
+	KEY_ALL_ACCESS
+
+=item :REG_
+
+All C<REG_*> constants:
+
+	REG_CREATED_NEW_KEY		REG_OPENED_EXISTING_KEY
+
+	REG_LEGAL_CHANGE_FILTER		REG_NOTIFY_CHANGE_ATTRIBUTES
+	REG_NOTIFY_CHANGE_NAME		REG_NOTIFY_CHANGE_LAST_SET
+	REG_NOTIFY_CHANGE_SECURITY	REG_LEGAL_OPTION
+
+	REG_OPTION_BACKUP_RESTORE	REG_OPTION_CREATE_LINK
+	REG_OPTION_NON_VOLATILE		REG_OPTION_OPEN_LINK
+	REG_OPTION_RESERVED		REG_OPTION_VOLATILE
+
+	REG_WHOLE_HIVE_VOLATILE		REG_REFRESH_HIVE
+	REG_NO_LAZY_FLUSH
+
+	REG_NONE			REG_SZ
+	REG_EXPAND_SZ			REG_BINARY
+	REG_DWORD			REG_DWORD_LITTLE_ENDIAN
+	REG_DWORD_BIG_ENDIAN		REG_LINK
+	REG_MULTI_SZ			REG_RESOURCE_LIST
+	REG_FULL_RESOURCE_DESCRIPTOR	REG_RESOURCE_REQUIREMENTS_LIST
+
+=item :ALL
+
+All of the above.
+
+=item :SE_
+
+The strings for the following privilege names:
+
+	SE_ASSIGNPRIMARYTOKEN_NAME	SE_AUDIT_NAME
+	SE_BACKUP_NAME			SE_CHANGE_NOTIFY_NAME
+	SE_CREATE_PAGEFILE_NAME		SE_CREATE_PERMANENT_NAME
+	SE_CREATE_TOKEN_NAME		SE_DEBUG_NAME
+	SE_INCREASE_QUOTA_NAME		SE_INC_BASE_PRIORITY_NAME
+	SE_LOAD_DRIVER_NAME		SE_LOCK_MEMORY_NAME
+	SE_MACHINE_ACCOUNT_NAME		SE_PROF_SINGLE_PROCESS_NAME
+	SE_REMOTE_SHUTDOWN_NAME		SE_RESTORE_NAME
+	SE_SECURITY_NAME		SE_SHUTDOWN_NAME
+	SE_SYSTEMTIME_NAME		SE_SYSTEM_ENVIRONMENT_NAME
+	SE_SYSTEM_PROFILE_NAME		SE_TAKE_OWNERSHIP_NAME
+	SE_TCB_NAME			SE_UNSOLICITED_INPUT_NAME
+
+It can be difficult to successfully build this module in a way
+that makes these constants available.  So some builds of this
+module may not make them available.  For such builds, trying
+to export any of these constants will cause a fatal error.
+For this reason, none of these symbols are currently included
+in the C<":ALL"> grouping.
+
+=back
+
+=head2 The Win32API:: heirarchy
+
+This and the other Win32API:: modules are meant to expose the
+nearly raw API calls so they can be used from Perl code in any
+way they might be used from C code.  This provides the following
+advantages:
+
+=over
+
+=item Many modules can be written by people that don't have a C compiler.
+
+=item Encourages more module code to be written in Perl [not C].
+
+Perl code is often much easier to inspect, debug, customize, and
+enhance than XS code.
+
+=item Allows those already familiar with the Win32 API to get
+off to a quick start.
+
+=item Provides an interactive tool for exploring even obscure
+details of the Win32 API.
+
+It can be very useful to interactively explore ad-hoc calls into
+parts of the Win32 API using:
+
+    perl -de 0
+
+=item Ensures that native Win32 data structures can be used.
+
+This allows maximum efficiency.  It also allows data from one
+module [for example, time or security information from the
+C<Win32API::Registry> or C<Win32API::File> modules] to be used
+with other modules [for example, C<Win32API::Time> and
+C<Win32API::SecDesc>].
+
+=item Provides a single version of the XS interface to each API
+call where improvements can be collected.
+
+=back
+
+=head2 Buffer sizes
+
+For each parameter that specifies a buffer size, a value of C<0>
+can be passed.  For parameter that are pointers to buffer sizes,
+you can also pass in C<NULL> by specifying an empty list reference,
+C<[]>.  Both of these cases will ensure that the variable has
+I<some> buffer space allocated to it and pass in that buffer's
+allocated size.  Many of the calls indicate, via C<ERROR_MORE_DATA>,
+that the buffer size was not sufficient and the F<Registry.xs>
+code will automatically enlarge the buffer to the required size
+and repeat the call.
+
+Numeric buffer sizes are used as minimum initial sizes for the
+buffers.  The larger of this size and the size of space already
+allocated to the scalar will be passed to the underlying routine. 
+If that size was insufficient, and the underlying call provides
+an easy method for determining the needed buffer size, then the
+buffer will be enlarged and the call repeated as above.
+
+The underlying calls define buffer size parameter as unsigned, so
+negative buffer sizes are treated as very large positive buffer
+sizes which usually cause C<malloc()> to fail.
+
+To force the F<Registry.xs> code to pass in a specific value for
+a buffer size, preceed the size with an equals sign via C<"=".>. 
+Buffer sizes that are passed in as strings starting with an equals
+sign will have the equal sign stripped and the remainder of the string
+interpretted as a number [via C's C<strtoul()> using only base 10]
+which will be passed to the underlying routine [even if the allocated
+buffer is actually larger].  The F<Registry.xs> code will enlarge the
+buffer to the specified size, if needed, but will not enlarge the
+buffer based on the underlying routine requesting more space.
+
+Some Reg*() calls may not currently set the buffer size when they
+return C<ERROR_MORE_DATA>.  But some that are not documented as
+doing so, currently do so anyway.  So the code assumes that any
+routine I<might> do this and resizes any buffers and repeats the
+call.   We hope that eventually all routines will provide this
+feature.
+
+When you use C<[]> for a buffer size, you can still find the
+length of the data returned by using C<length($buffer)>.  Note
+that this length will be in bytes while a few of the buffer
+sizes would have been in units of wide characters.
+
+Note that the RegQueryValueEx*() and RegEnumValue*() calls
+will trim the trailing C<'\0'> [if present] from the returned data
+values of type C<REG_SZ> or C<REG_EXPAND_SZ> but only if the
+value data length parameter is omitted [or specified as C<[]>].
+
+The RegSetValueEx*() calls will add a trailing C<'\0'> [if
+missing] to the supplied data values of type C<REG_SZ> and
+C<REG_EXPAND_SZ> but only if the value data length parameter
+is omitted [or specified as C<0>].
+
+=head2 Hungarian Notation
+
+The following abbreviations are used at the start of each parameter
+name to hint at aspects of how the parameter is used.  The prefix
+is always in lower case and followed by a capital letter that starts
+the descriptive part of the parameter name.  Several of the following
+abbreviations can be combined into a single prefix.
+
+Probably not all of these prefix notations are used by this module. 
+This document section may be included in any C<Win32API> module and
+so covers some notations not used by this specific module.
+
+=over
+
+=item s
+
+A string.  In C, a C<'\0'>-terminated C<char *>.  In Perl, just a
+string except that it will be truncated at the first C<"\0">, if
+it contains one.
+
+=item sw
+
+A wide [UNICODE] string.  In C, a C<L'\0'>-terminated C<WCHAR *>.
+In Perl, a string that contains UNICODE data.  You can convert a
+string to UNICODE in Perl via:
+
+    $string= "This is an example string";
+    $unicode= pack( "S*", unpack("C*",$string), 0 );
+
+Note how C<, 0> above causes an explicit C<L'\0'> to be added since
+Perl's implicit C<'\0'> that it puts after each of its strings is not
+wide enough to terminate a UNICODE string.  So UNICODE strings are
+different than regular strings in that the Perl version of a regular
+string will not include the trialing C<'\0'> while the Perl version
+of a UNICODE string must include the trailing C<L'\0'>.
+
+If a UNICODE string contains no non-ASCII characters, then you
+can convert it back into a normal string via:
+
+    $string= pack( "C*", unpack("S*",$unicode) );
+    $string =~ s/\0$//;
+
+=item p
+
+A pointer to some buffer [usually containing some C<struct>].  In C,
+a C<void *> or some other pointer type.  In Perl, a string that is
+usually manipulated using C<pack> and C<unpack>.  The "p" is usually
+followed by more prefix character(s) to indicate what type of data is
+stored in the bufffer.
+
+=item a
+
+A packed array.  In C, an array [usually of C<struct>s].  In Perl, a
+string containing the packed data.  The "a" is usually followed by
+more prefix character(s) to indicate the data type of the elements.
+
+These packed arrays are also called "vectors" in places to avoid
+confusion with Perl arrays.
+
+=item n
+
+A generic number.   In C, any of the integer or floating point data
+types.  In Perl, a number; either an integer, unsigned, or double
+[IV, UV, or NV, respectively].  Usually an integer.
+
+=item iv
+
+A signed integral value.  In C, any of the signed integer data types. 
+In Perl, an integer [IV].
+
+=item u
+
+An unsigned integral value.  In C, any of the unsigned integer data
+types.  In Perl, an unsigned integer [UV].
+
+=item d
+
+A floating-point number.  In C, a C<float> or C<double> or, perhaps,
+a C<long double>.  In Perl, a double-precision floating-point number
+[NV].
+
+=item b
+
+A Boolean value.  In C, any integer data type, though usually via
+a type alias of C<bool> or C<BOOL>, containing either a 0 [false] or
+non-zero [true] value.  In Perl, a scalar containing a Boolean value
+[C<0>, C<"">, or C<undef> for "false" and anything else for "true"].
+
+=item c
+
+A count of items.  In C, any integer data type.  In Perl, an unsigned
+integer [UV].  Usually used in conjunction with a "vector" parameter
+[see L</a> above] to indicate the number of elements.
+
+=item l
+
+A length [in bytes].  In C, any integer data type.  In Perl, an
+unsigned integer [UV].  Usually used in conjunction with a "string"
+or "pointer" parameter [see L</s> and L</p> above] to indicate the
+buffer size or the size of the value stored in the buffer.
+
+For strings, there is no general rule as to whether the trailing
+C<'\0'> is included in such sizes.  For this reason, the C<Win32API>
+modules follow the Perl rule of always allocating one extra byte
+and reporting buffer sizes as being one smaller than allocated in
+case the C<'\0'> is not included in the size.
+
+=item lw
+
+A length measured as number of UNICODE characters.  In C, a count
+of C<WCHAR>s.  In Perl, an unsigned integer [UV] counting "shorts"
+[see "s" and "S" in C<pack> and C<unpack>].
+
+For UNICODE strings, the trailing C<L'\0'> may or may not be
+included in a length so, again, we always allocate extra room
+for one and don't report that extra space.
+
+=item h
+
+A handle.  In C, a C<HANDLE> or more-specific handle data type. 
+In Perl, an unsigned integer [UV].  In C, these handles are often
+actually some type of pointer, but Perl just treats them as opaque
+numbers, as it should.  This prefix is also used for other pointers
+that are treated as integers in Perl code.
+
+=item r
+
+A record.  In C, almost always a C<struct> or perhaps C<union>.  Note
+that C C<struct>s are rarely passed by value so the "r" is almost
+always preceeded by a "p" or "a" [see L</p> and L</a> above].  For
+the very rare unadorned "r", Perl stores the record in the same way
+as a "pr", that is, in a string.  For the very rare case where Perl
+explicitly stores a pointer to the C<struct> rather than storing the
+C<struct> directly in a Perl string, the prefix "pp" or "ppr" or even
+"par" is used.
+
+=item sv
+
+=item rv
+
+=item hv
+
+=item av
+
+=item cv
+
+A Perl data type.  Respectively, a scalar value [SV], a reference
+[RV] [usually to a scalar], a hash [HV], a Perl array [AV], or a Perl
+code reference [PVCV].  For the "hv", "av", and "cv" prefixes, a
+leading "rv" is usually assumed.  For a parameter to an XS subroutine,
+a prefix of "sv" means the parameter is a scalar and so may be a string
+or a number [or C<undef>] or even both at the same time.  So "sv"
+doesn't imply a leading "rv".
+
+=item Input or Output
+
+Whether a parameter is for input data, output data, or both is usually
+not reflected by the data type prefix.  In cases where this is not
+obvious nor reflected in the parameter name proper, we may use the
+following in front of the data type prefix.
+
+=over
+
+=item i
+
+An input parameter given to the API [usually omitted].
+
+=item o
+
+An output-only parameter taken from the API.  You should not get a
+warning if such a parameter is C<undef> when you pass it into the
+function.  You should get an error if such a parameter is read-only.
+You can [usually] pass in C<[]> for such a parameter to have the
+parameter silently ignored.
+
+The output may be written directly into the Perl variable passed
+to the subroutine, the same way the buffer parameter to Perl's
+C<sysread()>.  This method is often avoided in Perl because
+the call then lacks any visual cue that some parameters are being
+overwritten.   But this method closely matches the C API which is
+what we are trying to do.
+
+=item io
+
+Input given to the API then overwritten with output taken from the
+API.  You should get a warning [if B<-w> is in effect] if such a
+parameter is C<undef> when you pass it into the function [unless it
+is a buffer or buffer length parameter].  If the value is read-only,
+then [for most parameters] the output is silently not written.  This
+is because it is often convenient to pass in read-only constants for
+many such parameters.  You can also usually pass in C<[]> for such
+parameters.
+
+=back
+
+=item pp
+
+=item ppr
+
+=item par
+
+=item pap
+
+These are just unusual combinations of prefix characters described above.
+
+For each, a pointer is stored in a [4-byte] Perl string.  You can
+usually use C<unpack "P"> to access the real data from Perl.
+
+For "ppr" [and often for "pp"], the pointer points directly at a
+C C<struct>.  For "par", the pointer points to the first element
+of a C [packed] array of C<struct>s.  For "pap", the pointer points
+to a C [packed] array of pointers to other things.
+
+=item ap
+
+Here we have a list of pointers packed into a single Perl string.
+
+=back
+
+=head1 BUGS
+
+The old ActiveState ports of Perl for Win32 [but not, ActivePerl, the
+ActiveState distributions of standard Perl 5.004 and beyond] do not support
+the tools for building extensions and so do not support this extension.
+
+No routines are provided for using the data returned in the C<FILETIME>
+buffers.  Those are in the C<Win32API::Time> module.
+
+No routines are provided for dealing with UNICODE data effectively. 
+See L</:FuncW> above for some simple-minded UNICODE methods.
+
+Parts of the module test will fail if used on a version of Perl
+that does not yet set C<$^E> based on C<GetLastError()>.
+
+On NT 4.0 [at least], the RegEnum*() calls do not set the required
+buffer sizes when returning C<ERROR_MORE_DATA> so this module will
+not grow the buffers in such cases.  C<Win32::TieRegistry> overcomes
+this by using values from C<RegQueryInfoKey()> for buffer sizes in
+RegEnum* calls.
+
+On NT 4.0 [at least], C<RegQueryInfoKey()> on C<HKEY_PERFORMANCE_DATA>
+never succeeds.  Also, C<RegQueryValueEx()> on C<HKEY_PERFORMANCE_DATA>
+never returns the required buffer size.  To access C<HKEY_PERFORMANCE_DATA>
+you will need to keep growing the data buffer until the call succeeds.
+
+Because C<goto &subroutine> seems to be buggy under Win32 Perl,
+it is not used in the stubs in F<Registry.pm>.
+
+=head1 AUTHOR
+
+Tye McQueen, tye@metronet.com, http://www.metronet.com/~tye/.
+
+=head1 SEE ALSO
+
+=over
+
+=item L<Win32::TieRegistry>
+
+=item L<Win32::Registry>
+
+=back
+
+=cut
diff --git a/lib/site_win50/Win32API/Registry/cRegistry.pc b/lib/site_win50/Win32API/Registry/cRegistry.pc
index f984543fa..9659d0c43 100644
--- a/lib/site_win50/Win32API/Registry/cRegistry.pc
+++ b/lib/site_win50/Win32API/Registry/cRegistry.pc
@@ -1,87 +1,87 @@
-# Generated by cRegistry_pc.cxx.
-# Package Win32API::Registry with options:
-#    CPLUSPLUS => q[1]
-#    IFDEF => q[ /^SE_/ ? '__cplusplus' : /REG_/ ]
-#    IMPORT_LIST => [q[/._/], q[!/[a-z]/]]
-#    VALUES => { KEY_DELETE=>q[DELETE], KEY_READ_CONTROL=>q[READ_CONTROL], KEY_WRITE_OWNER=>q[WRITE_OWNER], KEY_SYNCHRONIZE=>q[SYNCHRONIZE], KEY_WRITE_DAC=>q[WRITE_DAC] }
-#    WRITE_PERL => q[1]
-# Perl files eval'd:
-#    Registry.pm => last if /^\s*(bootstrap|XSLoader::load)\b/
-# C files included:
-#    Registry.xs => last if m#/[/*]\s*CONSTS_DEFINED\b|^\s*MODULE\b#
-sub HKEY_CLASSES_ROOT () { 0x80000000 }
-sub HKEY_CURRENT_CONFIG () { 0x80000005 }
-sub HKEY_CURRENT_USER () { 0x80000001 }
-sub HKEY_DYN_DATA () { 0x80000006 }
-sub HKEY_LOCAL_MACHINE () { 0x80000002 }
-sub HKEY_PERFORMANCE_DATA () { 0x80000004 }
-sub HKEY_USERS () { 0x80000003 }
-sub KEY_ALL_ACCESS () { 983103 }
-sub KEY_CREATE_LINK () { 32 }
-sub KEY_CREATE_SUB_KEY () { 4 }
-sub KEY_DELETE () { 65536 }
-sub KEY_ENUMERATE_SUB_KEYS () { 8 }
-sub KEY_EXECUTE () { 131097 }
-sub KEY_NOTIFY () { 16 }
-sub KEY_QUERY_VALUE () { 1 }
-sub KEY_READ () { 131097 }
-sub KEY_READ_CONTROL () { 131072 }
-sub KEY_SET_VALUE () { 2 }
-sub KEY_SYNCHRONIZE () { 1048576 }
-sub KEY_WRITE () { 131078 }
-sub KEY_WRITE_DAC () { 262144 }
-sub KEY_WRITE_OWNER () { 524288 }
-sub REG_BINARY () { 3 }
-sub REG_CREATED_NEW_KEY () { 1 }
-sub REG_DWORD () { 4 }
-sub REG_DWORD_BIG_ENDIAN () { 5 }
-sub REG_DWORD_LITTLE_ENDIAN () { 4 }
-sub REG_EXPAND_SZ () { 2 }
-sub REG_FULL_RESOURCE_DESCRIPTOR () { 9 }
-sub REG_LEGAL_CHANGE_FILTER () { 15 }
-sub REG_LEGAL_OPTION () { 15 }
-sub REG_LINK () { 6 }
-sub REG_MULTI_SZ () { 7 }
-sub REG_NONE () { 0 }
-sub REG_NOTIFY_CHANGE_ATTRIBUTES () { 2 }
-sub REG_NOTIFY_CHANGE_LAST_SET () { 4 }
-sub REG_NOTIFY_CHANGE_NAME () { 1 }
-sub REG_NOTIFY_CHANGE_SECURITY () { 8 }
-sub REG_NO_LAZY_FLUSH () { 4 }
-sub REG_OPENED_EXISTING_KEY () { 2 }
-sub REG_OPTION_BACKUP_RESTORE () { 4 }
-sub REG_OPTION_CREATE_LINK () { 2 }
-sub REG_OPTION_NON_VOLATILE () { 0 }
-sub REG_OPTION_OPEN_LINK () { 8 }
-sub REG_OPTION_RESERVED () { 0 }
-sub REG_OPTION_VOLATILE () { 1 }
-sub REG_REFRESH_HIVE () { 2 }
-sub REG_RESOURCE_LIST () { 8 }
-sub REG_RESOURCE_REQUIREMENTS_LIST () { 10 }
-sub REG_SZ () { 1 }
-sub REG_WHOLE_HIVE_VOLATILE () { 1 }
-sub SE_ASSIGNPRIMARYTOKEN_NAME () { 'SeAssignPrimaryTokenPrivilege' }
-sub SE_AUDIT_NAME () { 'SeAuditPrivilege' }
-sub SE_BACKUP_NAME () { 'SeBackupPrivilege' }
-sub SE_CHANGE_NOTIFY_NAME () { 'SeChangeNotifyPrivilege' }
-sub SE_CREATE_PAGEFILE_NAME () { 'SeCreatePagefilePrivilege' }
-sub SE_CREATE_PERMANENT_NAME () { 'SeCreatePermanentPrivilege' }
-sub SE_CREATE_TOKEN_NAME () { 'SeCreateTokenPrivilege' }
-sub SE_DEBUG_NAME () { 'SeDebugPrivilege' }
-sub SE_INCREASE_QUOTA_NAME () { 'SeIncreaseQuotaPrivilege' }
-sub SE_INC_BASE_PRIORITY_NAME () { 'SeIncreaseBasePriorityPrivilege' }
-sub SE_LOAD_DRIVER_NAME () { 'SeLoadDriverPrivilege' }
-sub SE_LOCK_MEMORY_NAME () { 'SeLockMemoryPrivilege' }
-sub SE_MACHINE_ACCOUNT_NAME () { 'SeMachineAccountPrivilege' }
-sub SE_PROF_SINGLE_PROCESS_NAME () { 'SeProfileSingleProcessPrivilege' }
-sub SE_REMOTE_SHUTDOWN_NAME () { 'SeRemoteShutdownPrivilege' }
-sub SE_RESTORE_NAME () { 'SeRestorePrivilege' }
-sub SE_SECURITY_NAME () { 'SeSecurityPrivilege' }
-sub SE_SHUTDOWN_NAME () { 'SeShutdownPrivilege' }
-sub SE_SYSTEMTIME_NAME () { 'SeSystemtimePrivilege' }
-sub SE_SYSTEM_ENVIRONMENT_NAME () { 'SeSystemEnvironmentPrivilege' }
-sub SE_SYSTEM_PROFILE_NAME () { 'SeSystemProfilePrivilege' }
-sub SE_TAKE_OWNERSHIP_NAME () { 'SeTakeOwnershipPrivilege' }
-sub SE_TCB_NAME () { 'SeTcbPrivilege' }
-sub SE_UNSOLICITED_INPUT_NAME () { 'SeUnsolicitedInputPrivilege' }
-1;
+# Generated by cRegistry_pc.cxx.
+# Package Win32API::Registry with options:
+#    CPLUSPLUS => q[1]
+#    IFDEF => q[ /^SE_/ ? '__cplusplus' : /REG_/ ]
+#    IMPORT_LIST => [q[/._/], q[!/[a-z]/]]
+#    VALUES => { KEY_DELETE=>q[DELETE], KEY_READ_CONTROL=>q[READ_CONTROL], KEY_WRITE_OWNER=>q[WRITE_OWNER], KEY_SYNCHRONIZE=>q[SYNCHRONIZE], KEY_WRITE_DAC=>q[WRITE_DAC] }
+#    WRITE_PERL => q[1]
+# Perl files eval'd:
+#    Registry.pm => last if /^\s*(bootstrap|XSLoader::load)\b/
+# C files included:
+#    Registry.xs => last if m#/[/*]\s*CONSTS_DEFINED\b|^\s*MODULE\b#
+sub HKEY_CLASSES_ROOT () { 0x80000000 }
+sub HKEY_CURRENT_CONFIG () { 0x80000005 }
+sub HKEY_CURRENT_USER () { 0x80000001 }
+sub HKEY_DYN_DATA () { 0x80000006 }
+sub HKEY_LOCAL_MACHINE () { 0x80000002 }
+sub HKEY_PERFORMANCE_DATA () { 0x80000004 }
+sub HKEY_USERS () { 0x80000003 }
+sub KEY_ALL_ACCESS () { 983103 }
+sub KEY_CREATE_LINK () { 32 }
+sub KEY_CREATE_SUB_KEY () { 4 }
+sub KEY_DELETE () { 65536 }
+sub KEY_ENUMERATE_SUB_KEYS () { 8 }
+sub KEY_EXECUTE () { 131097 }
+sub KEY_NOTIFY () { 16 }
+sub KEY_QUERY_VALUE () { 1 }
+sub KEY_READ () { 131097 }
+sub KEY_READ_CONTROL () { 131072 }
+sub KEY_SET_VALUE () { 2 }
+sub KEY_SYNCHRONIZE () { 1048576 }
+sub KEY_WRITE () { 131078 }
+sub KEY_WRITE_DAC () { 262144 }
+sub KEY_WRITE_OWNER () { 524288 }
+sub REG_BINARY () { 3 }
+sub REG_CREATED_NEW_KEY () { 1 }
+sub REG_DWORD () { 4 }
+sub REG_DWORD_BIG_ENDIAN () { 5 }
+sub REG_DWORD_LITTLE_ENDIAN () { 4 }
+sub REG_EXPAND_SZ () { 2 }
+sub REG_FULL_RESOURCE_DESCRIPTOR () { 9 }
+sub REG_LEGAL_CHANGE_FILTER () { 15 }
+sub REG_LEGAL_OPTION () { 15 }
+sub REG_LINK () { 6 }
+sub REG_MULTI_SZ () { 7 }
+sub REG_NONE () { 0 }
+sub REG_NOTIFY_CHANGE_ATTRIBUTES () { 2 }
+sub REG_NOTIFY_CHANGE_LAST_SET () { 4 }
+sub REG_NOTIFY_CHANGE_NAME () { 1 }
+sub REG_NOTIFY_CHANGE_SECURITY () { 8 }
+sub REG_NO_LAZY_FLUSH () { 4 }
+sub REG_OPENED_EXISTING_KEY () { 2 }
+sub REG_OPTION_BACKUP_RESTORE () { 4 }
+sub REG_OPTION_CREATE_LINK () { 2 }
+sub REG_OPTION_NON_VOLATILE () { 0 }
+sub REG_OPTION_OPEN_LINK () { 8 }
+sub REG_OPTION_RESERVED () { 0 }
+sub REG_OPTION_VOLATILE () { 1 }
+sub REG_REFRESH_HIVE () { 2 }
+sub REG_RESOURCE_LIST () { 8 }
+sub REG_RESOURCE_REQUIREMENTS_LIST () { 10 }
+sub REG_SZ () { 1 }
+sub REG_WHOLE_HIVE_VOLATILE () { 1 }
+sub SE_ASSIGNPRIMARYTOKEN_NAME () { 'SeAssignPrimaryTokenPrivilege' }
+sub SE_AUDIT_NAME () { 'SeAuditPrivilege' }
+sub SE_BACKUP_NAME () { 'SeBackupPrivilege' }
+sub SE_CHANGE_NOTIFY_NAME () { 'SeChangeNotifyPrivilege' }
+sub SE_CREATE_PAGEFILE_NAME () { 'SeCreatePagefilePrivilege' }
+sub SE_CREATE_PERMANENT_NAME () { 'SeCreatePermanentPrivilege' }
+sub SE_CREATE_TOKEN_NAME () { 'SeCreateTokenPrivilege' }
+sub SE_DEBUG_NAME () { 'SeDebugPrivilege' }
+sub SE_INCREASE_QUOTA_NAME () { 'SeIncreaseQuotaPrivilege' }
+sub SE_INC_BASE_PRIORITY_NAME () { 'SeIncreaseBasePriorityPrivilege' }
+sub SE_LOAD_DRIVER_NAME () { 'SeLoadDriverPrivilege' }
+sub SE_LOCK_MEMORY_NAME () { 'SeLockMemoryPrivilege' }
+sub SE_MACHINE_ACCOUNT_NAME () { 'SeMachineAccountPrivilege' }
+sub SE_PROF_SINGLE_PROCESS_NAME () { 'SeProfileSingleProcessPrivilege' }
+sub SE_REMOTE_SHUTDOWN_NAME () { 'SeRemoteShutdownPrivilege' }
+sub SE_RESTORE_NAME () { 'SeRestorePrivilege' }
+sub SE_SECURITY_NAME () { 'SeSecurityPrivilege' }
+sub SE_SHUTDOWN_NAME () { 'SeShutdownPrivilege' }
+sub SE_SYSTEMTIME_NAME () { 'SeSystemtimePrivilege' }
+sub SE_SYSTEM_ENVIRONMENT_NAME () { 'SeSystemEnvironmentPrivilege' }
+sub SE_SYSTEM_PROFILE_NAME () { 'SeSystemProfilePrivilege' }
+sub SE_TAKE_OWNERSHIP_NAME () { 'SeTakeOwnershipPrivilege' }
+sub SE_TCB_NAME () { 'SeTcbPrivilege' }
+sub SE_UNSOLICITED_INPUT_NAME () { 'SeUnsolicitedInputPrivilege' }
+1;
diff --git a/lib/site_win56/Win32/Registry.pm b/lib/site_win56/Win32/Registry.pm
index cd20b1e07..c83fca5a3 100644
--- a/lib/site_win56/Win32/Registry.pm
+++ b/lib/site_win56/Win32/Registry.pm
@@ -1,547 +1,547 @@
-package Win32::Registry;
-
-=head1 NAME
-
-Win32::Registry - accessing the Windows registry [obsolete, use Win32::TieRegistry]
-
-=head1 SYNOPSIS
-
-    use Win32::Registry;
-    my $tips;
-    $::HKEY_LOCAL_MACHINE->Open("SOFTWARE\\Microsoft\\Windows"
-                               ."\\CurrentVersion\\Explorer\\Tips", $tips)
-        or die "Can't open tips: $^E";
-    my ($type, $value);
-    $tips->QueryValueEx("18", $type, $value) or die "No tip #18: $^E";
-    print "Here's a tip: $value\n";
-
-=head1 DESCRIPTION
-
-    NOTE: This module provides a very klunky interface to access the
-    Windows registry, and is not currently being developed actively.  It
-    only exists for backward compatibility with old code that uses it.
-    For more powerful and flexible ways to access the registry, use
-    Win32::TieRegistry.
-
-Win32::Registry provides an object oriented interface to the Windows
-Registry.
-
-The following "root" registry objects are exported to the main:: name
-space.  Additional keys must be opened by calling the provided methods
-on one of these.
-
-    $HKEY_CLASSES_ROOT
-    $HKEY_CURRENT_USER
-    $HKEY_LOCAL_MACHINE
-    $HKEY_USERS
-    $HKEY_PERFORMANCE_DATA
-    $HKEY_CURRENT_CONFIG
-    $HKEY_DYN_DATA
-
-=cut
-
-use strict;
-require Exporter;
-require DynaLoader;
-use Win32::WinError;
-
-require Win32 unless defined &Win32::GetLastError;
-
-use vars qw($VERSION $AUTOLOAD @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
-$VERSION = '0.07';
-
-@ISA	= qw( Exporter DynaLoader );
-@EXPORT = qw(
-	HKEY_CLASSES_ROOT
-	HKEY_CURRENT_USER
-	HKEY_LOCAL_MACHINE
-	HKEY_PERFORMANCE_DATA
-	HKEY_CURRENT_CONFIG
-	HKEY_DYN_DATA
-	HKEY_USERS
-	KEY_ALL_ACCESS
-	KEY_CREATE_LINK
-	KEY_CREATE_SUB_KEY
-	KEY_ENUMERATE_SUB_KEYS
-	KEY_EXECUTE
-	KEY_NOTIFY
-	KEY_QUERY_VALUE
-	KEY_READ
-	KEY_SET_VALUE
-	KEY_WRITE
-	REG_BINARY
-	REG_CREATED_NEW_KEY
-	REG_DWORD
-	REG_DWORD_BIG_ENDIAN
-	REG_DWORD_LITTLE_ENDIAN
-	REG_EXPAND_SZ
-	REG_FULL_RESOURCE_DESCRIPTOR
-	REG_LEGAL_CHANGE_FILTER
-	REG_LEGAL_OPTION
-	REG_LINK
-	REG_MULTI_SZ
-	REG_NONE
-	REG_NOTIFY_CHANGE_ATTRIBUTES
-	REG_NOTIFY_CHANGE_LAST_SET
-	REG_NOTIFY_CHANGE_NAME
-	REG_NOTIFY_CHANGE_SECURITY
-	REG_OPENED_EXISTING_KEY
-	REG_OPTION_BACKUP_RESTORE
-	REG_OPTION_CREATE_LINK
-	REG_OPTION_NON_VOLATILE
-	REG_OPTION_RESERVED
-	REG_OPTION_VOLATILE
-	REG_REFRESH_HIVE
-	REG_RESOURCE_LIST
-	REG_RESOURCE_REQUIREMENTS_LIST
-	REG_SZ
-	REG_WHOLE_HIVE_VOLATILE
-);
-
-@EXPORT_OK = qw(
-    RegCloseKey
-    RegConnectRegistry
-    RegCreateKey
-    RegCreateKeyEx
-    RegDeleteKey
-    RegDeleteValue
-    RegEnumKey
-    RegEnumValue
-    RegFlushKey
-    RegGetKeySecurity
-    RegLoadKey
-    RegNotifyChangeKeyValue
-    RegOpenKey
-    RegOpenKeyEx
-    RegQueryInfoKey
-    RegQueryValue
-    RegQueryValueEx
-    RegReplaceKey
-    RegRestoreKey
-    RegSaveKey
-    RegSetKeySecurity
-    RegSetValue
-    RegSetValueEx
-    RegUnLoadKey
-);
-$EXPORT_TAGS{ALL}= \@EXPORT_OK;
-
-bootstrap Win32::Registry;
-
-sub import {
-    my $pkg = shift;
-    if ($_[0] && "Win32" eq $_[0]) {
-	Exporter::export($pkg, "Win32", @EXPORT_OK);
-	shift;
-    }
-    Win32::Registry->export_to_level(1+$Exporter::ExportLevel, $pkg, @_);
-}
-
-#######################################################################
-# This AUTOLOAD is used to 'autoload' constants from the constant()
-# XS function.  If a constant is not found then control is passed
-# to the AUTOLOAD in AutoLoader.
-
-sub AUTOLOAD {
-    my($constname);
-    ($constname = $AUTOLOAD) =~ s/.*:://;
-    #reset $! to zero to reset any current errors.
-    local $! = 0;
-    my $val = constant($constname, 0);
-    if ($! != 0) {
-	if ($! =~ /Invalid/) {
-	    $AutoLoader::AUTOLOAD = $AUTOLOAD;
-	    goto &AutoLoader::AUTOLOAD;
-	}
-	else {
-	    my ($pack,$file,$line) = caller;
-	    die "Unknown constant $constname in Win32::Registry "
-	       . "at $file line $line.\n";
-	}
-    }
-    eval "sub $AUTOLOAD { $val }";
-    goto &$AUTOLOAD;
-}
-
-#######################################################################
-# _new is a private constructor, not intended for public use.
-#
-
-sub _new {
-    my $self;
-    if ($_[0]) {
-	$self->{'handle'} = $_[0];
-	bless $self;
-    }
-    $self;
-}
-
-#define the basic registry objects to be exported.
-#these had to be hardwired unfortunately.
-# XXX Yuck!
-
-{
-    package main;
-    use vars qw(
-		$HKEY_CLASSES_ROOT
-		$HKEY_CURRENT_USER
-		$HKEY_LOCAL_MACHINE
-		$HKEY_USERS
-		$HKEY_PERFORMANCE_DATA
-		$HKEY_CURRENT_CONFIG
-		$HKEY_DYN_DATA
-	       );
-}
-
-$::HKEY_CLASSES_ROOT		= _new(&HKEY_CLASSES_ROOT);
-$::HKEY_CURRENT_USER		= _new(&HKEY_CURRENT_USER);
-$::HKEY_LOCAL_MACHINE		= _new(&HKEY_LOCAL_MACHINE);
-$::HKEY_USERS			= _new(&HKEY_USERS);
-$::HKEY_PERFORMANCE_DATA	= _new(&HKEY_PERFORMANCE_DATA);
-$::HKEY_CURRENT_CONFIG		= _new(&HKEY_CURRENT_CONFIG);
-$::HKEY_DYN_DATA		= _new(&HKEY_DYN_DATA);
-
-=head2 Methods
-
-The following methods are supported.  Note that subkeys can be
-specified as a path name, separated by backslashes (which may
-need to be doubled if you put them in double quotes).
-
-=over 8
-
-=item Open
-
-    $reg_obj->Open($sub_key_name, $sub_reg_obj);
-
-Opens a subkey of a registry object, returning the new registry object
-in $sub_reg_obj.
-
-=cut
-
-sub Open {
-    my $self = shift;
-    die 'usage: $obj->Open($sub_key_name, $sub_reg_obj)' if @_ != 2;
-    
-    my ($subkey) = @_;
-    my ($result,$subhandle);
-
-    $result = RegOpenKey($self->{'handle'},$subkey,$subhandle);
-    $_[1] = _new($subhandle);
-    
-    return 0 unless $_[1];
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item Close
-
-    $reg_obj->Close();
-
-Closes an open registry key.
-
-=cut
-
-sub Close {
-    my $self = shift;
-    die 'usage: $obj->Close()' if @_ != 0;
-
-    return unless exists $self->{'handle'};
-    my $result = RegCloseKey($self->{'handle'});
-    if ($result) {
-	delete $self->{'handle'};
-    }
-    else {
-	$! = Win32::GetLastError();
-    }
-    return $result;
-}
-
-sub DESTROY {
-    my $self = shift;
-    return unless exists $self->{'handle'};
-    RegCloseKey($self->{'handle'});
-    delete $self->{'handle'};
-}
-
-
-=item Connect
-
-    $reg_obj->Connect($node_name, $new_reg_obj);
-
-Connects to a remote Registry on the node specified by $node_name,
-returning it in $new_reg_obj.  Returns false if it fails.
-
-=cut
-
-sub Connect {
-    my $self = shift;
-    die 'usage: $obj->Connect($node_name, $new_reg_obj)' if @_ != 2;
-     
-    my ($node) = @_;
-    my ($result,$subhandle);
-
-    $result = RegConnectRegistry ($node, $self->{'handle'}, $subhandle);
-    $_[1] = _new($subhandle);
-
-    return 0 unless $_[1];
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}  
-
-=item Create
-
-    $reg_obj->Create($sub_key_name, $new_reg_obj);
-
-Opens the subkey specified by $sub_key_name, returning the new registry
-object in $new_reg_obj.  If the specified subkey doesn't exist, it is
-created.
-
-=cut
-
-sub Create {
-    my $self = shift;
-    die 'usage: $obj->Create($sub_key_name, $new_reg_obj)' if @_ != 2;
-
-    my ($subkey) = @_;
-    my ($result,$subhandle);
-
-    $result = RegCreateKey($self->{'handle'},$subkey,$subhandle);
-    $_[1] = _new ($subhandle);
-
-    return 0 unless $_[1];
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item SetValue
-
-    $reg_obj->SetValue($sub_key_name, $type, $value);
-
-Sets the default value for a subkey specified by $sub_key_name.
-
-=cut
-
-sub SetValue {
-    my $self = shift;
-    die 'usage: $obj->SetValue($subkey, $type, $value)' if @_ != 3;
-    my $result = RegSetValue($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item SetValueEx
-
-    $reg_obj->SetValueEx($value_name, $reserved, $type, $value);
-
-Sets the value for the value name identified by $value_name
-in the key specified by $reg_obj.
-
-=cut
-
-sub SetValueEx {
-    my $self = shift;
-    die 'usage: $obj->SetValueEx($value_name, $reserved, $type, $value)' if @_ != 4;
-    my $result = RegSetValueEx($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item QueryValue
-
-    $reg_obj->QueryValue($sub_key_name, $value);
-
-Gets the default value of the subkey specified by $sub_key_name.
-
-=cut
-
-sub QueryValue {
-    my $self = shift;
-    die 'usage: $obj->QueryValue($sub_key_name, $value)' if @_ != 2;
-    my $result = RegQueryValue($self->{'handle'}, $_[0], $_[1]);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item QueryKey
-
-    $reg_obj->QueryKey($classref, $number_of_subkeys, $number_of_values);
-
-Gets information on a key specified by $reg_obj.
-
-=cut
-
-sub QueryKey {
-    my $garbage;
-    my $self = shift;
-    die 'usage: $obj->QueryKey($classref, $number_of_subkeys, $number_of_values)'
-    	if @_ != 3;
-
-    my $result = RegQueryInfoKey($self->{'handle'}, $_[0],
-    				 $garbage, $garbage, $_[1],
-			         $garbage, $garbage, $_[2],
-			         $garbage, $garbage, $garbage, $garbage);
-
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item QueryValueEx
-
-    $reg_obj->QueryValueEx($value_name, $type, $value);
-
-Gets the value for the value name identified by $value_name
-in the key specified by $reg_obj.
-
-=cut
-
-sub QueryValueEx {
-    my $self = shift;
-    die 'usage: $obj->QueryValueEx($value_name, $type, $value)' if @_ != 3;
-    my $result = RegQueryValueEx($self->{'handle'}, $_[0], undef, $_[1], $_[2]);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item GetKeys
-
-    my @keys;
-    $reg_obj->GetKeys(\@keys);
-
-Populates the supplied array reference with the names of all the keys
-within the registry object $reg_obj.
-
-=cut
-
-sub GetKeys {
-    my $self = shift;
-    die 'usage: $obj->GetKeys($arrayref)' if @_ != 1 or ref($_[0]) ne 'ARRAY';
-
-    my ($result, $i, $keyname);
-    $keyname = "DummyVal";
-    $i = 0;
-    $result = 1;
-    
-    while ( $result ) {
-	$result = RegEnumKey( $self->{'handle'},$i++, $keyname );
-	if ($result) {
-	    push( @{$_[0]}, $keyname );
-	}
-    }
-    return(1);
-}
-
-=item GetValues
-
-    my %values;
-    $reg_obj->GetValues(\%values);
-
-Populates the supplied hash reference with entries of the form
-
-    $value_name => [ $value_name, $type, $data ]
-
-for each value in the registry object $reg_obj.
-
-=cut
-
-sub GetValues {
-    my $self = shift;
-    die 'usage: $obj->GetValues($hashref)' if @_ != 1;
-
-    my ($result,$name,$type,$data,$i);
-    $name = "DummyVal";
-    $i = 0;
-    while ( $result=RegEnumValue( $self->{'handle'},
-				  $i++,
-				  $name,
-				  undef,
-				  $type,
-				  $data ))
-    {
-	$_[0]->{$name} = [ $name, $type, $data ];
-    }
-    return(1);
-}
-
-=item DeleteKey
-
-    $reg_obj->DeleteKey($sub_key_name);
-
-Deletes a subkey specified by $sub_key_name from the registry.
-
-=cut
-
-sub DeleteKey {
-    my $self = shift;
-    die 'usage: $obj->DeleteKey($sub_key_name)' if @_ != 1;
-    my $result = RegDeleteKey($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item DeleteValue
-
-    $reg_obj->DeleteValue($value_name);
-
-Deletes a value identified by $value_name from the registry.
-
-=cut
-
-sub DeleteValue {
-    my $self = shift;
-    die 'usage: $obj->DeleteValue($value_name)' if @_ != 1;
-    my $result = RegDeleteValue($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item Save
-
-    $reg_obj->Save($filename);
-
-Saves the hive specified by $reg_obj to a file.
-
-=cut
-
-sub Save {
-    my $self = shift;
-    die 'usage: $obj->Save($filename)' if @_ != 1;
-    my $result = RegSaveKey($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item Load
-
-    $reg_obj->Load($sub_key_name, $file_name);
-
-Loads a key specified by $sub_key_name from a file.
-
-=cut
-
-sub Load {
-    my $self = shift;
-    die 'usage: $obj->Load($sub_key_name, $file_name)' if @_ != 2;
-    my $result = RegLoadKey($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item UnLoad
-
-    $reg_obj->Unload($sub_key_name);
-
-Unloads a registry hive.
-
-=cut
-
-sub UnLoad {
-    my $self = shift;
-    die 'usage: $obj->UnLoad($sub_key_name)' if @_ != 1;
-    my $result = RegUnLoadKey($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-1;
-__END__
+package Win32::Registry;
+
+=head1 NAME
+
+Win32::Registry - accessing the Windows registry [obsolete, use Win32::TieRegistry]
+
+=head1 SYNOPSIS
+
+    use Win32::Registry;
+    my $tips;
+    $::HKEY_LOCAL_MACHINE->Open("SOFTWARE\\Microsoft\\Windows"
+                               ."\\CurrentVersion\\Explorer\\Tips", $tips)
+        or die "Can't open tips: $^E";
+    my ($type, $value);
+    $tips->QueryValueEx("18", $type, $value) or die "No tip #18: $^E";
+    print "Here's a tip: $value\n";
+
+=head1 DESCRIPTION
+
+    NOTE: This module provides a very klunky interface to access the
+    Windows registry, and is not currently being developed actively.  It
+    only exists for backward compatibility with old code that uses it.
+    For more powerful and flexible ways to access the registry, use
+    Win32::TieRegistry.
+
+Win32::Registry provides an object oriented interface to the Windows
+Registry.
+
+The following "root" registry objects are exported to the main:: name
+space.  Additional keys must be opened by calling the provided methods
+on one of these.
+
+    $HKEY_CLASSES_ROOT
+    $HKEY_CURRENT_USER
+    $HKEY_LOCAL_MACHINE
+    $HKEY_USERS
+    $HKEY_PERFORMANCE_DATA
+    $HKEY_CURRENT_CONFIG
+    $HKEY_DYN_DATA
+
+=cut
+
+use strict;
+require Exporter;
+require DynaLoader;
+use Win32::WinError;
+
+require Win32 unless defined &Win32::GetLastError;
+
+use vars qw($VERSION $AUTOLOAD @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+
+$VERSION = '0.07';
+
+@ISA	= qw( Exporter DynaLoader );
+@EXPORT = qw(
+	HKEY_CLASSES_ROOT
+	HKEY_CURRENT_USER
+	HKEY_LOCAL_MACHINE
+	HKEY_PERFORMANCE_DATA
+	HKEY_CURRENT_CONFIG
+	HKEY_DYN_DATA
+	HKEY_USERS
+	KEY_ALL_ACCESS
+	KEY_CREATE_LINK
+	KEY_CREATE_SUB_KEY
+	KEY_ENUMERATE_SUB_KEYS
+	KEY_EXECUTE
+	KEY_NOTIFY
+	KEY_QUERY_VALUE
+	KEY_READ
+	KEY_SET_VALUE
+	KEY_WRITE
+	REG_BINARY
+	REG_CREATED_NEW_KEY
+	REG_DWORD
+	REG_DWORD_BIG_ENDIAN
+	REG_DWORD_LITTLE_ENDIAN
+	REG_EXPAND_SZ
+	REG_FULL_RESOURCE_DESCRIPTOR
+	REG_LEGAL_CHANGE_FILTER
+	REG_LEGAL_OPTION
+	REG_LINK
+	REG_MULTI_SZ
+	REG_NONE
+	REG_NOTIFY_CHANGE_ATTRIBUTES
+	REG_NOTIFY_CHANGE_LAST_SET
+	REG_NOTIFY_CHANGE_NAME
+	REG_NOTIFY_CHANGE_SECURITY
+	REG_OPENED_EXISTING_KEY
+	REG_OPTION_BACKUP_RESTORE
+	REG_OPTION_CREATE_LINK
+	REG_OPTION_NON_VOLATILE
+	REG_OPTION_RESERVED
+	REG_OPTION_VOLATILE
+	REG_REFRESH_HIVE
+	REG_RESOURCE_LIST
+	REG_RESOURCE_REQUIREMENTS_LIST
+	REG_SZ
+	REG_WHOLE_HIVE_VOLATILE
+);
+
+@EXPORT_OK = qw(
+    RegCloseKey
+    RegConnectRegistry
+    RegCreateKey
+    RegCreateKeyEx
+    RegDeleteKey
+    RegDeleteValue
+    RegEnumKey
+    RegEnumValue
+    RegFlushKey
+    RegGetKeySecurity
+    RegLoadKey
+    RegNotifyChangeKeyValue
+    RegOpenKey
+    RegOpenKeyEx
+    RegQueryInfoKey
+    RegQueryValue
+    RegQueryValueEx
+    RegReplaceKey
+    RegRestoreKey
+    RegSaveKey
+    RegSetKeySecurity
+    RegSetValue
+    RegSetValueEx
+    RegUnLoadKey
+);
+$EXPORT_TAGS{ALL}= \@EXPORT_OK;
+
+bootstrap Win32::Registry;
+
+sub import {
+    my $pkg = shift;
+    if ($_[0] && "Win32" eq $_[0]) {
+	Exporter::export($pkg, "Win32", @EXPORT_OK);
+	shift;
+    }
+    Win32::Registry->export_to_level(1+$Exporter::ExportLevel, $pkg, @_);
+}
+
+#######################################################################
+# This AUTOLOAD is used to 'autoload' constants from the constant()
+# XS function.  If a constant is not found then control is passed
+# to the AUTOLOAD in AutoLoader.
+
+sub AUTOLOAD {
+    my($constname);
+    ($constname = $AUTOLOAD) =~ s/.*:://;
+    #reset $! to zero to reset any current errors.
+    local $! = 0;
+    my $val = constant($constname, 0);
+    if ($! != 0) {
+	if ($! =~ /Invalid/) {
+	    $AutoLoader::AUTOLOAD = $AUTOLOAD;
+	    goto &AutoLoader::AUTOLOAD;
+	}
+	else {
+	    my ($pack,$file,$line) = caller;
+	    die "Unknown constant $constname in Win32::Registry "
+	       . "at $file line $line.\n";
+	}
+    }
+    eval "sub $AUTOLOAD { $val }";
+    goto &$AUTOLOAD;
+}
+
+#######################################################################
+# _new is a private constructor, not intended for public use.
+#
+
+sub _new {
+    my $self;
+    if ($_[0]) {
+	$self->{'handle'} = $_[0];
+	bless $self;
+    }
+    $self;
+}
+
+#define the basic registry objects to be exported.
+#these had to be hardwired unfortunately.
+# XXX Yuck!
+
+{
+    package main;
+    use vars qw(
+		$HKEY_CLASSES_ROOT
+		$HKEY_CURRENT_USER
+		$HKEY_LOCAL_MACHINE
+		$HKEY_USERS
+		$HKEY_PERFORMANCE_DATA
+		$HKEY_CURRENT_CONFIG
+		$HKEY_DYN_DATA
+	       );
+}
+
+$::HKEY_CLASSES_ROOT		= _new(&HKEY_CLASSES_ROOT);
+$::HKEY_CURRENT_USER		= _new(&HKEY_CURRENT_USER);
+$::HKEY_LOCAL_MACHINE		= _new(&HKEY_LOCAL_MACHINE);
+$::HKEY_USERS			= _new(&HKEY_USERS);
+$::HKEY_PERFORMANCE_DATA	= _new(&HKEY_PERFORMANCE_DATA);
+$::HKEY_CURRENT_CONFIG		= _new(&HKEY_CURRENT_CONFIG);
+$::HKEY_DYN_DATA		= _new(&HKEY_DYN_DATA);
+
+=head2 Methods
+
+The following methods are supported.  Note that subkeys can be
+specified as a path name, separated by backslashes (which may
+need to be doubled if you put them in double quotes).
+
+=over 8
+
+=item Open
+
+    $reg_obj->Open($sub_key_name, $sub_reg_obj);
+
+Opens a subkey of a registry object, returning the new registry object
+in $sub_reg_obj.
+
+=cut
+
+sub Open {
+    my $self = shift;
+    die 'usage: $obj->Open($sub_key_name, $sub_reg_obj)' if @_ != 2;
+    
+    my ($subkey) = @_;
+    my ($result,$subhandle);
+
+    $result = RegOpenKey($self->{'handle'},$subkey,$subhandle);
+    $_[1] = _new($subhandle);
+    
+    return 0 unless $_[1];
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item Close
+
+    $reg_obj->Close();
+
+Closes an open registry key.
+
+=cut
+
+sub Close {
+    my $self = shift;
+    die 'usage: $obj->Close()' if @_ != 0;
+
+    return unless exists $self->{'handle'};
+    my $result = RegCloseKey($self->{'handle'});
+    if ($result) {
+	delete $self->{'handle'};
+    }
+    else {
+	$! = Win32::GetLastError();
+    }
+    return $result;
+}
+
+sub DESTROY {
+    my $self = shift;
+    return unless exists $self->{'handle'};
+    RegCloseKey($self->{'handle'});
+    delete $self->{'handle'};
+}
+
+
+=item Connect
+
+    $reg_obj->Connect($node_name, $new_reg_obj);
+
+Connects to a remote Registry on the node specified by $node_name,
+returning it in $new_reg_obj.  Returns false if it fails.
+
+=cut
+
+sub Connect {
+    my $self = shift;
+    die 'usage: $obj->Connect($node_name, $new_reg_obj)' if @_ != 2;
+     
+    my ($node) = @_;
+    my ($result,$subhandle);
+
+    $result = RegConnectRegistry ($node, $self->{'handle'}, $subhandle);
+    $_[1] = _new($subhandle);
+
+    return 0 unless $_[1];
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}  
+
+=item Create
+
+    $reg_obj->Create($sub_key_name, $new_reg_obj);
+
+Opens the subkey specified by $sub_key_name, returning the new registry
+object in $new_reg_obj.  If the specified subkey doesn't exist, it is
+created.
+
+=cut
+
+sub Create {
+    my $self = shift;
+    die 'usage: $obj->Create($sub_key_name, $new_reg_obj)' if @_ != 2;
+
+    my ($subkey) = @_;
+    my ($result,$subhandle);
+
+    $result = RegCreateKey($self->{'handle'},$subkey,$subhandle);
+    $_[1] = _new ($subhandle);
+
+    return 0 unless $_[1];
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item SetValue
+
+    $reg_obj->SetValue($sub_key_name, $type, $value);
+
+Sets the default value for a subkey specified by $sub_key_name.
+
+=cut
+
+sub SetValue {
+    my $self = shift;
+    die 'usage: $obj->SetValue($subkey, $type, $value)' if @_ != 3;
+    my $result = RegSetValue($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item SetValueEx
+
+    $reg_obj->SetValueEx($value_name, $reserved, $type, $value);
+
+Sets the value for the value name identified by $value_name
+in the key specified by $reg_obj.
+
+=cut
+
+sub SetValueEx {
+    my $self = shift;
+    die 'usage: $obj->SetValueEx($value_name, $reserved, $type, $value)' if @_ != 4;
+    my $result = RegSetValueEx($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item QueryValue
+
+    $reg_obj->QueryValue($sub_key_name, $value);
+
+Gets the default value of the subkey specified by $sub_key_name.
+
+=cut
+
+sub QueryValue {
+    my $self = shift;
+    die 'usage: $obj->QueryValue($sub_key_name, $value)' if @_ != 2;
+    my $result = RegQueryValue($self->{'handle'}, $_[0], $_[1]);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item QueryKey
+
+    $reg_obj->QueryKey($classref, $number_of_subkeys, $number_of_values);
+
+Gets information on a key specified by $reg_obj.
+
+=cut
+
+sub QueryKey {
+    my $garbage;
+    my $self = shift;
+    die 'usage: $obj->QueryKey($classref, $number_of_subkeys, $number_of_values)'
+    	if @_ != 3;
+
+    my $result = RegQueryInfoKey($self->{'handle'}, $_[0],
+    				 $garbage, $garbage, $_[1],
+			         $garbage, $garbage, $_[2],
+			         $garbage, $garbage, $garbage, $garbage);
+
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item QueryValueEx
+
+    $reg_obj->QueryValueEx($value_name, $type, $value);
+
+Gets the value for the value name identified by $value_name
+in the key specified by $reg_obj.
+
+=cut
+
+sub QueryValueEx {
+    my $self = shift;
+    die 'usage: $obj->QueryValueEx($value_name, $type, $value)' if @_ != 3;
+    my $result = RegQueryValueEx($self->{'handle'}, $_[0], undef, $_[1], $_[2]);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item GetKeys
+
+    my @keys;
+    $reg_obj->GetKeys(\@keys);
+
+Populates the supplied array reference with the names of all the keys
+within the registry object $reg_obj.
+
+=cut
+
+sub GetKeys {
+    my $self = shift;
+    die 'usage: $obj->GetKeys($arrayref)' if @_ != 1 or ref($_[0]) ne 'ARRAY';
+
+    my ($result, $i, $keyname);
+    $keyname = "DummyVal";
+    $i = 0;
+    $result = 1;
+    
+    while ( $result ) {
+	$result = RegEnumKey( $self->{'handle'},$i++, $keyname );
+	if ($result) {
+	    push( @{$_[0]}, $keyname );
+	}
+    }
+    return(1);
+}
+
+=item GetValues
+
+    my %values;
+    $reg_obj->GetValues(\%values);
+
+Populates the supplied hash reference with entries of the form
+
+    $value_name => [ $value_name, $type, $data ]
+
+for each value in the registry object $reg_obj.
+
+=cut
+
+sub GetValues {
+    my $self = shift;
+    die 'usage: $obj->GetValues($hashref)' if @_ != 1;
+
+    my ($result,$name,$type,$data,$i);
+    $name = "DummyVal";
+    $i = 0;
+    while ( $result=RegEnumValue( $self->{'handle'},
+				  $i++,
+				  $name,
+				  undef,
+				  $type,
+				  $data ))
+    {
+	$_[0]->{$name} = [ $name, $type, $data ];
+    }
+    return(1);
+}
+
+=item DeleteKey
+
+    $reg_obj->DeleteKey($sub_key_name);
+
+Deletes a subkey specified by $sub_key_name from the registry.
+
+=cut
+
+sub DeleteKey {
+    my $self = shift;
+    die 'usage: $obj->DeleteKey($sub_key_name)' if @_ != 1;
+    my $result = RegDeleteKey($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item DeleteValue
+
+    $reg_obj->DeleteValue($value_name);
+
+Deletes a value identified by $value_name from the registry.
+
+=cut
+
+sub DeleteValue {
+    my $self = shift;
+    die 'usage: $obj->DeleteValue($value_name)' if @_ != 1;
+    my $result = RegDeleteValue($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item Save
+
+    $reg_obj->Save($filename);
+
+Saves the hive specified by $reg_obj to a file.
+
+=cut
+
+sub Save {
+    my $self = shift;
+    die 'usage: $obj->Save($filename)' if @_ != 1;
+    my $result = RegSaveKey($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item Load
+
+    $reg_obj->Load($sub_key_name, $file_name);
+
+Loads a key specified by $sub_key_name from a file.
+
+=cut
+
+sub Load {
+    my $self = shift;
+    die 'usage: $obj->Load($sub_key_name, $file_name)' if @_ != 2;
+    my $result = RegLoadKey($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item UnLoad
+
+    $reg_obj->Unload($sub_key_name);
+
+Unloads a registry hive.
+
+=cut
+
+sub UnLoad {
+    my $self = shift;
+    die 'usage: $obj->UnLoad($sub_key_name)' if @_ != 1;
+    my $result = RegUnLoadKey($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+1;
+__END__
diff --git a/lib/site_win56/Win32API/Registry.pm b/lib/site_win56/Win32API/Registry.pm
index a653dec52..dbf98b4e2 100644
--- a/lib/site_win56/Win32API/Registry.pm
+++ b/lib/site_win56/Win32API/Registry.pm
@@ -1,1792 +1,1792 @@
-# Registry.pm -- Low-level access to functions/constants from WINREG.h
-
-package Win32API::Registry;
-
-use strict;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); #@EXPORT_FAIL);
-$VERSION= '0.24';
-
-require Exporter;
-require DynaLoader;
-@ISA= qw(Exporter DynaLoader);
-
-@EXPORT= qw();
-%EXPORT_TAGS= (
-    Func =>	[qw(		regConstant		regLastError
-	AllowPriv		AbortSystemShutdown	InitiateSystemShutdown
-	RegCloseKey		RegConnectRegistry	RegCreateKey
-	RegCreateKeyEx		RegDeleteKey		RegDeleteValue
-	RegEnumKey		RegEnumKeyEx		RegEnumValue
-	RegFlushKey		RegGetKeySecurity	RegLoadKey
-	RegNotifyChangeKeyValue	RegOpenKey		RegOpenKeyEx
-	RegQueryInfoKey		RegQueryMultipleValues	RegQueryValue
-	RegQueryValueEx		RegReplaceKey		RegRestoreKey
-	RegSaveKey		RegSetKeySecurity	RegSetValue
-	RegSetValueEx		RegUnLoadKey )],
-    FuncA =>	[qw(
-	AbortSystemShutdownA	InitiateSystemShutdownA
-	RegConnectRegistryA	RegCreateKeyA		RegCreateKeyExA
-	RegDeleteKeyA		RegDeleteValueA		RegEnumKeyA
-	RegEnumKeyExA		RegEnumValueA		RegLoadKeyA
-	RegOpenKeyA		RegOpenKeyExA		RegQueryInfoKeyA
-	RegQueryMultipleValuesA	RegQueryValueA		RegQueryValueExA
-	RegReplaceKeyA		RegRestoreKeyA		RegSaveKeyA
-	RegSetValueA		RegSetValueExA		RegUnLoadKeyA )],
-    FuncW =>	[qw(
-	AbortSystemShutdownW	InitiateSystemShutdownW
-	RegConnectRegistryW	RegCreateKeyW		RegCreateKeyExW
-	RegDeleteKeyW		RegDeleteValueW		RegEnumKeyW
-	RegEnumKeyExW		RegEnumValueW		RegLoadKeyW
-	RegOpenKeyW		RegOpenKeyExW		RegQueryInfoKeyW
-	RegQueryMultipleValuesW	RegQueryValueW		RegQueryValueExW
-	RegReplaceKeyW		RegRestoreKeyW		RegSaveKeyW
-	RegSetValueW		RegSetValueExW		RegUnLoadKeyW )],
-    HKEY_ =>	[qw(
-	HKEY_CLASSES_ROOT	HKEY_CURRENT_CONFIG	HKEY_CURRENT_USER
-	HKEY_DYN_DATA		HKEY_LOCAL_MACHINE	HKEY_PERFORMANCE_DATA
-	HKEY_USERS )],
-    KEY_ =>	[qw(
-	KEY_QUERY_VALUE		KEY_SET_VALUE		KEY_CREATE_SUB_KEY
-	KEY_ENUMERATE_SUB_KEYS	KEY_NOTIFY		KEY_CREATE_LINK
-	KEY_READ		KEY_WRITE		KEY_EXECUTE
-	KEY_ALL_ACCESS),
-	'KEY_DELETE',		# DELETE          (0x00010000L)
-	'KEY_READ_CONTROL',	# READ_CONTROL    (0x00020000L)
-	'KEY_WRITE_DAC',	# WRITE_DAC       (0x00040000L)
-	'KEY_WRITE_OWNER',	# WRITE_OWNER     (0x00080000L)
-	'KEY_SYNCHRONIZE',	# SYNCHRONIZE     (0x00100000L) (not used)
-	],
-    REG_ =>	[qw(
-	REG_OPTION_RESERVED	REG_OPTION_NON_VOLATILE	REG_OPTION_VOLATILE
-	REG_OPTION_CREATE_LINK	REG_OPTION_BACKUP_RESTORE
-	REG_OPTION_OPEN_LINK	REG_LEGAL_OPTION	REG_CREATED_NEW_KEY
-	REG_OPENED_EXISTING_KEY	REG_WHOLE_HIVE_VOLATILE	REG_REFRESH_HIVE
-	REG_NO_LAZY_FLUSH	REG_NOTIFY_CHANGE_ATTRIBUTES
-	REG_NOTIFY_CHANGE_NAME	REG_NOTIFY_CHANGE_LAST_SET
-	REG_NOTIFY_CHANGE_SECURITY			REG_LEGAL_CHANGE_FILTER
-	REG_NONE		REG_SZ			REG_EXPAND_SZ
-	REG_BINARY		REG_DWORD		REG_DWORD_LITTLE_ENDIAN
-	REG_DWORD_BIG_ENDIAN	REG_LINK		REG_MULTI_SZ
-	REG_RESOURCE_LIST	REG_FULL_RESOURCE_DESCRIPTOR
-	REG_RESOURCE_REQUIREMENTS_LIST )],
-    SE_ =>	[qw(
-	SE_ASSIGNPRIMARYTOKEN_NAME	SE_AUDIT_NAME
-	SE_BACKUP_NAME			SE_CHANGE_NOTIFY_NAME
-	SE_CREATE_PAGEFILE_NAME		SE_CREATE_PERMANENT_NAME
-	SE_CREATE_TOKEN_NAME		SE_DEBUG_NAME
-	SE_INCREASE_QUOTA_NAME		SE_INC_BASE_PRIORITY_NAME
-	SE_LOAD_DRIVER_NAME		SE_LOCK_MEMORY_NAME
-	SE_MACHINE_ACCOUNT_NAME		SE_PROF_SINGLE_PROCESS_NAME
-	SE_REMOTE_SHUTDOWN_NAME		SE_RESTORE_NAME
-	SE_SECURITY_NAME		SE_SHUTDOWN_NAME
-	SE_SYSTEMTIME_NAME		SE_SYSTEM_ENVIRONMENT_NAME
-	SE_SYSTEM_PROFILE_NAME		SE_TAKE_OWNERSHIP_NAME
-	SE_TCB_NAME			SE_UNSOLICITED_INPUT_NAME )],
-);
-@EXPORT_OK= ();
-{ my $ref;
-    foreach $ref (  values(%EXPORT_TAGS)  ) {
-	push( @EXPORT_OK, @$ref )   unless  $ref->[0] =~ /^SE_/;
-    }
-}
-$EXPORT_TAGS{ALL}= [ @EXPORT_OK ];	# \@EXPORT_OK once SE_* settles down.
-# push( @EXPORT_OK, "JHEREG_TACOSALAD" );	# Used to test Mkconst2perl
-push( @EXPORT_OK, @{$EXPORT_TAGS{SE_}} );
-
-bootstrap Win32API::Registry $VERSION;
-
-# Preloaded methods go here.
-
-# To convert C constants to Perl code in cRegistry.pc
-# [instead of C or C++ code in cRegistry.h]:
-#    * Modify F<Makefile.PL> to add WriteMakeFile() =>
-#      CONST2PERL/postamble => [[ "Win32API::Registry" => ]] WRITE_PERL => 1.
-#    * Either comment out C<#include "cRegistry.h"> from F<Registry.xs>
-#      or make F<cRegistry.h> an empty file.
-#    * Make sure the following C<if> block is not commented out.
-#    * "nmake clean", "perl Makefile.PL", "nmake"
-
-if(  ! defined &REG_NONE  ) {
-    require "Win32API/Registry/cRegistry.pc";
-}
-
-# This would be convenient but inconsistant and hard to explain:
-#push( @{$EXPORT_TAGS{ALL}}, @{$EXPORT_TAGS{SE_}} )
-#  if  defined &SE_TCB_NAME;
-
-sub regConstant
-{
-    my( $name )= @_;
-    if(  1 != @_  ||  ! $name  ||  $name =~ /\W/  ) {
-	require Carp;
-	Carp::croak( 'Usage: ',__PACKAGE__,'::regConstant("CONST_NAME")' );
-    }
-    my $proto= prototype $name;
-    if(  defined \&$name
-     &&  defined $proto
-     &&  "" eq $proto  ) {
-	no strict 'refs';
-	return &$name;
-    }
-    return undef;
-}
-
-# We provide this for backwards compatibility:
-sub constant
-{
-    my( $name )= @_;
-    my $value= regConstant( $name );
-    if(  defined $value  ) {
-	$!= 0;
-	return $value;
-    }
-    $!= 11; # EINVAL
-    return 0;
-}
-
-# BEGIN {
-#     my $code= 'return _regLastError(@_)';
-#     local( $!, $^E )= ( 1, 1 );
-#     if(  $! ne $^E  ) {
-# 	$code= '
-# 	    local( $^E )= _regLastError(@_);
-# 	    my $ret= $^E;
-# 	    return $ret;
-# 	';
-#     }
-#     eval "sub regLastError { $code }";
-#     die "$@"   if  $@;
-# }
-
-package Win32API::Registry::_error;
-
-use overload
-    '""' => sub {
-	require Win32 unless defined &Win32::FormatMessage;
-	$_ = Win32::FormatMessage(Win32API::Registry::_regLastError());
-	tr/\r\n//d;
-	return $_;
-    },
-    '0+' => sub { Win32API::Registry::_regLastError() },
-    'fallback' => 1;
-
-sub new { return bless {}, shift }
-sub set { Win32API::Registry::_regLastError($_[1]); return $_[0] }
-
-package Win32API::Registry;
-
-my $_error = new Win32API::Registry::_error;
-
-sub regLastError {
-    require Carp;
-    Carp::croak('Usage: ',__PACKAGE__,'::regLastError( [$setWin32ErrCode] )') if @_ > 1;
-    $_error->set($_[0]) if defined $_[0];
-    return $_error;
-}
-
-# Since we ISA DynaLoader which ISA AutoLoader, we ISA AutoLoader so we
-# need this next chunk to prevent Win32API::Registry->nonesuch() from
-# looking for "nonesuch.al" and producing confusing error messages:
-use vars qw($AUTOLOAD);
-sub AUTOLOAD {
-    require Carp;
-    Carp::croak(
-      "Can't locate method $AUTOLOAD via package Win32API::Registry" );
-}
-
-# Replace "&rout;" with "goto &rout;" when that is supported on Win32.
-
-# Let user omit all buffer sizes:
-sub RegEnumKeyExA {
-    if(  6 == @_  ) {	splice(@_,4,0,[]);  splice(@_,2,0,[]);  }
-    &_RegEnumKeyExA;
-}
-sub RegEnumKeyExW {
-    if(  6 == @_  ) {	splice(@_,4,0,[]);  splice(@_,2,0,[]);  }
-    &_RegEnumKeyExW;
-}
-sub RegEnumValueA {
-    if(  6 == @_  ) {	splice(@_,2,0,[]);  push(@_,[]);  }
-    &_RegEnumValueA;
-}
-sub RegEnumValueW {
-    if(  6 == @_  ) {	splice(@_,2,0,[]);  push(@_,[]);  }
-    &_RegEnumValueW;
-}
-sub RegQueryInfoKeyA {
-    if(  11 == @_  ) {	splice(@_,2,0,[]);  }
-    &_RegQueryInfoKeyA;
-}
-sub RegQueryInfoKeyW {
-    if(  11 == @_  ) {	splice(@_,2,0,[]);  }
-    &_RegQueryInfoKeyW;
-}
-
-sub RegEnumKeyA {
-    push(@_,[])   if  3 == @_;
-    &_RegEnumKeyA;
-}
-sub RegEnumKeyW {
-    push(@_,[])   if  3 == @_;
-    &_RegEnumKeyW;
-}
-sub RegGetKeySecurity {
-    push(@_,[])   if  3 == @_;
-    &_RegGetKeySecurity;
-}
-sub RegQueryMultipleValuesA {
-    push(@_,[])   if  4 == @_;
-    &_RegQueryMultipleValuesA;
-}
-sub RegQueryMultipleValuesW {
-    push(@_,[])   if  4 == @_;
-    &_RegQueryMultipleValuesW;
-}
-sub RegQueryValueA {
-    push(@_,[])   if  3 == @_;
-    &_RegQueryValueA;
-}
-sub RegQueryValueW {
-    push(@_,[])   if  3 == @_;
-    &_RegQueryValueW;
-}
-sub RegQueryValueExA {
-    push(@_,[])   if  5 == @_;
-    &_RegQueryValueExA;
-}
-sub RegQueryValueExW {
-    push(@_,[])   if  5 == @_;
-    &_RegQueryValueExW;
-}
-sub RegSetValueA {
-    push(@_,0)   if  4 == @_;
-    &_RegSetValueA;
-}
-sub RegSetValueW {
-    push(@_,0)   if  4 == @_;
-    &_RegSetValueW;
-}
-sub RegSetValueExA {
-    push(@_,0)   if  5 == @_;
-    &_RegSetValueExA;
-}
-sub RegSetValueExW {
-    push(@_,0)   if  5 == @_;
-    &_RegSetValueExW;
-}
-
-# Aliases for non-Unicode functions:
-sub AbortSystemShutdown		{ &AbortSystemShutdownA; }
-sub InitiateSystemShutdown	{ &InitiateSystemShutdownA; }
-sub RegConnectRegistry		{ &RegConnectRegistryA; }
-sub RegCreateKey		{ &RegCreateKeyA; }
-sub RegCreateKeyEx		{ &RegCreateKeyExA; }
-sub RegDeleteKey		{ &RegDeleteKeyA; }
-sub RegDeleteValue		{ &RegDeleteValueA; }
-sub RegEnumKey			{ &RegEnumKeyA; }
-sub RegEnumKeyEx		{ &RegEnumKeyExA; }
-sub RegEnumValue		{ &RegEnumValueA; }
-sub RegLoadKey			{ &RegLoadKeyA; }
-sub RegOpenKey			{ &RegOpenKeyA; }
-sub RegOpenKeyEx		{ &RegOpenKeyExA; }
-sub RegQueryInfoKey		{ &RegQueryInfoKeyA; }
-sub RegQueryMultipleValues	{ &RegQueryMultipleValuesA; }
-sub RegQueryValue		{ &RegQueryValueA; }
-sub RegQueryValueEx		{ &RegQueryValueExA; }
-sub RegReplaceKey		{ &RegReplaceKeyA; }
-sub RegRestoreKey		{ &RegRestoreKeyA; }
-sub RegSaveKey			{ &RegSaveKeyA; }
-sub RegSetValue			{ &RegSetValueA; }
-sub RegSetValueEx		{ &RegSetValueExA; }
-sub RegUnLoadKey		{ &RegUnLoadKeyA; }
-
-1;
-__END__
-
-=head1 NAME
-
-Win32API::Registry - Low-level access to Win32 system API calls from WINREG.H
-
-=head1 SYNOPSIS
-
-  use Win32API::Registry 0.21 qw( :ALL );
-
-  RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SYSTEM\\Disk", 0, KEY_READ, $key );
-    or  die "Can't open HKEY_LOCAL_MACHINE\\SYSTEM\\Disk: ",
-	    regLastError(),"\n";
-  RegQueryValueEx( $key, "Information", [], $type, $data, [] );
-    or  die "Can't read HKEY_L*MACHINE\\SYSTEM\\Disk\\Information: ",
-	    regLastError(),"\n";
-  [...]
-  RegCloseKey( $key )
-    or  die "Can't close HKEY_LOCAL_MACHINE\\SYSTEM\\Disk: ",
-	    regLastError(),"\n";
-
-=head1 DESCRIPTION
-
-This provides fairly low-level access to the Win32 System API
-calls dealing with the Registry [mostly from WINREG.H].  This
-is mostly intended to be used by other modules such as
-C<Win32::TieRegistry> [which provides an extremely Perl-friendly
-method for using the Registry].
-
-For a description of the logical structure of the Registry, see
-the documentation for the C<Win32::TieRegistry> module.
-
-To pass in C<NULL> as the pointer to an optional buffer, pass in
-an empty list reference, C<[]>.
-
-Beyond raw access to the API calls and related constants, this module
-handles smart buffer allocation and translation of return codes.
-
-All calls return a true value for success and a false value for
-failure.  After any failure, C<$^E> should automatically be set
-to indicate the reason.  However, current versions of Perl often
-overwrite C<$^E> too quickly, so you can use C<regLastError()>
-instead, which is only set by Win32API::Registry routines.
-
-Note that C<$!> is not set by these routines except by
-C<Win32API::Registry::constant()> when a constant is not defined.
-
-=head2 Exports
-
-Nothing is exported by default.  The following tags can be used to
-have sets of symbols exported.
-
-[Note that much of the following documentation refers to the
-behavior of the underlying API calls which may vary in current
-and future versions of the Win32 API without any changes to this
-module.  Therefore you should check the Win32 API documentation
-directly when needed.]
-
-=over
-
-=item :Func
-
-The basic function names:
-
-=over
-
-=item AllowPriv
-
-=item C<AllowPriv( $sPrivName, $bEnable )>
-
-Not a Win32 API call.  Enables or disables a specific privilege for
-the current process.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.  This routine
-does not provide a way to tell if a privilege is currently enabled.
-
-C<$sPrivname> is a Win32 privilege name [see L</:SE_>].  For example,
-C<"SeBackupPrivilege"> [a.k.a. C<SE_BACKUP_NAME>] controls whether
-you can use C<RegSaveKey()> and C<"SeRestorePrivilege"> [a.k.a.
-C<SE_RESTORE_NAME>] controls whether you can use C<RegLoadKey()>.
-
-If C<$bEnable> is true, then C<AllowPriv()> tries to enable the
-privilege.  Otherwise it tries to disable the privilege.
-
-=item AbortSystemShutdown
-
-=item C<AbortSystemShutdown( $sComputerName )>
-
-Tries to abort a remote shutdown request previously made via
-C<InitiateSystemShutdown()>.  Returns a true value if successful
-and a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-=item InitiateSystemShutdown
-
-=item C<InitiateSystemShutdown( $sComputer, $sMessage, $uTimeoutSecs, $bForce, $bReboot )>
-
-Requests that a [remote] computer be shutdown or rebooted.
-Returns a true value if successful and a false value [and
-sets C<$^E>/C<regLastError()>] on failure.
-
-C<$sComputer> is the name [or address] of the computer to be
-shutdown or rebooted.  You can use C<[]> [for C<NULL>] or C<"">
-to indicate the local computer.
-
-C<$sMessage> is the message to be displayed in a pop-up window
-on the desktop of the computer to be shutdown or rebooted until
-the timeout expires or the shutdown is aborted via
-C<AbortSystemShutdown()>.  With C<$iTimeoutSecs == 0>, the
-message will never be visible.
-
-C<$iTimeoutSecs> is the number of seconds to wait before starting
-the shutdown.
-
-If C<$bForce> is false, then any applications running on the remote
-computer get a chance to prompt the remote user whether they want
-to save changes.  Also, for any applications that do not exit quickly
-enough, the operating system will prompt the user whether they wish
-to wait longer for the application to exit or force it to exit now.
-At any of these prompts the user can press B<CANCEL> to abort the
-shutdown but if no applications have unsaved data, they will likely
-all exit quickly and the shutdown will progress with the remote user
-having no option to cancel the shutdown.
-
-If C<$bForce> is true, all applications are told to exit immediately
-and so will not prompt the user even if there is unsaved data.  Any
-applications that take too long to exit will be forcibly killed after
-a short time.  The only way to abort the shutdown is to call
-C<AbortSystemShutdown()> before the timeout expires and there is no
-way to abort the shutdown once it has begun.
-
-If C<$bReboot> is true, the computer will automatically reboot once
-the shutdown is complete.  If C<$bReboot> is false, then when the
-shutdown is complete the computer will halt at a screen indicating
-that the shutdown is complete and offering a way for the user to
-start to boot the computer.
-
-You must have the C<"SeRemoteShutdownPrivilege"> privilege
-on the remote computer for this call to succeed.  If shutting
-down the local computer, then the calling process must have
-the C<"SeShutdownPrivilege"> privilege and have it enabled.
-
-=item RegCloseKey
-
-=item C<RegCloseKey( $hKey )>
-
-Closes the handle to a Registry key returned by C<RegOpenKeyEx()>,
-C<RegConnectRegistry()>, C<RegCreateKeyEx()>, or a few other
-routines.  Returns a true value if successful and a false value
-[and sets C<$^E>/C<regLastError()>] on failure.
-
-=item RegConnectRegistry
-
-=item C<RegConnectRegistry( $sComputer, $hRootKey, $ohKey )>
-
-Connects to one of the root Registry keys of a remote computer.
-Returns a true value if successful and a false value [and
-sets C<$^E>/C<regLastError()>] on failure.
-
-C<$sComputer> is the name [or address] of a remote computer
-whose Registry you wish to access.
-
-C<$hKey> must be either C<HKEY_LOCAL_MACHINE> or C<HKEY_USERS>
-and specifies which root Registry key on the remote computer
-you wish to have access to.
-
-C<$phKey> will be set to the handle to be used to access the
-remote Registry key if the call succeeds.
-
-=item regConstant
-
-=item C<$value= regConstant( $sConstantName )>
-
-Fetch the value of a constant.  Returns C<undef> if C<$sConstantName>
-is not the name of a constant supported by this module.  Never sets
-C<$!> nor C<$^E>.
-
-This function is rarely used since you will usually get the value of a
-constant by having that constant imported into your package by listing
-the constant name in the C<use Win32API::Registry> statement and then
-simply using the constant name in your code [perhaps followed by
-C<()>].  This function is useful for verifying constant names not in
-Perl code, for example, after prompting a user to type in a constant
-name.
-
-=item RegCreateKey
-
-=item C<RegCreateKey( $hKey, $sSubKey, $ohSubKey )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegCreateKeyEx()> instead.
-
-=item RegCreateKeyEx
-
-=item C<RegCreateKeyEx( $hKey, $sSubKey, $uZero, $sClass, $uOpts, $uAccess, $pSecAttr, $ohNewKey, $ouDisp )>
-
-Creates a new Registry subkey.  Returns a true value if successful and
-a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sSubKey> is the name of the new subkey to be created.
-
-C<$iZero> is reserved for future use and should always be specified
-as C<0>.
-
-C<$sClass> is a string to be used as the class for the new
-subkey.  We are not aware of any current use for Registry key
-class information so the empty string, C<"">, should usually
-be used here.
-
-C<$iOpts> is a numeric value containing bits that control options
-used while creating the new subkey.  C<REG_OPTION_NON_VOLATILE>
-is the default.  C<REG_OPTION_VOLATILE> [which is ignored on
-Windows 95] means the data stored under this key is not kept
-in a file and will not be preserved when the system reboots.
-C<REG_OPTION_BACKUP_RESTORE> [also ignored on Windows 95] means
-ignore the C<$iAccess> parameter and try to open the new key with
-the access required to backup or restore the key.
-
-C<$iAccess> is a numeric mask of bits specifying what type of
-access is desired when opening the new subkey.  See C<RegOpenKeyEx()>.
-
-C<$pSecAttr> is a C<SECURITY_ATTRIBUTES> structure packed into
-a Perl string which controls whether the returned handle can be
-inherited by child processes.  Normally you would pass C<[]> for
-this parameter to have C<NULL> passed to the underlying API
-indicating that the handle cannot be inherited.  If not under
-Windows95, then C<$pSecAttr> also allows you to specify
-C<SECURITY_DESCRIPTOR> that controls which users will have
-what type of access to the new key -- otherwise the new key
-inherits its security from its parent key.
-
-C<$phKey> will be set to the handle to be used to access the new
-subkey if the call succeeds.
-
-C<$piDisp> will be set to either C<REG_CREATED_NEW_KEY> or
-C<REG_OPENED_EXISTING_KEY> to indicate for which reason the
-call succeeded.  Can be specified as C<[]> if you don't care.
-
-If C<$phKey> and C<$piDisp> start out as integers, then they will
-probably remain unchanged if the call fails.
-
-=item RegDeleteKey
-
-=item C<RegDeleteKey( $hKey, $sSubKey )>
-
-Deletes a subkey of an open Registry key provided that the subkey
-contains no subkeys of its own [but the subkey may contain values].
-Returns a true value if successful and a false value [and sets
-C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sSubKey> is the name of the subkey to be deleted.
-
-=item RegDeleteValue
-
-=item C<RegDeleteValue( $hKey, $sValueName )>
-
-Deletes a value from an open Registry key.  Returns a true value if
-successful and a false value [and sets C<$^E>/C<regLastError()>] on
-failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sValueKey> is the name of the value to be deleted.
-
-=item RegEnumKey
-
-=item C<RegEnumKey( $hKey, $uIndex, $osName, $ilNameSize )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegEnumKeyEx()> instead.
-
-=item RegEnumKeyEx
-
-=item C<RegEnumKeyEx( $hKey, $uIndex, $osName, $iolName, $pNull, $osClass, $iolClass, $opftLastWrite )>
-
-Lets you enumerate the names of all of the subkeys directly under
-an open Registry key.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$iIndex> is the sequence number of the immediate subkey that
-you want information on.  Start with this value as C<0> then
-repeat the call incrementing this value each time until the
-call fails with C<$^E>/C<regLastError()> numerically equal to
-C<ERROR_NO_MORE_ITEMS>.
-
-C<$sName> will be set to the name of the subkey.  Can be C<[]> if
-you don't care about the name.
-
-C<$plName> initially specifies the [minimum] buffer size to be
-allocated for C<$sName>.  Will be set to the length of the subkey
-name if the requested subkey exists even if C<$sName> isn't
-successfully set to the subkey name.  See L<Buffer sizes> for
-more information.
-
-C<$pNull> is reserved for future used and should be passed as C<[]>.
-
-C<$sClass> will be set to the class name for the subkey.  Can be
-C<[]> if you don't care about the class.
-
-C<$plClass> initially specifies the [minimum] buffer size to be
-allocated for C<$sClass> and will be set to the length of the
-subkey class name if the requested subkey exists.  See L<Buffer
-sizes> for more information.
-
-C<$pftLastWrite> will be set to a C<FILETIME> structure packed
-into a Perl string and indicating when the subkey was last changed.
-Can be C<[]>.
-
-You may omit both C<$plName> and C<$plClass> to get the same effect
-as passing in C<[]> for each of them.
-
-=item RegEnumValue
-
-=item C<RegEnumValue( $hKey, $uIndex, $osValName, $iolValName, $pNull, $ouType, $opValData, $iolValData )>
-
-Lets you enumerate the names of all of the values contained in an
-open Registry key.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$iIndex> is the sequence number of the value that you want
-information on.  Start with this value as C<0> then repeat the
-call incrementing this value each time until the call fails with
-C<ERROR_NO_MORE_ITEMS>.
-
-C<$sValName> will be set to the name of the value.  Can be C<[]>
-if you don't care about the name.
-
-C<$plValName> initially specifies the [minimum] buffer size to be
-allocated for C<$sValName>.  Will be set to the length of the value
-name if the requested value exists even if C<$sValName> isn't
-successfully set to the value name.  See L<Buffer sizes> for
-more information.
-
-C<$pNull> is reserved for future used and should be passed as C<[]>.
-
-C<$piType> will be set to the type of data stored in the value data.
-If the call succeeds, it will be set to a C<REG_*> value unless
-passed in as C<[]>.
-
-C<$pValData> will be set to the data [packed into a Perl string]
-that is stored in the requested value.  Can be C<[]> if you don't
-care about the value data.
-
-C<$plValData> initially specifies the [minimum] buffer size to be
-allocated for C<$sValData> and will be set to the length of the
-value data if the requested value exists.  See L<Buffer sizes> for
-more information.
-
-You may omit both C<$plValName> and C<$plValData> to get the same
-effect as passing in C<[]> for each of them.
-
-=item RegFlushKey
-
-=item C<RegFlushKey( $hKey )>
-
-Forces the data stored under an open Registry key to be flushed
-to the disk file where the data is preserved between reboots.
-Forced flushing is not guaranteed to be efficient so this routine
-should almost never be called.  Returns a true value if successful
-and a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-=item RegGetKeySecurity
-
-=item C<RegGetKeySecurity( $hKey, $uSecInfo, $opSecDesc, $iolSecDesc )>
-
-Retrieves one of the C<SECURITY_DESCRIPTOR> structures describing
-part of the security for an open Registry key.  Returns a true value
-if successful and a false value [and sets C<$^E>/C<regLastError()>]
-on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$iSecInfo> is a numeric C<SECURITY_INFORMATION> value that
-specifies which parts of the C<SECURITY_DESCRIPTOR> structure
-to retrieve.  Should be C<OWNER_SECURITY_INFORMATION>,
-C<GROUP_SECURITY_INFORMATION>, C<DACL_SECURITY_INFORMATION>, or
-or C<SACL_SECURITY_INFORMATION> or two or more of these bits
-combined using C<|>.
-
-C<$pSecDesc> will be set to the requested C<SECURITY_DESCRIPTOR>
-structure [packed into a Perl string].
-
-C<$plSecDesc> initially specifies the [minimum] buffer size to be
-allocated for C<$sSecDesc> and will be set to the length of the
-security descriptor.  See L<Buffer sizes> for more information.
-You may omit this parameter to get the same effect as passing in
-C<[]> for it.
-
-=item regLastError
-
-=item C<$svError= regLastError();>
-
-=item C<regLastError( $uError );>
-
-Returns the last error encountered by a routine from this module. 
-It is just like C<$^E> except it isn't changed by anything except
-routines from this module.  Ideally you could just use C<$^E>, but
-current versions of Perl often overwrite C<$^E> before you get a
-chance to check it and really old versions of Perl don't really
-support C<$^E> under Win32.
-
-Just like C<$^E>, in a numeric context C<regLastError()> returns
-the numeric error value while in a string context it returns a
-text description of the error [actually it returns a Perl scalar
-that contains both values so C<$x= regLastError()> causes C<$x>
-to give different values in string vs. numeric contexts].
-
-The last form sets the error returned by future calls to
-C<regLastError()> and should not be used often.  C<$uError> must
-be a numeric error code.  Also returns the dual-valued version
-of C<$uError>.
-
-=item RegLoadKey
-
-=item C<RegLoadKey( $hKey, $sSubKey, $sFileName )>
-
-Loads a hive file.  That is, it creates a new subkey in the
-Registry and associates that subkey with a disk file that contains
-a Registry hive so that the new subkey can be used to access the
-keys and values stored in that hive.  Hives are usually created
-via C<RegSaveKey()>.  Returns a true value if successful and a
-false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key that can have hives
-loaded to it.  This must be C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>,
-or a remote version of one of these from a call to
-C<RegConnectRegistry()>.
-
-C<$sSubKey> is the name of the new subkey to created and associated
-with the hive file.
-
-C<$sFileName> is the name of the hive file to be loaded.  This
-file name is interpretted relative to the
-C<%SystemRoot%/System32/config> directory on the computer where
-the C<$hKey> key resides.  If C<$sFileName> is on a FAT file
-system, then its name must not have an extension.
-
-You must have the C<SE_RESTORE_NAME> privilege to use this routine.
-
-WARNING:  Loading of hive files via a network share may silently
-corrupt the hive and so should not be attempted [this is a problem
-in at least some versions of the underlying API which this module
-does not try to fix or avoid].  To access a hive file located on a
-remote computer, connect to the remote computer's Registry and load
-the hive via that.
-
-=item RegNotifyChangeKeyValue
-
-=item C<RegNotifyChangeKeyValue( $hKey, $bWatchSubtree, $uNotifyFilter, $hEvent, $bAsync )>
-
-Arranges for your process to be notified when part of the Registry
-is changed.  Returns a true value if successful and a false value
-[and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call] for which you wish to be notified when any changes
-are made to it.
-
-If C<$bWatchSubtree> is true, then changes to any subkey or
-descendant of C<$hKey> are also reported.
-
-C<$iNotifyFilter> controllers what types of changes are reported.  It
-is a numeric value containing one or more of the following bit masks:
-
-=over
-
-=item C<REG_NOTIFY_CHANGE_NAME>
-
-Notify if a subkey is added or deleted to a monitored key.
-
-=item C<REG_NOTIFY_CHANGE_LAST_SET>
-
-Notify if a value in a monitored key is added, deleted, or modified.
-
-=item C<REG_NOTIFY_CHANGE_SECURITY>
-
-Notify if a security descriptor of a monitored key is changed.
-
-=item C<REG_NOTIFY_CHANGE_ATTRIBUTES>
-
-Notify if any attributes of a monitored key are changed [class
-name or security descriptors].
-
-=back
-
-C<$hEvent> is ignored unless C<$bAsync> is true.  Otherwise, C<$hEvent>
-is a handle to a Win32 I<event> that will be signaled when changes are
-to be reported.
-
-If C<$bAsync> is true, then C<RegNotifyChangeKeyValue()> returns
-immediately and uses C<$hEvent> to notify your process of changes.
-If C<$bAsync> is false, then C<RegNotifyChangeKeyValue()> does
-not return until there is a change to be notified of.
-
-This routine does not work with Registry keys on remote computers.
-
-=item RegOpenKey
-
-=item C<RegOpenKey( $hKey, $sSubKey, $ohSubKey )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegOpenKeyEx()> instead.
-
-=item RegOpenKeyEx
-
-=item C<RegOpenKeyEx( $hKey, $sSubKey, $uOptions, $uAccess, $ohSubKey )>
-
-Opens an existing Registry key.  Returns a true value if successful
-and a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sSubKey> is the name of an existing subkey to be opened.
-Can be C<""> or C<[]> to open an additional handle to the
-key specified by C<$hKey>.
-
-C<$iOptions> is a numeric value containing bits that control options
-used while opening the subkey.  There are currently no supported
-options so this parameter should be specified as C<0>.
-
-C<$iAccess> is a numeric mask of bits specifying what type of
-access is desired when opening the new subkey.  Should be a
-combination of one or more of the following bit masks:
-
-=over
-
-=item C<KEY_ALL_ACCESS>
-
-    KEY_READ | KEY_WRITE | KEY_CREATE_LINK
-
-=item C<KEY_READ>
-
-    KEY_QUERY_VALUE | KEY_ENUMERATE_SUBKEYS | KEY_NOTIFY | STANDARD_RIGHTS_READ
-
-=item C<KEY_WRITE>
-
-    KEY_SET_VALUE | KEY_CREATE_SUB_KEY | STANDARD_RIGHTS_WRITE
-
-=item C<KEY_QUERY_VALUE>
-
-=item C<KEY_SET_VALUE>
-
-=item C<KEY_ENUMERATE_SUB_KEYS>
-
-=item C<KEY_CREATE_SUB_KEY>
-
-=item C<KEY_NOTIFY>
-
-Allows you to use C<RegNotifyChangeKeyValue()> on the opened key.
-
-=item C<KEY_EXECUTE>
-
-Same as C<KEY_READ>.
-
-=item C<KEY_CREATE_LINK>
-
-Gives you permission to create a symbolic link like
-C<HKEY_CLASSES_ROOT> and C<HKEY_CURRENT_USER>, though the method for
-doing so is not documented [and probably requires use of the mostly
-undocumented "native" routines, C<Nt*()> a.k.a. C<Zw*()>].
-
-=back
-
-C<$phKey> will be set to the handle to be used to access the new subkey
-if the call succeeds.
-
-=item RegQueryInfoKey
-
-=item C<RegQueryInfoKey( $hKey, $osClass, $iolClass, $pNull, $ocSubKeys, $olSubKey, $olSubClass, $ocValues, $olValName, $olValData, $olSecDesc, $opftTime )>
-
-Gets miscellaneous information about an open Registry key.
-Returns a true value if successful and a false value [and
-sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sClass> will be set to the class name for the key.  Can be
-C<[]> if you don't care about the class.
-
-C<$plClass> initially specifies the [minimum] buffer size to be
-allocated for C<$sClass> and will be set to the length of the
-key's class name.  See L<Buffer sizes> for more information.
-You may omit this parameter to get the same effect as passing in
-C<[]> for it.
-
-C<$pNull> is reserved for future use and should be passed as C<[]>.
-
-C<$pcSubKeys> will be set to the count of the number of subkeys
-directly under this key.  Can be C<[]>.
-
-C<$plSubKey> will be set to the length of the longest subkey name.
-Can be C<[]>.
-
-C<$plSubClass> will be set to the length of the longest class name
-used with an immediate subkey of this key.  Can be C<[]>.
-
-C<$pcValues> will be set to the count of the number of values in
-this key.  Can be C<[]>.
-
-C<$plValName> will be set to the length of the longest value name
-in this key.  Can be C<[]>.
-
-C<$plValData> will be set to the length of the longest value data
-in this key.  Can be C<[]>.
-
-C<$plSecDesc> will be set to the length of this key's full security
-descriptor.
-
-C<$pftTime> will be set to a C<FILETIME> structure packed
-into a Perl string and indicating when this key was last changed.
-Can be C<[]>.
-
-=item RegQueryMultipleValues
-
-=item C<RegQueryMultipleValues( $hKey, $ioarValueEnts, $icValueEnts, $opBuffer, $iolBuffer )>
-
-Allows you to use a single call to query several values from a single
-open Registry key to maximize efficiency.  Returns a true value if
-successful and a false value [and sets C<$^E>/C<regLastError()>] on
-failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$pValueEnts> should contain a list of C<VALENT> structures packed
-into a single Perl string.  Each C<VALENT> structure should have
-the C<ve_valuename> entry [the first 4 bytes] pointing to a string
-containing the name of a value stored in this key.  The remaining
-fields are set if the function succeeds.
-
-C<$cValueEnts> should contain the count of the number of C<VALENT>
-structures contained in C<$pValueEnts>.
-
-C<$pBuffer> will be set to the data from all of the requested values
-concatenated into a single Perl string.
-
-C<$plBuffer> initially specifies the [minimum] buffer size to be
-allocated for C<$sBuffer> and will be set to the total length of
-the data to be written to C<$sBuffer>.  See L<Buffer sizes> for
-more information.  You may omit this parameter to get the same
-effect as passing in C<[]> for it.
-
-Here is sample code to populate C<$pValueEnts>:
-
-    # @ValueNames= ...list of value name strings...;
-    $cValueEnts= @ValueNames;
-    $pValueEnts= pack( " p x4 x4 x4 " x $cValueEnts, @ValueNames );
-
-Here is sample code to retrieve the data type and data length
-returned in C<$pValueEnts>:
-
-    @Lengths= unpack( " x4 L x4 x4 " x $cValueEnts, $pValueEnts );
-    @Types=   unpack( " x4 x4 x4 L " x $cValueEnts, $pValueEnts );
-
-Given the above, and assuming you haven't modified C<$sBuffer> since
-the call, you can also extract the value data strings from C<$sBuffer>
-by using the pointers returned in C<$pValueEnts>:
-
-    @Data=    unpack(  join( "", map {" x4 x4 P$_ x4 "} @Lengths ),
-    		$pValueEnts  );
-
-Much better is to use the lengths and extract directly from
-C<$sBuffer> using C<unpack()> [or C<substr()>]:
-
-    @Data= unpack( join("",map("P$_",@Lengths)), $sBuffer );
-
-=item RegQueryValue
-
-=item C<RegQueryValue( $hKey, $sSubKey, $osValueData, $iolValueData )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegQueryValueEx()> instead.  This routine can only
-query unamed values [a.k.a. "default values"], that is, values with
-a name of C<"">.
-
-=item RegQueryValueEx
-
-=item C<RegQueryValueEx( $hKey, $sValueName, $pNull, $ouType, $opValueData, $iolValueData )>
-
-Lets you look up value data stored in an open Registry key by
-specifying the value name.  Returns a true value if successful
-and a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sValueName> is the name of the value whose data you wish to
-retrieve.
-
-C<$pNull> this parameter is reserved for future use and should be
-specified as C<[]>.
-
-C<$piType> will be set to indicate what type of data is stored in
-the named value.  Will be set to a C<REG_*> value if the function
-succeeds.
-
-C<$pValueData> will be set to the value data [packed into a Perl
-string] that is stored in the named value.  Can be C<[]> if you
-don't care about the value data.
-
-C<$plValueData> initially specifies the [minimum] buffer size to be
-allocated for C<$sValueData> and will be set to the size [always
-in bytes] of the data to be written to C<$sValueData>, even if
-C<$sValueData> is not successfully written to.  See L<Buffer sizes>
-for more information.
-
-=item RegReplaceKey
-
-=item C<RegReplaceKey( $hKey, $sSubKey, $sNewFile, $sOldFile )>
-
-Lets you replace an entire hive when the system is next booted. 
-Returns a true value if successful and a false value [and sets
-C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key that has hive(s)
-loaded in it.  This must be C<HKEY_LOCAL_MACHINE>,
-C<HKEY_USERS>, or a remote version of one of these from
-a call to C<RegConnectRegistry()>.
-
-C<$sSubKey> is the name of the subkey of C<$hKey> whose hive
-you wish to have replaced on the next reboot.
-
-C<$sNewFile> is the name of a file that will replace the existing
-hive file when the system reboots.
-
-C<$sOldFile> is the file name to save the current hive file to
-when the system reboots.
-
-C<$sNewFile> and C<$sOldFile> are interpretted relative to the
-C<%SystemRoot%/System32/config> directory on the computer where
-the C<$hKey> key resides [I think].  If either file is [would be]
-on a FAT file system, then its name must not have an extension.
-
-You must have the C<SE_RESTORE_NAME> privilege to use this routine.
-
-=item RegRestoreKey
-
-=item C<RegRestoreKey( $hKey, $sFileName, $uFlags )>
-
-Reads in a hive file and copies its contents over an existing
-Registry tree.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sFileName> is the name of the hive file to be read.  For each
-value and subkey in this file, a value or subkey will be added
-or replaced in C<$hKey>.
-
-C<$uFlags> is usally C<0>.  It can also be C<REG_WHOLE_HIVE_VOLATILE>
-which, rather than copying the hive over the existing key,
-replaces the existing key with a temporary, memory-only Registry
-key and then copies the hive contents into it.  This option only
-works if C<$hKey> is C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>, or a
-remote version of one of these from a call to C<RegConnectRegistry()>.
-
-C<RegRestoreKey> does I<not> delete values nor keys from the
-existing Registry tree when there is no corresponding value/key
-in the hive file.
-
-=item RegSaveKey
-
-=item C<RegSaveKey( $hKey, $sFileName, $pSecAttr )>
-
-Dumps any open Registry key and all of its subkeys and values into
-a new hive file.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sFileName> is the name of the file that the Registry tree
-should be saved to.  It is interpretted relative to the
-C<%SystemRoot%/System32/config> directory on the computer where
-the C<$hKey> key resides.  If C<$sFileName> is on a FAT file system,
-then it must not have an extension.
-
-C<$pSecAttr> contains a C<SECURITY_ATTRIBUTES> structure that specifies
-the permissions to be set on the new file that is created.  This can
-be C<[]>.
-
-You must have the C<SE_RESTORE_NAME> privilege to use this routine.
-
-=item RegSetKeySecurity
-
-=item C<RegSetKeySecurity( $hKey, $uSecInfo, $pSecDesc )>
-
-Sets [part of] the C<SECURITY_DESCRIPTOR> structure describing part
-of the security for an open Registry key.  Returns a true value if
-successful and a false value [and sets C<$^E>/C<regLastError()>] on
-failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$uSecInfo> is a numeric C<SECURITY_INFORMATION> value that
-specifies which C<SECURITY_DESCRIPTOR> structure to set.  Should
-be C<OWNER_SECURITY_INFORMATION>, C<GROUP_SECURITY_INFORMATION>,
-C<DACL_SECURITY_INFORMATION>, or C<SACL_SECURITY_INFORMATION>
-or two or more of these bits combined using C<|>.
-
-C<$pSecDesc> contains the new C<SECURITY_DESCRIPTOR> structure
-packed into a Perl string.
-
-=item RegSetValue
-
-=item C<RegSetValue( $hKey, $sSubKey, $uType, $sValueData, $lValueData )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegSetValueEx()> instead.  This routine can only
-set unamed values [a.k.a. "default values"].
-
-=item RegSetValueEx
-
-=item C<RegSetValueEx( $hKey, $sName, $uZero, $uType, $pData, $lData )>
-
-Adds or replaces a value in an open Registry key.  Returns
-a true value if successful and a false value [and sets
-C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sName> is the name of the value to be set.
-
-C<$uZero> is reserved for future use and should be specified as C<0>.
-
-C<$uType> is the type of data stored in C<$pData>.  It should
-be a C<REG_*> value.
-
-C<$pData> is the value data packed into a Perl string.
-
-C<$lData> is the length of the value data that is stored in C<$pData>.
-You will usually omit this parameter or pass in C<0> to have
-C<length($pData)> used.  In both of these cases, if C<$iType> is
-C<REG_SZ> or C<REG_EXPAND_SZ>, C<RegSetValueEx()> will append a
-trailing C<'\0'> to the end of C<$pData> [unless there is already
-one].
-
-=item RegUnLoadKey
-
-=item C<RegUnLoadKey( $hKey, $sSubKey )>
-
-Unloads a previously loaded hive file.  That is, closes the
-hive file then deletes the subkey that was providing access
-to it.  Returns a true value if successful and a false value
-[and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key that has hives
-loaded in it.  This must be C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>,
-or a remote version of one of these from a call to
-C<RegConnectRegistry()>.
-
-C<$sSubKey> is the name of the subkey whose hive you wish to
-have unloaded.
-
-=item :FuncA
-
-The ASCII-specific function names.
-
-Each of these is identical to the version listed above without the
-trailing "A":
-
-	AbortSystemShutdownA	InitiateSystemShutdownA
-	RegConnectRegistryA	RegCreateKeyA		RegCreateKeyExA
-	RegDeleteKeyA		RegDeleteValueA		RegEnumKeyA
-	RegEnumKeyExA		RegEnumValueA		RegLoadKeyA
-	RegOpenKeyA		RegOpenKeyExA		RegQueryInfoKeyA
-	RegQueryMultipleValuesA	RegQueryValueA		RegQueryValueExA
-	RegReplaceKeyA		RegRestoreKeyA		RegSaveKeyA
-	RegSetValueA		RegSetValueExA		RegUnLoadKeyA
-
-=item :FuncW
-
-The UNICODE-specific function names.  These are the same as the
-versions listed above without the trailing "W" except that string
-parameters are UNICODE strings rather than ASCII strings, as
-indicated.
-
-=item AbortSystemShutdownW
-
-=item C<AbortSystemShutdownW( $swComputerName )>
-
-C<$swComputerName> is UNICODE.
-
-=item InitiateSystemShutdownW
-
-=item C<InitiateSystemShutdownW( $swComputer, $swMessage, $uTimeoutSecs, $bForce, $bReboot )>
-
-C<$swComputer> and C<$swMessage> are UNICODE.
-
-=item RegConnectRegistryW
-
-=item C<RegConnectRegistryW( $swComputer, $hRootKey, $ohKey )>
-
-C<$swComputer> is UNICODE.
-
-=item RegCreateKeyW
-
-=item C<RegCreateKeyW( $hKey, $swSubKey, $ohSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item RegCreateKeyExW
-
-=item C<RegCreateKeyExW( $hKey, $swSubKey, $uZero, $swClass, $uOpts, $uAccess, $pSecAttr, $ohNewKey, $ouDisp )>
-
-C<$swSubKey> and C<$swClass> are UNICODE.
-
-=item RegDeleteKeyW
-
-=item C<RegDeleteKeyW( $hKey, $swSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item RegDeleteValueW
-
-=item C<RegDeleteValueW( $hKey, $swValueName )>
-
-C<$swValueName> is UNICODE.
-
-=item RegEnumKeyW
-
-=item C<RegEnumKeyW( $hKey, $uIndex, $oswName, $ilwNameSize )>
-
-C<$oswName> is UNICODE and C<$ilwNameSize> is measured as number of
-C<WCHAR>s.
-
-=item RegEnumKeyExW
-
-=item C<RegEnumKeyExW( $hKey, $uIndex, $oswName, $iolwName, $pNull, $oswClass, $iolwClass, $opftLastWrite )>
-
-C<$swName> and C<$swClass> are UNICODE and C<$iolwName> and C<$iolwClass>
-are measured as number of C<WCHAR>s.
-
-=item RegEnumValueW
-
-=item C<RegEnumValueW( $hKey, $uIndex, $oswName, $iolwName, $pNull, $ouType, $opData, $iolData )>
-
-C<$oswName> is UNICODE and C<$iolwName> is measured as number
-of C<WCHAR>s.
-
-C<$opData> is UNICODE if C<$piType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
-or C<REG_MULTI_SZ>.  Note that C<$iolData> is measured as number
-of bytes even in these cases.
-
-=item RegLoadKeyW
-
-=item C<RegLoadKeyW( $hKey, $swSubKey, $swFileName )>
-
-C<$swSubKey> and C<$swFileName> are UNICODE.
-
-=item RegOpenKeyW
-
-=item C<RegOpenKeyW( $hKey, $swSubKey, $ohSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item RegOpenKeyExW
-
-=item C<RegOpenKeyExW( $hKey, $swSubKey, $uOptions, $uAccess, $ohSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item RegQueryInfoKeyW
-
-=item C<RegQueryInfoKeyW( $hKey, $oswClass, $iolwClass, $pNull, $ocSubKeys, $olwSubKey, $olwSubClass, $ocValues, $olwValName, $olValData, $olSecDesc, $opftTime )>
-
-C<$swClass> is UNICODE.  C<$iolwClass>, C<$olwSubKey>, C<$olwSubClass>,
-and C<$olwValName> are measured as number of C<WCHAR>s.  Note that
-C<$olValData> is measured as number of bytes.
-
-=item RegQueryMultipleValuesW
-
-=item C<RegQueryMultipleValuesW( $hKey, $ioarValueEnts, $icValueEnts, $opBuffer, $iolBuffer )>
-
-The C<ve_valuename> fields of the C<VALENT> [actually C<VALENTW>]
-structures in C<$ioarValueEnts> are UNICODE.  Values of type C<REG_SZ>,
-C<REG_EXPAND_SZ>, and C<REG_MULTI_SZ> are written to C<$opBuffer>
-in UNICODE.  Note that C<$iolBuffer> and the C<ve_valuelen> fields
-of the C<VALENT> [C<VALENTW>] structures are measured as number of
-bytes.
-
-=item RegQueryValueW
-
-=item C<RegQueryValueW( $hKey, $swSubKey, $oswValueData, $iolValueData )>
-
-C<$swSubKey> and C<$oswValueData> are UNICODE.  Note that
-C<$iolValueData> is measured as number of bytes.
-
-=item RegQueryValueExW
-
-=item C<RegQueryValueExW( $hKey, $swName, $pNull, $ouType, $opData, $iolData )>
-
-C<$swName> is UNICODE.
-
-C<$opData> is UNICODE if C<$ouType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
-or C<REG_MULTI_SZ>.  Note that C<$iolData> is measured as number of
-bytes even in these cases.
-
-=item RegReplaceKeyW
-
-=item C<RegReplaceKeyW( $hKey, $swSubKey, $swNewFile, $swOldFile )>
-
-C<$swSubKey>, C<$swNewFile>, and C<$swOldFile> are UNICODE.
-
-=item RegRestoreKeyW
-
-=item C<RegRestoreKeyW( $hKey, $swFileName, $uFlags )>
-
-C<$swFileName> is UNICODE.
-
-=item RegSaveKeyW
-
-=item C<RegSaveKeyW( $hKey, $swFileName, $pSecAttr )>
-
-C<$swFileName> is UNICODE.
-
-=item RegSetValueW
-
-=item C<RegSetValueW( $hKey, $swSubKey, $uType, $swValueData, $lValueData )>
-
-C<$swSubKey> and C<$swValueData> are UNICODE.  Note that
-C<$lValueData> is measured as number of bytes even though
-C<$swValueData> is always UNICODE.
-
-=item RegSetValueExW
-
-=item C<RegSetValueExW( $hKey, $swName, $uZero, $uType, $pData, $lData )>
-
-C<$swName> is UNICODE.
-
-C<$pData> is UNICODE if C<$uType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
-or C<REG_MULTI_SZ>.  Note that C<$lData> is measured as number of
-bytes even in these cases.
-
-=item RegUnLoadKeyW
-
-=item C<RegUnLoadKeyW( $hKey, $swSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item :HKEY_
-
-All C<HKEY_*> constants:
-
-	HKEY_CLASSES_ROOT	HKEY_CURRENT_CONFIG	HKEY_CURRENT_USER
-	HKEY_DYN_DATA		HKEY_LOCAL_MACHINE	HKEY_PERFORMANCE_DATA
-	HKEY_USERS
-
-=item :KEY_
-
-All C<KEY_*> constants:
-
-	KEY_QUERY_VALUE		KEY_SET_VALUE		KEY_CREATE_SUB_KEY
-	KEY_ENUMERATE_SUB_KEYS	KEY_NOTIFY		KEY_CREATE_LINK
-	KEY_READ		KEY_WRITE		KEY_EXECUTE
-	KEY_ALL_ACCESS
-
-=item :REG_
-
-All C<REG_*> constants:
-
-	REG_CREATED_NEW_KEY		REG_OPENED_EXISTING_KEY
-
-	REG_LEGAL_CHANGE_FILTER		REG_NOTIFY_CHANGE_ATTRIBUTES
-	REG_NOTIFY_CHANGE_NAME		REG_NOTIFY_CHANGE_LAST_SET
-	REG_NOTIFY_CHANGE_SECURITY	REG_LEGAL_OPTION
-
-	REG_OPTION_BACKUP_RESTORE	REG_OPTION_CREATE_LINK
-	REG_OPTION_NON_VOLATILE		REG_OPTION_OPEN_LINK
-	REG_OPTION_RESERVED		REG_OPTION_VOLATILE
-
-	REG_WHOLE_HIVE_VOLATILE		REG_REFRESH_HIVE
-	REG_NO_LAZY_FLUSH
-
-	REG_NONE			REG_SZ
-	REG_EXPAND_SZ			REG_BINARY
-	REG_DWORD			REG_DWORD_LITTLE_ENDIAN
-	REG_DWORD_BIG_ENDIAN		REG_LINK
-	REG_MULTI_SZ			REG_RESOURCE_LIST
-	REG_FULL_RESOURCE_DESCRIPTOR	REG_RESOURCE_REQUIREMENTS_LIST
-
-=item :ALL
-
-All of the above.
-
-=item :SE_
-
-The strings for the following privilege names:
-
-	SE_ASSIGNPRIMARYTOKEN_NAME	SE_AUDIT_NAME
-	SE_BACKUP_NAME			SE_CHANGE_NOTIFY_NAME
-	SE_CREATE_PAGEFILE_NAME		SE_CREATE_PERMANENT_NAME
-	SE_CREATE_TOKEN_NAME		SE_DEBUG_NAME
-	SE_INCREASE_QUOTA_NAME		SE_INC_BASE_PRIORITY_NAME
-	SE_LOAD_DRIVER_NAME		SE_LOCK_MEMORY_NAME
-	SE_MACHINE_ACCOUNT_NAME		SE_PROF_SINGLE_PROCESS_NAME
-	SE_REMOTE_SHUTDOWN_NAME		SE_RESTORE_NAME
-	SE_SECURITY_NAME		SE_SHUTDOWN_NAME
-	SE_SYSTEMTIME_NAME		SE_SYSTEM_ENVIRONMENT_NAME
-	SE_SYSTEM_PROFILE_NAME		SE_TAKE_OWNERSHIP_NAME
-	SE_TCB_NAME			SE_UNSOLICITED_INPUT_NAME
-
-It can be difficult to successfully build this module in a way
-that makes these constants available.  So some builds of this
-module may not make them available.  For such builds, trying
-to export any of these constants will cause a fatal error.
-For this reason, none of these symbols are currently included
-in the C<":ALL"> grouping.
-
-=back
-
-=head2 The Win32API:: heirarchy
-
-This and the other Win32API:: modules are meant to expose the
-nearly raw API calls so they can be used from Perl code in any
-way they might be used from C code.  This provides the following
-advantages:
-
-=over
-
-=item Many modules can be written by people that don't have a C compiler.
-
-=item Encourages more module code to be written in Perl [not C].
-
-Perl code is often much easier to inspect, debug, customize, and
-enhance than XS code.
-
-=item Allows those already familiar with the Win32 API to get
-off to a quick start.
-
-=item Provides an interactive tool for exploring even obscure
-details of the Win32 API.
-
-It can be very useful to interactively explore ad-hoc calls into
-parts of the Win32 API using:
-
-    perl -de 0
-
-=item Ensures that native Win32 data structures can be used.
-
-This allows maximum efficiency.  It also allows data from one
-module [for example, time or security information from the
-C<Win32API::Registry> or C<Win32API::File> modules] to be used
-with other modules [for example, C<Win32API::Time> and
-C<Win32API::SecDesc>].
-
-=item Provides a single version of the XS interface to each API
-call where improvements can be collected.
-
-=back
-
-=head2 Buffer sizes
-
-For each parameter that specifies a buffer size, a value of C<0>
-can be passed.  For parameter that are pointers to buffer sizes,
-you can also pass in C<NULL> by specifying an empty list reference,
-C<[]>.  Both of these cases will ensure that the variable has
-I<some> buffer space allocated to it and pass in that buffer's
-allocated size.  Many of the calls indicate, via C<ERROR_MORE_DATA>,
-that the buffer size was not sufficient and the F<Registry.xs>
-code will automatically enlarge the buffer to the required size
-and repeat the call.
-
-Numeric buffer sizes are used as minimum initial sizes for the
-buffers.  The larger of this size and the size of space already
-allocated to the scalar will be passed to the underlying routine. 
-If that size was insufficient, and the underlying call provides
-an easy method for determining the needed buffer size, then the
-buffer will be enlarged and the call repeated as above.
-
-The underlying calls define buffer size parameter as unsigned, so
-negative buffer sizes are treated as very large positive buffer
-sizes which usually cause C<malloc()> to fail.
-
-To force the F<Registry.xs> code to pass in a specific value for
-a buffer size, preceed the size with an equals sign via C<"=".>. 
-Buffer sizes that are passed in as strings starting with an equals
-sign will have the equal sign stripped and the remainder of the string
-interpretted as a number [via C's C<strtoul()> using only base 10]
-which will be passed to the underlying routine [even if the allocated
-buffer is actually larger].  The F<Registry.xs> code will enlarge the
-buffer to the specified size, if needed, but will not enlarge the
-buffer based on the underlying routine requesting more space.
-
-Some Reg*() calls may not currently set the buffer size when they
-return C<ERROR_MORE_DATA>.  But some that are not documented as
-doing so, currently do so anyway.  So the code assumes that any
-routine I<might> do this and resizes any buffers and repeats the
-call.   We hope that eventually all routines will provide this
-feature.
-
-When you use C<[]> for a buffer size, you can still find the
-length of the data returned by using C<length($buffer)>.  Note
-that this length will be in bytes while a few of the buffer
-sizes would have been in units of wide characters.
-
-Note that the RegQueryValueEx*() and RegEnumValue*() calls
-will trim the trailing C<'\0'> [if present] from the returned data
-values of type C<REG_SZ> or C<REG_EXPAND_SZ> but only if the
-value data length parameter is omitted [or specified as C<[]>].
-
-The RegSetValueEx*() calls will add a trailing C<'\0'> [if
-missing] to the supplied data values of type C<REG_SZ> and
-C<REG_EXPAND_SZ> but only if the value data length parameter
-is omitted [or specified as C<0>].
-
-=head2 Hungarian Notation
-
-The following abbreviations are used at the start of each parameter
-name to hint at aspects of how the parameter is used.  The prefix
-is always in lower case and followed by a capital letter that starts
-the descriptive part of the parameter name.  Several of the following
-abbreviations can be combined into a single prefix.
-
-Probably not all of these prefix notations are used by this module. 
-This document section may be included in any C<Win32API> module and
-so covers some notations not used by this specific module.
-
-=over
-
-=item s
-
-A string.  In C, a C<'\0'>-terminated C<char *>.  In Perl, just a
-string except that it will be truncated at the first C<"\0">, if
-it contains one.
-
-=item sw
-
-A wide [UNICODE] string.  In C, a C<L'\0'>-terminated C<WCHAR *>.
-In Perl, a string that contains UNICODE data.  You can convert a
-string to UNICODE in Perl via:
-
-    $string= "This is an example string";
-    $unicode= pack( "S*", unpack("C*",$string), 0 );
-
-Note how C<, 0> above causes an explicit C<L'\0'> to be added since
-Perl's implicit C<'\0'> that it puts after each of its strings is not
-wide enough to terminate a UNICODE string.  So UNICODE strings are
-different than regular strings in that the Perl version of a regular
-string will not include the trialing C<'\0'> while the Perl version
-of a UNICODE string must include the trailing C<L'\0'>.
-
-If a UNICODE string contains no non-ASCII characters, then you
-can convert it back into a normal string via:
-
-    $string= pack( "C*", unpack("S*",$unicode) );
-    $string =~ s/\0$//;
-
-=item p
-
-A pointer to some buffer [usually containing some C<struct>].  In C,
-a C<void *> or some other pointer type.  In Perl, a string that is
-usually manipulated using C<pack> and C<unpack>.  The "p" is usually
-followed by more prefix character(s) to indicate what type of data is
-stored in the bufffer.
-
-=item a
-
-A packed array.  In C, an array [usually of C<struct>s].  In Perl, a
-string containing the packed data.  The "a" is usually followed by
-more prefix character(s) to indicate the data type of the elements.
-
-These packed arrays are also called "vectors" in places to avoid
-confusion with Perl arrays.
-
-=item n
-
-A generic number.   In C, any of the integer or floating point data
-types.  In Perl, a number; either an integer, unsigned, or double
-[IV, UV, or NV, respectively].  Usually an integer.
-
-=item iv
-
-A signed integral value.  In C, any of the signed integer data types. 
-In Perl, an integer [IV].
-
-=item u
-
-An unsigned integral value.  In C, any of the unsigned integer data
-types.  In Perl, an unsigned integer [UV].
-
-=item d
-
-A floating-point number.  In C, a C<float> or C<double> or, perhaps,
-a C<long double>.  In Perl, a double-precision floating-point number
-[NV].
-
-=item b
-
-A Boolean value.  In C, any integer data type, though usually via
-a type alias of C<bool> or C<BOOL>, containing either a 0 [false] or
-non-zero [true] value.  In Perl, a scalar containing a Boolean value
-[C<0>, C<"">, or C<undef> for "false" and anything else for "true"].
-
-=item c
-
-A count of items.  In C, any integer data type.  In Perl, an unsigned
-integer [UV].  Usually used in conjunction with a "vector" parameter
-[see L</a> above] to indicate the number of elements.
-
-=item l
-
-A length [in bytes].  In C, any integer data type.  In Perl, an
-unsigned integer [UV].  Usually used in conjunction with a "string"
-or "pointer" parameter [see L</s> and L</p> above] to indicate the
-buffer size or the size of the value stored in the buffer.
-
-For strings, there is no general rule as to whether the trailing
-C<'\0'> is included in such sizes.  For this reason, the C<Win32API>
-modules follow the Perl rule of always allocating one extra byte
-and reporting buffer sizes as being one smaller than allocated in
-case the C<'\0'> is not included in the size.
-
-=item lw
-
-A length measured as number of UNICODE characters.  In C, a count
-of C<WCHAR>s.  In Perl, an unsigned integer [UV] counting "shorts"
-[see "s" and "S" in C<pack> and C<unpack>].
-
-For UNICODE strings, the trailing C<L'\0'> may or may not be
-included in a length so, again, we always allocate extra room
-for one and don't report that extra space.
-
-=item h
-
-A handle.  In C, a C<HANDLE> or more-specific handle data type. 
-In Perl, an unsigned integer [UV].  In C, these handles are often
-actually some type of pointer, but Perl just treats them as opaque
-numbers, as it should.  This prefix is also used for other pointers
-that are treated as integers in Perl code.
-
-=item r
-
-A record.  In C, almost always a C<struct> or perhaps C<union>.  Note
-that C C<struct>s are rarely passed by value so the "r" is almost
-always preceeded by a "p" or "a" [see L</p> and L</a> above].  For
-the very rare unadorned "r", Perl stores the record in the same way
-as a "pr", that is, in a string.  For the very rare case where Perl
-explicitly stores a pointer to the C<struct> rather than storing the
-C<struct> directly in a Perl string, the prefix "pp" or "ppr" or even
-"par" is used.
-
-=item sv
-
-=item rv
-
-=item hv
-
-=item av
-
-=item cv
-
-A Perl data type.  Respectively, a scalar value [SV], a reference
-[RV] [usually to a scalar], a hash [HV], a Perl array [AV], or a Perl
-code reference [PVCV].  For the "hv", "av", and "cv" prefixes, a
-leading "rv" is usually assumed.  For a parameter to an XS subroutine,
-a prefix of "sv" means the parameter is a scalar and so may be a string
-or a number [or C<undef>] or even both at the same time.  So "sv"
-doesn't imply a leading "rv".
-
-=item Input or Output
-
-Whether a parameter is for input data, output data, or both is usually
-not reflected by the data type prefix.  In cases where this is not
-obvious nor reflected in the parameter name proper, we may use the
-following in front of the data type prefix.
-
-=over
-
-=item i
-
-An input parameter given to the API [usually omitted].
-
-=item o
-
-An output-only parameter taken from the API.  You should not get a
-warning if such a parameter is C<undef> when you pass it into the
-function.  You should get an error if such a parameter is read-only.
-You can [usually] pass in C<[]> for such a parameter to have the
-parameter silently ignored.
-
-The output may be written directly into the Perl variable passed
-to the subroutine, the same way the buffer parameter to Perl's
-C<sysread()>.  This method is often avoided in Perl because
-the call then lacks any visual cue that some parameters are being
-overwritten.   But this method closely matches the C API which is
-what we are trying to do.
-
-=item io
-
-Input given to the API then overwritten with output taken from the
-API.  You should get a warning [if B<-w> is in effect] if such a
-parameter is C<undef> when you pass it into the function [unless it
-is a buffer or buffer length parameter].  If the value is read-only,
-then [for most parameters] the output is silently not written.  This
-is because it is often convenient to pass in read-only constants for
-many such parameters.  You can also usually pass in C<[]> for such
-parameters.
-
-=back
-
-=item pp
-
-=item ppr
-
-=item par
-
-=item pap
-
-These are just unusual combinations of prefix characters described above.
-
-For each, a pointer is stored in a [4-byte] Perl string.  You can
-usually use C<unpack "P"> to access the real data from Perl.
-
-For "ppr" [and often for "pp"], the pointer points directly at a
-C C<struct>.  For "par", the pointer points to the first element
-of a C [packed] array of C<struct>s.  For "pap", the pointer points
-to a C [packed] array of pointers to other things.
-
-=item ap
-
-Here we have a list of pointers packed into a single Perl string.
-
-=back
-
-=head1 BUGS
-
-The old ActiveState ports of Perl for Win32 [but not, ActivePerl, the
-ActiveState distributions of standard Perl 5.004 and beyond] do not support
-the tools for building extensions and so do not support this extension.
-
-No routines are provided for using the data returned in the C<FILETIME>
-buffers.  Those are in the C<Win32API::Time> module.
-
-No routines are provided for dealing with UNICODE data effectively. 
-See L</:FuncW> above for some simple-minded UNICODE methods.
-
-Parts of the module test will fail if used on a version of Perl
-that does not yet set C<$^E> based on C<GetLastError()>.
-
-On NT 4.0 [at least], the RegEnum*() calls do not set the required
-buffer sizes when returning C<ERROR_MORE_DATA> so this module will
-not grow the buffers in such cases.  C<Win32::TieRegistry> overcomes
-this by using values from C<RegQueryInfoKey()> for buffer sizes in
-RegEnum* calls.
-
-On NT 4.0 [at least], C<RegQueryInfoKey()> on C<HKEY_PERFORMANCE_DATA>
-never succeeds.  Also, C<RegQueryValueEx()> on C<HKEY_PERFORMANCE_DATA>
-never returns the required buffer size.  To access C<HKEY_PERFORMANCE_DATA>
-you will need to keep growing the data buffer until the call succeeds.
-
-Because C<goto &subroutine> seems to be buggy under Win32 Perl,
-it is not used in the stubs in F<Registry.pm>.
-
-=head1 AUTHOR
-
-Tye McQueen, tye@metronet.com, http://www.metronet.com/~tye/.
-
-=head1 SEE ALSO
-
-=over
-
-=item L<Win32::TieRegistry>
-
-=item L<Win32::Registry>
-
-=back
-
-=cut
+# Registry.pm -- Low-level access to functions/constants from WINREG.h
+
+package Win32API::Registry;
+
+use strict;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); #@EXPORT_FAIL);
+$VERSION= '0.24';
+
+require Exporter;
+require DynaLoader;
+@ISA= qw(Exporter DynaLoader);
+
+@EXPORT= qw();
+%EXPORT_TAGS= (
+    Func =>	[qw(		regConstant		regLastError
+	AllowPriv		AbortSystemShutdown	InitiateSystemShutdown
+	RegCloseKey		RegConnectRegistry	RegCreateKey
+	RegCreateKeyEx		RegDeleteKey		RegDeleteValue
+	RegEnumKey		RegEnumKeyEx		RegEnumValue
+	RegFlushKey		RegGetKeySecurity	RegLoadKey
+	RegNotifyChangeKeyValue	RegOpenKey		RegOpenKeyEx
+	RegQueryInfoKey		RegQueryMultipleValues	RegQueryValue
+	RegQueryValueEx		RegReplaceKey		RegRestoreKey
+	RegSaveKey		RegSetKeySecurity	RegSetValue
+	RegSetValueEx		RegUnLoadKey )],
+    FuncA =>	[qw(
+	AbortSystemShutdownA	InitiateSystemShutdownA
+	RegConnectRegistryA	RegCreateKeyA		RegCreateKeyExA
+	RegDeleteKeyA		RegDeleteValueA		RegEnumKeyA
+	RegEnumKeyExA		RegEnumValueA		RegLoadKeyA
+	RegOpenKeyA		RegOpenKeyExA		RegQueryInfoKeyA
+	RegQueryMultipleValuesA	RegQueryValueA		RegQueryValueExA
+	RegReplaceKeyA		RegRestoreKeyA		RegSaveKeyA
+	RegSetValueA		RegSetValueExA		RegUnLoadKeyA )],
+    FuncW =>	[qw(
+	AbortSystemShutdownW	InitiateSystemShutdownW
+	RegConnectRegistryW	RegCreateKeyW		RegCreateKeyExW
+	RegDeleteKeyW		RegDeleteValueW		RegEnumKeyW
+	RegEnumKeyExW		RegEnumValueW		RegLoadKeyW
+	RegOpenKeyW		RegOpenKeyExW		RegQueryInfoKeyW
+	RegQueryMultipleValuesW	RegQueryValueW		RegQueryValueExW
+	RegReplaceKeyW		RegRestoreKeyW		RegSaveKeyW
+	RegSetValueW		RegSetValueExW		RegUnLoadKeyW )],
+    HKEY_ =>	[qw(
+	HKEY_CLASSES_ROOT	HKEY_CURRENT_CONFIG	HKEY_CURRENT_USER
+	HKEY_DYN_DATA		HKEY_LOCAL_MACHINE	HKEY_PERFORMANCE_DATA
+	HKEY_USERS )],
+    KEY_ =>	[qw(
+	KEY_QUERY_VALUE		KEY_SET_VALUE		KEY_CREATE_SUB_KEY
+	KEY_ENUMERATE_SUB_KEYS	KEY_NOTIFY		KEY_CREATE_LINK
+	KEY_READ		KEY_WRITE		KEY_EXECUTE
+	KEY_ALL_ACCESS),
+	'KEY_DELETE',		# DELETE          (0x00010000L)
+	'KEY_READ_CONTROL',	# READ_CONTROL    (0x00020000L)
+	'KEY_WRITE_DAC',	# WRITE_DAC       (0x00040000L)
+	'KEY_WRITE_OWNER',	# WRITE_OWNER     (0x00080000L)
+	'KEY_SYNCHRONIZE',	# SYNCHRONIZE     (0x00100000L) (not used)
+	],
+    REG_ =>	[qw(
+	REG_OPTION_RESERVED	REG_OPTION_NON_VOLATILE	REG_OPTION_VOLATILE
+	REG_OPTION_CREATE_LINK	REG_OPTION_BACKUP_RESTORE
+	REG_OPTION_OPEN_LINK	REG_LEGAL_OPTION	REG_CREATED_NEW_KEY
+	REG_OPENED_EXISTING_KEY	REG_WHOLE_HIVE_VOLATILE	REG_REFRESH_HIVE
+	REG_NO_LAZY_FLUSH	REG_NOTIFY_CHANGE_ATTRIBUTES
+	REG_NOTIFY_CHANGE_NAME	REG_NOTIFY_CHANGE_LAST_SET
+	REG_NOTIFY_CHANGE_SECURITY			REG_LEGAL_CHANGE_FILTER
+	REG_NONE		REG_SZ			REG_EXPAND_SZ
+	REG_BINARY		REG_DWORD		REG_DWORD_LITTLE_ENDIAN
+	REG_DWORD_BIG_ENDIAN	REG_LINK		REG_MULTI_SZ
+	REG_RESOURCE_LIST	REG_FULL_RESOURCE_DESCRIPTOR
+	REG_RESOURCE_REQUIREMENTS_LIST )],
+    SE_ =>	[qw(
+	SE_ASSIGNPRIMARYTOKEN_NAME	SE_AUDIT_NAME
+	SE_BACKUP_NAME			SE_CHANGE_NOTIFY_NAME
+	SE_CREATE_PAGEFILE_NAME		SE_CREATE_PERMANENT_NAME
+	SE_CREATE_TOKEN_NAME		SE_DEBUG_NAME
+	SE_INCREASE_QUOTA_NAME		SE_INC_BASE_PRIORITY_NAME
+	SE_LOAD_DRIVER_NAME		SE_LOCK_MEMORY_NAME
+	SE_MACHINE_ACCOUNT_NAME		SE_PROF_SINGLE_PROCESS_NAME
+	SE_REMOTE_SHUTDOWN_NAME		SE_RESTORE_NAME
+	SE_SECURITY_NAME		SE_SHUTDOWN_NAME
+	SE_SYSTEMTIME_NAME		SE_SYSTEM_ENVIRONMENT_NAME
+	SE_SYSTEM_PROFILE_NAME		SE_TAKE_OWNERSHIP_NAME
+	SE_TCB_NAME			SE_UNSOLICITED_INPUT_NAME )],
+);
+@EXPORT_OK= ();
+{ my $ref;
+    foreach $ref (  values(%EXPORT_TAGS)  ) {
+	push( @EXPORT_OK, @$ref )   unless  $ref->[0] =~ /^SE_/;
+    }
+}
+$EXPORT_TAGS{ALL}= [ @EXPORT_OK ];	# \@EXPORT_OK once SE_* settles down.
+# push( @EXPORT_OK, "JHEREG_TACOSALAD" );	# Used to test Mkconst2perl
+push( @EXPORT_OK, @{$EXPORT_TAGS{SE_}} );
+
+bootstrap Win32API::Registry $VERSION;
+
+# Preloaded methods go here.
+
+# To convert C constants to Perl code in cRegistry.pc
+# [instead of C or C++ code in cRegistry.h]:
+#    * Modify F<Makefile.PL> to add WriteMakeFile() =>
+#      CONST2PERL/postamble => [[ "Win32API::Registry" => ]] WRITE_PERL => 1.
+#    * Either comment out C<#include "cRegistry.h"> from F<Registry.xs>
+#      or make F<cRegistry.h> an empty file.
+#    * Make sure the following C<if> block is not commented out.
+#    * "nmake clean", "perl Makefile.PL", "nmake"
+
+if(  ! defined &REG_NONE  ) {
+    require "Win32API/Registry/cRegistry.pc";
+}
+
+# This would be convenient but inconsistant and hard to explain:
+#push( @{$EXPORT_TAGS{ALL}}, @{$EXPORT_TAGS{SE_}} )
+#  if  defined &SE_TCB_NAME;
+
+sub regConstant
+{
+    my( $name )= @_;
+    if(  1 != @_  ||  ! $name  ||  $name =~ /\W/  ) {
+	require Carp;
+	Carp::croak( 'Usage: ',__PACKAGE__,'::regConstant("CONST_NAME")' );
+    }
+    my $proto= prototype $name;
+    if(  defined \&$name
+     &&  defined $proto
+     &&  "" eq $proto  ) {
+	no strict 'refs';
+	return &$name;
+    }
+    return undef;
+}
+
+# We provide this for backwards compatibility:
+sub constant
+{
+    my( $name )= @_;
+    my $value= regConstant( $name );
+    if(  defined $value  ) {
+	$!= 0;
+	return $value;
+    }
+    $!= 11; # EINVAL
+    return 0;
+}
+
+# BEGIN {
+#     my $code= 'return _regLastError(@_)';
+#     local( $!, $^E )= ( 1, 1 );
+#     if(  $! ne $^E  ) {
+# 	$code= '
+# 	    local( $^E )= _regLastError(@_);
+# 	    my $ret= $^E;
+# 	    return $ret;
+# 	';
+#     }
+#     eval "sub regLastError { $code }";
+#     die "$@"   if  $@;
+# }
+
+package Win32API::Registry::_error;
+
+use overload
+    '""' => sub {
+	require Win32 unless defined &Win32::FormatMessage;
+	$_ = Win32::FormatMessage(Win32API::Registry::_regLastError());
+	tr/\r\n//d;
+	return $_;
+    },
+    '0+' => sub { Win32API::Registry::_regLastError() },
+    'fallback' => 1;
+
+sub new { return bless {}, shift }
+sub set { Win32API::Registry::_regLastError($_[1]); return $_[0] }
+
+package Win32API::Registry;
+
+my $_error = new Win32API::Registry::_error;
+
+sub regLastError {
+    require Carp;
+    Carp::croak('Usage: ',__PACKAGE__,'::regLastError( [$setWin32ErrCode] )') if @_ > 1;
+    $_error->set($_[0]) if defined $_[0];
+    return $_error;
+}
+
+# Since we ISA DynaLoader which ISA AutoLoader, we ISA AutoLoader so we
+# need this next chunk to prevent Win32API::Registry->nonesuch() from
+# looking for "nonesuch.al" and producing confusing error messages:
+use vars qw($AUTOLOAD);
+sub AUTOLOAD {
+    require Carp;
+    Carp::croak(
+      "Can't locate method $AUTOLOAD via package Win32API::Registry" );
+}
+
+# Replace "&rout;" with "goto &rout;" when that is supported on Win32.
+
+# Let user omit all buffer sizes:
+sub RegEnumKeyExA {
+    if(  6 == @_  ) {	splice(@_,4,0,[]);  splice(@_,2,0,[]);  }
+    &_RegEnumKeyExA;
+}
+sub RegEnumKeyExW {
+    if(  6 == @_  ) {	splice(@_,4,0,[]);  splice(@_,2,0,[]);  }
+    &_RegEnumKeyExW;
+}
+sub RegEnumValueA {
+    if(  6 == @_  ) {	splice(@_,2,0,[]);  push(@_,[]);  }
+    &_RegEnumValueA;
+}
+sub RegEnumValueW {
+    if(  6 == @_  ) {	splice(@_,2,0,[]);  push(@_,[]);  }
+    &_RegEnumValueW;
+}
+sub RegQueryInfoKeyA {
+    if(  11 == @_  ) {	splice(@_,2,0,[]);  }
+    &_RegQueryInfoKeyA;
+}
+sub RegQueryInfoKeyW {
+    if(  11 == @_  ) {	splice(@_,2,0,[]);  }
+    &_RegQueryInfoKeyW;
+}
+
+sub RegEnumKeyA {
+    push(@_,[])   if  3 == @_;
+    &_RegEnumKeyA;
+}
+sub RegEnumKeyW {
+    push(@_,[])   if  3 == @_;
+    &_RegEnumKeyW;
+}
+sub RegGetKeySecurity {
+    push(@_,[])   if  3 == @_;
+    &_RegGetKeySecurity;
+}
+sub RegQueryMultipleValuesA {
+    push(@_,[])   if  4 == @_;
+    &_RegQueryMultipleValuesA;
+}
+sub RegQueryMultipleValuesW {
+    push(@_,[])   if  4 == @_;
+    &_RegQueryMultipleValuesW;
+}
+sub RegQueryValueA {
+    push(@_,[])   if  3 == @_;
+    &_RegQueryValueA;
+}
+sub RegQueryValueW {
+    push(@_,[])   if  3 == @_;
+    &_RegQueryValueW;
+}
+sub RegQueryValueExA {
+    push(@_,[])   if  5 == @_;
+    &_RegQueryValueExA;
+}
+sub RegQueryValueExW {
+    push(@_,[])   if  5 == @_;
+    &_RegQueryValueExW;
+}
+sub RegSetValueA {
+    push(@_,0)   if  4 == @_;
+    &_RegSetValueA;
+}
+sub RegSetValueW {
+    push(@_,0)   if  4 == @_;
+    &_RegSetValueW;
+}
+sub RegSetValueExA {
+    push(@_,0)   if  5 == @_;
+    &_RegSetValueExA;
+}
+sub RegSetValueExW {
+    push(@_,0)   if  5 == @_;
+    &_RegSetValueExW;
+}
+
+# Aliases for non-Unicode functions:
+sub AbortSystemShutdown		{ &AbortSystemShutdownA; }
+sub InitiateSystemShutdown	{ &InitiateSystemShutdownA; }
+sub RegConnectRegistry		{ &RegConnectRegistryA; }
+sub RegCreateKey		{ &RegCreateKeyA; }
+sub RegCreateKeyEx		{ &RegCreateKeyExA; }
+sub RegDeleteKey		{ &RegDeleteKeyA; }
+sub RegDeleteValue		{ &RegDeleteValueA; }
+sub RegEnumKey			{ &RegEnumKeyA; }
+sub RegEnumKeyEx		{ &RegEnumKeyExA; }
+sub RegEnumValue		{ &RegEnumValueA; }
+sub RegLoadKey			{ &RegLoadKeyA; }
+sub RegOpenKey			{ &RegOpenKeyA; }
+sub RegOpenKeyEx		{ &RegOpenKeyExA; }
+sub RegQueryInfoKey		{ &RegQueryInfoKeyA; }
+sub RegQueryMultipleValues	{ &RegQueryMultipleValuesA; }
+sub RegQueryValue		{ &RegQueryValueA; }
+sub RegQueryValueEx		{ &RegQueryValueExA; }
+sub RegReplaceKey		{ &RegReplaceKeyA; }
+sub RegRestoreKey		{ &RegRestoreKeyA; }
+sub RegSaveKey			{ &RegSaveKeyA; }
+sub RegSetValue			{ &RegSetValueA; }
+sub RegSetValueEx		{ &RegSetValueExA; }
+sub RegUnLoadKey		{ &RegUnLoadKeyA; }
+
+1;
+__END__
+
+=head1 NAME
+
+Win32API::Registry - Low-level access to Win32 system API calls from WINREG.H
+
+=head1 SYNOPSIS
+
+  use Win32API::Registry 0.21 qw( :ALL );
+
+  RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SYSTEM\\Disk", 0, KEY_READ, $key );
+    or  die "Can't open HKEY_LOCAL_MACHINE\\SYSTEM\\Disk: ",
+	    regLastError(),"\n";
+  RegQueryValueEx( $key, "Information", [], $type, $data, [] );
+    or  die "Can't read HKEY_L*MACHINE\\SYSTEM\\Disk\\Information: ",
+	    regLastError(),"\n";
+  [...]
+  RegCloseKey( $key )
+    or  die "Can't close HKEY_LOCAL_MACHINE\\SYSTEM\\Disk: ",
+	    regLastError(),"\n";
+
+=head1 DESCRIPTION
+
+This provides fairly low-level access to the Win32 System API
+calls dealing with the Registry [mostly from WINREG.H].  This
+is mostly intended to be used by other modules such as
+C<Win32::TieRegistry> [which provides an extremely Perl-friendly
+method for using the Registry].
+
+For a description of the logical structure of the Registry, see
+the documentation for the C<Win32::TieRegistry> module.
+
+To pass in C<NULL> as the pointer to an optional buffer, pass in
+an empty list reference, C<[]>.
+
+Beyond raw access to the API calls and related constants, this module
+handles smart buffer allocation and translation of return codes.
+
+All calls return a true value for success and a false value for
+failure.  After any failure, C<$^E> should automatically be set
+to indicate the reason.  However, current versions of Perl often
+overwrite C<$^E> too quickly, so you can use C<regLastError()>
+instead, which is only set by Win32API::Registry routines.
+
+Note that C<$!> is not set by these routines except by
+C<Win32API::Registry::constant()> when a constant is not defined.
+
+=head2 Exports
+
+Nothing is exported by default.  The following tags can be used to
+have sets of symbols exported.
+
+[Note that much of the following documentation refers to the
+behavior of the underlying API calls which may vary in current
+and future versions of the Win32 API without any changes to this
+module.  Therefore you should check the Win32 API documentation
+directly when needed.]
+
+=over
+
+=item :Func
+
+The basic function names:
+
+=over
+
+=item AllowPriv
+
+=item C<AllowPriv( $sPrivName, $bEnable )>
+
+Not a Win32 API call.  Enables or disables a specific privilege for
+the current process.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.  This routine
+does not provide a way to tell if a privilege is currently enabled.
+
+C<$sPrivname> is a Win32 privilege name [see L</:SE_>].  For example,
+C<"SeBackupPrivilege"> [a.k.a. C<SE_BACKUP_NAME>] controls whether
+you can use C<RegSaveKey()> and C<"SeRestorePrivilege"> [a.k.a.
+C<SE_RESTORE_NAME>] controls whether you can use C<RegLoadKey()>.
+
+If C<$bEnable> is true, then C<AllowPriv()> tries to enable the
+privilege.  Otherwise it tries to disable the privilege.
+
+=item AbortSystemShutdown
+
+=item C<AbortSystemShutdown( $sComputerName )>
+
+Tries to abort a remote shutdown request previously made via
+C<InitiateSystemShutdown()>.  Returns a true value if successful
+and a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+=item InitiateSystemShutdown
+
+=item C<InitiateSystemShutdown( $sComputer, $sMessage, $uTimeoutSecs, $bForce, $bReboot )>
+
+Requests that a [remote] computer be shutdown or rebooted.
+Returns a true value if successful and a false value [and
+sets C<$^E>/C<regLastError()>] on failure.
+
+C<$sComputer> is the name [or address] of the computer to be
+shutdown or rebooted.  You can use C<[]> [for C<NULL>] or C<"">
+to indicate the local computer.
+
+C<$sMessage> is the message to be displayed in a pop-up window
+on the desktop of the computer to be shutdown or rebooted until
+the timeout expires or the shutdown is aborted via
+C<AbortSystemShutdown()>.  With C<$iTimeoutSecs == 0>, the
+message will never be visible.
+
+C<$iTimeoutSecs> is the number of seconds to wait before starting
+the shutdown.
+
+If C<$bForce> is false, then any applications running on the remote
+computer get a chance to prompt the remote user whether they want
+to save changes.  Also, for any applications that do not exit quickly
+enough, the operating system will prompt the user whether they wish
+to wait longer for the application to exit or force it to exit now.
+At any of these prompts the user can press B<CANCEL> to abort the
+shutdown but if no applications have unsaved data, they will likely
+all exit quickly and the shutdown will progress with the remote user
+having no option to cancel the shutdown.
+
+If C<$bForce> is true, all applications are told to exit immediately
+and so will not prompt the user even if there is unsaved data.  Any
+applications that take too long to exit will be forcibly killed after
+a short time.  The only way to abort the shutdown is to call
+C<AbortSystemShutdown()> before the timeout expires and there is no
+way to abort the shutdown once it has begun.
+
+If C<$bReboot> is true, the computer will automatically reboot once
+the shutdown is complete.  If C<$bReboot> is false, then when the
+shutdown is complete the computer will halt at a screen indicating
+that the shutdown is complete and offering a way for the user to
+start to boot the computer.
+
+You must have the C<"SeRemoteShutdownPrivilege"> privilege
+on the remote computer for this call to succeed.  If shutting
+down the local computer, then the calling process must have
+the C<"SeShutdownPrivilege"> privilege and have it enabled.
+
+=item RegCloseKey
+
+=item C<RegCloseKey( $hKey )>
+
+Closes the handle to a Registry key returned by C<RegOpenKeyEx()>,
+C<RegConnectRegistry()>, C<RegCreateKeyEx()>, or a few other
+routines.  Returns a true value if successful and a false value
+[and sets C<$^E>/C<regLastError()>] on failure.
+
+=item RegConnectRegistry
+
+=item C<RegConnectRegistry( $sComputer, $hRootKey, $ohKey )>
+
+Connects to one of the root Registry keys of a remote computer.
+Returns a true value if successful and a false value [and
+sets C<$^E>/C<regLastError()>] on failure.
+
+C<$sComputer> is the name [or address] of a remote computer
+whose Registry you wish to access.
+
+C<$hKey> must be either C<HKEY_LOCAL_MACHINE> or C<HKEY_USERS>
+and specifies which root Registry key on the remote computer
+you wish to have access to.
+
+C<$phKey> will be set to the handle to be used to access the
+remote Registry key if the call succeeds.
+
+=item regConstant
+
+=item C<$value= regConstant( $sConstantName )>
+
+Fetch the value of a constant.  Returns C<undef> if C<$sConstantName>
+is not the name of a constant supported by this module.  Never sets
+C<$!> nor C<$^E>.
+
+This function is rarely used since you will usually get the value of a
+constant by having that constant imported into your package by listing
+the constant name in the C<use Win32API::Registry> statement and then
+simply using the constant name in your code [perhaps followed by
+C<()>].  This function is useful for verifying constant names not in
+Perl code, for example, after prompting a user to type in a constant
+name.
+
+=item RegCreateKey
+
+=item C<RegCreateKey( $hKey, $sSubKey, $ohSubKey )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegCreateKeyEx()> instead.
+
+=item RegCreateKeyEx
+
+=item C<RegCreateKeyEx( $hKey, $sSubKey, $uZero, $sClass, $uOpts, $uAccess, $pSecAttr, $ohNewKey, $ouDisp )>
+
+Creates a new Registry subkey.  Returns a true value if successful and
+a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sSubKey> is the name of the new subkey to be created.
+
+C<$iZero> is reserved for future use and should always be specified
+as C<0>.
+
+C<$sClass> is a string to be used as the class for the new
+subkey.  We are not aware of any current use for Registry key
+class information so the empty string, C<"">, should usually
+be used here.
+
+C<$iOpts> is a numeric value containing bits that control options
+used while creating the new subkey.  C<REG_OPTION_NON_VOLATILE>
+is the default.  C<REG_OPTION_VOLATILE> [which is ignored on
+Windows 95] means the data stored under this key is not kept
+in a file and will not be preserved when the system reboots.
+C<REG_OPTION_BACKUP_RESTORE> [also ignored on Windows 95] means
+ignore the C<$iAccess> parameter and try to open the new key with
+the access required to backup or restore the key.
+
+C<$iAccess> is a numeric mask of bits specifying what type of
+access is desired when opening the new subkey.  See C<RegOpenKeyEx()>.
+
+C<$pSecAttr> is a C<SECURITY_ATTRIBUTES> structure packed into
+a Perl string which controls whether the returned handle can be
+inherited by child processes.  Normally you would pass C<[]> for
+this parameter to have C<NULL> passed to the underlying API
+indicating that the handle cannot be inherited.  If not under
+Windows95, then C<$pSecAttr> also allows you to specify
+C<SECURITY_DESCRIPTOR> that controls which users will have
+what type of access to the new key -- otherwise the new key
+inherits its security from its parent key.
+
+C<$phKey> will be set to the handle to be used to access the new
+subkey if the call succeeds.
+
+C<$piDisp> will be set to either C<REG_CREATED_NEW_KEY> or
+C<REG_OPENED_EXISTING_KEY> to indicate for which reason the
+call succeeded.  Can be specified as C<[]> if you don't care.
+
+If C<$phKey> and C<$piDisp> start out as integers, then they will
+probably remain unchanged if the call fails.
+
+=item RegDeleteKey
+
+=item C<RegDeleteKey( $hKey, $sSubKey )>
+
+Deletes a subkey of an open Registry key provided that the subkey
+contains no subkeys of its own [but the subkey may contain values].
+Returns a true value if successful and a false value [and sets
+C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sSubKey> is the name of the subkey to be deleted.
+
+=item RegDeleteValue
+
+=item C<RegDeleteValue( $hKey, $sValueName )>
+
+Deletes a value from an open Registry key.  Returns a true value if
+successful and a false value [and sets C<$^E>/C<regLastError()>] on
+failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sValueKey> is the name of the value to be deleted.
+
+=item RegEnumKey
+
+=item C<RegEnumKey( $hKey, $uIndex, $osName, $ilNameSize )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegEnumKeyEx()> instead.
+
+=item RegEnumKeyEx
+
+=item C<RegEnumKeyEx( $hKey, $uIndex, $osName, $iolName, $pNull, $osClass, $iolClass, $opftLastWrite )>
+
+Lets you enumerate the names of all of the subkeys directly under
+an open Registry key.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$iIndex> is the sequence number of the immediate subkey that
+you want information on.  Start with this value as C<0> then
+repeat the call incrementing this value each time until the
+call fails with C<$^E>/C<regLastError()> numerically equal to
+C<ERROR_NO_MORE_ITEMS>.
+
+C<$sName> will be set to the name of the subkey.  Can be C<[]> if
+you don't care about the name.
+
+C<$plName> initially specifies the [minimum] buffer size to be
+allocated for C<$sName>.  Will be set to the length of the subkey
+name if the requested subkey exists even if C<$sName> isn't
+successfully set to the subkey name.  See L<Buffer sizes> for
+more information.
+
+C<$pNull> is reserved for future used and should be passed as C<[]>.
+
+C<$sClass> will be set to the class name for the subkey.  Can be
+C<[]> if you don't care about the class.
+
+C<$plClass> initially specifies the [minimum] buffer size to be
+allocated for C<$sClass> and will be set to the length of the
+subkey class name if the requested subkey exists.  See L<Buffer
+sizes> for more information.
+
+C<$pftLastWrite> will be set to a C<FILETIME> structure packed
+into a Perl string and indicating when the subkey was last changed.
+Can be C<[]>.
+
+You may omit both C<$plName> and C<$plClass> to get the same effect
+as passing in C<[]> for each of them.
+
+=item RegEnumValue
+
+=item C<RegEnumValue( $hKey, $uIndex, $osValName, $iolValName, $pNull, $ouType, $opValData, $iolValData )>
+
+Lets you enumerate the names of all of the values contained in an
+open Registry key.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$iIndex> is the sequence number of the value that you want
+information on.  Start with this value as C<0> then repeat the
+call incrementing this value each time until the call fails with
+C<ERROR_NO_MORE_ITEMS>.
+
+C<$sValName> will be set to the name of the value.  Can be C<[]>
+if you don't care about the name.
+
+C<$plValName> initially specifies the [minimum] buffer size to be
+allocated for C<$sValName>.  Will be set to the length of the value
+name if the requested value exists even if C<$sValName> isn't
+successfully set to the value name.  See L<Buffer sizes> for
+more information.
+
+C<$pNull> is reserved for future used and should be passed as C<[]>.
+
+C<$piType> will be set to the type of data stored in the value data.
+If the call succeeds, it will be set to a C<REG_*> value unless
+passed in as C<[]>.
+
+C<$pValData> will be set to the data [packed into a Perl string]
+that is stored in the requested value.  Can be C<[]> if you don't
+care about the value data.
+
+C<$plValData> initially specifies the [minimum] buffer size to be
+allocated for C<$sValData> and will be set to the length of the
+value data if the requested value exists.  See L<Buffer sizes> for
+more information.
+
+You may omit both C<$plValName> and C<$plValData> to get the same
+effect as passing in C<[]> for each of them.
+
+=item RegFlushKey
+
+=item C<RegFlushKey( $hKey )>
+
+Forces the data stored under an open Registry key to be flushed
+to the disk file where the data is preserved between reboots.
+Forced flushing is not guaranteed to be efficient so this routine
+should almost never be called.  Returns a true value if successful
+and a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+=item RegGetKeySecurity
+
+=item C<RegGetKeySecurity( $hKey, $uSecInfo, $opSecDesc, $iolSecDesc )>
+
+Retrieves one of the C<SECURITY_DESCRIPTOR> structures describing
+part of the security for an open Registry key.  Returns a true value
+if successful and a false value [and sets C<$^E>/C<regLastError()>]
+on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$iSecInfo> is a numeric C<SECURITY_INFORMATION> value that
+specifies which parts of the C<SECURITY_DESCRIPTOR> structure
+to retrieve.  Should be C<OWNER_SECURITY_INFORMATION>,
+C<GROUP_SECURITY_INFORMATION>, C<DACL_SECURITY_INFORMATION>, or
+or C<SACL_SECURITY_INFORMATION> or two or more of these bits
+combined using C<|>.
+
+C<$pSecDesc> will be set to the requested C<SECURITY_DESCRIPTOR>
+structure [packed into a Perl string].
+
+C<$plSecDesc> initially specifies the [minimum] buffer size to be
+allocated for C<$sSecDesc> and will be set to the length of the
+security descriptor.  See L<Buffer sizes> for more information.
+You may omit this parameter to get the same effect as passing in
+C<[]> for it.
+
+=item regLastError
+
+=item C<$svError= regLastError();>
+
+=item C<regLastError( $uError );>
+
+Returns the last error encountered by a routine from this module. 
+It is just like C<$^E> except it isn't changed by anything except
+routines from this module.  Ideally you could just use C<$^E>, but
+current versions of Perl often overwrite C<$^E> before you get a
+chance to check it and really old versions of Perl don't really
+support C<$^E> under Win32.
+
+Just like C<$^E>, in a numeric context C<regLastError()> returns
+the numeric error value while in a string context it returns a
+text description of the error [actually it returns a Perl scalar
+that contains both values so C<$x= regLastError()> causes C<$x>
+to give different values in string vs. numeric contexts].
+
+The last form sets the error returned by future calls to
+C<regLastError()> and should not be used often.  C<$uError> must
+be a numeric error code.  Also returns the dual-valued version
+of C<$uError>.
+
+=item RegLoadKey
+
+=item C<RegLoadKey( $hKey, $sSubKey, $sFileName )>
+
+Loads a hive file.  That is, it creates a new subkey in the
+Registry and associates that subkey with a disk file that contains
+a Registry hive so that the new subkey can be used to access the
+keys and values stored in that hive.  Hives are usually created
+via C<RegSaveKey()>.  Returns a true value if successful and a
+false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key that can have hives
+loaded to it.  This must be C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>,
+or a remote version of one of these from a call to
+C<RegConnectRegistry()>.
+
+C<$sSubKey> is the name of the new subkey to created and associated
+with the hive file.
+
+C<$sFileName> is the name of the hive file to be loaded.  This
+file name is interpretted relative to the
+C<%SystemRoot%/System32/config> directory on the computer where
+the C<$hKey> key resides.  If C<$sFileName> is on a FAT file
+system, then its name must not have an extension.
+
+You must have the C<SE_RESTORE_NAME> privilege to use this routine.
+
+WARNING:  Loading of hive files via a network share may silently
+corrupt the hive and so should not be attempted [this is a problem
+in at least some versions of the underlying API which this module
+does not try to fix or avoid].  To access a hive file located on a
+remote computer, connect to the remote computer's Registry and load
+the hive via that.
+
+=item RegNotifyChangeKeyValue
+
+=item C<RegNotifyChangeKeyValue( $hKey, $bWatchSubtree, $uNotifyFilter, $hEvent, $bAsync )>
+
+Arranges for your process to be notified when part of the Registry
+is changed.  Returns a true value if successful and a false value
+[and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call] for which you wish to be notified when any changes
+are made to it.
+
+If C<$bWatchSubtree> is true, then changes to any subkey or
+descendant of C<$hKey> are also reported.
+
+C<$iNotifyFilter> controllers what types of changes are reported.  It
+is a numeric value containing one or more of the following bit masks:
+
+=over
+
+=item C<REG_NOTIFY_CHANGE_NAME>
+
+Notify if a subkey is added or deleted to a monitored key.
+
+=item C<REG_NOTIFY_CHANGE_LAST_SET>
+
+Notify if a value in a monitored key is added, deleted, or modified.
+
+=item C<REG_NOTIFY_CHANGE_SECURITY>
+
+Notify if a security descriptor of a monitored key is changed.
+
+=item C<REG_NOTIFY_CHANGE_ATTRIBUTES>
+
+Notify if any attributes of a monitored key are changed [class
+name or security descriptors].
+
+=back
+
+C<$hEvent> is ignored unless C<$bAsync> is true.  Otherwise, C<$hEvent>
+is a handle to a Win32 I<event> that will be signaled when changes are
+to be reported.
+
+If C<$bAsync> is true, then C<RegNotifyChangeKeyValue()> returns
+immediately and uses C<$hEvent> to notify your process of changes.
+If C<$bAsync> is false, then C<RegNotifyChangeKeyValue()> does
+not return until there is a change to be notified of.
+
+This routine does not work with Registry keys on remote computers.
+
+=item RegOpenKey
+
+=item C<RegOpenKey( $hKey, $sSubKey, $ohSubKey )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegOpenKeyEx()> instead.
+
+=item RegOpenKeyEx
+
+=item C<RegOpenKeyEx( $hKey, $sSubKey, $uOptions, $uAccess, $ohSubKey )>
+
+Opens an existing Registry key.  Returns a true value if successful
+and a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sSubKey> is the name of an existing subkey to be opened.
+Can be C<""> or C<[]> to open an additional handle to the
+key specified by C<$hKey>.
+
+C<$iOptions> is a numeric value containing bits that control options
+used while opening the subkey.  There are currently no supported
+options so this parameter should be specified as C<0>.
+
+C<$iAccess> is a numeric mask of bits specifying what type of
+access is desired when opening the new subkey.  Should be a
+combination of one or more of the following bit masks:
+
+=over
+
+=item C<KEY_ALL_ACCESS>
+
+    KEY_READ | KEY_WRITE | KEY_CREATE_LINK
+
+=item C<KEY_READ>
+
+    KEY_QUERY_VALUE | KEY_ENUMERATE_SUBKEYS | KEY_NOTIFY | STANDARD_RIGHTS_READ
+
+=item C<KEY_WRITE>
+
+    KEY_SET_VALUE | KEY_CREATE_SUB_KEY | STANDARD_RIGHTS_WRITE
+
+=item C<KEY_QUERY_VALUE>
+
+=item C<KEY_SET_VALUE>
+
+=item C<KEY_ENUMERATE_SUB_KEYS>
+
+=item C<KEY_CREATE_SUB_KEY>
+
+=item C<KEY_NOTIFY>
+
+Allows you to use C<RegNotifyChangeKeyValue()> on the opened key.
+
+=item C<KEY_EXECUTE>
+
+Same as C<KEY_READ>.
+
+=item C<KEY_CREATE_LINK>
+
+Gives you permission to create a symbolic link like
+C<HKEY_CLASSES_ROOT> and C<HKEY_CURRENT_USER>, though the method for
+doing so is not documented [and probably requires use of the mostly
+undocumented "native" routines, C<Nt*()> a.k.a. C<Zw*()>].
+
+=back
+
+C<$phKey> will be set to the handle to be used to access the new subkey
+if the call succeeds.
+
+=item RegQueryInfoKey
+
+=item C<RegQueryInfoKey( $hKey, $osClass, $iolClass, $pNull, $ocSubKeys, $olSubKey, $olSubClass, $ocValues, $olValName, $olValData, $olSecDesc, $opftTime )>
+
+Gets miscellaneous information about an open Registry key.
+Returns a true value if successful and a false value [and
+sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sClass> will be set to the class name for the key.  Can be
+C<[]> if you don't care about the class.
+
+C<$plClass> initially specifies the [minimum] buffer size to be
+allocated for C<$sClass> and will be set to the length of the
+key's class name.  See L<Buffer sizes> for more information.
+You may omit this parameter to get the same effect as passing in
+C<[]> for it.
+
+C<$pNull> is reserved for future use and should be passed as C<[]>.
+
+C<$pcSubKeys> will be set to the count of the number of subkeys
+directly under this key.  Can be C<[]>.
+
+C<$plSubKey> will be set to the length of the longest subkey name.
+Can be C<[]>.
+
+C<$plSubClass> will be set to the length of the longest class name
+used with an immediate subkey of this key.  Can be C<[]>.
+
+C<$pcValues> will be set to the count of the number of values in
+this key.  Can be C<[]>.
+
+C<$plValName> will be set to the length of the longest value name
+in this key.  Can be C<[]>.
+
+C<$plValData> will be set to the length of the longest value data
+in this key.  Can be C<[]>.
+
+C<$plSecDesc> will be set to the length of this key's full security
+descriptor.
+
+C<$pftTime> will be set to a C<FILETIME> structure packed
+into a Perl string and indicating when this key was last changed.
+Can be C<[]>.
+
+=item RegQueryMultipleValues
+
+=item C<RegQueryMultipleValues( $hKey, $ioarValueEnts, $icValueEnts, $opBuffer, $iolBuffer )>
+
+Allows you to use a single call to query several values from a single
+open Registry key to maximize efficiency.  Returns a true value if
+successful and a false value [and sets C<$^E>/C<regLastError()>] on
+failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$pValueEnts> should contain a list of C<VALENT> structures packed
+into a single Perl string.  Each C<VALENT> structure should have
+the C<ve_valuename> entry [the first 4 bytes] pointing to a string
+containing the name of a value stored in this key.  The remaining
+fields are set if the function succeeds.
+
+C<$cValueEnts> should contain the count of the number of C<VALENT>
+structures contained in C<$pValueEnts>.
+
+C<$pBuffer> will be set to the data from all of the requested values
+concatenated into a single Perl string.
+
+C<$plBuffer> initially specifies the [minimum] buffer size to be
+allocated for C<$sBuffer> and will be set to the total length of
+the data to be written to C<$sBuffer>.  See L<Buffer sizes> for
+more information.  You may omit this parameter to get the same
+effect as passing in C<[]> for it.
+
+Here is sample code to populate C<$pValueEnts>:
+
+    # @ValueNames= ...list of value name strings...;
+    $cValueEnts= @ValueNames;
+    $pValueEnts= pack( " p x4 x4 x4 " x $cValueEnts, @ValueNames );
+
+Here is sample code to retrieve the data type and data length
+returned in C<$pValueEnts>:
+
+    @Lengths= unpack( " x4 L x4 x4 " x $cValueEnts, $pValueEnts );
+    @Types=   unpack( " x4 x4 x4 L " x $cValueEnts, $pValueEnts );
+
+Given the above, and assuming you haven't modified C<$sBuffer> since
+the call, you can also extract the value data strings from C<$sBuffer>
+by using the pointers returned in C<$pValueEnts>:
+
+    @Data=    unpack(  join( "", map {" x4 x4 P$_ x4 "} @Lengths ),
+    		$pValueEnts  );
+
+Much better is to use the lengths and extract directly from
+C<$sBuffer> using C<unpack()> [or C<substr()>]:
+
+    @Data= unpack( join("",map("P$_",@Lengths)), $sBuffer );
+
+=item RegQueryValue
+
+=item C<RegQueryValue( $hKey, $sSubKey, $osValueData, $iolValueData )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegQueryValueEx()> instead.  This routine can only
+query unamed values [a.k.a. "default values"], that is, values with
+a name of C<"">.
+
+=item RegQueryValueEx
+
+=item C<RegQueryValueEx( $hKey, $sValueName, $pNull, $ouType, $opValueData, $iolValueData )>
+
+Lets you look up value data stored in an open Registry key by
+specifying the value name.  Returns a true value if successful
+and a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sValueName> is the name of the value whose data you wish to
+retrieve.
+
+C<$pNull> this parameter is reserved for future use and should be
+specified as C<[]>.
+
+C<$piType> will be set to indicate what type of data is stored in
+the named value.  Will be set to a C<REG_*> value if the function
+succeeds.
+
+C<$pValueData> will be set to the value data [packed into a Perl
+string] that is stored in the named value.  Can be C<[]> if you
+don't care about the value data.
+
+C<$plValueData> initially specifies the [minimum] buffer size to be
+allocated for C<$sValueData> and will be set to the size [always
+in bytes] of the data to be written to C<$sValueData>, even if
+C<$sValueData> is not successfully written to.  See L<Buffer sizes>
+for more information.
+
+=item RegReplaceKey
+
+=item C<RegReplaceKey( $hKey, $sSubKey, $sNewFile, $sOldFile )>
+
+Lets you replace an entire hive when the system is next booted. 
+Returns a true value if successful and a false value [and sets
+C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key that has hive(s)
+loaded in it.  This must be C<HKEY_LOCAL_MACHINE>,
+C<HKEY_USERS>, or a remote version of one of these from
+a call to C<RegConnectRegistry()>.
+
+C<$sSubKey> is the name of the subkey of C<$hKey> whose hive
+you wish to have replaced on the next reboot.
+
+C<$sNewFile> is the name of a file that will replace the existing
+hive file when the system reboots.
+
+C<$sOldFile> is the file name to save the current hive file to
+when the system reboots.
+
+C<$sNewFile> and C<$sOldFile> are interpretted relative to the
+C<%SystemRoot%/System32/config> directory on the computer where
+the C<$hKey> key resides [I think].  If either file is [would be]
+on a FAT file system, then its name must not have an extension.
+
+You must have the C<SE_RESTORE_NAME> privilege to use this routine.
+
+=item RegRestoreKey
+
+=item C<RegRestoreKey( $hKey, $sFileName, $uFlags )>
+
+Reads in a hive file and copies its contents over an existing
+Registry tree.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sFileName> is the name of the hive file to be read.  For each
+value and subkey in this file, a value or subkey will be added
+or replaced in C<$hKey>.
+
+C<$uFlags> is usally C<0>.  It can also be C<REG_WHOLE_HIVE_VOLATILE>
+which, rather than copying the hive over the existing key,
+replaces the existing key with a temporary, memory-only Registry
+key and then copies the hive contents into it.  This option only
+works if C<$hKey> is C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>, or a
+remote version of one of these from a call to C<RegConnectRegistry()>.
+
+C<RegRestoreKey> does I<not> delete values nor keys from the
+existing Registry tree when there is no corresponding value/key
+in the hive file.
+
+=item RegSaveKey
+
+=item C<RegSaveKey( $hKey, $sFileName, $pSecAttr )>
+
+Dumps any open Registry key and all of its subkeys and values into
+a new hive file.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sFileName> is the name of the file that the Registry tree
+should be saved to.  It is interpretted relative to the
+C<%SystemRoot%/System32/config> directory on the computer where
+the C<$hKey> key resides.  If C<$sFileName> is on a FAT file system,
+then it must not have an extension.
+
+C<$pSecAttr> contains a C<SECURITY_ATTRIBUTES> structure that specifies
+the permissions to be set on the new file that is created.  This can
+be C<[]>.
+
+You must have the C<SE_RESTORE_NAME> privilege to use this routine.
+
+=item RegSetKeySecurity
+
+=item C<RegSetKeySecurity( $hKey, $uSecInfo, $pSecDesc )>
+
+Sets [part of] the C<SECURITY_DESCRIPTOR> structure describing part
+of the security for an open Registry key.  Returns a true value if
+successful and a false value [and sets C<$^E>/C<regLastError()>] on
+failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$uSecInfo> is a numeric C<SECURITY_INFORMATION> value that
+specifies which C<SECURITY_DESCRIPTOR> structure to set.  Should
+be C<OWNER_SECURITY_INFORMATION>, C<GROUP_SECURITY_INFORMATION>,
+C<DACL_SECURITY_INFORMATION>, or C<SACL_SECURITY_INFORMATION>
+or two or more of these bits combined using C<|>.
+
+C<$pSecDesc> contains the new C<SECURITY_DESCRIPTOR> structure
+packed into a Perl string.
+
+=item RegSetValue
+
+=item C<RegSetValue( $hKey, $sSubKey, $uType, $sValueData, $lValueData )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegSetValueEx()> instead.  This routine can only
+set unamed values [a.k.a. "default values"].
+
+=item RegSetValueEx
+
+=item C<RegSetValueEx( $hKey, $sName, $uZero, $uType, $pData, $lData )>
+
+Adds or replaces a value in an open Registry key.  Returns
+a true value if successful and a false value [and sets
+C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sName> is the name of the value to be set.
+
+C<$uZero> is reserved for future use and should be specified as C<0>.
+
+C<$uType> is the type of data stored in C<$pData>.  It should
+be a C<REG_*> value.
+
+C<$pData> is the value data packed into a Perl string.
+
+C<$lData> is the length of the value data that is stored in C<$pData>.
+You will usually omit this parameter or pass in C<0> to have
+C<length($pData)> used.  In both of these cases, if C<$iType> is
+C<REG_SZ> or C<REG_EXPAND_SZ>, C<RegSetValueEx()> will append a
+trailing C<'\0'> to the end of C<$pData> [unless there is already
+one].
+
+=item RegUnLoadKey
+
+=item C<RegUnLoadKey( $hKey, $sSubKey )>
+
+Unloads a previously loaded hive file.  That is, closes the
+hive file then deletes the subkey that was providing access
+to it.  Returns a true value if successful and a false value
+[and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key that has hives
+loaded in it.  This must be C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>,
+or a remote version of one of these from a call to
+C<RegConnectRegistry()>.
+
+C<$sSubKey> is the name of the subkey whose hive you wish to
+have unloaded.
+
+=item :FuncA
+
+The ASCII-specific function names.
+
+Each of these is identical to the version listed above without the
+trailing "A":
+
+	AbortSystemShutdownA	InitiateSystemShutdownA
+	RegConnectRegistryA	RegCreateKeyA		RegCreateKeyExA
+	RegDeleteKeyA		RegDeleteValueA		RegEnumKeyA
+	RegEnumKeyExA		RegEnumValueA		RegLoadKeyA
+	RegOpenKeyA		RegOpenKeyExA		RegQueryInfoKeyA
+	RegQueryMultipleValuesA	RegQueryValueA		RegQueryValueExA
+	RegReplaceKeyA		RegRestoreKeyA		RegSaveKeyA
+	RegSetValueA		RegSetValueExA		RegUnLoadKeyA
+
+=item :FuncW
+
+The UNICODE-specific function names.  These are the same as the
+versions listed above without the trailing "W" except that string
+parameters are UNICODE strings rather than ASCII strings, as
+indicated.
+
+=item AbortSystemShutdownW
+
+=item C<AbortSystemShutdownW( $swComputerName )>
+
+C<$swComputerName> is UNICODE.
+
+=item InitiateSystemShutdownW
+
+=item C<InitiateSystemShutdownW( $swComputer, $swMessage, $uTimeoutSecs, $bForce, $bReboot )>
+
+C<$swComputer> and C<$swMessage> are UNICODE.
+
+=item RegConnectRegistryW
+
+=item C<RegConnectRegistryW( $swComputer, $hRootKey, $ohKey )>
+
+C<$swComputer> is UNICODE.
+
+=item RegCreateKeyW
+
+=item C<RegCreateKeyW( $hKey, $swSubKey, $ohSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item RegCreateKeyExW
+
+=item C<RegCreateKeyExW( $hKey, $swSubKey, $uZero, $swClass, $uOpts, $uAccess, $pSecAttr, $ohNewKey, $ouDisp )>
+
+C<$swSubKey> and C<$swClass> are UNICODE.
+
+=item RegDeleteKeyW
+
+=item C<RegDeleteKeyW( $hKey, $swSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item RegDeleteValueW
+
+=item C<RegDeleteValueW( $hKey, $swValueName )>
+
+C<$swValueName> is UNICODE.
+
+=item RegEnumKeyW
+
+=item C<RegEnumKeyW( $hKey, $uIndex, $oswName, $ilwNameSize )>
+
+C<$oswName> is UNICODE and C<$ilwNameSize> is measured as number of
+C<WCHAR>s.
+
+=item RegEnumKeyExW
+
+=item C<RegEnumKeyExW( $hKey, $uIndex, $oswName, $iolwName, $pNull, $oswClass, $iolwClass, $opftLastWrite )>
+
+C<$swName> and C<$swClass> are UNICODE and C<$iolwName> and C<$iolwClass>
+are measured as number of C<WCHAR>s.
+
+=item RegEnumValueW
+
+=item C<RegEnumValueW( $hKey, $uIndex, $oswName, $iolwName, $pNull, $ouType, $opData, $iolData )>
+
+C<$oswName> is UNICODE and C<$iolwName> is measured as number
+of C<WCHAR>s.
+
+C<$opData> is UNICODE if C<$piType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
+or C<REG_MULTI_SZ>.  Note that C<$iolData> is measured as number
+of bytes even in these cases.
+
+=item RegLoadKeyW
+
+=item C<RegLoadKeyW( $hKey, $swSubKey, $swFileName )>
+
+C<$swSubKey> and C<$swFileName> are UNICODE.
+
+=item RegOpenKeyW
+
+=item C<RegOpenKeyW( $hKey, $swSubKey, $ohSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item RegOpenKeyExW
+
+=item C<RegOpenKeyExW( $hKey, $swSubKey, $uOptions, $uAccess, $ohSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item RegQueryInfoKeyW
+
+=item C<RegQueryInfoKeyW( $hKey, $oswClass, $iolwClass, $pNull, $ocSubKeys, $olwSubKey, $olwSubClass, $ocValues, $olwValName, $olValData, $olSecDesc, $opftTime )>
+
+C<$swClass> is UNICODE.  C<$iolwClass>, C<$olwSubKey>, C<$olwSubClass>,
+and C<$olwValName> are measured as number of C<WCHAR>s.  Note that
+C<$olValData> is measured as number of bytes.
+
+=item RegQueryMultipleValuesW
+
+=item C<RegQueryMultipleValuesW( $hKey, $ioarValueEnts, $icValueEnts, $opBuffer, $iolBuffer )>
+
+The C<ve_valuename> fields of the C<VALENT> [actually C<VALENTW>]
+structures in C<$ioarValueEnts> are UNICODE.  Values of type C<REG_SZ>,
+C<REG_EXPAND_SZ>, and C<REG_MULTI_SZ> are written to C<$opBuffer>
+in UNICODE.  Note that C<$iolBuffer> and the C<ve_valuelen> fields
+of the C<VALENT> [C<VALENTW>] structures are measured as number of
+bytes.
+
+=item RegQueryValueW
+
+=item C<RegQueryValueW( $hKey, $swSubKey, $oswValueData, $iolValueData )>
+
+C<$swSubKey> and C<$oswValueData> are UNICODE.  Note that
+C<$iolValueData> is measured as number of bytes.
+
+=item RegQueryValueExW
+
+=item C<RegQueryValueExW( $hKey, $swName, $pNull, $ouType, $opData, $iolData )>
+
+C<$swName> is UNICODE.
+
+C<$opData> is UNICODE if C<$ouType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
+or C<REG_MULTI_SZ>.  Note that C<$iolData> is measured as number of
+bytes even in these cases.
+
+=item RegReplaceKeyW
+
+=item C<RegReplaceKeyW( $hKey, $swSubKey, $swNewFile, $swOldFile )>
+
+C<$swSubKey>, C<$swNewFile>, and C<$swOldFile> are UNICODE.
+
+=item RegRestoreKeyW
+
+=item C<RegRestoreKeyW( $hKey, $swFileName, $uFlags )>
+
+C<$swFileName> is UNICODE.
+
+=item RegSaveKeyW
+
+=item C<RegSaveKeyW( $hKey, $swFileName, $pSecAttr )>
+
+C<$swFileName> is UNICODE.
+
+=item RegSetValueW
+
+=item C<RegSetValueW( $hKey, $swSubKey, $uType, $swValueData, $lValueData )>
+
+C<$swSubKey> and C<$swValueData> are UNICODE.  Note that
+C<$lValueData> is measured as number of bytes even though
+C<$swValueData> is always UNICODE.
+
+=item RegSetValueExW
+
+=item C<RegSetValueExW( $hKey, $swName, $uZero, $uType, $pData, $lData )>
+
+C<$swName> is UNICODE.
+
+C<$pData> is UNICODE if C<$uType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
+or C<REG_MULTI_SZ>.  Note that C<$lData> is measured as number of
+bytes even in these cases.
+
+=item RegUnLoadKeyW
+
+=item C<RegUnLoadKeyW( $hKey, $swSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item :HKEY_
+
+All C<HKEY_*> constants:
+
+	HKEY_CLASSES_ROOT	HKEY_CURRENT_CONFIG	HKEY_CURRENT_USER
+	HKEY_DYN_DATA		HKEY_LOCAL_MACHINE	HKEY_PERFORMANCE_DATA
+	HKEY_USERS
+
+=item :KEY_
+
+All C<KEY_*> constants:
+
+	KEY_QUERY_VALUE		KEY_SET_VALUE		KEY_CREATE_SUB_KEY
+	KEY_ENUMERATE_SUB_KEYS	KEY_NOTIFY		KEY_CREATE_LINK
+	KEY_READ		KEY_WRITE		KEY_EXECUTE
+	KEY_ALL_ACCESS
+
+=item :REG_
+
+All C<REG_*> constants:
+
+	REG_CREATED_NEW_KEY		REG_OPENED_EXISTING_KEY
+
+	REG_LEGAL_CHANGE_FILTER		REG_NOTIFY_CHANGE_ATTRIBUTES
+	REG_NOTIFY_CHANGE_NAME		REG_NOTIFY_CHANGE_LAST_SET
+	REG_NOTIFY_CHANGE_SECURITY	REG_LEGAL_OPTION
+
+	REG_OPTION_BACKUP_RESTORE	REG_OPTION_CREATE_LINK
+	REG_OPTION_NON_VOLATILE		REG_OPTION_OPEN_LINK
+	REG_OPTION_RESERVED		REG_OPTION_VOLATILE
+
+	REG_WHOLE_HIVE_VOLATILE		REG_REFRESH_HIVE
+	REG_NO_LAZY_FLUSH
+
+	REG_NONE			REG_SZ
+	REG_EXPAND_SZ			REG_BINARY
+	REG_DWORD			REG_DWORD_LITTLE_ENDIAN
+	REG_DWORD_BIG_ENDIAN		REG_LINK
+	REG_MULTI_SZ			REG_RESOURCE_LIST
+	REG_FULL_RESOURCE_DESCRIPTOR	REG_RESOURCE_REQUIREMENTS_LIST
+
+=item :ALL
+
+All of the above.
+
+=item :SE_
+
+The strings for the following privilege names:
+
+	SE_ASSIGNPRIMARYTOKEN_NAME	SE_AUDIT_NAME
+	SE_BACKUP_NAME			SE_CHANGE_NOTIFY_NAME
+	SE_CREATE_PAGEFILE_NAME		SE_CREATE_PERMANENT_NAME
+	SE_CREATE_TOKEN_NAME		SE_DEBUG_NAME
+	SE_INCREASE_QUOTA_NAME		SE_INC_BASE_PRIORITY_NAME
+	SE_LOAD_DRIVER_NAME		SE_LOCK_MEMORY_NAME
+	SE_MACHINE_ACCOUNT_NAME		SE_PROF_SINGLE_PROCESS_NAME
+	SE_REMOTE_SHUTDOWN_NAME		SE_RESTORE_NAME
+	SE_SECURITY_NAME		SE_SHUTDOWN_NAME
+	SE_SYSTEMTIME_NAME		SE_SYSTEM_ENVIRONMENT_NAME
+	SE_SYSTEM_PROFILE_NAME		SE_TAKE_OWNERSHIP_NAME
+	SE_TCB_NAME			SE_UNSOLICITED_INPUT_NAME
+
+It can be difficult to successfully build this module in a way
+that makes these constants available.  So some builds of this
+module may not make them available.  For such builds, trying
+to export any of these constants will cause a fatal error.
+For this reason, none of these symbols are currently included
+in the C<":ALL"> grouping.
+
+=back
+
+=head2 The Win32API:: heirarchy
+
+This and the other Win32API:: modules are meant to expose the
+nearly raw API calls so they can be used from Perl code in any
+way they might be used from C code.  This provides the following
+advantages:
+
+=over
+
+=item Many modules can be written by people that don't have a C compiler.
+
+=item Encourages more module code to be written in Perl [not C].
+
+Perl code is often much easier to inspect, debug, customize, and
+enhance than XS code.
+
+=item Allows those already familiar with the Win32 API to get
+off to a quick start.
+
+=item Provides an interactive tool for exploring even obscure
+details of the Win32 API.
+
+It can be very useful to interactively explore ad-hoc calls into
+parts of the Win32 API using:
+
+    perl -de 0
+
+=item Ensures that native Win32 data structures can be used.
+
+This allows maximum efficiency.  It also allows data from one
+module [for example, time or security information from the
+C<Win32API::Registry> or C<Win32API::File> modules] to be used
+with other modules [for example, C<Win32API::Time> and
+C<Win32API::SecDesc>].
+
+=item Provides a single version of the XS interface to each API
+call where improvements can be collected.
+
+=back
+
+=head2 Buffer sizes
+
+For each parameter that specifies a buffer size, a value of C<0>
+can be passed.  For parameter that are pointers to buffer sizes,
+you can also pass in C<NULL> by specifying an empty list reference,
+C<[]>.  Both of these cases will ensure that the variable has
+I<some> buffer space allocated to it and pass in that buffer's
+allocated size.  Many of the calls indicate, via C<ERROR_MORE_DATA>,
+that the buffer size was not sufficient and the F<Registry.xs>
+code will automatically enlarge the buffer to the required size
+and repeat the call.
+
+Numeric buffer sizes are used as minimum initial sizes for the
+buffers.  The larger of this size and the size of space already
+allocated to the scalar will be passed to the underlying routine. 
+If that size was insufficient, and the underlying call provides
+an easy method for determining the needed buffer size, then the
+buffer will be enlarged and the call repeated as above.
+
+The underlying calls define buffer size parameter as unsigned, so
+negative buffer sizes are treated as very large positive buffer
+sizes which usually cause C<malloc()> to fail.
+
+To force the F<Registry.xs> code to pass in a specific value for
+a buffer size, preceed the size with an equals sign via C<"=".>. 
+Buffer sizes that are passed in as strings starting with an equals
+sign will have the equal sign stripped and the remainder of the string
+interpretted as a number [via C's C<strtoul()> using only base 10]
+which will be passed to the underlying routine [even if the allocated
+buffer is actually larger].  The F<Registry.xs> code will enlarge the
+buffer to the specified size, if needed, but will not enlarge the
+buffer based on the underlying routine requesting more space.
+
+Some Reg*() calls may not currently set the buffer size when they
+return C<ERROR_MORE_DATA>.  But some that are not documented as
+doing so, currently do so anyway.  So the code assumes that any
+routine I<might> do this and resizes any buffers and repeats the
+call.   We hope that eventually all routines will provide this
+feature.
+
+When you use C<[]> for a buffer size, you can still find the
+length of the data returned by using C<length($buffer)>.  Note
+that this length will be in bytes while a few of the buffer
+sizes would have been in units of wide characters.
+
+Note that the RegQueryValueEx*() and RegEnumValue*() calls
+will trim the trailing C<'\0'> [if present] from the returned data
+values of type C<REG_SZ> or C<REG_EXPAND_SZ> but only if the
+value data length parameter is omitted [or specified as C<[]>].
+
+The RegSetValueEx*() calls will add a trailing C<'\0'> [if
+missing] to the supplied data values of type C<REG_SZ> and
+C<REG_EXPAND_SZ> but only if the value data length parameter
+is omitted [or specified as C<0>].
+
+=head2 Hungarian Notation
+
+The following abbreviations are used at the start of each parameter
+name to hint at aspects of how the parameter is used.  The prefix
+is always in lower case and followed by a capital letter that starts
+the descriptive part of the parameter name.  Several of the following
+abbreviations can be combined into a single prefix.
+
+Probably not all of these prefix notations are used by this module. 
+This document section may be included in any C<Win32API> module and
+so covers some notations not used by this specific module.
+
+=over
+
+=item s
+
+A string.  In C, a C<'\0'>-terminated C<char *>.  In Perl, just a
+string except that it will be truncated at the first C<"\0">, if
+it contains one.
+
+=item sw
+
+A wide [UNICODE] string.  In C, a C<L'\0'>-terminated C<WCHAR *>.
+In Perl, a string that contains UNICODE data.  You can convert a
+string to UNICODE in Perl via:
+
+    $string= "This is an example string";
+    $unicode= pack( "S*", unpack("C*",$string), 0 );
+
+Note how C<, 0> above causes an explicit C<L'\0'> to be added since
+Perl's implicit C<'\0'> that it puts after each of its strings is not
+wide enough to terminate a UNICODE string.  So UNICODE strings are
+different than regular strings in that the Perl version of a regular
+string will not include the trialing C<'\0'> while the Perl version
+of a UNICODE string must include the trailing C<L'\0'>.
+
+If a UNICODE string contains no non-ASCII characters, then you
+can convert it back into a normal string via:
+
+    $string= pack( "C*", unpack("S*",$unicode) );
+    $string =~ s/\0$//;
+
+=item p
+
+A pointer to some buffer [usually containing some C<struct>].  In C,
+a C<void *> or some other pointer type.  In Perl, a string that is
+usually manipulated using C<pack> and C<unpack>.  The "p" is usually
+followed by more prefix character(s) to indicate what type of data is
+stored in the bufffer.
+
+=item a
+
+A packed array.  In C, an array [usually of C<struct>s].  In Perl, a
+string containing the packed data.  The "a" is usually followed by
+more prefix character(s) to indicate the data type of the elements.
+
+These packed arrays are also called "vectors" in places to avoid
+confusion with Perl arrays.
+
+=item n
+
+A generic number.   In C, any of the integer or floating point data
+types.  In Perl, a number; either an integer, unsigned, or double
+[IV, UV, or NV, respectively].  Usually an integer.
+
+=item iv
+
+A signed integral value.  In C, any of the signed integer data types. 
+In Perl, an integer [IV].
+
+=item u
+
+An unsigned integral value.  In C, any of the unsigned integer data
+types.  In Perl, an unsigned integer [UV].
+
+=item d
+
+A floating-point number.  In C, a C<float> or C<double> or, perhaps,
+a C<long double>.  In Perl, a double-precision floating-point number
+[NV].
+
+=item b
+
+A Boolean value.  In C, any integer data type, though usually via
+a type alias of C<bool> or C<BOOL>, containing either a 0 [false] or
+non-zero [true] value.  In Perl, a scalar containing a Boolean value
+[C<0>, C<"">, or C<undef> for "false" and anything else for "true"].
+
+=item c
+
+A count of items.  In C, any integer data type.  In Perl, an unsigned
+integer [UV].  Usually used in conjunction with a "vector" parameter
+[see L</a> above] to indicate the number of elements.
+
+=item l
+
+A length [in bytes].  In C, any integer data type.  In Perl, an
+unsigned integer [UV].  Usually used in conjunction with a "string"
+or "pointer" parameter [see L</s> and L</p> above] to indicate the
+buffer size or the size of the value stored in the buffer.
+
+For strings, there is no general rule as to whether the trailing
+C<'\0'> is included in such sizes.  For this reason, the C<Win32API>
+modules follow the Perl rule of always allocating one extra byte
+and reporting buffer sizes as being one smaller than allocated in
+case the C<'\0'> is not included in the size.
+
+=item lw
+
+A length measured as number of UNICODE characters.  In C, a count
+of C<WCHAR>s.  In Perl, an unsigned integer [UV] counting "shorts"
+[see "s" and "S" in C<pack> and C<unpack>].
+
+For UNICODE strings, the trailing C<L'\0'> may or may not be
+included in a length so, again, we always allocate extra room
+for one and don't report that extra space.
+
+=item h
+
+A handle.  In C, a C<HANDLE> or more-specific handle data type. 
+In Perl, an unsigned integer [UV].  In C, these handles are often
+actually some type of pointer, but Perl just treats them as opaque
+numbers, as it should.  This prefix is also used for other pointers
+that are treated as integers in Perl code.
+
+=item r
+
+A record.  In C, almost always a C<struct> or perhaps C<union>.  Note
+that C C<struct>s are rarely passed by value so the "r" is almost
+always preceeded by a "p" or "a" [see L</p> and L</a> above].  For
+the very rare unadorned "r", Perl stores the record in the same way
+as a "pr", that is, in a string.  For the very rare case where Perl
+explicitly stores a pointer to the C<struct> rather than storing the
+C<struct> directly in a Perl string, the prefix "pp" or "ppr" or even
+"par" is used.
+
+=item sv
+
+=item rv
+
+=item hv
+
+=item av
+
+=item cv
+
+A Perl data type.  Respectively, a scalar value [SV], a reference
+[RV] [usually to a scalar], a hash [HV], a Perl array [AV], or a Perl
+code reference [PVCV].  For the "hv", "av", and "cv" prefixes, a
+leading "rv" is usually assumed.  For a parameter to an XS subroutine,
+a prefix of "sv" means the parameter is a scalar and so may be a string
+or a number [or C<undef>] or even both at the same time.  So "sv"
+doesn't imply a leading "rv".
+
+=item Input or Output
+
+Whether a parameter is for input data, output data, or both is usually
+not reflected by the data type prefix.  In cases where this is not
+obvious nor reflected in the parameter name proper, we may use the
+following in front of the data type prefix.
+
+=over
+
+=item i
+
+An input parameter given to the API [usually omitted].
+
+=item o
+
+An output-only parameter taken from the API.  You should not get a
+warning if such a parameter is C<undef> when you pass it into the
+function.  You should get an error if such a parameter is read-only.
+You can [usually] pass in C<[]> for such a parameter to have the
+parameter silently ignored.
+
+The output may be written directly into the Perl variable passed
+to the subroutine, the same way the buffer parameter to Perl's
+C<sysread()>.  This method is often avoided in Perl because
+the call then lacks any visual cue that some parameters are being
+overwritten.   But this method closely matches the C API which is
+what we are trying to do.
+
+=item io
+
+Input given to the API then overwritten with output taken from the
+API.  You should get a warning [if B<-w> is in effect] if such a
+parameter is C<undef> when you pass it into the function [unless it
+is a buffer or buffer length parameter].  If the value is read-only,
+then [for most parameters] the output is silently not written.  This
+is because it is often convenient to pass in read-only constants for
+many such parameters.  You can also usually pass in C<[]> for such
+parameters.
+
+=back
+
+=item pp
+
+=item ppr
+
+=item par
+
+=item pap
+
+These are just unusual combinations of prefix characters described above.
+
+For each, a pointer is stored in a [4-byte] Perl string.  You can
+usually use C<unpack "P"> to access the real data from Perl.
+
+For "ppr" [and often for "pp"], the pointer points directly at a
+C C<struct>.  For "par", the pointer points to the first element
+of a C [packed] array of C<struct>s.  For "pap", the pointer points
+to a C [packed] array of pointers to other things.
+
+=item ap
+
+Here we have a list of pointers packed into a single Perl string.
+
+=back
+
+=head1 BUGS
+
+The old ActiveState ports of Perl for Win32 [but not, ActivePerl, the
+ActiveState distributions of standard Perl 5.004 and beyond] do not support
+the tools for building extensions and so do not support this extension.
+
+No routines are provided for using the data returned in the C<FILETIME>
+buffers.  Those are in the C<Win32API::Time> module.
+
+No routines are provided for dealing with UNICODE data effectively. 
+See L</:FuncW> above for some simple-minded UNICODE methods.
+
+Parts of the module test will fail if used on a version of Perl
+that does not yet set C<$^E> based on C<GetLastError()>.
+
+On NT 4.0 [at least], the RegEnum*() calls do not set the required
+buffer sizes when returning C<ERROR_MORE_DATA> so this module will
+not grow the buffers in such cases.  C<Win32::TieRegistry> overcomes
+this by using values from C<RegQueryInfoKey()> for buffer sizes in
+RegEnum* calls.
+
+On NT 4.0 [at least], C<RegQueryInfoKey()> on C<HKEY_PERFORMANCE_DATA>
+never succeeds.  Also, C<RegQueryValueEx()> on C<HKEY_PERFORMANCE_DATA>
+never returns the required buffer size.  To access C<HKEY_PERFORMANCE_DATA>
+you will need to keep growing the data buffer until the call succeeds.
+
+Because C<goto &subroutine> seems to be buggy under Win32 Perl,
+it is not used in the stubs in F<Registry.pm>.
+
+=head1 AUTHOR
+
+Tye McQueen, tye@metronet.com, http://www.metronet.com/~tye/.
+
+=head1 SEE ALSO
+
+=over
+
+=item L<Win32::TieRegistry>
+
+=item L<Win32::Registry>
+
+=back
+
+=cut
diff --git a/lib/site_win56/Win32API/Registry/cRegistry.pc b/lib/site_win56/Win32API/Registry/cRegistry.pc
index f984543fa..9659d0c43 100644
--- a/lib/site_win56/Win32API/Registry/cRegistry.pc
+++ b/lib/site_win56/Win32API/Registry/cRegistry.pc
@@ -1,87 +1,87 @@
-# Generated by cRegistry_pc.cxx.
-# Package Win32API::Registry with options:
-#    CPLUSPLUS => q[1]
-#    IFDEF => q[ /^SE_/ ? '__cplusplus' : /REG_/ ]
-#    IMPORT_LIST => [q[/._/], q[!/[a-z]/]]
-#    VALUES => { KEY_DELETE=>q[DELETE], KEY_READ_CONTROL=>q[READ_CONTROL], KEY_WRITE_OWNER=>q[WRITE_OWNER], KEY_SYNCHRONIZE=>q[SYNCHRONIZE], KEY_WRITE_DAC=>q[WRITE_DAC] }
-#    WRITE_PERL => q[1]
-# Perl files eval'd:
-#    Registry.pm => last if /^\s*(bootstrap|XSLoader::load)\b/
-# C files included:
-#    Registry.xs => last if m#/[/*]\s*CONSTS_DEFINED\b|^\s*MODULE\b#
-sub HKEY_CLASSES_ROOT () { 0x80000000 }
-sub HKEY_CURRENT_CONFIG () { 0x80000005 }
-sub HKEY_CURRENT_USER () { 0x80000001 }
-sub HKEY_DYN_DATA () { 0x80000006 }
-sub HKEY_LOCAL_MACHINE () { 0x80000002 }
-sub HKEY_PERFORMANCE_DATA () { 0x80000004 }
-sub HKEY_USERS () { 0x80000003 }
-sub KEY_ALL_ACCESS () { 983103 }
-sub KEY_CREATE_LINK () { 32 }
-sub KEY_CREATE_SUB_KEY () { 4 }
-sub KEY_DELETE () { 65536 }
-sub KEY_ENUMERATE_SUB_KEYS () { 8 }
-sub KEY_EXECUTE () { 131097 }
-sub KEY_NOTIFY () { 16 }
-sub KEY_QUERY_VALUE () { 1 }
-sub KEY_READ () { 131097 }
-sub KEY_READ_CONTROL () { 131072 }
-sub KEY_SET_VALUE () { 2 }
-sub KEY_SYNCHRONIZE () { 1048576 }
-sub KEY_WRITE () { 131078 }
-sub KEY_WRITE_DAC () { 262144 }
-sub KEY_WRITE_OWNER () { 524288 }
-sub REG_BINARY () { 3 }
-sub REG_CREATED_NEW_KEY () { 1 }
-sub REG_DWORD () { 4 }
-sub REG_DWORD_BIG_ENDIAN () { 5 }
-sub REG_DWORD_LITTLE_ENDIAN () { 4 }
-sub REG_EXPAND_SZ () { 2 }
-sub REG_FULL_RESOURCE_DESCRIPTOR () { 9 }
-sub REG_LEGAL_CHANGE_FILTER () { 15 }
-sub REG_LEGAL_OPTION () { 15 }
-sub REG_LINK () { 6 }
-sub REG_MULTI_SZ () { 7 }
-sub REG_NONE () { 0 }
-sub REG_NOTIFY_CHANGE_ATTRIBUTES () { 2 }
-sub REG_NOTIFY_CHANGE_LAST_SET () { 4 }
-sub REG_NOTIFY_CHANGE_NAME () { 1 }
-sub REG_NOTIFY_CHANGE_SECURITY () { 8 }
-sub REG_NO_LAZY_FLUSH () { 4 }
-sub REG_OPENED_EXISTING_KEY () { 2 }
-sub REG_OPTION_BACKUP_RESTORE () { 4 }
-sub REG_OPTION_CREATE_LINK () { 2 }
-sub REG_OPTION_NON_VOLATILE () { 0 }
-sub REG_OPTION_OPEN_LINK () { 8 }
-sub REG_OPTION_RESERVED () { 0 }
-sub REG_OPTION_VOLATILE () { 1 }
-sub REG_REFRESH_HIVE () { 2 }
-sub REG_RESOURCE_LIST () { 8 }
-sub REG_RESOURCE_REQUIREMENTS_LIST () { 10 }
-sub REG_SZ () { 1 }
-sub REG_WHOLE_HIVE_VOLATILE () { 1 }
-sub SE_ASSIGNPRIMARYTOKEN_NAME () { 'SeAssignPrimaryTokenPrivilege' }
-sub SE_AUDIT_NAME () { 'SeAuditPrivilege' }
-sub SE_BACKUP_NAME () { 'SeBackupPrivilege' }
-sub SE_CHANGE_NOTIFY_NAME () { 'SeChangeNotifyPrivilege' }
-sub SE_CREATE_PAGEFILE_NAME () { 'SeCreatePagefilePrivilege' }
-sub SE_CREATE_PERMANENT_NAME () { 'SeCreatePermanentPrivilege' }
-sub SE_CREATE_TOKEN_NAME () { 'SeCreateTokenPrivilege' }
-sub SE_DEBUG_NAME () { 'SeDebugPrivilege' }
-sub SE_INCREASE_QUOTA_NAME () { 'SeIncreaseQuotaPrivilege' }
-sub SE_INC_BASE_PRIORITY_NAME () { 'SeIncreaseBasePriorityPrivilege' }
-sub SE_LOAD_DRIVER_NAME () { 'SeLoadDriverPrivilege' }
-sub SE_LOCK_MEMORY_NAME () { 'SeLockMemoryPrivilege' }
-sub SE_MACHINE_ACCOUNT_NAME () { 'SeMachineAccountPrivilege' }
-sub SE_PROF_SINGLE_PROCESS_NAME () { 'SeProfileSingleProcessPrivilege' }
-sub SE_REMOTE_SHUTDOWN_NAME () { 'SeRemoteShutdownPrivilege' }
-sub SE_RESTORE_NAME () { 'SeRestorePrivilege' }
-sub SE_SECURITY_NAME () { 'SeSecurityPrivilege' }
-sub SE_SHUTDOWN_NAME () { 'SeShutdownPrivilege' }
-sub SE_SYSTEMTIME_NAME () { 'SeSystemtimePrivilege' }
-sub SE_SYSTEM_ENVIRONMENT_NAME () { 'SeSystemEnvironmentPrivilege' }
-sub SE_SYSTEM_PROFILE_NAME () { 'SeSystemProfilePrivilege' }
-sub SE_TAKE_OWNERSHIP_NAME () { 'SeTakeOwnershipPrivilege' }
-sub SE_TCB_NAME () { 'SeTcbPrivilege' }
-sub SE_UNSOLICITED_INPUT_NAME () { 'SeUnsolicitedInputPrivilege' }
-1;
+# Generated by cRegistry_pc.cxx.
+# Package Win32API::Registry with options:
+#    CPLUSPLUS => q[1]
+#    IFDEF => q[ /^SE_/ ? '__cplusplus' : /REG_/ ]
+#    IMPORT_LIST => [q[/._/], q[!/[a-z]/]]
+#    VALUES => { KEY_DELETE=>q[DELETE], KEY_READ_CONTROL=>q[READ_CONTROL], KEY_WRITE_OWNER=>q[WRITE_OWNER], KEY_SYNCHRONIZE=>q[SYNCHRONIZE], KEY_WRITE_DAC=>q[WRITE_DAC] }
+#    WRITE_PERL => q[1]
+# Perl files eval'd:
+#    Registry.pm => last if /^\s*(bootstrap|XSLoader::load)\b/
+# C files included:
+#    Registry.xs => last if m#/[/*]\s*CONSTS_DEFINED\b|^\s*MODULE\b#
+sub HKEY_CLASSES_ROOT () { 0x80000000 }
+sub HKEY_CURRENT_CONFIG () { 0x80000005 }
+sub HKEY_CURRENT_USER () { 0x80000001 }
+sub HKEY_DYN_DATA () { 0x80000006 }
+sub HKEY_LOCAL_MACHINE () { 0x80000002 }
+sub HKEY_PERFORMANCE_DATA () { 0x80000004 }
+sub HKEY_USERS () { 0x80000003 }
+sub KEY_ALL_ACCESS () { 983103 }
+sub KEY_CREATE_LINK () { 32 }
+sub KEY_CREATE_SUB_KEY () { 4 }
+sub KEY_DELETE () { 65536 }
+sub KEY_ENUMERATE_SUB_KEYS () { 8 }
+sub KEY_EXECUTE () { 131097 }
+sub KEY_NOTIFY () { 16 }
+sub KEY_QUERY_VALUE () { 1 }
+sub KEY_READ () { 131097 }
+sub KEY_READ_CONTROL () { 131072 }
+sub KEY_SET_VALUE () { 2 }
+sub KEY_SYNCHRONIZE () { 1048576 }
+sub KEY_WRITE () { 131078 }
+sub KEY_WRITE_DAC () { 262144 }
+sub KEY_WRITE_OWNER () { 524288 }
+sub REG_BINARY () { 3 }
+sub REG_CREATED_NEW_KEY () { 1 }
+sub REG_DWORD () { 4 }
+sub REG_DWORD_BIG_ENDIAN () { 5 }
+sub REG_DWORD_LITTLE_ENDIAN () { 4 }
+sub REG_EXPAND_SZ () { 2 }
+sub REG_FULL_RESOURCE_DESCRIPTOR () { 9 }
+sub REG_LEGAL_CHANGE_FILTER () { 15 }
+sub REG_LEGAL_OPTION () { 15 }
+sub REG_LINK () { 6 }
+sub REG_MULTI_SZ () { 7 }
+sub REG_NONE () { 0 }
+sub REG_NOTIFY_CHANGE_ATTRIBUTES () { 2 }
+sub REG_NOTIFY_CHANGE_LAST_SET () { 4 }
+sub REG_NOTIFY_CHANGE_NAME () { 1 }
+sub REG_NOTIFY_CHANGE_SECURITY () { 8 }
+sub REG_NO_LAZY_FLUSH () { 4 }
+sub REG_OPENED_EXISTING_KEY () { 2 }
+sub REG_OPTION_BACKUP_RESTORE () { 4 }
+sub REG_OPTION_CREATE_LINK () { 2 }
+sub REG_OPTION_NON_VOLATILE () { 0 }
+sub REG_OPTION_OPEN_LINK () { 8 }
+sub REG_OPTION_RESERVED () { 0 }
+sub REG_OPTION_VOLATILE () { 1 }
+sub REG_REFRESH_HIVE () { 2 }
+sub REG_RESOURCE_LIST () { 8 }
+sub REG_RESOURCE_REQUIREMENTS_LIST () { 10 }
+sub REG_SZ () { 1 }
+sub REG_WHOLE_HIVE_VOLATILE () { 1 }
+sub SE_ASSIGNPRIMARYTOKEN_NAME () { 'SeAssignPrimaryTokenPrivilege' }
+sub SE_AUDIT_NAME () { 'SeAuditPrivilege' }
+sub SE_BACKUP_NAME () { 'SeBackupPrivilege' }
+sub SE_CHANGE_NOTIFY_NAME () { 'SeChangeNotifyPrivilege' }
+sub SE_CREATE_PAGEFILE_NAME () { 'SeCreatePagefilePrivilege' }
+sub SE_CREATE_PERMANENT_NAME () { 'SeCreatePermanentPrivilege' }
+sub SE_CREATE_TOKEN_NAME () { 'SeCreateTokenPrivilege' }
+sub SE_DEBUG_NAME () { 'SeDebugPrivilege' }
+sub SE_INCREASE_QUOTA_NAME () { 'SeIncreaseQuotaPrivilege' }
+sub SE_INC_BASE_PRIORITY_NAME () { 'SeIncreaseBasePriorityPrivilege' }
+sub SE_LOAD_DRIVER_NAME () { 'SeLoadDriverPrivilege' }
+sub SE_LOCK_MEMORY_NAME () { 'SeLockMemoryPrivilege' }
+sub SE_MACHINE_ACCOUNT_NAME () { 'SeMachineAccountPrivilege' }
+sub SE_PROF_SINGLE_PROCESS_NAME () { 'SeProfileSingleProcessPrivilege' }
+sub SE_REMOTE_SHUTDOWN_NAME () { 'SeRemoteShutdownPrivilege' }
+sub SE_RESTORE_NAME () { 'SeRestorePrivilege' }
+sub SE_SECURITY_NAME () { 'SeSecurityPrivilege' }
+sub SE_SHUTDOWN_NAME () { 'SeShutdownPrivilege' }
+sub SE_SYSTEMTIME_NAME () { 'SeSystemtimePrivilege' }
+sub SE_SYSTEM_ENVIRONMENT_NAME () { 'SeSystemEnvironmentPrivilege' }
+sub SE_SYSTEM_PROFILE_NAME () { 'SeSystemProfilePrivilege' }
+sub SE_TAKE_OWNERSHIP_NAME () { 'SeTakeOwnershipPrivilege' }
+sub SE_TCB_NAME () { 'SeTcbPrivilege' }
+sub SE_UNSOLICITED_INPUT_NAME () { 'SeUnsolicitedInputPrivilege' }
+1;
diff --git a/lib/site_win58/Win32/Registry.pm b/lib/site_win58/Win32/Registry.pm
index cd20b1e07..c83fca5a3 100644
--- a/lib/site_win58/Win32/Registry.pm
+++ b/lib/site_win58/Win32/Registry.pm
@@ -1,547 +1,547 @@
-package Win32::Registry;
-
-=head1 NAME
-
-Win32::Registry - accessing the Windows registry [obsolete, use Win32::TieRegistry]
-
-=head1 SYNOPSIS
-
-    use Win32::Registry;
-    my $tips;
-    $::HKEY_LOCAL_MACHINE->Open("SOFTWARE\\Microsoft\\Windows"
-                               ."\\CurrentVersion\\Explorer\\Tips", $tips)
-        or die "Can't open tips: $^E";
-    my ($type, $value);
-    $tips->QueryValueEx("18", $type, $value) or die "No tip #18: $^E";
-    print "Here's a tip: $value\n";
-
-=head1 DESCRIPTION
-
-    NOTE: This module provides a very klunky interface to access the
-    Windows registry, and is not currently being developed actively.  It
-    only exists for backward compatibility with old code that uses it.
-    For more powerful and flexible ways to access the registry, use
-    Win32::TieRegistry.
-
-Win32::Registry provides an object oriented interface to the Windows
-Registry.
-
-The following "root" registry objects are exported to the main:: name
-space.  Additional keys must be opened by calling the provided methods
-on one of these.
-
-    $HKEY_CLASSES_ROOT
-    $HKEY_CURRENT_USER
-    $HKEY_LOCAL_MACHINE
-    $HKEY_USERS
-    $HKEY_PERFORMANCE_DATA
-    $HKEY_CURRENT_CONFIG
-    $HKEY_DYN_DATA
-
-=cut
-
-use strict;
-require Exporter;
-require DynaLoader;
-use Win32::WinError;
-
-require Win32 unless defined &Win32::GetLastError;
-
-use vars qw($VERSION $AUTOLOAD @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
-$VERSION = '0.07';
-
-@ISA	= qw( Exporter DynaLoader );
-@EXPORT = qw(
-	HKEY_CLASSES_ROOT
-	HKEY_CURRENT_USER
-	HKEY_LOCAL_MACHINE
-	HKEY_PERFORMANCE_DATA
-	HKEY_CURRENT_CONFIG
-	HKEY_DYN_DATA
-	HKEY_USERS
-	KEY_ALL_ACCESS
-	KEY_CREATE_LINK
-	KEY_CREATE_SUB_KEY
-	KEY_ENUMERATE_SUB_KEYS
-	KEY_EXECUTE
-	KEY_NOTIFY
-	KEY_QUERY_VALUE
-	KEY_READ
-	KEY_SET_VALUE
-	KEY_WRITE
-	REG_BINARY
-	REG_CREATED_NEW_KEY
-	REG_DWORD
-	REG_DWORD_BIG_ENDIAN
-	REG_DWORD_LITTLE_ENDIAN
-	REG_EXPAND_SZ
-	REG_FULL_RESOURCE_DESCRIPTOR
-	REG_LEGAL_CHANGE_FILTER
-	REG_LEGAL_OPTION
-	REG_LINK
-	REG_MULTI_SZ
-	REG_NONE
-	REG_NOTIFY_CHANGE_ATTRIBUTES
-	REG_NOTIFY_CHANGE_LAST_SET
-	REG_NOTIFY_CHANGE_NAME
-	REG_NOTIFY_CHANGE_SECURITY
-	REG_OPENED_EXISTING_KEY
-	REG_OPTION_BACKUP_RESTORE
-	REG_OPTION_CREATE_LINK
-	REG_OPTION_NON_VOLATILE
-	REG_OPTION_RESERVED
-	REG_OPTION_VOLATILE
-	REG_REFRESH_HIVE
-	REG_RESOURCE_LIST
-	REG_RESOURCE_REQUIREMENTS_LIST
-	REG_SZ
-	REG_WHOLE_HIVE_VOLATILE
-);
-
-@EXPORT_OK = qw(
-    RegCloseKey
-    RegConnectRegistry
-    RegCreateKey
-    RegCreateKeyEx
-    RegDeleteKey
-    RegDeleteValue
-    RegEnumKey
-    RegEnumValue
-    RegFlushKey
-    RegGetKeySecurity
-    RegLoadKey
-    RegNotifyChangeKeyValue
-    RegOpenKey
-    RegOpenKeyEx
-    RegQueryInfoKey
-    RegQueryValue
-    RegQueryValueEx
-    RegReplaceKey
-    RegRestoreKey
-    RegSaveKey
-    RegSetKeySecurity
-    RegSetValue
-    RegSetValueEx
-    RegUnLoadKey
-);
-$EXPORT_TAGS{ALL}= \@EXPORT_OK;
-
-bootstrap Win32::Registry;
-
-sub import {
-    my $pkg = shift;
-    if ($_[0] && "Win32" eq $_[0]) {
-	Exporter::export($pkg, "Win32", @EXPORT_OK);
-	shift;
-    }
-    Win32::Registry->export_to_level(1+$Exporter::ExportLevel, $pkg, @_);
-}
-
-#######################################################################
-# This AUTOLOAD is used to 'autoload' constants from the constant()
-# XS function.  If a constant is not found then control is passed
-# to the AUTOLOAD in AutoLoader.
-
-sub AUTOLOAD {
-    my($constname);
-    ($constname = $AUTOLOAD) =~ s/.*:://;
-    #reset $! to zero to reset any current errors.
-    local $! = 0;
-    my $val = constant($constname, 0);
-    if ($! != 0) {
-	if ($! =~ /Invalid/) {
-	    $AutoLoader::AUTOLOAD = $AUTOLOAD;
-	    goto &AutoLoader::AUTOLOAD;
-	}
-	else {
-	    my ($pack,$file,$line) = caller;
-	    die "Unknown constant $constname in Win32::Registry "
-	       . "at $file line $line.\n";
-	}
-    }
-    eval "sub $AUTOLOAD { $val }";
-    goto &$AUTOLOAD;
-}
-
-#######################################################################
-# _new is a private constructor, not intended for public use.
-#
-
-sub _new {
-    my $self;
-    if ($_[0]) {
-	$self->{'handle'} = $_[0];
-	bless $self;
-    }
-    $self;
-}
-
-#define the basic registry objects to be exported.
-#these had to be hardwired unfortunately.
-# XXX Yuck!
-
-{
-    package main;
-    use vars qw(
-		$HKEY_CLASSES_ROOT
-		$HKEY_CURRENT_USER
-		$HKEY_LOCAL_MACHINE
-		$HKEY_USERS
-		$HKEY_PERFORMANCE_DATA
-		$HKEY_CURRENT_CONFIG
-		$HKEY_DYN_DATA
-	       );
-}
-
-$::HKEY_CLASSES_ROOT		= _new(&HKEY_CLASSES_ROOT);
-$::HKEY_CURRENT_USER		= _new(&HKEY_CURRENT_USER);
-$::HKEY_LOCAL_MACHINE		= _new(&HKEY_LOCAL_MACHINE);
-$::HKEY_USERS			= _new(&HKEY_USERS);
-$::HKEY_PERFORMANCE_DATA	= _new(&HKEY_PERFORMANCE_DATA);
-$::HKEY_CURRENT_CONFIG		= _new(&HKEY_CURRENT_CONFIG);
-$::HKEY_DYN_DATA		= _new(&HKEY_DYN_DATA);
-
-=head2 Methods
-
-The following methods are supported.  Note that subkeys can be
-specified as a path name, separated by backslashes (which may
-need to be doubled if you put them in double quotes).
-
-=over 8
-
-=item Open
-
-    $reg_obj->Open($sub_key_name, $sub_reg_obj);
-
-Opens a subkey of a registry object, returning the new registry object
-in $sub_reg_obj.
-
-=cut
-
-sub Open {
-    my $self = shift;
-    die 'usage: $obj->Open($sub_key_name, $sub_reg_obj)' if @_ != 2;
-    
-    my ($subkey) = @_;
-    my ($result,$subhandle);
-
-    $result = RegOpenKey($self->{'handle'},$subkey,$subhandle);
-    $_[1] = _new($subhandle);
-    
-    return 0 unless $_[1];
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item Close
-
-    $reg_obj->Close();
-
-Closes an open registry key.
-
-=cut
-
-sub Close {
-    my $self = shift;
-    die 'usage: $obj->Close()' if @_ != 0;
-
-    return unless exists $self->{'handle'};
-    my $result = RegCloseKey($self->{'handle'});
-    if ($result) {
-	delete $self->{'handle'};
-    }
-    else {
-	$! = Win32::GetLastError();
-    }
-    return $result;
-}
-
-sub DESTROY {
-    my $self = shift;
-    return unless exists $self->{'handle'};
-    RegCloseKey($self->{'handle'});
-    delete $self->{'handle'};
-}
-
-
-=item Connect
-
-    $reg_obj->Connect($node_name, $new_reg_obj);
-
-Connects to a remote Registry on the node specified by $node_name,
-returning it in $new_reg_obj.  Returns false if it fails.
-
-=cut
-
-sub Connect {
-    my $self = shift;
-    die 'usage: $obj->Connect($node_name, $new_reg_obj)' if @_ != 2;
-     
-    my ($node) = @_;
-    my ($result,$subhandle);
-
-    $result = RegConnectRegistry ($node, $self->{'handle'}, $subhandle);
-    $_[1] = _new($subhandle);
-
-    return 0 unless $_[1];
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}  
-
-=item Create
-
-    $reg_obj->Create($sub_key_name, $new_reg_obj);
-
-Opens the subkey specified by $sub_key_name, returning the new registry
-object in $new_reg_obj.  If the specified subkey doesn't exist, it is
-created.
-
-=cut
-
-sub Create {
-    my $self = shift;
-    die 'usage: $obj->Create($sub_key_name, $new_reg_obj)' if @_ != 2;
-
-    my ($subkey) = @_;
-    my ($result,$subhandle);
-
-    $result = RegCreateKey($self->{'handle'},$subkey,$subhandle);
-    $_[1] = _new ($subhandle);
-
-    return 0 unless $_[1];
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item SetValue
-
-    $reg_obj->SetValue($sub_key_name, $type, $value);
-
-Sets the default value for a subkey specified by $sub_key_name.
-
-=cut
-
-sub SetValue {
-    my $self = shift;
-    die 'usage: $obj->SetValue($subkey, $type, $value)' if @_ != 3;
-    my $result = RegSetValue($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item SetValueEx
-
-    $reg_obj->SetValueEx($value_name, $reserved, $type, $value);
-
-Sets the value for the value name identified by $value_name
-in the key specified by $reg_obj.
-
-=cut
-
-sub SetValueEx {
-    my $self = shift;
-    die 'usage: $obj->SetValueEx($value_name, $reserved, $type, $value)' if @_ != 4;
-    my $result = RegSetValueEx($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item QueryValue
-
-    $reg_obj->QueryValue($sub_key_name, $value);
-
-Gets the default value of the subkey specified by $sub_key_name.
-
-=cut
-
-sub QueryValue {
-    my $self = shift;
-    die 'usage: $obj->QueryValue($sub_key_name, $value)' if @_ != 2;
-    my $result = RegQueryValue($self->{'handle'}, $_[0], $_[1]);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item QueryKey
-
-    $reg_obj->QueryKey($classref, $number_of_subkeys, $number_of_values);
-
-Gets information on a key specified by $reg_obj.
-
-=cut
-
-sub QueryKey {
-    my $garbage;
-    my $self = shift;
-    die 'usage: $obj->QueryKey($classref, $number_of_subkeys, $number_of_values)'
-    	if @_ != 3;
-
-    my $result = RegQueryInfoKey($self->{'handle'}, $_[0],
-    				 $garbage, $garbage, $_[1],
-			         $garbage, $garbage, $_[2],
-			         $garbage, $garbage, $garbage, $garbage);
-
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item QueryValueEx
-
-    $reg_obj->QueryValueEx($value_name, $type, $value);
-
-Gets the value for the value name identified by $value_name
-in the key specified by $reg_obj.
-
-=cut
-
-sub QueryValueEx {
-    my $self = shift;
-    die 'usage: $obj->QueryValueEx($value_name, $type, $value)' if @_ != 3;
-    my $result = RegQueryValueEx($self->{'handle'}, $_[0], undef, $_[1], $_[2]);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item GetKeys
-
-    my @keys;
-    $reg_obj->GetKeys(\@keys);
-
-Populates the supplied array reference with the names of all the keys
-within the registry object $reg_obj.
-
-=cut
-
-sub GetKeys {
-    my $self = shift;
-    die 'usage: $obj->GetKeys($arrayref)' if @_ != 1 or ref($_[0]) ne 'ARRAY';
-
-    my ($result, $i, $keyname);
-    $keyname = "DummyVal";
-    $i = 0;
-    $result = 1;
-    
-    while ( $result ) {
-	$result = RegEnumKey( $self->{'handle'},$i++, $keyname );
-	if ($result) {
-	    push( @{$_[0]}, $keyname );
-	}
-    }
-    return(1);
-}
-
-=item GetValues
-
-    my %values;
-    $reg_obj->GetValues(\%values);
-
-Populates the supplied hash reference with entries of the form
-
-    $value_name => [ $value_name, $type, $data ]
-
-for each value in the registry object $reg_obj.
-
-=cut
-
-sub GetValues {
-    my $self = shift;
-    die 'usage: $obj->GetValues($hashref)' if @_ != 1;
-
-    my ($result,$name,$type,$data,$i);
-    $name = "DummyVal";
-    $i = 0;
-    while ( $result=RegEnumValue( $self->{'handle'},
-				  $i++,
-				  $name,
-				  undef,
-				  $type,
-				  $data ))
-    {
-	$_[0]->{$name} = [ $name, $type, $data ];
-    }
-    return(1);
-}
-
-=item DeleteKey
-
-    $reg_obj->DeleteKey($sub_key_name);
-
-Deletes a subkey specified by $sub_key_name from the registry.
-
-=cut
-
-sub DeleteKey {
-    my $self = shift;
-    die 'usage: $obj->DeleteKey($sub_key_name)' if @_ != 1;
-    my $result = RegDeleteKey($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item DeleteValue
-
-    $reg_obj->DeleteValue($value_name);
-
-Deletes a value identified by $value_name from the registry.
-
-=cut
-
-sub DeleteValue {
-    my $self = shift;
-    die 'usage: $obj->DeleteValue($value_name)' if @_ != 1;
-    my $result = RegDeleteValue($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item Save
-
-    $reg_obj->Save($filename);
-
-Saves the hive specified by $reg_obj to a file.
-
-=cut
-
-sub Save {
-    my $self = shift;
-    die 'usage: $obj->Save($filename)' if @_ != 1;
-    my $result = RegSaveKey($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item Load
-
-    $reg_obj->Load($sub_key_name, $file_name);
-
-Loads a key specified by $sub_key_name from a file.
-
-=cut
-
-sub Load {
-    my $self = shift;
-    die 'usage: $obj->Load($sub_key_name, $file_name)' if @_ != 2;
-    my $result = RegLoadKey($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-=item UnLoad
-
-    $reg_obj->Unload($sub_key_name);
-
-Unloads a registry hive.
-
-=cut
-
-sub UnLoad {
-    my $self = shift;
-    die 'usage: $obj->UnLoad($sub_key_name)' if @_ != 1;
-    my $result = RegUnLoadKey($self->{'handle'}, @_);
-    $! = Win32::GetLastError() unless $result;
-    return $result;
-}
-
-1;
-__END__
+package Win32::Registry;
+
+=head1 NAME
+
+Win32::Registry - accessing the Windows registry [obsolete, use Win32::TieRegistry]
+
+=head1 SYNOPSIS
+
+    use Win32::Registry;
+    my $tips;
+    $::HKEY_LOCAL_MACHINE->Open("SOFTWARE\\Microsoft\\Windows"
+                               ."\\CurrentVersion\\Explorer\\Tips", $tips)
+        or die "Can't open tips: $^E";
+    my ($type, $value);
+    $tips->QueryValueEx("18", $type, $value) or die "No tip #18: $^E";
+    print "Here's a tip: $value\n";
+
+=head1 DESCRIPTION
+
+    NOTE: This module provides a very klunky interface to access the
+    Windows registry, and is not currently being developed actively.  It
+    only exists for backward compatibility with old code that uses it.
+    For more powerful and flexible ways to access the registry, use
+    Win32::TieRegistry.
+
+Win32::Registry provides an object oriented interface to the Windows
+Registry.
+
+The following "root" registry objects are exported to the main:: name
+space.  Additional keys must be opened by calling the provided methods
+on one of these.
+
+    $HKEY_CLASSES_ROOT
+    $HKEY_CURRENT_USER
+    $HKEY_LOCAL_MACHINE
+    $HKEY_USERS
+    $HKEY_PERFORMANCE_DATA
+    $HKEY_CURRENT_CONFIG
+    $HKEY_DYN_DATA
+
+=cut
+
+use strict;
+require Exporter;
+require DynaLoader;
+use Win32::WinError;
+
+require Win32 unless defined &Win32::GetLastError;
+
+use vars qw($VERSION $AUTOLOAD @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+
+$VERSION = '0.07';
+
+@ISA	= qw( Exporter DynaLoader );
+@EXPORT = qw(
+	HKEY_CLASSES_ROOT
+	HKEY_CURRENT_USER
+	HKEY_LOCAL_MACHINE
+	HKEY_PERFORMANCE_DATA
+	HKEY_CURRENT_CONFIG
+	HKEY_DYN_DATA
+	HKEY_USERS
+	KEY_ALL_ACCESS
+	KEY_CREATE_LINK
+	KEY_CREATE_SUB_KEY
+	KEY_ENUMERATE_SUB_KEYS
+	KEY_EXECUTE
+	KEY_NOTIFY
+	KEY_QUERY_VALUE
+	KEY_READ
+	KEY_SET_VALUE
+	KEY_WRITE
+	REG_BINARY
+	REG_CREATED_NEW_KEY
+	REG_DWORD
+	REG_DWORD_BIG_ENDIAN
+	REG_DWORD_LITTLE_ENDIAN
+	REG_EXPAND_SZ
+	REG_FULL_RESOURCE_DESCRIPTOR
+	REG_LEGAL_CHANGE_FILTER
+	REG_LEGAL_OPTION
+	REG_LINK
+	REG_MULTI_SZ
+	REG_NONE
+	REG_NOTIFY_CHANGE_ATTRIBUTES
+	REG_NOTIFY_CHANGE_LAST_SET
+	REG_NOTIFY_CHANGE_NAME
+	REG_NOTIFY_CHANGE_SECURITY
+	REG_OPENED_EXISTING_KEY
+	REG_OPTION_BACKUP_RESTORE
+	REG_OPTION_CREATE_LINK
+	REG_OPTION_NON_VOLATILE
+	REG_OPTION_RESERVED
+	REG_OPTION_VOLATILE
+	REG_REFRESH_HIVE
+	REG_RESOURCE_LIST
+	REG_RESOURCE_REQUIREMENTS_LIST
+	REG_SZ
+	REG_WHOLE_HIVE_VOLATILE
+);
+
+@EXPORT_OK = qw(
+    RegCloseKey
+    RegConnectRegistry
+    RegCreateKey
+    RegCreateKeyEx
+    RegDeleteKey
+    RegDeleteValue
+    RegEnumKey
+    RegEnumValue
+    RegFlushKey
+    RegGetKeySecurity
+    RegLoadKey
+    RegNotifyChangeKeyValue
+    RegOpenKey
+    RegOpenKeyEx
+    RegQueryInfoKey
+    RegQueryValue
+    RegQueryValueEx
+    RegReplaceKey
+    RegRestoreKey
+    RegSaveKey
+    RegSetKeySecurity
+    RegSetValue
+    RegSetValueEx
+    RegUnLoadKey
+);
+$EXPORT_TAGS{ALL}= \@EXPORT_OK;
+
+bootstrap Win32::Registry;
+
+sub import {
+    my $pkg = shift;
+    if ($_[0] && "Win32" eq $_[0]) {
+	Exporter::export($pkg, "Win32", @EXPORT_OK);
+	shift;
+    }
+    Win32::Registry->export_to_level(1+$Exporter::ExportLevel, $pkg, @_);
+}
+
+#######################################################################
+# This AUTOLOAD is used to 'autoload' constants from the constant()
+# XS function.  If a constant is not found then control is passed
+# to the AUTOLOAD in AutoLoader.
+
+sub AUTOLOAD {
+    my($constname);
+    ($constname = $AUTOLOAD) =~ s/.*:://;
+    #reset $! to zero to reset any current errors.
+    local $! = 0;
+    my $val = constant($constname, 0);
+    if ($! != 0) {
+	if ($! =~ /Invalid/) {
+	    $AutoLoader::AUTOLOAD = $AUTOLOAD;
+	    goto &AutoLoader::AUTOLOAD;
+	}
+	else {
+	    my ($pack,$file,$line) = caller;
+	    die "Unknown constant $constname in Win32::Registry "
+	       . "at $file line $line.\n";
+	}
+    }
+    eval "sub $AUTOLOAD { $val }";
+    goto &$AUTOLOAD;
+}
+
+#######################################################################
+# _new is a private constructor, not intended for public use.
+#
+
+sub _new {
+    my $self;
+    if ($_[0]) {
+	$self->{'handle'} = $_[0];
+	bless $self;
+    }
+    $self;
+}
+
+#define the basic registry objects to be exported.
+#these had to be hardwired unfortunately.
+# XXX Yuck!
+
+{
+    package main;
+    use vars qw(
+		$HKEY_CLASSES_ROOT
+		$HKEY_CURRENT_USER
+		$HKEY_LOCAL_MACHINE
+		$HKEY_USERS
+		$HKEY_PERFORMANCE_DATA
+		$HKEY_CURRENT_CONFIG
+		$HKEY_DYN_DATA
+	       );
+}
+
+$::HKEY_CLASSES_ROOT		= _new(&HKEY_CLASSES_ROOT);
+$::HKEY_CURRENT_USER		= _new(&HKEY_CURRENT_USER);
+$::HKEY_LOCAL_MACHINE		= _new(&HKEY_LOCAL_MACHINE);
+$::HKEY_USERS			= _new(&HKEY_USERS);
+$::HKEY_PERFORMANCE_DATA	= _new(&HKEY_PERFORMANCE_DATA);
+$::HKEY_CURRENT_CONFIG		= _new(&HKEY_CURRENT_CONFIG);
+$::HKEY_DYN_DATA		= _new(&HKEY_DYN_DATA);
+
+=head2 Methods
+
+The following methods are supported.  Note that subkeys can be
+specified as a path name, separated by backslashes (which may
+need to be doubled if you put them in double quotes).
+
+=over 8
+
+=item Open
+
+    $reg_obj->Open($sub_key_name, $sub_reg_obj);
+
+Opens a subkey of a registry object, returning the new registry object
+in $sub_reg_obj.
+
+=cut
+
+sub Open {
+    my $self = shift;
+    die 'usage: $obj->Open($sub_key_name, $sub_reg_obj)' if @_ != 2;
+    
+    my ($subkey) = @_;
+    my ($result,$subhandle);
+
+    $result = RegOpenKey($self->{'handle'},$subkey,$subhandle);
+    $_[1] = _new($subhandle);
+    
+    return 0 unless $_[1];
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item Close
+
+    $reg_obj->Close();
+
+Closes an open registry key.
+
+=cut
+
+sub Close {
+    my $self = shift;
+    die 'usage: $obj->Close()' if @_ != 0;
+
+    return unless exists $self->{'handle'};
+    my $result = RegCloseKey($self->{'handle'});
+    if ($result) {
+	delete $self->{'handle'};
+    }
+    else {
+	$! = Win32::GetLastError();
+    }
+    return $result;
+}
+
+sub DESTROY {
+    my $self = shift;
+    return unless exists $self->{'handle'};
+    RegCloseKey($self->{'handle'});
+    delete $self->{'handle'};
+}
+
+
+=item Connect
+
+    $reg_obj->Connect($node_name, $new_reg_obj);
+
+Connects to a remote Registry on the node specified by $node_name,
+returning it in $new_reg_obj.  Returns false if it fails.
+
+=cut
+
+sub Connect {
+    my $self = shift;
+    die 'usage: $obj->Connect($node_name, $new_reg_obj)' if @_ != 2;
+     
+    my ($node) = @_;
+    my ($result,$subhandle);
+
+    $result = RegConnectRegistry ($node, $self->{'handle'}, $subhandle);
+    $_[1] = _new($subhandle);
+
+    return 0 unless $_[1];
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}  
+
+=item Create
+
+    $reg_obj->Create($sub_key_name, $new_reg_obj);
+
+Opens the subkey specified by $sub_key_name, returning the new registry
+object in $new_reg_obj.  If the specified subkey doesn't exist, it is
+created.
+
+=cut
+
+sub Create {
+    my $self = shift;
+    die 'usage: $obj->Create($sub_key_name, $new_reg_obj)' if @_ != 2;
+
+    my ($subkey) = @_;
+    my ($result,$subhandle);
+
+    $result = RegCreateKey($self->{'handle'},$subkey,$subhandle);
+    $_[1] = _new ($subhandle);
+
+    return 0 unless $_[1];
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item SetValue
+
+    $reg_obj->SetValue($sub_key_name, $type, $value);
+
+Sets the default value for a subkey specified by $sub_key_name.
+
+=cut
+
+sub SetValue {
+    my $self = shift;
+    die 'usage: $obj->SetValue($subkey, $type, $value)' if @_ != 3;
+    my $result = RegSetValue($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item SetValueEx
+
+    $reg_obj->SetValueEx($value_name, $reserved, $type, $value);
+
+Sets the value for the value name identified by $value_name
+in the key specified by $reg_obj.
+
+=cut
+
+sub SetValueEx {
+    my $self = shift;
+    die 'usage: $obj->SetValueEx($value_name, $reserved, $type, $value)' if @_ != 4;
+    my $result = RegSetValueEx($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item QueryValue
+
+    $reg_obj->QueryValue($sub_key_name, $value);
+
+Gets the default value of the subkey specified by $sub_key_name.
+
+=cut
+
+sub QueryValue {
+    my $self = shift;
+    die 'usage: $obj->QueryValue($sub_key_name, $value)' if @_ != 2;
+    my $result = RegQueryValue($self->{'handle'}, $_[0], $_[1]);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item QueryKey
+
+    $reg_obj->QueryKey($classref, $number_of_subkeys, $number_of_values);
+
+Gets information on a key specified by $reg_obj.
+
+=cut
+
+sub QueryKey {
+    my $garbage;
+    my $self = shift;
+    die 'usage: $obj->QueryKey($classref, $number_of_subkeys, $number_of_values)'
+    	if @_ != 3;
+
+    my $result = RegQueryInfoKey($self->{'handle'}, $_[0],
+    				 $garbage, $garbage, $_[1],
+			         $garbage, $garbage, $_[2],
+			         $garbage, $garbage, $garbage, $garbage);
+
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item QueryValueEx
+
+    $reg_obj->QueryValueEx($value_name, $type, $value);
+
+Gets the value for the value name identified by $value_name
+in the key specified by $reg_obj.
+
+=cut
+
+sub QueryValueEx {
+    my $self = shift;
+    die 'usage: $obj->QueryValueEx($value_name, $type, $value)' if @_ != 3;
+    my $result = RegQueryValueEx($self->{'handle'}, $_[0], undef, $_[1], $_[2]);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item GetKeys
+
+    my @keys;
+    $reg_obj->GetKeys(\@keys);
+
+Populates the supplied array reference with the names of all the keys
+within the registry object $reg_obj.
+
+=cut
+
+sub GetKeys {
+    my $self = shift;
+    die 'usage: $obj->GetKeys($arrayref)' if @_ != 1 or ref($_[0]) ne 'ARRAY';
+
+    my ($result, $i, $keyname);
+    $keyname = "DummyVal";
+    $i = 0;
+    $result = 1;
+    
+    while ( $result ) {
+	$result = RegEnumKey( $self->{'handle'},$i++, $keyname );
+	if ($result) {
+	    push( @{$_[0]}, $keyname );
+	}
+    }
+    return(1);
+}
+
+=item GetValues
+
+    my %values;
+    $reg_obj->GetValues(\%values);
+
+Populates the supplied hash reference with entries of the form
+
+    $value_name => [ $value_name, $type, $data ]
+
+for each value in the registry object $reg_obj.
+
+=cut
+
+sub GetValues {
+    my $self = shift;
+    die 'usage: $obj->GetValues($hashref)' if @_ != 1;
+
+    my ($result,$name,$type,$data,$i);
+    $name = "DummyVal";
+    $i = 0;
+    while ( $result=RegEnumValue( $self->{'handle'},
+				  $i++,
+				  $name,
+				  undef,
+				  $type,
+				  $data ))
+    {
+	$_[0]->{$name} = [ $name, $type, $data ];
+    }
+    return(1);
+}
+
+=item DeleteKey
+
+    $reg_obj->DeleteKey($sub_key_name);
+
+Deletes a subkey specified by $sub_key_name from the registry.
+
+=cut
+
+sub DeleteKey {
+    my $self = shift;
+    die 'usage: $obj->DeleteKey($sub_key_name)' if @_ != 1;
+    my $result = RegDeleteKey($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item DeleteValue
+
+    $reg_obj->DeleteValue($value_name);
+
+Deletes a value identified by $value_name from the registry.
+
+=cut
+
+sub DeleteValue {
+    my $self = shift;
+    die 'usage: $obj->DeleteValue($value_name)' if @_ != 1;
+    my $result = RegDeleteValue($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item Save
+
+    $reg_obj->Save($filename);
+
+Saves the hive specified by $reg_obj to a file.
+
+=cut
+
+sub Save {
+    my $self = shift;
+    die 'usage: $obj->Save($filename)' if @_ != 1;
+    my $result = RegSaveKey($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item Load
+
+    $reg_obj->Load($sub_key_name, $file_name);
+
+Loads a key specified by $sub_key_name from a file.
+
+=cut
+
+sub Load {
+    my $self = shift;
+    die 'usage: $obj->Load($sub_key_name, $file_name)' if @_ != 2;
+    my $result = RegLoadKey($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+=item UnLoad
+
+    $reg_obj->Unload($sub_key_name);
+
+Unloads a registry hive.
+
+=cut
+
+sub UnLoad {
+    my $self = shift;
+    die 'usage: $obj->UnLoad($sub_key_name)' if @_ != 1;
+    my $result = RegUnLoadKey($self->{'handle'}, @_);
+    $! = Win32::GetLastError() unless $result;
+    return $result;
+}
+
+1;
+__END__
diff --git a/lib/site_win58/Win32API/Registry.pm b/lib/site_win58/Win32API/Registry.pm
index a653dec52..dbf98b4e2 100644
--- a/lib/site_win58/Win32API/Registry.pm
+++ b/lib/site_win58/Win32API/Registry.pm
@@ -1,1792 +1,1792 @@
-# Registry.pm -- Low-level access to functions/constants from WINREG.h
-
-package Win32API::Registry;
-
-use strict;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); #@EXPORT_FAIL);
-$VERSION= '0.24';
-
-require Exporter;
-require DynaLoader;
-@ISA= qw(Exporter DynaLoader);
-
-@EXPORT= qw();
-%EXPORT_TAGS= (
-    Func =>	[qw(		regConstant		regLastError
-	AllowPriv		AbortSystemShutdown	InitiateSystemShutdown
-	RegCloseKey		RegConnectRegistry	RegCreateKey
-	RegCreateKeyEx		RegDeleteKey		RegDeleteValue
-	RegEnumKey		RegEnumKeyEx		RegEnumValue
-	RegFlushKey		RegGetKeySecurity	RegLoadKey
-	RegNotifyChangeKeyValue	RegOpenKey		RegOpenKeyEx
-	RegQueryInfoKey		RegQueryMultipleValues	RegQueryValue
-	RegQueryValueEx		RegReplaceKey		RegRestoreKey
-	RegSaveKey		RegSetKeySecurity	RegSetValue
-	RegSetValueEx		RegUnLoadKey )],
-    FuncA =>	[qw(
-	AbortSystemShutdownA	InitiateSystemShutdownA
-	RegConnectRegistryA	RegCreateKeyA		RegCreateKeyExA
-	RegDeleteKeyA		RegDeleteValueA		RegEnumKeyA
-	RegEnumKeyExA		RegEnumValueA		RegLoadKeyA
-	RegOpenKeyA		RegOpenKeyExA		RegQueryInfoKeyA
-	RegQueryMultipleValuesA	RegQueryValueA		RegQueryValueExA
-	RegReplaceKeyA		RegRestoreKeyA		RegSaveKeyA
-	RegSetValueA		RegSetValueExA		RegUnLoadKeyA )],
-    FuncW =>	[qw(
-	AbortSystemShutdownW	InitiateSystemShutdownW
-	RegConnectRegistryW	RegCreateKeyW		RegCreateKeyExW
-	RegDeleteKeyW		RegDeleteValueW		RegEnumKeyW
-	RegEnumKeyExW		RegEnumValueW		RegLoadKeyW
-	RegOpenKeyW		RegOpenKeyExW		RegQueryInfoKeyW
-	RegQueryMultipleValuesW	RegQueryValueW		RegQueryValueExW
-	RegReplaceKeyW		RegRestoreKeyW		RegSaveKeyW
-	RegSetValueW		RegSetValueExW		RegUnLoadKeyW )],
-    HKEY_ =>	[qw(
-	HKEY_CLASSES_ROOT	HKEY_CURRENT_CONFIG	HKEY_CURRENT_USER
-	HKEY_DYN_DATA		HKEY_LOCAL_MACHINE	HKEY_PERFORMANCE_DATA
-	HKEY_USERS )],
-    KEY_ =>	[qw(
-	KEY_QUERY_VALUE		KEY_SET_VALUE		KEY_CREATE_SUB_KEY
-	KEY_ENUMERATE_SUB_KEYS	KEY_NOTIFY		KEY_CREATE_LINK
-	KEY_READ		KEY_WRITE		KEY_EXECUTE
-	KEY_ALL_ACCESS),
-	'KEY_DELETE',		# DELETE          (0x00010000L)
-	'KEY_READ_CONTROL',	# READ_CONTROL    (0x00020000L)
-	'KEY_WRITE_DAC',	# WRITE_DAC       (0x00040000L)
-	'KEY_WRITE_OWNER',	# WRITE_OWNER     (0x00080000L)
-	'KEY_SYNCHRONIZE',	# SYNCHRONIZE     (0x00100000L) (not used)
-	],
-    REG_ =>	[qw(
-	REG_OPTION_RESERVED	REG_OPTION_NON_VOLATILE	REG_OPTION_VOLATILE
-	REG_OPTION_CREATE_LINK	REG_OPTION_BACKUP_RESTORE
-	REG_OPTION_OPEN_LINK	REG_LEGAL_OPTION	REG_CREATED_NEW_KEY
-	REG_OPENED_EXISTING_KEY	REG_WHOLE_HIVE_VOLATILE	REG_REFRESH_HIVE
-	REG_NO_LAZY_FLUSH	REG_NOTIFY_CHANGE_ATTRIBUTES
-	REG_NOTIFY_CHANGE_NAME	REG_NOTIFY_CHANGE_LAST_SET
-	REG_NOTIFY_CHANGE_SECURITY			REG_LEGAL_CHANGE_FILTER
-	REG_NONE		REG_SZ			REG_EXPAND_SZ
-	REG_BINARY		REG_DWORD		REG_DWORD_LITTLE_ENDIAN
-	REG_DWORD_BIG_ENDIAN	REG_LINK		REG_MULTI_SZ
-	REG_RESOURCE_LIST	REG_FULL_RESOURCE_DESCRIPTOR
-	REG_RESOURCE_REQUIREMENTS_LIST )],
-    SE_ =>	[qw(
-	SE_ASSIGNPRIMARYTOKEN_NAME	SE_AUDIT_NAME
-	SE_BACKUP_NAME			SE_CHANGE_NOTIFY_NAME
-	SE_CREATE_PAGEFILE_NAME		SE_CREATE_PERMANENT_NAME
-	SE_CREATE_TOKEN_NAME		SE_DEBUG_NAME
-	SE_INCREASE_QUOTA_NAME		SE_INC_BASE_PRIORITY_NAME
-	SE_LOAD_DRIVER_NAME		SE_LOCK_MEMORY_NAME
-	SE_MACHINE_ACCOUNT_NAME		SE_PROF_SINGLE_PROCESS_NAME
-	SE_REMOTE_SHUTDOWN_NAME		SE_RESTORE_NAME
-	SE_SECURITY_NAME		SE_SHUTDOWN_NAME
-	SE_SYSTEMTIME_NAME		SE_SYSTEM_ENVIRONMENT_NAME
-	SE_SYSTEM_PROFILE_NAME		SE_TAKE_OWNERSHIP_NAME
-	SE_TCB_NAME			SE_UNSOLICITED_INPUT_NAME )],
-);
-@EXPORT_OK= ();
-{ my $ref;
-    foreach $ref (  values(%EXPORT_TAGS)  ) {
-	push( @EXPORT_OK, @$ref )   unless  $ref->[0] =~ /^SE_/;
-    }
-}
-$EXPORT_TAGS{ALL}= [ @EXPORT_OK ];	# \@EXPORT_OK once SE_* settles down.
-# push( @EXPORT_OK, "JHEREG_TACOSALAD" );	# Used to test Mkconst2perl
-push( @EXPORT_OK, @{$EXPORT_TAGS{SE_}} );
-
-bootstrap Win32API::Registry $VERSION;
-
-# Preloaded methods go here.
-
-# To convert C constants to Perl code in cRegistry.pc
-# [instead of C or C++ code in cRegistry.h]:
-#    * Modify F<Makefile.PL> to add WriteMakeFile() =>
-#      CONST2PERL/postamble => [[ "Win32API::Registry" => ]] WRITE_PERL => 1.
-#    * Either comment out C<#include "cRegistry.h"> from F<Registry.xs>
-#      or make F<cRegistry.h> an empty file.
-#    * Make sure the following C<if> block is not commented out.
-#    * "nmake clean", "perl Makefile.PL", "nmake"
-
-if(  ! defined &REG_NONE  ) {
-    require "Win32API/Registry/cRegistry.pc";
-}
-
-# This would be convenient but inconsistant and hard to explain:
-#push( @{$EXPORT_TAGS{ALL}}, @{$EXPORT_TAGS{SE_}} )
-#  if  defined &SE_TCB_NAME;
-
-sub regConstant
-{
-    my( $name )= @_;
-    if(  1 != @_  ||  ! $name  ||  $name =~ /\W/  ) {
-	require Carp;
-	Carp::croak( 'Usage: ',__PACKAGE__,'::regConstant("CONST_NAME")' );
-    }
-    my $proto= prototype $name;
-    if(  defined \&$name
-     &&  defined $proto
-     &&  "" eq $proto  ) {
-	no strict 'refs';
-	return &$name;
-    }
-    return undef;
-}
-
-# We provide this for backwards compatibility:
-sub constant
-{
-    my( $name )= @_;
-    my $value= regConstant( $name );
-    if(  defined $value  ) {
-	$!= 0;
-	return $value;
-    }
-    $!= 11; # EINVAL
-    return 0;
-}
-
-# BEGIN {
-#     my $code= 'return _regLastError(@_)';
-#     local( $!, $^E )= ( 1, 1 );
-#     if(  $! ne $^E  ) {
-# 	$code= '
-# 	    local( $^E )= _regLastError(@_);
-# 	    my $ret= $^E;
-# 	    return $ret;
-# 	';
-#     }
-#     eval "sub regLastError { $code }";
-#     die "$@"   if  $@;
-# }
-
-package Win32API::Registry::_error;
-
-use overload
-    '""' => sub {
-	require Win32 unless defined &Win32::FormatMessage;
-	$_ = Win32::FormatMessage(Win32API::Registry::_regLastError());
-	tr/\r\n//d;
-	return $_;
-    },
-    '0+' => sub { Win32API::Registry::_regLastError() },
-    'fallback' => 1;
-
-sub new { return bless {}, shift }
-sub set { Win32API::Registry::_regLastError($_[1]); return $_[0] }
-
-package Win32API::Registry;
-
-my $_error = new Win32API::Registry::_error;
-
-sub regLastError {
-    require Carp;
-    Carp::croak('Usage: ',__PACKAGE__,'::regLastError( [$setWin32ErrCode] )') if @_ > 1;
-    $_error->set($_[0]) if defined $_[0];
-    return $_error;
-}
-
-# Since we ISA DynaLoader which ISA AutoLoader, we ISA AutoLoader so we
-# need this next chunk to prevent Win32API::Registry->nonesuch() from
-# looking for "nonesuch.al" and producing confusing error messages:
-use vars qw($AUTOLOAD);
-sub AUTOLOAD {
-    require Carp;
-    Carp::croak(
-      "Can't locate method $AUTOLOAD via package Win32API::Registry" );
-}
-
-# Replace "&rout;" with "goto &rout;" when that is supported on Win32.
-
-# Let user omit all buffer sizes:
-sub RegEnumKeyExA {
-    if(  6 == @_  ) {	splice(@_,4,0,[]);  splice(@_,2,0,[]);  }
-    &_RegEnumKeyExA;
-}
-sub RegEnumKeyExW {
-    if(  6 == @_  ) {	splice(@_,4,0,[]);  splice(@_,2,0,[]);  }
-    &_RegEnumKeyExW;
-}
-sub RegEnumValueA {
-    if(  6 == @_  ) {	splice(@_,2,0,[]);  push(@_,[]);  }
-    &_RegEnumValueA;
-}
-sub RegEnumValueW {
-    if(  6 == @_  ) {	splice(@_,2,0,[]);  push(@_,[]);  }
-    &_RegEnumValueW;
-}
-sub RegQueryInfoKeyA {
-    if(  11 == @_  ) {	splice(@_,2,0,[]);  }
-    &_RegQueryInfoKeyA;
-}
-sub RegQueryInfoKeyW {
-    if(  11 == @_  ) {	splice(@_,2,0,[]);  }
-    &_RegQueryInfoKeyW;
-}
-
-sub RegEnumKeyA {
-    push(@_,[])   if  3 == @_;
-    &_RegEnumKeyA;
-}
-sub RegEnumKeyW {
-    push(@_,[])   if  3 == @_;
-    &_RegEnumKeyW;
-}
-sub RegGetKeySecurity {
-    push(@_,[])   if  3 == @_;
-    &_RegGetKeySecurity;
-}
-sub RegQueryMultipleValuesA {
-    push(@_,[])   if  4 == @_;
-    &_RegQueryMultipleValuesA;
-}
-sub RegQueryMultipleValuesW {
-    push(@_,[])   if  4 == @_;
-    &_RegQueryMultipleValuesW;
-}
-sub RegQueryValueA {
-    push(@_,[])   if  3 == @_;
-    &_RegQueryValueA;
-}
-sub RegQueryValueW {
-    push(@_,[])   if  3 == @_;
-    &_RegQueryValueW;
-}
-sub RegQueryValueExA {
-    push(@_,[])   if  5 == @_;
-    &_RegQueryValueExA;
-}
-sub RegQueryValueExW {
-    push(@_,[])   if  5 == @_;
-    &_RegQueryValueExW;
-}
-sub RegSetValueA {
-    push(@_,0)   if  4 == @_;
-    &_RegSetValueA;
-}
-sub RegSetValueW {
-    push(@_,0)   if  4 == @_;
-    &_RegSetValueW;
-}
-sub RegSetValueExA {
-    push(@_,0)   if  5 == @_;
-    &_RegSetValueExA;
-}
-sub RegSetValueExW {
-    push(@_,0)   if  5 == @_;
-    &_RegSetValueExW;
-}
-
-# Aliases for non-Unicode functions:
-sub AbortSystemShutdown		{ &AbortSystemShutdownA; }
-sub InitiateSystemShutdown	{ &InitiateSystemShutdownA; }
-sub RegConnectRegistry		{ &RegConnectRegistryA; }
-sub RegCreateKey		{ &RegCreateKeyA; }
-sub RegCreateKeyEx		{ &RegCreateKeyExA; }
-sub RegDeleteKey		{ &RegDeleteKeyA; }
-sub RegDeleteValue		{ &RegDeleteValueA; }
-sub RegEnumKey			{ &RegEnumKeyA; }
-sub RegEnumKeyEx		{ &RegEnumKeyExA; }
-sub RegEnumValue		{ &RegEnumValueA; }
-sub RegLoadKey			{ &RegLoadKeyA; }
-sub RegOpenKey			{ &RegOpenKeyA; }
-sub RegOpenKeyEx		{ &RegOpenKeyExA; }
-sub RegQueryInfoKey		{ &RegQueryInfoKeyA; }
-sub RegQueryMultipleValues	{ &RegQueryMultipleValuesA; }
-sub RegQueryValue		{ &RegQueryValueA; }
-sub RegQueryValueEx		{ &RegQueryValueExA; }
-sub RegReplaceKey		{ &RegReplaceKeyA; }
-sub RegRestoreKey		{ &RegRestoreKeyA; }
-sub RegSaveKey			{ &RegSaveKeyA; }
-sub RegSetValue			{ &RegSetValueA; }
-sub RegSetValueEx		{ &RegSetValueExA; }
-sub RegUnLoadKey		{ &RegUnLoadKeyA; }
-
-1;
-__END__
-
-=head1 NAME
-
-Win32API::Registry - Low-level access to Win32 system API calls from WINREG.H
-
-=head1 SYNOPSIS
-
-  use Win32API::Registry 0.21 qw( :ALL );
-
-  RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SYSTEM\\Disk", 0, KEY_READ, $key );
-    or  die "Can't open HKEY_LOCAL_MACHINE\\SYSTEM\\Disk: ",
-	    regLastError(),"\n";
-  RegQueryValueEx( $key, "Information", [], $type, $data, [] );
-    or  die "Can't read HKEY_L*MACHINE\\SYSTEM\\Disk\\Information: ",
-	    regLastError(),"\n";
-  [...]
-  RegCloseKey( $key )
-    or  die "Can't close HKEY_LOCAL_MACHINE\\SYSTEM\\Disk: ",
-	    regLastError(),"\n";
-
-=head1 DESCRIPTION
-
-This provides fairly low-level access to the Win32 System API
-calls dealing with the Registry [mostly from WINREG.H].  This
-is mostly intended to be used by other modules such as
-C<Win32::TieRegistry> [which provides an extremely Perl-friendly
-method for using the Registry].
-
-For a description of the logical structure of the Registry, see
-the documentation for the C<Win32::TieRegistry> module.
-
-To pass in C<NULL> as the pointer to an optional buffer, pass in
-an empty list reference, C<[]>.
-
-Beyond raw access to the API calls and related constants, this module
-handles smart buffer allocation and translation of return codes.
-
-All calls return a true value for success and a false value for
-failure.  After any failure, C<$^E> should automatically be set
-to indicate the reason.  However, current versions of Perl often
-overwrite C<$^E> too quickly, so you can use C<regLastError()>
-instead, which is only set by Win32API::Registry routines.
-
-Note that C<$!> is not set by these routines except by
-C<Win32API::Registry::constant()> when a constant is not defined.
-
-=head2 Exports
-
-Nothing is exported by default.  The following tags can be used to
-have sets of symbols exported.
-
-[Note that much of the following documentation refers to the
-behavior of the underlying API calls which may vary in current
-and future versions of the Win32 API without any changes to this
-module.  Therefore you should check the Win32 API documentation
-directly when needed.]
-
-=over
-
-=item :Func
-
-The basic function names:
-
-=over
-
-=item AllowPriv
-
-=item C<AllowPriv( $sPrivName, $bEnable )>
-
-Not a Win32 API call.  Enables or disables a specific privilege for
-the current process.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.  This routine
-does not provide a way to tell if a privilege is currently enabled.
-
-C<$sPrivname> is a Win32 privilege name [see L</:SE_>].  For example,
-C<"SeBackupPrivilege"> [a.k.a. C<SE_BACKUP_NAME>] controls whether
-you can use C<RegSaveKey()> and C<"SeRestorePrivilege"> [a.k.a.
-C<SE_RESTORE_NAME>] controls whether you can use C<RegLoadKey()>.
-
-If C<$bEnable> is true, then C<AllowPriv()> tries to enable the
-privilege.  Otherwise it tries to disable the privilege.
-
-=item AbortSystemShutdown
-
-=item C<AbortSystemShutdown( $sComputerName )>
-
-Tries to abort a remote shutdown request previously made via
-C<InitiateSystemShutdown()>.  Returns a true value if successful
-and a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-=item InitiateSystemShutdown
-
-=item C<InitiateSystemShutdown( $sComputer, $sMessage, $uTimeoutSecs, $bForce, $bReboot )>
-
-Requests that a [remote] computer be shutdown or rebooted.
-Returns a true value if successful and a false value [and
-sets C<$^E>/C<regLastError()>] on failure.
-
-C<$sComputer> is the name [or address] of the computer to be
-shutdown or rebooted.  You can use C<[]> [for C<NULL>] or C<"">
-to indicate the local computer.
-
-C<$sMessage> is the message to be displayed in a pop-up window
-on the desktop of the computer to be shutdown or rebooted until
-the timeout expires or the shutdown is aborted via
-C<AbortSystemShutdown()>.  With C<$iTimeoutSecs == 0>, the
-message will never be visible.
-
-C<$iTimeoutSecs> is the number of seconds to wait before starting
-the shutdown.
-
-If C<$bForce> is false, then any applications running on the remote
-computer get a chance to prompt the remote user whether they want
-to save changes.  Also, for any applications that do not exit quickly
-enough, the operating system will prompt the user whether they wish
-to wait longer for the application to exit or force it to exit now.
-At any of these prompts the user can press B<CANCEL> to abort the
-shutdown but if no applications have unsaved data, they will likely
-all exit quickly and the shutdown will progress with the remote user
-having no option to cancel the shutdown.
-
-If C<$bForce> is true, all applications are told to exit immediately
-and so will not prompt the user even if there is unsaved data.  Any
-applications that take too long to exit will be forcibly killed after
-a short time.  The only way to abort the shutdown is to call
-C<AbortSystemShutdown()> before the timeout expires and there is no
-way to abort the shutdown once it has begun.
-
-If C<$bReboot> is true, the computer will automatically reboot once
-the shutdown is complete.  If C<$bReboot> is false, then when the
-shutdown is complete the computer will halt at a screen indicating
-that the shutdown is complete and offering a way for the user to
-start to boot the computer.
-
-You must have the C<"SeRemoteShutdownPrivilege"> privilege
-on the remote computer for this call to succeed.  If shutting
-down the local computer, then the calling process must have
-the C<"SeShutdownPrivilege"> privilege and have it enabled.
-
-=item RegCloseKey
-
-=item C<RegCloseKey( $hKey )>
-
-Closes the handle to a Registry key returned by C<RegOpenKeyEx()>,
-C<RegConnectRegistry()>, C<RegCreateKeyEx()>, or a few other
-routines.  Returns a true value if successful and a false value
-[and sets C<$^E>/C<regLastError()>] on failure.
-
-=item RegConnectRegistry
-
-=item C<RegConnectRegistry( $sComputer, $hRootKey, $ohKey )>
-
-Connects to one of the root Registry keys of a remote computer.
-Returns a true value if successful and a false value [and
-sets C<$^E>/C<regLastError()>] on failure.
-
-C<$sComputer> is the name [or address] of a remote computer
-whose Registry you wish to access.
-
-C<$hKey> must be either C<HKEY_LOCAL_MACHINE> or C<HKEY_USERS>
-and specifies which root Registry key on the remote computer
-you wish to have access to.
-
-C<$phKey> will be set to the handle to be used to access the
-remote Registry key if the call succeeds.
-
-=item regConstant
-
-=item C<$value= regConstant( $sConstantName )>
-
-Fetch the value of a constant.  Returns C<undef> if C<$sConstantName>
-is not the name of a constant supported by this module.  Never sets
-C<$!> nor C<$^E>.
-
-This function is rarely used since you will usually get the value of a
-constant by having that constant imported into your package by listing
-the constant name in the C<use Win32API::Registry> statement and then
-simply using the constant name in your code [perhaps followed by
-C<()>].  This function is useful for verifying constant names not in
-Perl code, for example, after prompting a user to type in a constant
-name.
-
-=item RegCreateKey
-
-=item C<RegCreateKey( $hKey, $sSubKey, $ohSubKey )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegCreateKeyEx()> instead.
-
-=item RegCreateKeyEx
-
-=item C<RegCreateKeyEx( $hKey, $sSubKey, $uZero, $sClass, $uOpts, $uAccess, $pSecAttr, $ohNewKey, $ouDisp )>
-
-Creates a new Registry subkey.  Returns a true value if successful and
-a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sSubKey> is the name of the new subkey to be created.
-
-C<$iZero> is reserved for future use and should always be specified
-as C<0>.
-
-C<$sClass> is a string to be used as the class for the new
-subkey.  We are not aware of any current use for Registry key
-class information so the empty string, C<"">, should usually
-be used here.
-
-C<$iOpts> is a numeric value containing bits that control options
-used while creating the new subkey.  C<REG_OPTION_NON_VOLATILE>
-is the default.  C<REG_OPTION_VOLATILE> [which is ignored on
-Windows 95] means the data stored under this key is not kept
-in a file and will not be preserved when the system reboots.
-C<REG_OPTION_BACKUP_RESTORE> [also ignored on Windows 95] means
-ignore the C<$iAccess> parameter and try to open the new key with
-the access required to backup or restore the key.
-
-C<$iAccess> is a numeric mask of bits specifying what type of
-access is desired when opening the new subkey.  See C<RegOpenKeyEx()>.
-
-C<$pSecAttr> is a C<SECURITY_ATTRIBUTES> structure packed into
-a Perl string which controls whether the returned handle can be
-inherited by child processes.  Normally you would pass C<[]> for
-this parameter to have C<NULL> passed to the underlying API
-indicating that the handle cannot be inherited.  If not under
-Windows95, then C<$pSecAttr> also allows you to specify
-C<SECURITY_DESCRIPTOR> that controls which users will have
-what type of access to the new key -- otherwise the new key
-inherits its security from its parent key.
-
-C<$phKey> will be set to the handle to be used to access the new
-subkey if the call succeeds.
-
-C<$piDisp> will be set to either C<REG_CREATED_NEW_KEY> or
-C<REG_OPENED_EXISTING_KEY> to indicate for which reason the
-call succeeded.  Can be specified as C<[]> if you don't care.
-
-If C<$phKey> and C<$piDisp> start out as integers, then they will
-probably remain unchanged if the call fails.
-
-=item RegDeleteKey
-
-=item C<RegDeleteKey( $hKey, $sSubKey )>
-
-Deletes a subkey of an open Registry key provided that the subkey
-contains no subkeys of its own [but the subkey may contain values].
-Returns a true value if successful and a false value [and sets
-C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sSubKey> is the name of the subkey to be deleted.
-
-=item RegDeleteValue
-
-=item C<RegDeleteValue( $hKey, $sValueName )>
-
-Deletes a value from an open Registry key.  Returns a true value if
-successful and a false value [and sets C<$^E>/C<regLastError()>] on
-failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sValueKey> is the name of the value to be deleted.
-
-=item RegEnumKey
-
-=item C<RegEnumKey( $hKey, $uIndex, $osName, $ilNameSize )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegEnumKeyEx()> instead.
-
-=item RegEnumKeyEx
-
-=item C<RegEnumKeyEx( $hKey, $uIndex, $osName, $iolName, $pNull, $osClass, $iolClass, $opftLastWrite )>
-
-Lets you enumerate the names of all of the subkeys directly under
-an open Registry key.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$iIndex> is the sequence number of the immediate subkey that
-you want information on.  Start with this value as C<0> then
-repeat the call incrementing this value each time until the
-call fails with C<$^E>/C<regLastError()> numerically equal to
-C<ERROR_NO_MORE_ITEMS>.
-
-C<$sName> will be set to the name of the subkey.  Can be C<[]> if
-you don't care about the name.
-
-C<$plName> initially specifies the [minimum] buffer size to be
-allocated for C<$sName>.  Will be set to the length of the subkey
-name if the requested subkey exists even if C<$sName> isn't
-successfully set to the subkey name.  See L<Buffer sizes> for
-more information.
-
-C<$pNull> is reserved for future used and should be passed as C<[]>.
-
-C<$sClass> will be set to the class name for the subkey.  Can be
-C<[]> if you don't care about the class.
-
-C<$plClass> initially specifies the [minimum] buffer size to be
-allocated for C<$sClass> and will be set to the length of the
-subkey class name if the requested subkey exists.  See L<Buffer
-sizes> for more information.
-
-C<$pftLastWrite> will be set to a C<FILETIME> structure packed
-into a Perl string and indicating when the subkey was last changed.
-Can be C<[]>.
-
-You may omit both C<$plName> and C<$plClass> to get the same effect
-as passing in C<[]> for each of them.
-
-=item RegEnumValue
-
-=item C<RegEnumValue( $hKey, $uIndex, $osValName, $iolValName, $pNull, $ouType, $opValData, $iolValData )>
-
-Lets you enumerate the names of all of the values contained in an
-open Registry key.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$iIndex> is the sequence number of the value that you want
-information on.  Start with this value as C<0> then repeat the
-call incrementing this value each time until the call fails with
-C<ERROR_NO_MORE_ITEMS>.
-
-C<$sValName> will be set to the name of the value.  Can be C<[]>
-if you don't care about the name.
-
-C<$plValName> initially specifies the [minimum] buffer size to be
-allocated for C<$sValName>.  Will be set to the length of the value
-name if the requested value exists even if C<$sValName> isn't
-successfully set to the value name.  See L<Buffer sizes> for
-more information.
-
-C<$pNull> is reserved for future used and should be passed as C<[]>.
-
-C<$piType> will be set to the type of data stored in the value data.
-If the call succeeds, it will be set to a C<REG_*> value unless
-passed in as C<[]>.
-
-C<$pValData> will be set to the data [packed into a Perl string]
-that is stored in the requested value.  Can be C<[]> if you don't
-care about the value data.
-
-C<$plValData> initially specifies the [minimum] buffer size to be
-allocated for C<$sValData> and will be set to the length of the
-value data if the requested value exists.  See L<Buffer sizes> for
-more information.
-
-You may omit both C<$plValName> and C<$plValData> to get the same
-effect as passing in C<[]> for each of them.
-
-=item RegFlushKey
-
-=item C<RegFlushKey( $hKey )>
-
-Forces the data stored under an open Registry key to be flushed
-to the disk file where the data is preserved between reboots.
-Forced flushing is not guaranteed to be efficient so this routine
-should almost never be called.  Returns a true value if successful
-and a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-=item RegGetKeySecurity
-
-=item C<RegGetKeySecurity( $hKey, $uSecInfo, $opSecDesc, $iolSecDesc )>
-
-Retrieves one of the C<SECURITY_DESCRIPTOR> structures describing
-part of the security for an open Registry key.  Returns a true value
-if successful and a false value [and sets C<$^E>/C<regLastError()>]
-on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$iSecInfo> is a numeric C<SECURITY_INFORMATION> value that
-specifies which parts of the C<SECURITY_DESCRIPTOR> structure
-to retrieve.  Should be C<OWNER_SECURITY_INFORMATION>,
-C<GROUP_SECURITY_INFORMATION>, C<DACL_SECURITY_INFORMATION>, or
-or C<SACL_SECURITY_INFORMATION> or two or more of these bits
-combined using C<|>.
-
-C<$pSecDesc> will be set to the requested C<SECURITY_DESCRIPTOR>
-structure [packed into a Perl string].
-
-C<$plSecDesc> initially specifies the [minimum] buffer size to be
-allocated for C<$sSecDesc> and will be set to the length of the
-security descriptor.  See L<Buffer sizes> for more information.
-You may omit this parameter to get the same effect as passing in
-C<[]> for it.
-
-=item regLastError
-
-=item C<$svError= regLastError();>
-
-=item C<regLastError( $uError );>
-
-Returns the last error encountered by a routine from this module. 
-It is just like C<$^E> except it isn't changed by anything except
-routines from this module.  Ideally you could just use C<$^E>, but
-current versions of Perl often overwrite C<$^E> before you get a
-chance to check it and really old versions of Perl don't really
-support C<$^E> under Win32.
-
-Just like C<$^E>, in a numeric context C<regLastError()> returns
-the numeric error value while in a string context it returns a
-text description of the error [actually it returns a Perl scalar
-that contains both values so C<$x= regLastError()> causes C<$x>
-to give different values in string vs. numeric contexts].
-
-The last form sets the error returned by future calls to
-C<regLastError()> and should not be used often.  C<$uError> must
-be a numeric error code.  Also returns the dual-valued version
-of C<$uError>.
-
-=item RegLoadKey
-
-=item C<RegLoadKey( $hKey, $sSubKey, $sFileName )>
-
-Loads a hive file.  That is, it creates a new subkey in the
-Registry and associates that subkey with a disk file that contains
-a Registry hive so that the new subkey can be used to access the
-keys and values stored in that hive.  Hives are usually created
-via C<RegSaveKey()>.  Returns a true value if successful and a
-false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key that can have hives
-loaded to it.  This must be C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>,
-or a remote version of one of these from a call to
-C<RegConnectRegistry()>.
-
-C<$sSubKey> is the name of the new subkey to created and associated
-with the hive file.
-
-C<$sFileName> is the name of the hive file to be loaded.  This
-file name is interpretted relative to the
-C<%SystemRoot%/System32/config> directory on the computer where
-the C<$hKey> key resides.  If C<$sFileName> is on a FAT file
-system, then its name must not have an extension.
-
-You must have the C<SE_RESTORE_NAME> privilege to use this routine.
-
-WARNING:  Loading of hive files via a network share may silently
-corrupt the hive and so should not be attempted [this is a problem
-in at least some versions of the underlying API which this module
-does not try to fix or avoid].  To access a hive file located on a
-remote computer, connect to the remote computer's Registry and load
-the hive via that.
-
-=item RegNotifyChangeKeyValue
-
-=item C<RegNotifyChangeKeyValue( $hKey, $bWatchSubtree, $uNotifyFilter, $hEvent, $bAsync )>
-
-Arranges for your process to be notified when part of the Registry
-is changed.  Returns a true value if successful and a false value
-[and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call] for which you wish to be notified when any changes
-are made to it.
-
-If C<$bWatchSubtree> is true, then changes to any subkey or
-descendant of C<$hKey> are also reported.
-
-C<$iNotifyFilter> controllers what types of changes are reported.  It
-is a numeric value containing one or more of the following bit masks:
-
-=over
-
-=item C<REG_NOTIFY_CHANGE_NAME>
-
-Notify if a subkey is added or deleted to a monitored key.
-
-=item C<REG_NOTIFY_CHANGE_LAST_SET>
-
-Notify if a value in a monitored key is added, deleted, or modified.
-
-=item C<REG_NOTIFY_CHANGE_SECURITY>
-
-Notify if a security descriptor of a monitored key is changed.
-
-=item C<REG_NOTIFY_CHANGE_ATTRIBUTES>
-
-Notify if any attributes of a monitored key are changed [class
-name or security descriptors].
-
-=back
-
-C<$hEvent> is ignored unless C<$bAsync> is true.  Otherwise, C<$hEvent>
-is a handle to a Win32 I<event> that will be signaled when changes are
-to be reported.
-
-If C<$bAsync> is true, then C<RegNotifyChangeKeyValue()> returns
-immediately and uses C<$hEvent> to notify your process of changes.
-If C<$bAsync> is false, then C<RegNotifyChangeKeyValue()> does
-not return until there is a change to be notified of.
-
-This routine does not work with Registry keys on remote computers.
-
-=item RegOpenKey
-
-=item C<RegOpenKey( $hKey, $sSubKey, $ohSubKey )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegOpenKeyEx()> instead.
-
-=item RegOpenKeyEx
-
-=item C<RegOpenKeyEx( $hKey, $sSubKey, $uOptions, $uAccess, $ohSubKey )>
-
-Opens an existing Registry key.  Returns a true value if successful
-and a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sSubKey> is the name of an existing subkey to be opened.
-Can be C<""> or C<[]> to open an additional handle to the
-key specified by C<$hKey>.
-
-C<$iOptions> is a numeric value containing bits that control options
-used while opening the subkey.  There are currently no supported
-options so this parameter should be specified as C<0>.
-
-C<$iAccess> is a numeric mask of bits specifying what type of
-access is desired when opening the new subkey.  Should be a
-combination of one or more of the following bit masks:
-
-=over
-
-=item C<KEY_ALL_ACCESS>
-
-    KEY_READ | KEY_WRITE | KEY_CREATE_LINK
-
-=item C<KEY_READ>
-
-    KEY_QUERY_VALUE | KEY_ENUMERATE_SUBKEYS | KEY_NOTIFY | STANDARD_RIGHTS_READ
-
-=item C<KEY_WRITE>
-
-    KEY_SET_VALUE | KEY_CREATE_SUB_KEY | STANDARD_RIGHTS_WRITE
-
-=item C<KEY_QUERY_VALUE>
-
-=item C<KEY_SET_VALUE>
-
-=item C<KEY_ENUMERATE_SUB_KEYS>
-
-=item C<KEY_CREATE_SUB_KEY>
-
-=item C<KEY_NOTIFY>
-
-Allows you to use C<RegNotifyChangeKeyValue()> on the opened key.
-
-=item C<KEY_EXECUTE>
-
-Same as C<KEY_READ>.
-
-=item C<KEY_CREATE_LINK>
-
-Gives you permission to create a symbolic link like
-C<HKEY_CLASSES_ROOT> and C<HKEY_CURRENT_USER>, though the method for
-doing so is not documented [and probably requires use of the mostly
-undocumented "native" routines, C<Nt*()> a.k.a. C<Zw*()>].
-
-=back
-
-C<$phKey> will be set to the handle to be used to access the new subkey
-if the call succeeds.
-
-=item RegQueryInfoKey
-
-=item C<RegQueryInfoKey( $hKey, $osClass, $iolClass, $pNull, $ocSubKeys, $olSubKey, $olSubClass, $ocValues, $olValName, $olValData, $olSecDesc, $opftTime )>
-
-Gets miscellaneous information about an open Registry key.
-Returns a true value if successful and a false value [and
-sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sClass> will be set to the class name for the key.  Can be
-C<[]> if you don't care about the class.
-
-C<$plClass> initially specifies the [minimum] buffer size to be
-allocated for C<$sClass> and will be set to the length of the
-key's class name.  See L<Buffer sizes> for more information.
-You may omit this parameter to get the same effect as passing in
-C<[]> for it.
-
-C<$pNull> is reserved for future use and should be passed as C<[]>.
-
-C<$pcSubKeys> will be set to the count of the number of subkeys
-directly under this key.  Can be C<[]>.
-
-C<$plSubKey> will be set to the length of the longest subkey name.
-Can be C<[]>.
-
-C<$plSubClass> will be set to the length of the longest class name
-used with an immediate subkey of this key.  Can be C<[]>.
-
-C<$pcValues> will be set to the count of the number of values in
-this key.  Can be C<[]>.
-
-C<$plValName> will be set to the length of the longest value name
-in this key.  Can be C<[]>.
-
-C<$plValData> will be set to the length of the longest value data
-in this key.  Can be C<[]>.
-
-C<$plSecDesc> will be set to the length of this key's full security
-descriptor.
-
-C<$pftTime> will be set to a C<FILETIME> structure packed
-into a Perl string and indicating when this key was last changed.
-Can be C<[]>.
-
-=item RegQueryMultipleValues
-
-=item C<RegQueryMultipleValues( $hKey, $ioarValueEnts, $icValueEnts, $opBuffer, $iolBuffer )>
-
-Allows you to use a single call to query several values from a single
-open Registry key to maximize efficiency.  Returns a true value if
-successful and a false value [and sets C<$^E>/C<regLastError()>] on
-failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$pValueEnts> should contain a list of C<VALENT> structures packed
-into a single Perl string.  Each C<VALENT> structure should have
-the C<ve_valuename> entry [the first 4 bytes] pointing to a string
-containing the name of a value stored in this key.  The remaining
-fields are set if the function succeeds.
-
-C<$cValueEnts> should contain the count of the number of C<VALENT>
-structures contained in C<$pValueEnts>.
-
-C<$pBuffer> will be set to the data from all of the requested values
-concatenated into a single Perl string.
-
-C<$plBuffer> initially specifies the [minimum] buffer size to be
-allocated for C<$sBuffer> and will be set to the total length of
-the data to be written to C<$sBuffer>.  See L<Buffer sizes> for
-more information.  You may omit this parameter to get the same
-effect as passing in C<[]> for it.
-
-Here is sample code to populate C<$pValueEnts>:
-
-    # @ValueNames= ...list of value name strings...;
-    $cValueEnts= @ValueNames;
-    $pValueEnts= pack( " p x4 x4 x4 " x $cValueEnts, @ValueNames );
-
-Here is sample code to retrieve the data type and data length
-returned in C<$pValueEnts>:
-
-    @Lengths= unpack( " x4 L x4 x4 " x $cValueEnts, $pValueEnts );
-    @Types=   unpack( " x4 x4 x4 L " x $cValueEnts, $pValueEnts );
-
-Given the above, and assuming you haven't modified C<$sBuffer> since
-the call, you can also extract the value data strings from C<$sBuffer>
-by using the pointers returned in C<$pValueEnts>:
-
-    @Data=    unpack(  join( "", map {" x4 x4 P$_ x4 "} @Lengths ),
-    		$pValueEnts  );
-
-Much better is to use the lengths and extract directly from
-C<$sBuffer> using C<unpack()> [or C<substr()>]:
-
-    @Data= unpack( join("",map("P$_",@Lengths)), $sBuffer );
-
-=item RegQueryValue
-
-=item C<RegQueryValue( $hKey, $sSubKey, $osValueData, $iolValueData )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegQueryValueEx()> instead.  This routine can only
-query unamed values [a.k.a. "default values"], that is, values with
-a name of C<"">.
-
-=item RegQueryValueEx
-
-=item C<RegQueryValueEx( $hKey, $sValueName, $pNull, $ouType, $opValueData, $iolValueData )>
-
-Lets you look up value data stored in an open Registry key by
-specifying the value name.  Returns a true value if successful
-and a false value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sValueName> is the name of the value whose data you wish to
-retrieve.
-
-C<$pNull> this parameter is reserved for future use and should be
-specified as C<[]>.
-
-C<$piType> will be set to indicate what type of data is stored in
-the named value.  Will be set to a C<REG_*> value if the function
-succeeds.
-
-C<$pValueData> will be set to the value data [packed into a Perl
-string] that is stored in the named value.  Can be C<[]> if you
-don't care about the value data.
-
-C<$plValueData> initially specifies the [minimum] buffer size to be
-allocated for C<$sValueData> and will be set to the size [always
-in bytes] of the data to be written to C<$sValueData>, even if
-C<$sValueData> is not successfully written to.  See L<Buffer sizes>
-for more information.
-
-=item RegReplaceKey
-
-=item C<RegReplaceKey( $hKey, $sSubKey, $sNewFile, $sOldFile )>
-
-Lets you replace an entire hive when the system is next booted. 
-Returns a true value if successful and a false value [and sets
-C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key that has hive(s)
-loaded in it.  This must be C<HKEY_LOCAL_MACHINE>,
-C<HKEY_USERS>, or a remote version of one of these from
-a call to C<RegConnectRegistry()>.
-
-C<$sSubKey> is the name of the subkey of C<$hKey> whose hive
-you wish to have replaced on the next reboot.
-
-C<$sNewFile> is the name of a file that will replace the existing
-hive file when the system reboots.
-
-C<$sOldFile> is the file name to save the current hive file to
-when the system reboots.
-
-C<$sNewFile> and C<$sOldFile> are interpretted relative to the
-C<%SystemRoot%/System32/config> directory on the computer where
-the C<$hKey> key resides [I think].  If either file is [would be]
-on a FAT file system, then its name must not have an extension.
-
-You must have the C<SE_RESTORE_NAME> privilege to use this routine.
-
-=item RegRestoreKey
-
-=item C<RegRestoreKey( $hKey, $sFileName, $uFlags )>
-
-Reads in a hive file and copies its contents over an existing
-Registry tree.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sFileName> is the name of the hive file to be read.  For each
-value and subkey in this file, a value or subkey will be added
-or replaced in C<$hKey>.
-
-C<$uFlags> is usally C<0>.  It can also be C<REG_WHOLE_HIVE_VOLATILE>
-which, rather than copying the hive over the existing key,
-replaces the existing key with a temporary, memory-only Registry
-key and then copies the hive contents into it.  This option only
-works if C<$hKey> is C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>, or a
-remote version of one of these from a call to C<RegConnectRegistry()>.
-
-C<RegRestoreKey> does I<not> delete values nor keys from the
-existing Registry tree when there is no corresponding value/key
-in the hive file.
-
-=item RegSaveKey
-
-=item C<RegSaveKey( $hKey, $sFileName, $pSecAttr )>
-
-Dumps any open Registry key and all of its subkeys and values into
-a new hive file.  Returns a true value if successful and a false
-value [and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sFileName> is the name of the file that the Registry tree
-should be saved to.  It is interpretted relative to the
-C<%SystemRoot%/System32/config> directory on the computer where
-the C<$hKey> key resides.  If C<$sFileName> is on a FAT file system,
-then it must not have an extension.
-
-C<$pSecAttr> contains a C<SECURITY_ATTRIBUTES> structure that specifies
-the permissions to be set on the new file that is created.  This can
-be C<[]>.
-
-You must have the C<SE_RESTORE_NAME> privilege to use this routine.
-
-=item RegSetKeySecurity
-
-=item C<RegSetKeySecurity( $hKey, $uSecInfo, $pSecDesc )>
-
-Sets [part of] the C<SECURITY_DESCRIPTOR> structure describing part
-of the security for an open Registry key.  Returns a true value if
-successful and a false value [and sets C<$^E>/C<regLastError()>] on
-failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$uSecInfo> is a numeric C<SECURITY_INFORMATION> value that
-specifies which C<SECURITY_DESCRIPTOR> structure to set.  Should
-be C<OWNER_SECURITY_INFORMATION>, C<GROUP_SECURITY_INFORMATION>,
-C<DACL_SECURITY_INFORMATION>, or C<SACL_SECURITY_INFORMATION>
-or two or more of these bits combined using C<|>.
-
-C<$pSecDesc> contains the new C<SECURITY_DESCRIPTOR> structure
-packed into a Perl string.
-
-=item RegSetValue
-
-=item C<RegSetValue( $hKey, $sSubKey, $uType, $sValueData, $lValueData )>
-
-This routine is meant only for compatibility with Windows version
-3.1.  Use C<RegSetValueEx()> instead.  This routine can only
-set unamed values [a.k.a. "default values"].
-
-=item RegSetValueEx
-
-=item C<RegSetValueEx( $hKey, $sName, $uZero, $uType, $pData, $lData )>
-
-Adds or replaces a value in an open Registry key.  Returns
-a true value if successful and a false value [and sets
-C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
-a previous call].
-
-C<$sName> is the name of the value to be set.
-
-C<$uZero> is reserved for future use and should be specified as C<0>.
-
-C<$uType> is the type of data stored in C<$pData>.  It should
-be a C<REG_*> value.
-
-C<$pData> is the value data packed into a Perl string.
-
-C<$lData> is the length of the value data that is stored in C<$pData>.
-You will usually omit this parameter or pass in C<0> to have
-C<length($pData)> used.  In both of these cases, if C<$iType> is
-C<REG_SZ> or C<REG_EXPAND_SZ>, C<RegSetValueEx()> will append a
-trailing C<'\0'> to the end of C<$pData> [unless there is already
-one].
-
-=item RegUnLoadKey
-
-=item C<RegUnLoadKey( $hKey, $sSubKey )>
-
-Unloads a previously loaded hive file.  That is, closes the
-hive file then deletes the subkey that was providing access
-to it.  Returns a true value if successful and a false value
-[and sets C<$^E>/C<regLastError()>] on failure.
-
-C<$hKey> is the handle to a Registry key that has hives
-loaded in it.  This must be C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>,
-or a remote version of one of these from a call to
-C<RegConnectRegistry()>.
-
-C<$sSubKey> is the name of the subkey whose hive you wish to
-have unloaded.
-
-=item :FuncA
-
-The ASCII-specific function names.
-
-Each of these is identical to the version listed above without the
-trailing "A":
-
-	AbortSystemShutdownA	InitiateSystemShutdownA
-	RegConnectRegistryA	RegCreateKeyA		RegCreateKeyExA
-	RegDeleteKeyA		RegDeleteValueA		RegEnumKeyA
-	RegEnumKeyExA		RegEnumValueA		RegLoadKeyA
-	RegOpenKeyA		RegOpenKeyExA		RegQueryInfoKeyA
-	RegQueryMultipleValuesA	RegQueryValueA		RegQueryValueExA
-	RegReplaceKeyA		RegRestoreKeyA		RegSaveKeyA
-	RegSetValueA		RegSetValueExA		RegUnLoadKeyA
-
-=item :FuncW
-
-The UNICODE-specific function names.  These are the same as the
-versions listed above without the trailing "W" except that string
-parameters are UNICODE strings rather than ASCII strings, as
-indicated.
-
-=item AbortSystemShutdownW
-
-=item C<AbortSystemShutdownW( $swComputerName )>
-
-C<$swComputerName> is UNICODE.
-
-=item InitiateSystemShutdownW
-
-=item C<InitiateSystemShutdownW( $swComputer, $swMessage, $uTimeoutSecs, $bForce, $bReboot )>
-
-C<$swComputer> and C<$swMessage> are UNICODE.
-
-=item RegConnectRegistryW
-
-=item C<RegConnectRegistryW( $swComputer, $hRootKey, $ohKey )>
-
-C<$swComputer> is UNICODE.
-
-=item RegCreateKeyW
-
-=item C<RegCreateKeyW( $hKey, $swSubKey, $ohSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item RegCreateKeyExW
-
-=item C<RegCreateKeyExW( $hKey, $swSubKey, $uZero, $swClass, $uOpts, $uAccess, $pSecAttr, $ohNewKey, $ouDisp )>
-
-C<$swSubKey> and C<$swClass> are UNICODE.
-
-=item RegDeleteKeyW
-
-=item C<RegDeleteKeyW( $hKey, $swSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item RegDeleteValueW
-
-=item C<RegDeleteValueW( $hKey, $swValueName )>
-
-C<$swValueName> is UNICODE.
-
-=item RegEnumKeyW
-
-=item C<RegEnumKeyW( $hKey, $uIndex, $oswName, $ilwNameSize )>
-
-C<$oswName> is UNICODE and C<$ilwNameSize> is measured as number of
-C<WCHAR>s.
-
-=item RegEnumKeyExW
-
-=item C<RegEnumKeyExW( $hKey, $uIndex, $oswName, $iolwName, $pNull, $oswClass, $iolwClass, $opftLastWrite )>
-
-C<$swName> and C<$swClass> are UNICODE and C<$iolwName> and C<$iolwClass>
-are measured as number of C<WCHAR>s.
-
-=item RegEnumValueW
-
-=item C<RegEnumValueW( $hKey, $uIndex, $oswName, $iolwName, $pNull, $ouType, $opData, $iolData )>
-
-C<$oswName> is UNICODE and C<$iolwName> is measured as number
-of C<WCHAR>s.
-
-C<$opData> is UNICODE if C<$piType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
-or C<REG_MULTI_SZ>.  Note that C<$iolData> is measured as number
-of bytes even in these cases.
-
-=item RegLoadKeyW
-
-=item C<RegLoadKeyW( $hKey, $swSubKey, $swFileName )>
-
-C<$swSubKey> and C<$swFileName> are UNICODE.
-
-=item RegOpenKeyW
-
-=item C<RegOpenKeyW( $hKey, $swSubKey, $ohSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item RegOpenKeyExW
-
-=item C<RegOpenKeyExW( $hKey, $swSubKey, $uOptions, $uAccess, $ohSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item RegQueryInfoKeyW
-
-=item C<RegQueryInfoKeyW( $hKey, $oswClass, $iolwClass, $pNull, $ocSubKeys, $olwSubKey, $olwSubClass, $ocValues, $olwValName, $olValData, $olSecDesc, $opftTime )>
-
-C<$swClass> is UNICODE.  C<$iolwClass>, C<$olwSubKey>, C<$olwSubClass>,
-and C<$olwValName> are measured as number of C<WCHAR>s.  Note that
-C<$olValData> is measured as number of bytes.
-
-=item RegQueryMultipleValuesW
-
-=item C<RegQueryMultipleValuesW( $hKey, $ioarValueEnts, $icValueEnts, $opBuffer, $iolBuffer )>
-
-The C<ve_valuename> fields of the C<VALENT> [actually C<VALENTW>]
-structures in C<$ioarValueEnts> are UNICODE.  Values of type C<REG_SZ>,
-C<REG_EXPAND_SZ>, and C<REG_MULTI_SZ> are written to C<$opBuffer>
-in UNICODE.  Note that C<$iolBuffer> and the C<ve_valuelen> fields
-of the C<VALENT> [C<VALENTW>] structures are measured as number of
-bytes.
-
-=item RegQueryValueW
-
-=item C<RegQueryValueW( $hKey, $swSubKey, $oswValueData, $iolValueData )>
-
-C<$swSubKey> and C<$oswValueData> are UNICODE.  Note that
-C<$iolValueData> is measured as number of bytes.
-
-=item RegQueryValueExW
-
-=item C<RegQueryValueExW( $hKey, $swName, $pNull, $ouType, $opData, $iolData )>
-
-C<$swName> is UNICODE.
-
-C<$opData> is UNICODE if C<$ouType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
-or C<REG_MULTI_SZ>.  Note that C<$iolData> is measured as number of
-bytes even in these cases.
-
-=item RegReplaceKeyW
-
-=item C<RegReplaceKeyW( $hKey, $swSubKey, $swNewFile, $swOldFile )>
-
-C<$swSubKey>, C<$swNewFile>, and C<$swOldFile> are UNICODE.
-
-=item RegRestoreKeyW
-
-=item C<RegRestoreKeyW( $hKey, $swFileName, $uFlags )>
-
-C<$swFileName> is UNICODE.
-
-=item RegSaveKeyW
-
-=item C<RegSaveKeyW( $hKey, $swFileName, $pSecAttr )>
-
-C<$swFileName> is UNICODE.
-
-=item RegSetValueW
-
-=item C<RegSetValueW( $hKey, $swSubKey, $uType, $swValueData, $lValueData )>
-
-C<$swSubKey> and C<$swValueData> are UNICODE.  Note that
-C<$lValueData> is measured as number of bytes even though
-C<$swValueData> is always UNICODE.
-
-=item RegSetValueExW
-
-=item C<RegSetValueExW( $hKey, $swName, $uZero, $uType, $pData, $lData )>
-
-C<$swName> is UNICODE.
-
-C<$pData> is UNICODE if C<$uType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
-or C<REG_MULTI_SZ>.  Note that C<$lData> is measured as number of
-bytes even in these cases.
-
-=item RegUnLoadKeyW
-
-=item C<RegUnLoadKeyW( $hKey, $swSubKey )>
-
-C<$swSubKey> is UNICODE.
-
-=item :HKEY_
-
-All C<HKEY_*> constants:
-
-	HKEY_CLASSES_ROOT	HKEY_CURRENT_CONFIG	HKEY_CURRENT_USER
-	HKEY_DYN_DATA		HKEY_LOCAL_MACHINE	HKEY_PERFORMANCE_DATA
-	HKEY_USERS
-
-=item :KEY_
-
-All C<KEY_*> constants:
-
-	KEY_QUERY_VALUE		KEY_SET_VALUE		KEY_CREATE_SUB_KEY
-	KEY_ENUMERATE_SUB_KEYS	KEY_NOTIFY		KEY_CREATE_LINK
-	KEY_READ		KEY_WRITE		KEY_EXECUTE
-	KEY_ALL_ACCESS
-
-=item :REG_
-
-All C<REG_*> constants:
-
-	REG_CREATED_NEW_KEY		REG_OPENED_EXISTING_KEY
-
-	REG_LEGAL_CHANGE_FILTER		REG_NOTIFY_CHANGE_ATTRIBUTES
-	REG_NOTIFY_CHANGE_NAME		REG_NOTIFY_CHANGE_LAST_SET
-	REG_NOTIFY_CHANGE_SECURITY	REG_LEGAL_OPTION
-
-	REG_OPTION_BACKUP_RESTORE	REG_OPTION_CREATE_LINK
-	REG_OPTION_NON_VOLATILE		REG_OPTION_OPEN_LINK
-	REG_OPTION_RESERVED		REG_OPTION_VOLATILE
-
-	REG_WHOLE_HIVE_VOLATILE		REG_REFRESH_HIVE
-	REG_NO_LAZY_FLUSH
-
-	REG_NONE			REG_SZ
-	REG_EXPAND_SZ			REG_BINARY
-	REG_DWORD			REG_DWORD_LITTLE_ENDIAN
-	REG_DWORD_BIG_ENDIAN		REG_LINK
-	REG_MULTI_SZ			REG_RESOURCE_LIST
-	REG_FULL_RESOURCE_DESCRIPTOR	REG_RESOURCE_REQUIREMENTS_LIST
-
-=item :ALL
-
-All of the above.
-
-=item :SE_
-
-The strings for the following privilege names:
-
-	SE_ASSIGNPRIMARYTOKEN_NAME	SE_AUDIT_NAME
-	SE_BACKUP_NAME			SE_CHANGE_NOTIFY_NAME
-	SE_CREATE_PAGEFILE_NAME		SE_CREATE_PERMANENT_NAME
-	SE_CREATE_TOKEN_NAME		SE_DEBUG_NAME
-	SE_INCREASE_QUOTA_NAME		SE_INC_BASE_PRIORITY_NAME
-	SE_LOAD_DRIVER_NAME		SE_LOCK_MEMORY_NAME
-	SE_MACHINE_ACCOUNT_NAME		SE_PROF_SINGLE_PROCESS_NAME
-	SE_REMOTE_SHUTDOWN_NAME		SE_RESTORE_NAME
-	SE_SECURITY_NAME		SE_SHUTDOWN_NAME
-	SE_SYSTEMTIME_NAME		SE_SYSTEM_ENVIRONMENT_NAME
-	SE_SYSTEM_PROFILE_NAME		SE_TAKE_OWNERSHIP_NAME
-	SE_TCB_NAME			SE_UNSOLICITED_INPUT_NAME
-
-It can be difficult to successfully build this module in a way
-that makes these constants available.  So some builds of this
-module may not make them available.  For such builds, trying
-to export any of these constants will cause a fatal error.
-For this reason, none of these symbols are currently included
-in the C<":ALL"> grouping.
-
-=back
-
-=head2 The Win32API:: heirarchy
-
-This and the other Win32API:: modules are meant to expose the
-nearly raw API calls so they can be used from Perl code in any
-way they might be used from C code.  This provides the following
-advantages:
-
-=over
-
-=item Many modules can be written by people that don't have a C compiler.
-
-=item Encourages more module code to be written in Perl [not C].
-
-Perl code is often much easier to inspect, debug, customize, and
-enhance than XS code.
-
-=item Allows those already familiar with the Win32 API to get
-off to a quick start.
-
-=item Provides an interactive tool for exploring even obscure
-details of the Win32 API.
-
-It can be very useful to interactively explore ad-hoc calls into
-parts of the Win32 API using:
-
-    perl -de 0
-
-=item Ensures that native Win32 data structures can be used.
-
-This allows maximum efficiency.  It also allows data from one
-module [for example, time or security information from the
-C<Win32API::Registry> or C<Win32API::File> modules] to be used
-with other modules [for example, C<Win32API::Time> and
-C<Win32API::SecDesc>].
-
-=item Provides a single version of the XS interface to each API
-call where improvements can be collected.
-
-=back
-
-=head2 Buffer sizes
-
-For each parameter that specifies a buffer size, a value of C<0>
-can be passed.  For parameter that are pointers to buffer sizes,
-you can also pass in C<NULL> by specifying an empty list reference,
-C<[]>.  Both of these cases will ensure that the variable has
-I<some> buffer space allocated to it and pass in that buffer's
-allocated size.  Many of the calls indicate, via C<ERROR_MORE_DATA>,
-that the buffer size was not sufficient and the F<Registry.xs>
-code will automatically enlarge the buffer to the required size
-and repeat the call.
-
-Numeric buffer sizes are used as minimum initial sizes for the
-buffers.  The larger of this size and the size of space already
-allocated to the scalar will be passed to the underlying routine. 
-If that size was insufficient, and the underlying call provides
-an easy method for determining the needed buffer size, then the
-buffer will be enlarged and the call repeated as above.
-
-The underlying calls define buffer size parameter as unsigned, so
-negative buffer sizes are treated as very large positive buffer
-sizes which usually cause C<malloc()> to fail.
-
-To force the F<Registry.xs> code to pass in a specific value for
-a buffer size, preceed the size with an equals sign via C<"=".>. 
-Buffer sizes that are passed in as strings starting with an equals
-sign will have the equal sign stripped and the remainder of the string
-interpretted as a number [via C's C<strtoul()> using only base 10]
-which will be passed to the underlying routine [even if the allocated
-buffer is actually larger].  The F<Registry.xs> code will enlarge the
-buffer to the specified size, if needed, but will not enlarge the
-buffer based on the underlying routine requesting more space.
-
-Some Reg*() calls may not currently set the buffer size when they
-return C<ERROR_MORE_DATA>.  But some that are not documented as
-doing so, currently do so anyway.  So the code assumes that any
-routine I<might> do this and resizes any buffers and repeats the
-call.   We hope that eventually all routines will provide this
-feature.
-
-When you use C<[]> for a buffer size, you can still find the
-length of the data returned by using C<length($buffer)>.  Note
-that this length will be in bytes while a few of the buffer
-sizes would have been in units of wide characters.
-
-Note that the RegQueryValueEx*() and RegEnumValue*() calls
-will trim the trailing C<'\0'> [if present] from the returned data
-values of type C<REG_SZ> or C<REG_EXPAND_SZ> but only if the
-value data length parameter is omitted [or specified as C<[]>].
-
-The RegSetValueEx*() calls will add a trailing C<'\0'> [if
-missing] to the supplied data values of type C<REG_SZ> and
-C<REG_EXPAND_SZ> but only if the value data length parameter
-is omitted [or specified as C<0>].
-
-=head2 Hungarian Notation
-
-The following abbreviations are used at the start of each parameter
-name to hint at aspects of how the parameter is used.  The prefix
-is always in lower case and followed by a capital letter that starts
-the descriptive part of the parameter name.  Several of the following
-abbreviations can be combined into a single prefix.
-
-Probably not all of these prefix notations are used by this module. 
-This document section may be included in any C<Win32API> module and
-so covers some notations not used by this specific module.
-
-=over
-
-=item s
-
-A string.  In C, a C<'\0'>-terminated C<char *>.  In Perl, just a
-string except that it will be truncated at the first C<"\0">, if
-it contains one.
-
-=item sw
-
-A wide [UNICODE] string.  In C, a C<L'\0'>-terminated C<WCHAR *>.
-In Perl, a string that contains UNICODE data.  You can convert a
-string to UNICODE in Perl via:
-
-    $string= "This is an example string";
-    $unicode= pack( "S*", unpack("C*",$string), 0 );
-
-Note how C<, 0> above causes an explicit C<L'\0'> to be added since
-Perl's implicit C<'\0'> that it puts after each of its strings is not
-wide enough to terminate a UNICODE string.  So UNICODE strings are
-different than regular strings in that the Perl version of a regular
-string will not include the trialing C<'\0'> while the Perl version
-of a UNICODE string must include the trailing C<L'\0'>.
-
-If a UNICODE string contains no non-ASCII characters, then you
-can convert it back into a normal string via:
-
-    $string= pack( "C*", unpack("S*",$unicode) );
-    $string =~ s/\0$//;
-
-=item p
-
-A pointer to some buffer [usually containing some C<struct>].  In C,
-a C<void *> or some other pointer type.  In Perl, a string that is
-usually manipulated using C<pack> and C<unpack>.  The "p" is usually
-followed by more prefix character(s) to indicate what type of data is
-stored in the bufffer.
-
-=item a
-
-A packed array.  In C, an array [usually of C<struct>s].  In Perl, a
-string containing the packed data.  The "a" is usually followed by
-more prefix character(s) to indicate the data type of the elements.
-
-These packed arrays are also called "vectors" in places to avoid
-confusion with Perl arrays.
-
-=item n
-
-A generic number.   In C, any of the integer or floating point data
-types.  In Perl, a number; either an integer, unsigned, or double
-[IV, UV, or NV, respectively].  Usually an integer.
-
-=item iv
-
-A signed integral value.  In C, any of the signed integer data types. 
-In Perl, an integer [IV].
-
-=item u
-
-An unsigned integral value.  In C, any of the unsigned integer data
-types.  In Perl, an unsigned integer [UV].
-
-=item d
-
-A floating-point number.  In C, a C<float> or C<double> or, perhaps,
-a C<long double>.  In Perl, a double-precision floating-point number
-[NV].
-
-=item b
-
-A Boolean value.  In C, any integer data type, though usually via
-a type alias of C<bool> or C<BOOL>, containing either a 0 [false] or
-non-zero [true] value.  In Perl, a scalar containing a Boolean value
-[C<0>, C<"">, or C<undef> for "false" and anything else for "true"].
-
-=item c
-
-A count of items.  In C, any integer data type.  In Perl, an unsigned
-integer [UV].  Usually used in conjunction with a "vector" parameter
-[see L</a> above] to indicate the number of elements.
-
-=item l
-
-A length [in bytes].  In C, any integer data type.  In Perl, an
-unsigned integer [UV].  Usually used in conjunction with a "string"
-or "pointer" parameter [see L</s> and L</p> above] to indicate the
-buffer size or the size of the value stored in the buffer.
-
-For strings, there is no general rule as to whether the trailing
-C<'\0'> is included in such sizes.  For this reason, the C<Win32API>
-modules follow the Perl rule of always allocating one extra byte
-and reporting buffer sizes as being one smaller than allocated in
-case the C<'\0'> is not included in the size.
-
-=item lw
-
-A length measured as number of UNICODE characters.  In C, a count
-of C<WCHAR>s.  In Perl, an unsigned integer [UV] counting "shorts"
-[see "s" and "S" in C<pack> and C<unpack>].
-
-For UNICODE strings, the trailing C<L'\0'> may or may not be
-included in a length so, again, we always allocate extra room
-for one and don't report that extra space.
-
-=item h
-
-A handle.  In C, a C<HANDLE> or more-specific handle data type. 
-In Perl, an unsigned integer [UV].  In C, these handles are often
-actually some type of pointer, but Perl just treats them as opaque
-numbers, as it should.  This prefix is also used for other pointers
-that are treated as integers in Perl code.
-
-=item r
-
-A record.  In C, almost always a C<struct> or perhaps C<union>.  Note
-that C C<struct>s are rarely passed by value so the "r" is almost
-always preceeded by a "p" or "a" [see L</p> and L</a> above].  For
-the very rare unadorned "r", Perl stores the record in the same way
-as a "pr", that is, in a string.  For the very rare case where Perl
-explicitly stores a pointer to the C<struct> rather than storing the
-C<struct> directly in a Perl string, the prefix "pp" or "ppr" or even
-"par" is used.
-
-=item sv
-
-=item rv
-
-=item hv
-
-=item av
-
-=item cv
-
-A Perl data type.  Respectively, a scalar value [SV], a reference
-[RV] [usually to a scalar], a hash [HV], a Perl array [AV], or a Perl
-code reference [PVCV].  For the "hv", "av", and "cv" prefixes, a
-leading "rv" is usually assumed.  For a parameter to an XS subroutine,
-a prefix of "sv" means the parameter is a scalar and so may be a string
-or a number [or C<undef>] or even both at the same time.  So "sv"
-doesn't imply a leading "rv".
-
-=item Input or Output
-
-Whether a parameter is for input data, output data, or both is usually
-not reflected by the data type prefix.  In cases where this is not
-obvious nor reflected in the parameter name proper, we may use the
-following in front of the data type prefix.
-
-=over
-
-=item i
-
-An input parameter given to the API [usually omitted].
-
-=item o
-
-An output-only parameter taken from the API.  You should not get a
-warning if such a parameter is C<undef> when you pass it into the
-function.  You should get an error if such a parameter is read-only.
-You can [usually] pass in C<[]> for such a parameter to have the
-parameter silently ignored.
-
-The output may be written directly into the Perl variable passed
-to the subroutine, the same way the buffer parameter to Perl's
-C<sysread()>.  This method is often avoided in Perl because
-the call then lacks any visual cue that some parameters are being
-overwritten.   But this method closely matches the C API which is
-what we are trying to do.
-
-=item io
-
-Input given to the API then overwritten with output taken from the
-API.  You should get a warning [if B<-w> is in effect] if such a
-parameter is C<undef> when you pass it into the function [unless it
-is a buffer or buffer length parameter].  If the value is read-only,
-then [for most parameters] the output is silently not written.  This
-is because it is often convenient to pass in read-only constants for
-many such parameters.  You can also usually pass in C<[]> for such
-parameters.
-
-=back
-
-=item pp
-
-=item ppr
-
-=item par
-
-=item pap
-
-These are just unusual combinations of prefix characters described above.
-
-For each, a pointer is stored in a [4-byte] Perl string.  You can
-usually use C<unpack "P"> to access the real data from Perl.
-
-For "ppr" [and often for "pp"], the pointer points directly at a
-C C<struct>.  For "par", the pointer points to the first element
-of a C [packed] array of C<struct>s.  For "pap", the pointer points
-to a C [packed] array of pointers to other things.
-
-=item ap
-
-Here we have a list of pointers packed into a single Perl string.
-
-=back
-
-=head1 BUGS
-
-The old ActiveState ports of Perl for Win32 [but not, ActivePerl, the
-ActiveState distributions of standard Perl 5.004 and beyond] do not support
-the tools for building extensions and so do not support this extension.
-
-No routines are provided for using the data returned in the C<FILETIME>
-buffers.  Those are in the C<Win32API::Time> module.
-
-No routines are provided for dealing with UNICODE data effectively. 
-See L</:FuncW> above for some simple-minded UNICODE methods.
-
-Parts of the module test will fail if used on a version of Perl
-that does not yet set C<$^E> based on C<GetLastError()>.
-
-On NT 4.0 [at least], the RegEnum*() calls do not set the required
-buffer sizes when returning C<ERROR_MORE_DATA> so this module will
-not grow the buffers in such cases.  C<Win32::TieRegistry> overcomes
-this by using values from C<RegQueryInfoKey()> for buffer sizes in
-RegEnum* calls.
-
-On NT 4.0 [at least], C<RegQueryInfoKey()> on C<HKEY_PERFORMANCE_DATA>
-never succeeds.  Also, C<RegQueryValueEx()> on C<HKEY_PERFORMANCE_DATA>
-never returns the required buffer size.  To access C<HKEY_PERFORMANCE_DATA>
-you will need to keep growing the data buffer until the call succeeds.
-
-Because C<goto &subroutine> seems to be buggy under Win32 Perl,
-it is not used in the stubs in F<Registry.pm>.
-
-=head1 AUTHOR
-
-Tye McQueen, tye@metronet.com, http://www.metronet.com/~tye/.
-
-=head1 SEE ALSO
-
-=over
-
-=item L<Win32::TieRegistry>
-
-=item L<Win32::Registry>
-
-=back
-
-=cut
+# Registry.pm -- Low-level access to functions/constants from WINREG.h
+
+package Win32API::Registry;
+
+use strict;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); #@EXPORT_FAIL);
+$VERSION= '0.24';
+
+require Exporter;
+require DynaLoader;
+@ISA= qw(Exporter DynaLoader);
+
+@EXPORT= qw();
+%EXPORT_TAGS= (
+    Func =>	[qw(		regConstant		regLastError
+	AllowPriv		AbortSystemShutdown	InitiateSystemShutdown
+	RegCloseKey		RegConnectRegistry	RegCreateKey
+	RegCreateKeyEx		RegDeleteKey		RegDeleteValue
+	RegEnumKey		RegEnumKeyEx		RegEnumValue
+	RegFlushKey		RegGetKeySecurity	RegLoadKey
+	RegNotifyChangeKeyValue	RegOpenKey		RegOpenKeyEx
+	RegQueryInfoKey		RegQueryMultipleValues	RegQueryValue
+	RegQueryValueEx		RegReplaceKey		RegRestoreKey
+	RegSaveKey		RegSetKeySecurity	RegSetValue
+	RegSetValueEx		RegUnLoadKey )],
+    FuncA =>	[qw(
+	AbortSystemShutdownA	InitiateSystemShutdownA
+	RegConnectRegistryA	RegCreateKeyA		RegCreateKeyExA
+	RegDeleteKeyA		RegDeleteValueA		RegEnumKeyA
+	RegEnumKeyExA		RegEnumValueA		RegLoadKeyA
+	RegOpenKeyA		RegOpenKeyExA		RegQueryInfoKeyA
+	RegQueryMultipleValuesA	RegQueryValueA		RegQueryValueExA
+	RegReplaceKeyA		RegRestoreKeyA		RegSaveKeyA
+	RegSetValueA		RegSetValueExA		RegUnLoadKeyA )],
+    FuncW =>	[qw(
+	AbortSystemShutdownW	InitiateSystemShutdownW
+	RegConnectRegistryW	RegCreateKeyW		RegCreateKeyExW
+	RegDeleteKeyW		RegDeleteValueW		RegEnumKeyW
+	RegEnumKeyExW		RegEnumValueW		RegLoadKeyW
+	RegOpenKeyW		RegOpenKeyExW		RegQueryInfoKeyW
+	RegQueryMultipleValuesW	RegQueryValueW		RegQueryValueExW
+	RegReplaceKeyW		RegRestoreKeyW		RegSaveKeyW
+	RegSetValueW		RegSetValueExW		RegUnLoadKeyW )],
+    HKEY_ =>	[qw(
+	HKEY_CLASSES_ROOT	HKEY_CURRENT_CONFIG	HKEY_CURRENT_USER
+	HKEY_DYN_DATA		HKEY_LOCAL_MACHINE	HKEY_PERFORMANCE_DATA
+	HKEY_USERS )],
+    KEY_ =>	[qw(
+	KEY_QUERY_VALUE		KEY_SET_VALUE		KEY_CREATE_SUB_KEY
+	KEY_ENUMERATE_SUB_KEYS	KEY_NOTIFY		KEY_CREATE_LINK
+	KEY_READ		KEY_WRITE		KEY_EXECUTE
+	KEY_ALL_ACCESS),
+	'KEY_DELETE',		# DELETE          (0x00010000L)
+	'KEY_READ_CONTROL',	# READ_CONTROL    (0x00020000L)
+	'KEY_WRITE_DAC',	# WRITE_DAC       (0x00040000L)
+	'KEY_WRITE_OWNER',	# WRITE_OWNER     (0x00080000L)
+	'KEY_SYNCHRONIZE',	# SYNCHRONIZE     (0x00100000L) (not used)
+	],
+    REG_ =>	[qw(
+	REG_OPTION_RESERVED	REG_OPTION_NON_VOLATILE	REG_OPTION_VOLATILE
+	REG_OPTION_CREATE_LINK	REG_OPTION_BACKUP_RESTORE
+	REG_OPTION_OPEN_LINK	REG_LEGAL_OPTION	REG_CREATED_NEW_KEY
+	REG_OPENED_EXISTING_KEY	REG_WHOLE_HIVE_VOLATILE	REG_REFRESH_HIVE
+	REG_NO_LAZY_FLUSH	REG_NOTIFY_CHANGE_ATTRIBUTES
+	REG_NOTIFY_CHANGE_NAME	REG_NOTIFY_CHANGE_LAST_SET
+	REG_NOTIFY_CHANGE_SECURITY			REG_LEGAL_CHANGE_FILTER
+	REG_NONE		REG_SZ			REG_EXPAND_SZ
+	REG_BINARY		REG_DWORD		REG_DWORD_LITTLE_ENDIAN
+	REG_DWORD_BIG_ENDIAN	REG_LINK		REG_MULTI_SZ
+	REG_RESOURCE_LIST	REG_FULL_RESOURCE_DESCRIPTOR
+	REG_RESOURCE_REQUIREMENTS_LIST )],
+    SE_ =>	[qw(
+	SE_ASSIGNPRIMARYTOKEN_NAME	SE_AUDIT_NAME
+	SE_BACKUP_NAME			SE_CHANGE_NOTIFY_NAME
+	SE_CREATE_PAGEFILE_NAME		SE_CREATE_PERMANENT_NAME
+	SE_CREATE_TOKEN_NAME		SE_DEBUG_NAME
+	SE_INCREASE_QUOTA_NAME		SE_INC_BASE_PRIORITY_NAME
+	SE_LOAD_DRIVER_NAME		SE_LOCK_MEMORY_NAME
+	SE_MACHINE_ACCOUNT_NAME		SE_PROF_SINGLE_PROCESS_NAME
+	SE_REMOTE_SHUTDOWN_NAME		SE_RESTORE_NAME
+	SE_SECURITY_NAME		SE_SHUTDOWN_NAME
+	SE_SYSTEMTIME_NAME		SE_SYSTEM_ENVIRONMENT_NAME
+	SE_SYSTEM_PROFILE_NAME		SE_TAKE_OWNERSHIP_NAME
+	SE_TCB_NAME			SE_UNSOLICITED_INPUT_NAME )],
+);
+@EXPORT_OK= ();
+{ my $ref;
+    foreach $ref (  values(%EXPORT_TAGS)  ) {
+	push( @EXPORT_OK, @$ref )   unless  $ref->[0] =~ /^SE_/;
+    }
+}
+$EXPORT_TAGS{ALL}= [ @EXPORT_OK ];	# \@EXPORT_OK once SE_* settles down.
+# push( @EXPORT_OK, "JHEREG_TACOSALAD" );	# Used to test Mkconst2perl
+push( @EXPORT_OK, @{$EXPORT_TAGS{SE_}} );
+
+bootstrap Win32API::Registry $VERSION;
+
+# Preloaded methods go here.
+
+# To convert C constants to Perl code in cRegistry.pc
+# [instead of C or C++ code in cRegistry.h]:
+#    * Modify F<Makefile.PL> to add WriteMakeFile() =>
+#      CONST2PERL/postamble => [[ "Win32API::Registry" => ]] WRITE_PERL => 1.
+#    * Either comment out C<#include "cRegistry.h"> from F<Registry.xs>
+#      or make F<cRegistry.h> an empty file.
+#    * Make sure the following C<if> block is not commented out.
+#    * "nmake clean", "perl Makefile.PL", "nmake"
+
+if(  ! defined &REG_NONE  ) {
+    require "Win32API/Registry/cRegistry.pc";
+}
+
+# This would be convenient but inconsistant and hard to explain:
+#push( @{$EXPORT_TAGS{ALL}}, @{$EXPORT_TAGS{SE_}} )
+#  if  defined &SE_TCB_NAME;
+
+sub regConstant
+{
+    my( $name )= @_;
+    if(  1 != @_  ||  ! $name  ||  $name =~ /\W/  ) {
+	require Carp;
+	Carp::croak( 'Usage: ',__PACKAGE__,'::regConstant("CONST_NAME")' );
+    }
+    my $proto= prototype $name;
+    if(  defined \&$name
+     &&  defined $proto
+     &&  "" eq $proto  ) {
+	no strict 'refs';
+	return &$name;
+    }
+    return undef;
+}
+
+# We provide this for backwards compatibility:
+sub constant
+{
+    my( $name )= @_;
+    my $value= regConstant( $name );
+    if(  defined $value  ) {
+	$!= 0;
+	return $value;
+    }
+    $!= 11; # EINVAL
+    return 0;
+}
+
+# BEGIN {
+#     my $code= 'return _regLastError(@_)';
+#     local( $!, $^E )= ( 1, 1 );
+#     if(  $! ne $^E  ) {
+# 	$code= '
+# 	    local( $^E )= _regLastError(@_);
+# 	    my $ret= $^E;
+# 	    return $ret;
+# 	';
+#     }
+#     eval "sub regLastError { $code }";
+#     die "$@"   if  $@;
+# }
+
+package Win32API::Registry::_error;
+
+use overload
+    '""' => sub {
+	require Win32 unless defined &Win32::FormatMessage;
+	$_ = Win32::FormatMessage(Win32API::Registry::_regLastError());
+	tr/\r\n//d;
+	return $_;
+    },
+    '0+' => sub { Win32API::Registry::_regLastError() },
+    'fallback' => 1;
+
+sub new { return bless {}, shift }
+sub set { Win32API::Registry::_regLastError($_[1]); return $_[0] }
+
+package Win32API::Registry;
+
+my $_error = new Win32API::Registry::_error;
+
+sub regLastError {
+    require Carp;
+    Carp::croak('Usage: ',__PACKAGE__,'::regLastError( [$setWin32ErrCode] )') if @_ > 1;
+    $_error->set($_[0]) if defined $_[0];
+    return $_error;
+}
+
+# Since we ISA DynaLoader which ISA AutoLoader, we ISA AutoLoader so we
+# need this next chunk to prevent Win32API::Registry->nonesuch() from
+# looking for "nonesuch.al" and producing confusing error messages:
+use vars qw($AUTOLOAD);
+sub AUTOLOAD {
+    require Carp;
+    Carp::croak(
+      "Can't locate method $AUTOLOAD via package Win32API::Registry" );
+}
+
+# Replace "&rout;" with "goto &rout;" when that is supported on Win32.
+
+# Let user omit all buffer sizes:
+sub RegEnumKeyExA {
+    if(  6 == @_  ) {	splice(@_,4,0,[]);  splice(@_,2,0,[]);  }
+    &_RegEnumKeyExA;
+}
+sub RegEnumKeyExW {
+    if(  6 == @_  ) {	splice(@_,4,0,[]);  splice(@_,2,0,[]);  }
+    &_RegEnumKeyExW;
+}
+sub RegEnumValueA {
+    if(  6 == @_  ) {	splice(@_,2,0,[]);  push(@_,[]);  }
+    &_RegEnumValueA;
+}
+sub RegEnumValueW {
+    if(  6 == @_  ) {	splice(@_,2,0,[]);  push(@_,[]);  }
+    &_RegEnumValueW;
+}
+sub RegQueryInfoKeyA {
+    if(  11 == @_  ) {	splice(@_,2,0,[]);  }
+    &_RegQueryInfoKeyA;
+}
+sub RegQueryInfoKeyW {
+    if(  11 == @_  ) {	splice(@_,2,0,[]);  }
+    &_RegQueryInfoKeyW;
+}
+
+sub RegEnumKeyA {
+    push(@_,[])   if  3 == @_;
+    &_RegEnumKeyA;
+}
+sub RegEnumKeyW {
+    push(@_,[])   if  3 == @_;
+    &_RegEnumKeyW;
+}
+sub RegGetKeySecurity {
+    push(@_,[])   if  3 == @_;
+    &_RegGetKeySecurity;
+}
+sub RegQueryMultipleValuesA {
+    push(@_,[])   if  4 == @_;
+    &_RegQueryMultipleValuesA;
+}
+sub RegQueryMultipleValuesW {
+    push(@_,[])   if  4 == @_;
+    &_RegQueryMultipleValuesW;
+}
+sub RegQueryValueA {
+    push(@_,[])   if  3 == @_;
+    &_RegQueryValueA;
+}
+sub RegQueryValueW {
+    push(@_,[])   if  3 == @_;
+    &_RegQueryValueW;
+}
+sub RegQueryValueExA {
+    push(@_,[])   if  5 == @_;
+    &_RegQueryValueExA;
+}
+sub RegQueryValueExW {
+    push(@_,[])   if  5 == @_;
+    &_RegQueryValueExW;
+}
+sub RegSetValueA {
+    push(@_,0)   if  4 == @_;
+    &_RegSetValueA;
+}
+sub RegSetValueW {
+    push(@_,0)   if  4 == @_;
+    &_RegSetValueW;
+}
+sub RegSetValueExA {
+    push(@_,0)   if  5 == @_;
+    &_RegSetValueExA;
+}
+sub RegSetValueExW {
+    push(@_,0)   if  5 == @_;
+    &_RegSetValueExW;
+}
+
+# Aliases for non-Unicode functions:
+sub AbortSystemShutdown		{ &AbortSystemShutdownA; }
+sub InitiateSystemShutdown	{ &InitiateSystemShutdownA; }
+sub RegConnectRegistry		{ &RegConnectRegistryA; }
+sub RegCreateKey		{ &RegCreateKeyA; }
+sub RegCreateKeyEx		{ &RegCreateKeyExA; }
+sub RegDeleteKey		{ &RegDeleteKeyA; }
+sub RegDeleteValue		{ &RegDeleteValueA; }
+sub RegEnumKey			{ &RegEnumKeyA; }
+sub RegEnumKeyEx		{ &RegEnumKeyExA; }
+sub RegEnumValue		{ &RegEnumValueA; }
+sub RegLoadKey			{ &RegLoadKeyA; }
+sub RegOpenKey			{ &RegOpenKeyA; }
+sub RegOpenKeyEx		{ &RegOpenKeyExA; }
+sub RegQueryInfoKey		{ &RegQueryInfoKeyA; }
+sub RegQueryMultipleValues	{ &RegQueryMultipleValuesA; }
+sub RegQueryValue		{ &RegQueryValueA; }
+sub RegQueryValueEx		{ &RegQueryValueExA; }
+sub RegReplaceKey		{ &RegReplaceKeyA; }
+sub RegRestoreKey		{ &RegRestoreKeyA; }
+sub RegSaveKey			{ &RegSaveKeyA; }
+sub RegSetValue			{ &RegSetValueA; }
+sub RegSetValueEx		{ &RegSetValueExA; }
+sub RegUnLoadKey		{ &RegUnLoadKeyA; }
+
+1;
+__END__
+
+=head1 NAME
+
+Win32API::Registry - Low-level access to Win32 system API calls from WINREG.H
+
+=head1 SYNOPSIS
+
+  use Win32API::Registry 0.21 qw( :ALL );
+
+  RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SYSTEM\\Disk", 0, KEY_READ, $key );
+    or  die "Can't open HKEY_LOCAL_MACHINE\\SYSTEM\\Disk: ",
+	    regLastError(),"\n";
+  RegQueryValueEx( $key, "Information", [], $type, $data, [] );
+    or  die "Can't read HKEY_L*MACHINE\\SYSTEM\\Disk\\Information: ",
+	    regLastError(),"\n";
+  [...]
+  RegCloseKey( $key )
+    or  die "Can't close HKEY_LOCAL_MACHINE\\SYSTEM\\Disk: ",
+	    regLastError(),"\n";
+
+=head1 DESCRIPTION
+
+This provides fairly low-level access to the Win32 System API
+calls dealing with the Registry [mostly from WINREG.H].  This
+is mostly intended to be used by other modules such as
+C<Win32::TieRegistry> [which provides an extremely Perl-friendly
+method for using the Registry].
+
+For a description of the logical structure of the Registry, see
+the documentation for the C<Win32::TieRegistry> module.
+
+To pass in C<NULL> as the pointer to an optional buffer, pass in
+an empty list reference, C<[]>.
+
+Beyond raw access to the API calls and related constants, this module
+handles smart buffer allocation and translation of return codes.
+
+All calls return a true value for success and a false value for
+failure.  After any failure, C<$^E> should automatically be set
+to indicate the reason.  However, current versions of Perl often
+overwrite C<$^E> too quickly, so you can use C<regLastError()>
+instead, which is only set by Win32API::Registry routines.
+
+Note that C<$!> is not set by these routines except by
+C<Win32API::Registry::constant()> when a constant is not defined.
+
+=head2 Exports
+
+Nothing is exported by default.  The following tags can be used to
+have sets of symbols exported.
+
+[Note that much of the following documentation refers to the
+behavior of the underlying API calls which may vary in current
+and future versions of the Win32 API without any changes to this
+module.  Therefore you should check the Win32 API documentation
+directly when needed.]
+
+=over
+
+=item :Func
+
+The basic function names:
+
+=over
+
+=item AllowPriv
+
+=item C<AllowPriv( $sPrivName, $bEnable )>
+
+Not a Win32 API call.  Enables or disables a specific privilege for
+the current process.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.  This routine
+does not provide a way to tell if a privilege is currently enabled.
+
+C<$sPrivname> is a Win32 privilege name [see L</:SE_>].  For example,
+C<"SeBackupPrivilege"> [a.k.a. C<SE_BACKUP_NAME>] controls whether
+you can use C<RegSaveKey()> and C<"SeRestorePrivilege"> [a.k.a.
+C<SE_RESTORE_NAME>] controls whether you can use C<RegLoadKey()>.
+
+If C<$bEnable> is true, then C<AllowPriv()> tries to enable the
+privilege.  Otherwise it tries to disable the privilege.
+
+=item AbortSystemShutdown
+
+=item C<AbortSystemShutdown( $sComputerName )>
+
+Tries to abort a remote shutdown request previously made via
+C<InitiateSystemShutdown()>.  Returns a true value if successful
+and a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+=item InitiateSystemShutdown
+
+=item C<InitiateSystemShutdown( $sComputer, $sMessage, $uTimeoutSecs, $bForce, $bReboot )>
+
+Requests that a [remote] computer be shutdown or rebooted.
+Returns a true value if successful and a false value [and
+sets C<$^E>/C<regLastError()>] on failure.
+
+C<$sComputer> is the name [or address] of the computer to be
+shutdown or rebooted.  You can use C<[]> [for C<NULL>] or C<"">
+to indicate the local computer.
+
+C<$sMessage> is the message to be displayed in a pop-up window
+on the desktop of the computer to be shutdown or rebooted until
+the timeout expires or the shutdown is aborted via
+C<AbortSystemShutdown()>.  With C<$iTimeoutSecs == 0>, the
+message will never be visible.
+
+C<$iTimeoutSecs> is the number of seconds to wait before starting
+the shutdown.
+
+If C<$bForce> is false, then any applications running on the remote
+computer get a chance to prompt the remote user whether they want
+to save changes.  Also, for any applications that do not exit quickly
+enough, the operating system will prompt the user whether they wish
+to wait longer for the application to exit or force it to exit now.
+At any of these prompts the user can press B<CANCEL> to abort the
+shutdown but if no applications have unsaved data, they will likely
+all exit quickly and the shutdown will progress with the remote user
+having no option to cancel the shutdown.
+
+If C<$bForce> is true, all applications are told to exit immediately
+and so will not prompt the user even if there is unsaved data.  Any
+applications that take too long to exit will be forcibly killed after
+a short time.  The only way to abort the shutdown is to call
+C<AbortSystemShutdown()> before the timeout expires and there is no
+way to abort the shutdown once it has begun.
+
+If C<$bReboot> is true, the computer will automatically reboot once
+the shutdown is complete.  If C<$bReboot> is false, then when the
+shutdown is complete the computer will halt at a screen indicating
+that the shutdown is complete and offering a way for the user to
+start to boot the computer.
+
+You must have the C<"SeRemoteShutdownPrivilege"> privilege
+on the remote computer for this call to succeed.  If shutting
+down the local computer, then the calling process must have
+the C<"SeShutdownPrivilege"> privilege and have it enabled.
+
+=item RegCloseKey
+
+=item C<RegCloseKey( $hKey )>
+
+Closes the handle to a Registry key returned by C<RegOpenKeyEx()>,
+C<RegConnectRegistry()>, C<RegCreateKeyEx()>, or a few other
+routines.  Returns a true value if successful and a false value
+[and sets C<$^E>/C<regLastError()>] on failure.
+
+=item RegConnectRegistry
+
+=item C<RegConnectRegistry( $sComputer, $hRootKey, $ohKey )>
+
+Connects to one of the root Registry keys of a remote computer.
+Returns a true value if successful and a false value [and
+sets C<$^E>/C<regLastError()>] on failure.
+
+C<$sComputer> is the name [or address] of a remote computer
+whose Registry you wish to access.
+
+C<$hKey> must be either C<HKEY_LOCAL_MACHINE> or C<HKEY_USERS>
+and specifies which root Registry key on the remote computer
+you wish to have access to.
+
+C<$phKey> will be set to the handle to be used to access the
+remote Registry key if the call succeeds.
+
+=item regConstant
+
+=item C<$value= regConstant( $sConstantName )>
+
+Fetch the value of a constant.  Returns C<undef> if C<$sConstantName>
+is not the name of a constant supported by this module.  Never sets
+C<$!> nor C<$^E>.
+
+This function is rarely used since you will usually get the value of a
+constant by having that constant imported into your package by listing
+the constant name in the C<use Win32API::Registry> statement and then
+simply using the constant name in your code [perhaps followed by
+C<()>].  This function is useful for verifying constant names not in
+Perl code, for example, after prompting a user to type in a constant
+name.
+
+=item RegCreateKey
+
+=item C<RegCreateKey( $hKey, $sSubKey, $ohSubKey )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegCreateKeyEx()> instead.
+
+=item RegCreateKeyEx
+
+=item C<RegCreateKeyEx( $hKey, $sSubKey, $uZero, $sClass, $uOpts, $uAccess, $pSecAttr, $ohNewKey, $ouDisp )>
+
+Creates a new Registry subkey.  Returns a true value if successful and
+a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sSubKey> is the name of the new subkey to be created.
+
+C<$iZero> is reserved for future use and should always be specified
+as C<0>.
+
+C<$sClass> is a string to be used as the class for the new
+subkey.  We are not aware of any current use for Registry key
+class information so the empty string, C<"">, should usually
+be used here.
+
+C<$iOpts> is a numeric value containing bits that control options
+used while creating the new subkey.  C<REG_OPTION_NON_VOLATILE>
+is the default.  C<REG_OPTION_VOLATILE> [which is ignored on
+Windows 95] means the data stored under this key is not kept
+in a file and will not be preserved when the system reboots.
+C<REG_OPTION_BACKUP_RESTORE> [also ignored on Windows 95] means
+ignore the C<$iAccess> parameter and try to open the new key with
+the access required to backup or restore the key.
+
+C<$iAccess> is a numeric mask of bits specifying what type of
+access is desired when opening the new subkey.  See C<RegOpenKeyEx()>.
+
+C<$pSecAttr> is a C<SECURITY_ATTRIBUTES> structure packed into
+a Perl string which controls whether the returned handle can be
+inherited by child processes.  Normally you would pass C<[]> for
+this parameter to have C<NULL> passed to the underlying API
+indicating that the handle cannot be inherited.  If not under
+Windows95, then C<$pSecAttr> also allows you to specify
+C<SECURITY_DESCRIPTOR> that controls which users will have
+what type of access to the new key -- otherwise the new key
+inherits its security from its parent key.
+
+C<$phKey> will be set to the handle to be used to access the new
+subkey if the call succeeds.
+
+C<$piDisp> will be set to either C<REG_CREATED_NEW_KEY> or
+C<REG_OPENED_EXISTING_KEY> to indicate for which reason the
+call succeeded.  Can be specified as C<[]> if you don't care.
+
+If C<$phKey> and C<$piDisp> start out as integers, then they will
+probably remain unchanged if the call fails.
+
+=item RegDeleteKey
+
+=item C<RegDeleteKey( $hKey, $sSubKey )>
+
+Deletes a subkey of an open Registry key provided that the subkey
+contains no subkeys of its own [but the subkey may contain values].
+Returns a true value if successful and a false value [and sets
+C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sSubKey> is the name of the subkey to be deleted.
+
+=item RegDeleteValue
+
+=item C<RegDeleteValue( $hKey, $sValueName )>
+
+Deletes a value from an open Registry key.  Returns a true value if
+successful and a false value [and sets C<$^E>/C<regLastError()>] on
+failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sValueKey> is the name of the value to be deleted.
+
+=item RegEnumKey
+
+=item C<RegEnumKey( $hKey, $uIndex, $osName, $ilNameSize )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegEnumKeyEx()> instead.
+
+=item RegEnumKeyEx
+
+=item C<RegEnumKeyEx( $hKey, $uIndex, $osName, $iolName, $pNull, $osClass, $iolClass, $opftLastWrite )>
+
+Lets you enumerate the names of all of the subkeys directly under
+an open Registry key.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$iIndex> is the sequence number of the immediate subkey that
+you want information on.  Start with this value as C<0> then
+repeat the call incrementing this value each time until the
+call fails with C<$^E>/C<regLastError()> numerically equal to
+C<ERROR_NO_MORE_ITEMS>.
+
+C<$sName> will be set to the name of the subkey.  Can be C<[]> if
+you don't care about the name.
+
+C<$plName> initially specifies the [minimum] buffer size to be
+allocated for C<$sName>.  Will be set to the length of the subkey
+name if the requested subkey exists even if C<$sName> isn't
+successfully set to the subkey name.  See L<Buffer sizes> for
+more information.
+
+C<$pNull> is reserved for future used and should be passed as C<[]>.
+
+C<$sClass> will be set to the class name for the subkey.  Can be
+C<[]> if you don't care about the class.
+
+C<$plClass> initially specifies the [minimum] buffer size to be
+allocated for C<$sClass> and will be set to the length of the
+subkey class name if the requested subkey exists.  See L<Buffer
+sizes> for more information.
+
+C<$pftLastWrite> will be set to a C<FILETIME> structure packed
+into a Perl string and indicating when the subkey was last changed.
+Can be C<[]>.
+
+You may omit both C<$plName> and C<$plClass> to get the same effect
+as passing in C<[]> for each of them.
+
+=item RegEnumValue
+
+=item C<RegEnumValue( $hKey, $uIndex, $osValName, $iolValName, $pNull, $ouType, $opValData, $iolValData )>
+
+Lets you enumerate the names of all of the values contained in an
+open Registry key.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$iIndex> is the sequence number of the value that you want
+information on.  Start with this value as C<0> then repeat the
+call incrementing this value each time until the call fails with
+C<ERROR_NO_MORE_ITEMS>.
+
+C<$sValName> will be set to the name of the value.  Can be C<[]>
+if you don't care about the name.
+
+C<$plValName> initially specifies the [minimum] buffer size to be
+allocated for C<$sValName>.  Will be set to the length of the value
+name if the requested value exists even if C<$sValName> isn't
+successfully set to the value name.  See L<Buffer sizes> for
+more information.
+
+C<$pNull> is reserved for future used and should be passed as C<[]>.
+
+C<$piType> will be set to the type of data stored in the value data.
+If the call succeeds, it will be set to a C<REG_*> value unless
+passed in as C<[]>.
+
+C<$pValData> will be set to the data [packed into a Perl string]
+that is stored in the requested value.  Can be C<[]> if you don't
+care about the value data.
+
+C<$plValData> initially specifies the [minimum] buffer size to be
+allocated for C<$sValData> and will be set to the length of the
+value data if the requested value exists.  See L<Buffer sizes> for
+more information.
+
+You may omit both C<$plValName> and C<$plValData> to get the same
+effect as passing in C<[]> for each of them.
+
+=item RegFlushKey
+
+=item C<RegFlushKey( $hKey )>
+
+Forces the data stored under an open Registry key to be flushed
+to the disk file where the data is preserved between reboots.
+Forced flushing is not guaranteed to be efficient so this routine
+should almost never be called.  Returns a true value if successful
+and a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+=item RegGetKeySecurity
+
+=item C<RegGetKeySecurity( $hKey, $uSecInfo, $opSecDesc, $iolSecDesc )>
+
+Retrieves one of the C<SECURITY_DESCRIPTOR> structures describing
+part of the security for an open Registry key.  Returns a true value
+if successful and a false value [and sets C<$^E>/C<regLastError()>]
+on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$iSecInfo> is a numeric C<SECURITY_INFORMATION> value that
+specifies which parts of the C<SECURITY_DESCRIPTOR> structure
+to retrieve.  Should be C<OWNER_SECURITY_INFORMATION>,
+C<GROUP_SECURITY_INFORMATION>, C<DACL_SECURITY_INFORMATION>, or
+or C<SACL_SECURITY_INFORMATION> or two or more of these bits
+combined using C<|>.
+
+C<$pSecDesc> will be set to the requested C<SECURITY_DESCRIPTOR>
+structure [packed into a Perl string].
+
+C<$plSecDesc> initially specifies the [minimum] buffer size to be
+allocated for C<$sSecDesc> and will be set to the length of the
+security descriptor.  See L<Buffer sizes> for more information.
+You may omit this parameter to get the same effect as passing in
+C<[]> for it.
+
+=item regLastError
+
+=item C<$svError= regLastError();>
+
+=item C<regLastError( $uError );>
+
+Returns the last error encountered by a routine from this module. 
+It is just like C<$^E> except it isn't changed by anything except
+routines from this module.  Ideally you could just use C<$^E>, but
+current versions of Perl often overwrite C<$^E> before you get a
+chance to check it and really old versions of Perl don't really
+support C<$^E> under Win32.
+
+Just like C<$^E>, in a numeric context C<regLastError()> returns
+the numeric error value while in a string context it returns a
+text description of the error [actually it returns a Perl scalar
+that contains both values so C<$x= regLastError()> causes C<$x>
+to give different values in string vs. numeric contexts].
+
+The last form sets the error returned by future calls to
+C<regLastError()> and should not be used often.  C<$uError> must
+be a numeric error code.  Also returns the dual-valued version
+of C<$uError>.
+
+=item RegLoadKey
+
+=item C<RegLoadKey( $hKey, $sSubKey, $sFileName )>
+
+Loads a hive file.  That is, it creates a new subkey in the
+Registry and associates that subkey with a disk file that contains
+a Registry hive so that the new subkey can be used to access the
+keys and values stored in that hive.  Hives are usually created
+via C<RegSaveKey()>.  Returns a true value if successful and a
+false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key that can have hives
+loaded to it.  This must be C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>,
+or a remote version of one of these from a call to
+C<RegConnectRegistry()>.
+
+C<$sSubKey> is the name of the new subkey to created and associated
+with the hive file.
+
+C<$sFileName> is the name of the hive file to be loaded.  This
+file name is interpretted relative to the
+C<%SystemRoot%/System32/config> directory on the computer where
+the C<$hKey> key resides.  If C<$sFileName> is on a FAT file
+system, then its name must not have an extension.
+
+You must have the C<SE_RESTORE_NAME> privilege to use this routine.
+
+WARNING:  Loading of hive files via a network share may silently
+corrupt the hive and so should not be attempted [this is a problem
+in at least some versions of the underlying API which this module
+does not try to fix or avoid].  To access a hive file located on a
+remote computer, connect to the remote computer's Registry and load
+the hive via that.
+
+=item RegNotifyChangeKeyValue
+
+=item C<RegNotifyChangeKeyValue( $hKey, $bWatchSubtree, $uNotifyFilter, $hEvent, $bAsync )>
+
+Arranges for your process to be notified when part of the Registry
+is changed.  Returns a true value if successful and a false value
+[and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call] for which you wish to be notified when any changes
+are made to it.
+
+If C<$bWatchSubtree> is true, then changes to any subkey or
+descendant of C<$hKey> are also reported.
+
+C<$iNotifyFilter> controllers what types of changes are reported.  It
+is a numeric value containing one or more of the following bit masks:
+
+=over
+
+=item C<REG_NOTIFY_CHANGE_NAME>
+
+Notify if a subkey is added or deleted to a monitored key.
+
+=item C<REG_NOTIFY_CHANGE_LAST_SET>
+
+Notify if a value in a monitored key is added, deleted, or modified.
+
+=item C<REG_NOTIFY_CHANGE_SECURITY>
+
+Notify if a security descriptor of a monitored key is changed.
+
+=item C<REG_NOTIFY_CHANGE_ATTRIBUTES>
+
+Notify if any attributes of a monitored key are changed [class
+name or security descriptors].
+
+=back
+
+C<$hEvent> is ignored unless C<$bAsync> is true.  Otherwise, C<$hEvent>
+is a handle to a Win32 I<event> that will be signaled when changes are
+to be reported.
+
+If C<$bAsync> is true, then C<RegNotifyChangeKeyValue()> returns
+immediately and uses C<$hEvent> to notify your process of changes.
+If C<$bAsync> is false, then C<RegNotifyChangeKeyValue()> does
+not return until there is a change to be notified of.
+
+This routine does not work with Registry keys on remote computers.
+
+=item RegOpenKey
+
+=item C<RegOpenKey( $hKey, $sSubKey, $ohSubKey )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegOpenKeyEx()> instead.
+
+=item RegOpenKeyEx
+
+=item C<RegOpenKeyEx( $hKey, $sSubKey, $uOptions, $uAccess, $ohSubKey )>
+
+Opens an existing Registry key.  Returns a true value if successful
+and a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sSubKey> is the name of an existing subkey to be opened.
+Can be C<""> or C<[]> to open an additional handle to the
+key specified by C<$hKey>.
+
+C<$iOptions> is a numeric value containing bits that control options
+used while opening the subkey.  There are currently no supported
+options so this parameter should be specified as C<0>.
+
+C<$iAccess> is a numeric mask of bits specifying what type of
+access is desired when opening the new subkey.  Should be a
+combination of one or more of the following bit masks:
+
+=over
+
+=item C<KEY_ALL_ACCESS>
+
+    KEY_READ | KEY_WRITE | KEY_CREATE_LINK
+
+=item C<KEY_READ>
+
+    KEY_QUERY_VALUE | KEY_ENUMERATE_SUBKEYS | KEY_NOTIFY | STANDARD_RIGHTS_READ
+
+=item C<KEY_WRITE>
+
+    KEY_SET_VALUE | KEY_CREATE_SUB_KEY | STANDARD_RIGHTS_WRITE
+
+=item C<KEY_QUERY_VALUE>
+
+=item C<KEY_SET_VALUE>
+
+=item C<KEY_ENUMERATE_SUB_KEYS>
+
+=item C<KEY_CREATE_SUB_KEY>
+
+=item C<KEY_NOTIFY>
+
+Allows you to use C<RegNotifyChangeKeyValue()> on the opened key.
+
+=item C<KEY_EXECUTE>
+
+Same as C<KEY_READ>.
+
+=item C<KEY_CREATE_LINK>
+
+Gives you permission to create a symbolic link like
+C<HKEY_CLASSES_ROOT> and C<HKEY_CURRENT_USER>, though the method for
+doing so is not documented [and probably requires use of the mostly
+undocumented "native" routines, C<Nt*()> a.k.a. C<Zw*()>].
+
+=back
+
+C<$phKey> will be set to the handle to be used to access the new subkey
+if the call succeeds.
+
+=item RegQueryInfoKey
+
+=item C<RegQueryInfoKey( $hKey, $osClass, $iolClass, $pNull, $ocSubKeys, $olSubKey, $olSubClass, $ocValues, $olValName, $olValData, $olSecDesc, $opftTime )>
+
+Gets miscellaneous information about an open Registry key.
+Returns a true value if successful and a false value [and
+sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sClass> will be set to the class name for the key.  Can be
+C<[]> if you don't care about the class.
+
+C<$plClass> initially specifies the [minimum] buffer size to be
+allocated for C<$sClass> and will be set to the length of the
+key's class name.  See L<Buffer sizes> for more information.
+You may omit this parameter to get the same effect as passing in
+C<[]> for it.
+
+C<$pNull> is reserved for future use and should be passed as C<[]>.
+
+C<$pcSubKeys> will be set to the count of the number of subkeys
+directly under this key.  Can be C<[]>.
+
+C<$plSubKey> will be set to the length of the longest subkey name.
+Can be C<[]>.
+
+C<$plSubClass> will be set to the length of the longest class name
+used with an immediate subkey of this key.  Can be C<[]>.
+
+C<$pcValues> will be set to the count of the number of values in
+this key.  Can be C<[]>.
+
+C<$plValName> will be set to the length of the longest value name
+in this key.  Can be C<[]>.
+
+C<$plValData> will be set to the length of the longest value data
+in this key.  Can be C<[]>.
+
+C<$plSecDesc> will be set to the length of this key's full security
+descriptor.
+
+C<$pftTime> will be set to a C<FILETIME> structure packed
+into a Perl string and indicating when this key was last changed.
+Can be C<[]>.
+
+=item RegQueryMultipleValues
+
+=item C<RegQueryMultipleValues( $hKey, $ioarValueEnts, $icValueEnts, $opBuffer, $iolBuffer )>
+
+Allows you to use a single call to query several values from a single
+open Registry key to maximize efficiency.  Returns a true value if
+successful and a false value [and sets C<$^E>/C<regLastError()>] on
+failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$pValueEnts> should contain a list of C<VALENT> structures packed
+into a single Perl string.  Each C<VALENT> structure should have
+the C<ve_valuename> entry [the first 4 bytes] pointing to a string
+containing the name of a value stored in this key.  The remaining
+fields are set if the function succeeds.
+
+C<$cValueEnts> should contain the count of the number of C<VALENT>
+structures contained in C<$pValueEnts>.
+
+C<$pBuffer> will be set to the data from all of the requested values
+concatenated into a single Perl string.
+
+C<$plBuffer> initially specifies the [minimum] buffer size to be
+allocated for C<$sBuffer> and will be set to the total length of
+the data to be written to C<$sBuffer>.  See L<Buffer sizes> for
+more information.  You may omit this parameter to get the same
+effect as passing in C<[]> for it.
+
+Here is sample code to populate C<$pValueEnts>:
+
+    # @ValueNames= ...list of value name strings...;
+    $cValueEnts= @ValueNames;
+    $pValueEnts= pack( " p x4 x4 x4 " x $cValueEnts, @ValueNames );
+
+Here is sample code to retrieve the data type and data length
+returned in C<$pValueEnts>:
+
+    @Lengths= unpack( " x4 L x4 x4 " x $cValueEnts, $pValueEnts );
+    @Types=   unpack( " x4 x4 x4 L " x $cValueEnts, $pValueEnts );
+
+Given the above, and assuming you haven't modified C<$sBuffer> since
+the call, you can also extract the value data strings from C<$sBuffer>
+by using the pointers returned in C<$pValueEnts>:
+
+    @Data=    unpack(  join( "", map {" x4 x4 P$_ x4 "} @Lengths ),
+    		$pValueEnts  );
+
+Much better is to use the lengths and extract directly from
+C<$sBuffer> using C<unpack()> [or C<substr()>]:
+
+    @Data= unpack( join("",map("P$_",@Lengths)), $sBuffer );
+
+=item RegQueryValue
+
+=item C<RegQueryValue( $hKey, $sSubKey, $osValueData, $iolValueData )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegQueryValueEx()> instead.  This routine can only
+query unamed values [a.k.a. "default values"], that is, values with
+a name of C<"">.
+
+=item RegQueryValueEx
+
+=item C<RegQueryValueEx( $hKey, $sValueName, $pNull, $ouType, $opValueData, $iolValueData )>
+
+Lets you look up value data stored in an open Registry key by
+specifying the value name.  Returns a true value if successful
+and a false value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sValueName> is the name of the value whose data you wish to
+retrieve.
+
+C<$pNull> this parameter is reserved for future use and should be
+specified as C<[]>.
+
+C<$piType> will be set to indicate what type of data is stored in
+the named value.  Will be set to a C<REG_*> value if the function
+succeeds.
+
+C<$pValueData> will be set to the value data [packed into a Perl
+string] that is stored in the named value.  Can be C<[]> if you
+don't care about the value data.
+
+C<$plValueData> initially specifies the [minimum] buffer size to be
+allocated for C<$sValueData> and will be set to the size [always
+in bytes] of the data to be written to C<$sValueData>, even if
+C<$sValueData> is not successfully written to.  See L<Buffer sizes>
+for more information.
+
+=item RegReplaceKey
+
+=item C<RegReplaceKey( $hKey, $sSubKey, $sNewFile, $sOldFile )>
+
+Lets you replace an entire hive when the system is next booted. 
+Returns a true value if successful and a false value [and sets
+C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key that has hive(s)
+loaded in it.  This must be C<HKEY_LOCAL_MACHINE>,
+C<HKEY_USERS>, or a remote version of one of these from
+a call to C<RegConnectRegistry()>.
+
+C<$sSubKey> is the name of the subkey of C<$hKey> whose hive
+you wish to have replaced on the next reboot.
+
+C<$sNewFile> is the name of a file that will replace the existing
+hive file when the system reboots.
+
+C<$sOldFile> is the file name to save the current hive file to
+when the system reboots.
+
+C<$sNewFile> and C<$sOldFile> are interpretted relative to the
+C<%SystemRoot%/System32/config> directory on the computer where
+the C<$hKey> key resides [I think].  If either file is [would be]
+on a FAT file system, then its name must not have an extension.
+
+You must have the C<SE_RESTORE_NAME> privilege to use this routine.
+
+=item RegRestoreKey
+
+=item C<RegRestoreKey( $hKey, $sFileName, $uFlags )>
+
+Reads in a hive file and copies its contents over an existing
+Registry tree.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sFileName> is the name of the hive file to be read.  For each
+value and subkey in this file, a value or subkey will be added
+or replaced in C<$hKey>.
+
+C<$uFlags> is usally C<0>.  It can also be C<REG_WHOLE_HIVE_VOLATILE>
+which, rather than copying the hive over the existing key,
+replaces the existing key with a temporary, memory-only Registry
+key and then copies the hive contents into it.  This option only
+works if C<$hKey> is C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>, or a
+remote version of one of these from a call to C<RegConnectRegistry()>.
+
+C<RegRestoreKey> does I<not> delete values nor keys from the
+existing Registry tree when there is no corresponding value/key
+in the hive file.
+
+=item RegSaveKey
+
+=item C<RegSaveKey( $hKey, $sFileName, $pSecAttr )>
+
+Dumps any open Registry key and all of its subkeys and values into
+a new hive file.  Returns a true value if successful and a false
+value [and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sFileName> is the name of the file that the Registry tree
+should be saved to.  It is interpretted relative to the
+C<%SystemRoot%/System32/config> directory on the computer where
+the C<$hKey> key resides.  If C<$sFileName> is on a FAT file system,
+then it must not have an extension.
+
+C<$pSecAttr> contains a C<SECURITY_ATTRIBUTES> structure that specifies
+the permissions to be set on the new file that is created.  This can
+be C<[]>.
+
+You must have the C<SE_RESTORE_NAME> privilege to use this routine.
+
+=item RegSetKeySecurity
+
+=item C<RegSetKeySecurity( $hKey, $uSecInfo, $pSecDesc )>
+
+Sets [part of] the C<SECURITY_DESCRIPTOR> structure describing part
+of the security for an open Registry key.  Returns a true value if
+successful and a false value [and sets C<$^E>/C<regLastError()>] on
+failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$uSecInfo> is a numeric C<SECURITY_INFORMATION> value that
+specifies which C<SECURITY_DESCRIPTOR> structure to set.  Should
+be C<OWNER_SECURITY_INFORMATION>, C<GROUP_SECURITY_INFORMATION>,
+C<DACL_SECURITY_INFORMATION>, or C<SACL_SECURITY_INFORMATION>
+or two or more of these bits combined using C<|>.
+
+C<$pSecDesc> contains the new C<SECURITY_DESCRIPTOR> structure
+packed into a Perl string.
+
+=item RegSetValue
+
+=item C<RegSetValue( $hKey, $sSubKey, $uType, $sValueData, $lValueData )>
+
+This routine is meant only for compatibility with Windows version
+3.1.  Use C<RegSetValueEx()> instead.  This routine can only
+set unamed values [a.k.a. "default values"].
+
+=item RegSetValueEx
+
+=item C<RegSetValueEx( $hKey, $sName, $uZero, $uType, $pData, $lData )>
+
+Adds or replaces a value in an open Registry key.  Returns
+a true value if successful and a false value [and sets
+C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key [either C<HKEY_*> or from
+a previous call].
+
+C<$sName> is the name of the value to be set.
+
+C<$uZero> is reserved for future use and should be specified as C<0>.
+
+C<$uType> is the type of data stored in C<$pData>.  It should
+be a C<REG_*> value.
+
+C<$pData> is the value data packed into a Perl string.
+
+C<$lData> is the length of the value data that is stored in C<$pData>.
+You will usually omit this parameter or pass in C<0> to have
+C<length($pData)> used.  In both of these cases, if C<$iType> is
+C<REG_SZ> or C<REG_EXPAND_SZ>, C<RegSetValueEx()> will append a
+trailing C<'\0'> to the end of C<$pData> [unless there is already
+one].
+
+=item RegUnLoadKey
+
+=item C<RegUnLoadKey( $hKey, $sSubKey )>
+
+Unloads a previously loaded hive file.  That is, closes the
+hive file then deletes the subkey that was providing access
+to it.  Returns a true value if successful and a false value
+[and sets C<$^E>/C<regLastError()>] on failure.
+
+C<$hKey> is the handle to a Registry key that has hives
+loaded in it.  This must be C<HKEY_LOCAL_MACHINE>, C<HKEY_USERS>,
+or a remote version of one of these from a call to
+C<RegConnectRegistry()>.
+
+C<$sSubKey> is the name of the subkey whose hive you wish to
+have unloaded.
+
+=item :FuncA
+
+The ASCII-specific function names.
+
+Each of these is identical to the version listed above without the
+trailing "A":
+
+	AbortSystemShutdownA	InitiateSystemShutdownA
+	RegConnectRegistryA	RegCreateKeyA		RegCreateKeyExA
+	RegDeleteKeyA		RegDeleteValueA		RegEnumKeyA
+	RegEnumKeyExA		RegEnumValueA		RegLoadKeyA
+	RegOpenKeyA		RegOpenKeyExA		RegQueryInfoKeyA
+	RegQueryMultipleValuesA	RegQueryValueA		RegQueryValueExA
+	RegReplaceKeyA		RegRestoreKeyA		RegSaveKeyA
+	RegSetValueA		RegSetValueExA		RegUnLoadKeyA
+
+=item :FuncW
+
+The UNICODE-specific function names.  These are the same as the
+versions listed above without the trailing "W" except that string
+parameters are UNICODE strings rather than ASCII strings, as
+indicated.
+
+=item AbortSystemShutdownW
+
+=item C<AbortSystemShutdownW( $swComputerName )>
+
+C<$swComputerName> is UNICODE.
+
+=item InitiateSystemShutdownW
+
+=item C<InitiateSystemShutdownW( $swComputer, $swMessage, $uTimeoutSecs, $bForce, $bReboot )>
+
+C<$swComputer> and C<$swMessage> are UNICODE.
+
+=item RegConnectRegistryW
+
+=item C<RegConnectRegistryW( $swComputer, $hRootKey, $ohKey )>
+
+C<$swComputer> is UNICODE.
+
+=item RegCreateKeyW
+
+=item C<RegCreateKeyW( $hKey, $swSubKey, $ohSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item RegCreateKeyExW
+
+=item C<RegCreateKeyExW( $hKey, $swSubKey, $uZero, $swClass, $uOpts, $uAccess, $pSecAttr, $ohNewKey, $ouDisp )>
+
+C<$swSubKey> and C<$swClass> are UNICODE.
+
+=item RegDeleteKeyW
+
+=item C<RegDeleteKeyW( $hKey, $swSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item RegDeleteValueW
+
+=item C<RegDeleteValueW( $hKey, $swValueName )>
+
+C<$swValueName> is UNICODE.
+
+=item RegEnumKeyW
+
+=item C<RegEnumKeyW( $hKey, $uIndex, $oswName, $ilwNameSize )>
+
+C<$oswName> is UNICODE and C<$ilwNameSize> is measured as number of
+C<WCHAR>s.
+
+=item RegEnumKeyExW
+
+=item C<RegEnumKeyExW( $hKey, $uIndex, $oswName, $iolwName, $pNull, $oswClass, $iolwClass, $opftLastWrite )>
+
+C<$swName> and C<$swClass> are UNICODE and C<$iolwName> and C<$iolwClass>
+are measured as number of C<WCHAR>s.
+
+=item RegEnumValueW
+
+=item C<RegEnumValueW( $hKey, $uIndex, $oswName, $iolwName, $pNull, $ouType, $opData, $iolData )>
+
+C<$oswName> is UNICODE and C<$iolwName> is measured as number
+of C<WCHAR>s.
+
+C<$opData> is UNICODE if C<$piType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
+or C<REG_MULTI_SZ>.  Note that C<$iolData> is measured as number
+of bytes even in these cases.
+
+=item RegLoadKeyW
+
+=item C<RegLoadKeyW( $hKey, $swSubKey, $swFileName )>
+
+C<$swSubKey> and C<$swFileName> are UNICODE.
+
+=item RegOpenKeyW
+
+=item C<RegOpenKeyW( $hKey, $swSubKey, $ohSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item RegOpenKeyExW
+
+=item C<RegOpenKeyExW( $hKey, $swSubKey, $uOptions, $uAccess, $ohSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item RegQueryInfoKeyW
+
+=item C<RegQueryInfoKeyW( $hKey, $oswClass, $iolwClass, $pNull, $ocSubKeys, $olwSubKey, $olwSubClass, $ocValues, $olwValName, $olValData, $olSecDesc, $opftTime )>
+
+C<$swClass> is UNICODE.  C<$iolwClass>, C<$olwSubKey>, C<$olwSubClass>,
+and C<$olwValName> are measured as number of C<WCHAR>s.  Note that
+C<$olValData> is measured as number of bytes.
+
+=item RegQueryMultipleValuesW
+
+=item C<RegQueryMultipleValuesW( $hKey, $ioarValueEnts, $icValueEnts, $opBuffer, $iolBuffer )>
+
+The C<ve_valuename> fields of the C<VALENT> [actually C<VALENTW>]
+structures in C<$ioarValueEnts> are UNICODE.  Values of type C<REG_SZ>,
+C<REG_EXPAND_SZ>, and C<REG_MULTI_SZ> are written to C<$opBuffer>
+in UNICODE.  Note that C<$iolBuffer> and the C<ve_valuelen> fields
+of the C<VALENT> [C<VALENTW>] structures are measured as number of
+bytes.
+
+=item RegQueryValueW
+
+=item C<RegQueryValueW( $hKey, $swSubKey, $oswValueData, $iolValueData )>
+
+C<$swSubKey> and C<$oswValueData> are UNICODE.  Note that
+C<$iolValueData> is measured as number of bytes.
+
+=item RegQueryValueExW
+
+=item C<RegQueryValueExW( $hKey, $swName, $pNull, $ouType, $opData, $iolData )>
+
+C<$swName> is UNICODE.
+
+C<$opData> is UNICODE if C<$ouType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
+or C<REG_MULTI_SZ>.  Note that C<$iolData> is measured as number of
+bytes even in these cases.
+
+=item RegReplaceKeyW
+
+=item C<RegReplaceKeyW( $hKey, $swSubKey, $swNewFile, $swOldFile )>
+
+C<$swSubKey>, C<$swNewFile>, and C<$swOldFile> are UNICODE.
+
+=item RegRestoreKeyW
+
+=item C<RegRestoreKeyW( $hKey, $swFileName, $uFlags )>
+
+C<$swFileName> is UNICODE.
+
+=item RegSaveKeyW
+
+=item C<RegSaveKeyW( $hKey, $swFileName, $pSecAttr )>
+
+C<$swFileName> is UNICODE.
+
+=item RegSetValueW
+
+=item C<RegSetValueW( $hKey, $swSubKey, $uType, $swValueData, $lValueData )>
+
+C<$swSubKey> and C<$swValueData> are UNICODE.  Note that
+C<$lValueData> is measured as number of bytes even though
+C<$swValueData> is always UNICODE.
+
+=item RegSetValueExW
+
+=item C<RegSetValueExW( $hKey, $swName, $uZero, $uType, $pData, $lData )>
+
+C<$swName> is UNICODE.
+
+C<$pData> is UNICODE if C<$uType> is C<REG_SZ>, C<REG_EXPAND_SZ>,
+or C<REG_MULTI_SZ>.  Note that C<$lData> is measured as number of
+bytes even in these cases.
+
+=item RegUnLoadKeyW
+
+=item C<RegUnLoadKeyW( $hKey, $swSubKey )>
+
+C<$swSubKey> is UNICODE.
+
+=item :HKEY_
+
+All C<HKEY_*> constants:
+
+	HKEY_CLASSES_ROOT	HKEY_CURRENT_CONFIG	HKEY_CURRENT_USER
+	HKEY_DYN_DATA		HKEY_LOCAL_MACHINE	HKEY_PERFORMANCE_DATA
+	HKEY_USERS
+
+=item :KEY_
+
+All C<KEY_*> constants:
+
+	KEY_QUERY_VALUE		KEY_SET_VALUE		KEY_CREATE_SUB_KEY
+	KEY_ENUMERATE_SUB_KEYS	KEY_NOTIFY		KEY_CREATE_LINK
+	KEY_READ		KEY_WRITE		KEY_EXECUTE
+	KEY_ALL_ACCESS
+
+=item :REG_
+
+All C<REG_*> constants:
+
+	REG_CREATED_NEW_KEY		REG_OPENED_EXISTING_KEY
+
+	REG_LEGAL_CHANGE_FILTER		REG_NOTIFY_CHANGE_ATTRIBUTES
+	REG_NOTIFY_CHANGE_NAME		REG_NOTIFY_CHANGE_LAST_SET
+	REG_NOTIFY_CHANGE_SECURITY	REG_LEGAL_OPTION
+
+	REG_OPTION_BACKUP_RESTORE	REG_OPTION_CREATE_LINK
+	REG_OPTION_NON_VOLATILE		REG_OPTION_OPEN_LINK
+	REG_OPTION_RESERVED		REG_OPTION_VOLATILE
+
+	REG_WHOLE_HIVE_VOLATILE		REG_REFRESH_HIVE
+	REG_NO_LAZY_FLUSH
+
+	REG_NONE			REG_SZ
+	REG_EXPAND_SZ			REG_BINARY
+	REG_DWORD			REG_DWORD_LITTLE_ENDIAN
+	REG_DWORD_BIG_ENDIAN		REG_LINK
+	REG_MULTI_SZ			REG_RESOURCE_LIST
+	REG_FULL_RESOURCE_DESCRIPTOR	REG_RESOURCE_REQUIREMENTS_LIST
+
+=item :ALL
+
+All of the above.
+
+=item :SE_
+
+The strings for the following privilege names:
+
+	SE_ASSIGNPRIMARYTOKEN_NAME	SE_AUDIT_NAME
+	SE_BACKUP_NAME			SE_CHANGE_NOTIFY_NAME
+	SE_CREATE_PAGEFILE_NAME		SE_CREATE_PERMANENT_NAME
+	SE_CREATE_TOKEN_NAME		SE_DEBUG_NAME
+	SE_INCREASE_QUOTA_NAME		SE_INC_BASE_PRIORITY_NAME
+	SE_LOAD_DRIVER_NAME		SE_LOCK_MEMORY_NAME
+	SE_MACHINE_ACCOUNT_NAME		SE_PROF_SINGLE_PROCESS_NAME
+	SE_REMOTE_SHUTDOWN_NAME		SE_RESTORE_NAME
+	SE_SECURITY_NAME		SE_SHUTDOWN_NAME
+	SE_SYSTEMTIME_NAME		SE_SYSTEM_ENVIRONMENT_NAME
+	SE_SYSTEM_PROFILE_NAME		SE_TAKE_OWNERSHIP_NAME
+	SE_TCB_NAME			SE_UNSOLICITED_INPUT_NAME
+
+It can be difficult to successfully build this module in a way
+that makes these constants available.  So some builds of this
+module may not make them available.  For such builds, trying
+to export any of these constants will cause a fatal error.
+For this reason, none of these symbols are currently included
+in the C<":ALL"> grouping.
+
+=back
+
+=head2 The Win32API:: heirarchy
+
+This and the other Win32API:: modules are meant to expose the
+nearly raw API calls so they can be used from Perl code in any
+way they might be used from C code.  This provides the following
+advantages:
+
+=over
+
+=item Many modules can be written by people that don't have a C compiler.
+
+=item Encourages more module code to be written in Perl [not C].
+
+Perl code is often much easier to inspect, debug, customize, and
+enhance than XS code.
+
+=item Allows those already familiar with the Win32 API to get
+off to a quick start.
+
+=item Provides an interactive tool for exploring even obscure
+details of the Win32 API.
+
+It can be very useful to interactively explore ad-hoc calls into
+parts of the Win32 API using:
+
+    perl -de 0
+
+=item Ensures that native Win32 data structures can be used.
+
+This allows maximum efficiency.  It also allows data from one
+module [for example, time or security information from the
+C<Win32API::Registry> or C<Win32API::File> modules] to be used
+with other modules [for example, C<Win32API::Time> and
+C<Win32API::SecDesc>].
+
+=item Provides a single version of the XS interface to each API
+call where improvements can be collected.
+
+=back
+
+=head2 Buffer sizes
+
+For each parameter that specifies a buffer size, a value of C<0>
+can be passed.  For parameter that are pointers to buffer sizes,
+you can also pass in C<NULL> by specifying an empty list reference,
+C<[]>.  Both of these cases will ensure that the variable has
+I<some> buffer space allocated to it and pass in that buffer's
+allocated size.  Many of the calls indicate, via C<ERROR_MORE_DATA>,
+that the buffer size was not sufficient and the F<Registry.xs>
+code will automatically enlarge the buffer to the required size
+and repeat the call.
+
+Numeric buffer sizes are used as minimum initial sizes for the
+buffers.  The larger of this size and the size of space already
+allocated to the scalar will be passed to the underlying routine. 
+If that size was insufficient, and the underlying call provides
+an easy method for determining the needed buffer size, then the
+buffer will be enlarged and the call repeated as above.
+
+The underlying calls define buffer size parameter as unsigned, so
+negative buffer sizes are treated as very large positive buffer
+sizes which usually cause C<malloc()> to fail.
+
+To force the F<Registry.xs> code to pass in a specific value for
+a buffer size, preceed the size with an equals sign via C<"=".>. 
+Buffer sizes that are passed in as strings starting with an equals
+sign will have the equal sign stripped and the remainder of the string
+interpretted as a number [via C's C<strtoul()> using only base 10]
+which will be passed to the underlying routine [even if the allocated
+buffer is actually larger].  The F<Registry.xs> code will enlarge the
+buffer to the specified size, if needed, but will not enlarge the
+buffer based on the underlying routine requesting more space.
+
+Some Reg*() calls may not currently set the buffer size when they
+return C<ERROR_MORE_DATA>.  But some that are not documented as
+doing so, currently do so anyway.  So the code assumes that any
+routine I<might> do this and resizes any buffers and repeats the
+call.   We hope that eventually all routines will provide this
+feature.
+
+When you use C<[]> for a buffer size, you can still find the
+length of the data returned by using C<length($buffer)>.  Note
+that this length will be in bytes while a few of the buffer
+sizes would have been in units of wide characters.
+
+Note that the RegQueryValueEx*() and RegEnumValue*() calls
+will trim the trailing C<'\0'> [if present] from the returned data
+values of type C<REG_SZ> or C<REG_EXPAND_SZ> but only if the
+value data length parameter is omitted [or specified as C<[]>].
+
+The RegSetValueEx*() calls will add a trailing C<'\0'> [if
+missing] to the supplied data values of type C<REG_SZ> and
+C<REG_EXPAND_SZ> but only if the value data length parameter
+is omitted [or specified as C<0>].
+
+=head2 Hungarian Notation
+
+The following abbreviations are used at the start of each parameter
+name to hint at aspects of how the parameter is used.  The prefix
+is always in lower case and followed by a capital letter that starts
+the descriptive part of the parameter name.  Several of the following
+abbreviations can be combined into a single prefix.
+
+Probably not all of these prefix notations are used by this module. 
+This document section may be included in any C<Win32API> module and
+so covers some notations not used by this specific module.
+
+=over
+
+=item s
+
+A string.  In C, a C<'\0'>-terminated C<char *>.  In Perl, just a
+string except that it will be truncated at the first C<"\0">, if
+it contains one.
+
+=item sw
+
+A wide [UNICODE] string.  In C, a C<L'\0'>-terminated C<WCHAR *>.
+In Perl, a string that contains UNICODE data.  You can convert a
+string to UNICODE in Perl via:
+
+    $string= "This is an example string";
+    $unicode= pack( "S*", unpack("C*",$string), 0 );
+
+Note how C<, 0> above causes an explicit C<L'\0'> to be added since
+Perl's implicit C<'\0'> that it puts after each of its strings is not
+wide enough to terminate a UNICODE string.  So UNICODE strings are
+different than regular strings in that the Perl version of a regular
+string will not include the trialing C<'\0'> while the Perl version
+of a UNICODE string must include the trailing C<L'\0'>.
+
+If a UNICODE string contains no non-ASCII characters, then you
+can convert it back into a normal string via:
+
+    $string= pack( "C*", unpack("S*",$unicode) );
+    $string =~ s/\0$//;
+
+=item p
+
+A pointer to some buffer [usually containing some C<struct>].  In C,
+a C<void *> or some other pointer type.  In Perl, a string that is
+usually manipulated using C<pack> and C<unpack>.  The "p" is usually
+followed by more prefix character(s) to indicate what type of data is
+stored in the bufffer.
+
+=item a
+
+A packed array.  In C, an array [usually of C<struct>s].  In Perl, a
+string containing the packed data.  The "a" is usually followed by
+more prefix character(s) to indicate the data type of the elements.
+
+These packed arrays are also called "vectors" in places to avoid
+confusion with Perl arrays.
+
+=item n
+
+A generic number.   In C, any of the integer or floating point data
+types.  In Perl, a number; either an integer, unsigned, or double
+[IV, UV, or NV, respectively].  Usually an integer.
+
+=item iv
+
+A signed integral value.  In C, any of the signed integer data types. 
+In Perl, an integer [IV].
+
+=item u
+
+An unsigned integral value.  In C, any of the unsigned integer data
+types.  In Perl, an unsigned integer [UV].
+
+=item d
+
+A floating-point number.  In C, a C<float> or C<double> or, perhaps,
+a C<long double>.  In Perl, a double-precision floating-point number
+[NV].
+
+=item b
+
+A Boolean value.  In C, any integer data type, though usually via
+a type alias of C<bool> or C<BOOL>, containing either a 0 [false] or
+non-zero [true] value.  In Perl, a scalar containing a Boolean value
+[C<0>, C<"">, or C<undef> for "false" and anything else for "true"].
+
+=item c
+
+A count of items.  In C, any integer data type.  In Perl, an unsigned
+integer [UV].  Usually used in conjunction with a "vector" parameter
+[see L</a> above] to indicate the number of elements.
+
+=item l
+
+A length [in bytes].  In C, any integer data type.  In Perl, an
+unsigned integer [UV].  Usually used in conjunction with a "string"
+or "pointer" parameter [see L</s> and L</p> above] to indicate the
+buffer size or the size of the value stored in the buffer.
+
+For strings, there is no general rule as to whether the trailing
+C<'\0'> is included in such sizes.  For this reason, the C<Win32API>
+modules follow the Perl rule of always allocating one extra byte
+and reporting buffer sizes as being one smaller than allocated in
+case the C<'\0'> is not included in the size.
+
+=item lw
+
+A length measured as number of UNICODE characters.  In C, a count
+of C<WCHAR>s.  In Perl, an unsigned integer [UV] counting "shorts"
+[see "s" and "S" in C<pack> and C<unpack>].
+
+For UNICODE strings, the trailing C<L'\0'> may or may not be
+included in a length so, again, we always allocate extra room
+for one and don't report that extra space.
+
+=item h
+
+A handle.  In C, a C<HANDLE> or more-specific handle data type. 
+In Perl, an unsigned integer [UV].  In C, these handles are often
+actually some type of pointer, but Perl just treats them as opaque
+numbers, as it should.  This prefix is also used for other pointers
+that are treated as integers in Perl code.
+
+=item r
+
+A record.  In C, almost always a C<struct> or perhaps C<union>.  Note
+that C C<struct>s are rarely passed by value so the "r" is almost
+always preceeded by a "p" or "a" [see L</p> and L</a> above].  For
+the very rare unadorned "r", Perl stores the record in the same way
+as a "pr", that is, in a string.  For the very rare case where Perl
+explicitly stores a pointer to the C<struct> rather than storing the
+C<struct> directly in a Perl string, the prefix "pp" or "ppr" or even
+"par" is used.
+
+=item sv
+
+=item rv
+
+=item hv
+
+=item av
+
+=item cv
+
+A Perl data type.  Respectively, a scalar value [SV], a reference
+[RV] [usually to a scalar], a hash [HV], a Perl array [AV], or a Perl
+code reference [PVCV].  For the "hv", "av", and "cv" prefixes, a
+leading "rv" is usually assumed.  For a parameter to an XS subroutine,
+a prefix of "sv" means the parameter is a scalar and so may be a string
+or a number [or C<undef>] or even both at the same time.  So "sv"
+doesn't imply a leading "rv".
+
+=item Input or Output
+
+Whether a parameter is for input data, output data, or both is usually
+not reflected by the data type prefix.  In cases where this is not
+obvious nor reflected in the parameter name proper, we may use the
+following in front of the data type prefix.
+
+=over
+
+=item i
+
+An input parameter given to the API [usually omitted].
+
+=item o
+
+An output-only parameter taken from the API.  You should not get a
+warning if such a parameter is C<undef> when you pass it into the
+function.  You should get an error if such a parameter is read-only.
+You can [usually] pass in C<[]> for such a parameter to have the
+parameter silently ignored.
+
+The output may be written directly into the Perl variable passed
+to the subroutine, the same way the buffer parameter to Perl's
+C<sysread()>.  This method is often avoided in Perl because
+the call then lacks any visual cue that some parameters are being
+overwritten.   But this method closely matches the C API which is
+what we are trying to do.
+
+=item io
+
+Input given to the API then overwritten with output taken from the
+API.  You should get a warning [if B<-w> is in effect] if such a
+parameter is C<undef> when you pass it into the function [unless it
+is a buffer or buffer length parameter].  If the value is read-only,
+then [for most parameters] the output is silently not written.  This
+is because it is often convenient to pass in read-only constants for
+many such parameters.  You can also usually pass in C<[]> for such
+parameters.
+
+=back
+
+=item pp
+
+=item ppr
+
+=item par
+
+=item pap
+
+These are just unusual combinations of prefix characters described above.
+
+For each, a pointer is stored in a [4-byte] Perl string.  You can
+usually use C<unpack "P"> to access the real data from Perl.
+
+For "ppr" [and often for "pp"], the pointer points directly at a
+C C<struct>.  For "par", the pointer points to the first element
+of a C [packed] array of C<struct>s.  For "pap", the pointer points
+to a C [packed] array of pointers to other things.
+
+=item ap
+
+Here we have a list of pointers packed into a single Perl string.
+
+=back
+
+=head1 BUGS
+
+The old ActiveState ports of Perl for Win32 [but not, ActivePerl, the
+ActiveState distributions of standard Perl 5.004 and beyond] do not support
+the tools for building extensions and so do not support this extension.
+
+No routines are provided for using the data returned in the C<FILETIME>
+buffers.  Those are in the C<Win32API::Time> module.
+
+No routines are provided for dealing with UNICODE data effectively. 
+See L</:FuncW> above for some simple-minded UNICODE methods.
+
+Parts of the module test will fail if used on a version of Perl
+that does not yet set C<$^E> based on C<GetLastError()>.
+
+On NT 4.0 [at least], the RegEnum*() calls do not set the required
+buffer sizes when returning C<ERROR_MORE_DATA> so this module will
+not grow the buffers in such cases.  C<Win32::TieRegistry> overcomes
+this by using values from C<RegQueryInfoKey()> for buffer sizes in
+RegEnum* calls.
+
+On NT 4.0 [at least], C<RegQueryInfoKey()> on C<HKEY_PERFORMANCE_DATA>
+never succeeds.  Also, C<RegQueryValueEx()> on C<HKEY_PERFORMANCE_DATA>
+never returns the required buffer size.  To access C<HKEY_PERFORMANCE_DATA>
+you will need to keep growing the data buffer until the call succeeds.
+
+Because C<goto &subroutine> seems to be buggy under Win32 Perl,
+it is not used in the stubs in F<Registry.pm>.
+
+=head1 AUTHOR
+
+Tye McQueen, tye@metronet.com, http://www.metronet.com/~tye/.
+
+=head1 SEE ALSO
+
+=over
+
+=item L<Win32::TieRegistry>
+
+=item L<Win32::Registry>
+
+=back
+
+=cut
diff --git a/lib/site_win58/Win32API/Registry/cRegistry.pc b/lib/site_win58/Win32API/Registry/cRegistry.pc
index f984543fa..9659d0c43 100644
--- a/lib/site_win58/Win32API/Registry/cRegistry.pc
+++ b/lib/site_win58/Win32API/Registry/cRegistry.pc
@@ -1,87 +1,87 @@
-# Generated by cRegistry_pc.cxx.
-# Package Win32API::Registry with options:
-#    CPLUSPLUS => q[1]
-#    IFDEF => q[ /^SE_/ ? '__cplusplus' : /REG_/ ]
-#    IMPORT_LIST => [q[/._/], q[!/[a-z]/]]
-#    VALUES => { KEY_DELETE=>q[DELETE], KEY_READ_CONTROL=>q[READ_CONTROL], KEY_WRITE_OWNER=>q[WRITE_OWNER], KEY_SYNCHRONIZE=>q[SYNCHRONIZE], KEY_WRITE_DAC=>q[WRITE_DAC] }
-#    WRITE_PERL => q[1]
-# Perl files eval'd:
-#    Registry.pm => last if /^\s*(bootstrap|XSLoader::load)\b/
-# C files included:
-#    Registry.xs => last if m#/[/*]\s*CONSTS_DEFINED\b|^\s*MODULE\b#
-sub HKEY_CLASSES_ROOT () { 0x80000000 }
-sub HKEY_CURRENT_CONFIG () { 0x80000005 }
-sub HKEY_CURRENT_USER () { 0x80000001 }
-sub HKEY_DYN_DATA () { 0x80000006 }
-sub HKEY_LOCAL_MACHINE () { 0x80000002 }
-sub HKEY_PERFORMANCE_DATA () { 0x80000004 }
-sub HKEY_USERS () { 0x80000003 }
-sub KEY_ALL_ACCESS () { 983103 }
-sub KEY_CREATE_LINK () { 32 }
-sub KEY_CREATE_SUB_KEY () { 4 }
-sub KEY_DELETE () { 65536 }
-sub KEY_ENUMERATE_SUB_KEYS () { 8 }
-sub KEY_EXECUTE () { 131097 }
-sub KEY_NOTIFY () { 16 }
-sub KEY_QUERY_VALUE () { 1 }
-sub KEY_READ () { 131097 }
-sub KEY_READ_CONTROL () { 131072 }
-sub KEY_SET_VALUE () { 2 }
-sub KEY_SYNCHRONIZE () { 1048576 }
-sub KEY_WRITE () { 131078 }
-sub KEY_WRITE_DAC () { 262144 }
-sub KEY_WRITE_OWNER () { 524288 }
-sub REG_BINARY () { 3 }
-sub REG_CREATED_NEW_KEY () { 1 }
-sub REG_DWORD () { 4 }
-sub REG_DWORD_BIG_ENDIAN () { 5 }
-sub REG_DWORD_LITTLE_ENDIAN () { 4 }
-sub REG_EXPAND_SZ () { 2 }
-sub REG_FULL_RESOURCE_DESCRIPTOR () { 9 }
-sub REG_LEGAL_CHANGE_FILTER () { 15 }
-sub REG_LEGAL_OPTION () { 15 }
-sub REG_LINK () { 6 }
-sub REG_MULTI_SZ () { 7 }
-sub REG_NONE () { 0 }
-sub REG_NOTIFY_CHANGE_ATTRIBUTES () { 2 }
-sub REG_NOTIFY_CHANGE_LAST_SET () { 4 }
-sub REG_NOTIFY_CHANGE_NAME () { 1 }
-sub REG_NOTIFY_CHANGE_SECURITY () { 8 }
-sub REG_NO_LAZY_FLUSH () { 4 }
-sub REG_OPENED_EXISTING_KEY () { 2 }
-sub REG_OPTION_BACKUP_RESTORE () { 4 }
-sub REG_OPTION_CREATE_LINK () { 2 }
-sub REG_OPTION_NON_VOLATILE () { 0 }
-sub REG_OPTION_OPEN_LINK () { 8 }
-sub REG_OPTION_RESERVED () { 0 }
-sub REG_OPTION_VOLATILE () { 1 }
-sub REG_REFRESH_HIVE () { 2 }
-sub REG_RESOURCE_LIST () { 8 }
-sub REG_RESOURCE_REQUIREMENTS_LIST () { 10 }
-sub REG_SZ () { 1 }
-sub REG_WHOLE_HIVE_VOLATILE () { 1 }
-sub SE_ASSIGNPRIMARYTOKEN_NAME () { 'SeAssignPrimaryTokenPrivilege' }
-sub SE_AUDIT_NAME () { 'SeAuditPrivilege' }
-sub SE_BACKUP_NAME () { 'SeBackupPrivilege' }
-sub SE_CHANGE_NOTIFY_NAME () { 'SeChangeNotifyPrivilege' }
-sub SE_CREATE_PAGEFILE_NAME () { 'SeCreatePagefilePrivilege' }
-sub SE_CREATE_PERMANENT_NAME () { 'SeCreatePermanentPrivilege' }
-sub SE_CREATE_TOKEN_NAME () { 'SeCreateTokenPrivilege' }
-sub SE_DEBUG_NAME () { 'SeDebugPrivilege' }
-sub SE_INCREASE_QUOTA_NAME () { 'SeIncreaseQuotaPrivilege' }
-sub SE_INC_BASE_PRIORITY_NAME () { 'SeIncreaseBasePriorityPrivilege' }
-sub SE_LOAD_DRIVER_NAME () { 'SeLoadDriverPrivilege' }
-sub SE_LOCK_MEMORY_NAME () { 'SeLockMemoryPrivilege' }
-sub SE_MACHINE_ACCOUNT_NAME () { 'SeMachineAccountPrivilege' }
-sub SE_PROF_SINGLE_PROCESS_NAME () { 'SeProfileSingleProcessPrivilege' }
-sub SE_REMOTE_SHUTDOWN_NAME () { 'SeRemoteShutdownPrivilege' }
-sub SE_RESTORE_NAME () { 'SeRestorePrivilege' }
-sub SE_SECURITY_NAME () { 'SeSecurityPrivilege' }
-sub SE_SHUTDOWN_NAME () { 'SeShutdownPrivilege' }
-sub SE_SYSTEMTIME_NAME () { 'SeSystemtimePrivilege' }
-sub SE_SYSTEM_ENVIRONMENT_NAME () { 'SeSystemEnvironmentPrivilege' }
-sub SE_SYSTEM_PROFILE_NAME () { 'SeSystemProfilePrivilege' }
-sub SE_TAKE_OWNERSHIP_NAME () { 'SeTakeOwnershipPrivilege' }
-sub SE_TCB_NAME () { 'SeTcbPrivilege' }
-sub SE_UNSOLICITED_INPUT_NAME () { 'SeUnsolicitedInputPrivilege' }
-1;
+# Generated by cRegistry_pc.cxx.
+# Package Win32API::Registry with options:
+#    CPLUSPLUS => q[1]
+#    IFDEF => q[ /^SE_/ ? '__cplusplus' : /REG_/ ]
+#    IMPORT_LIST => [q[/._/], q[!/[a-z]/]]
+#    VALUES => { KEY_DELETE=>q[DELETE], KEY_READ_CONTROL=>q[READ_CONTROL], KEY_WRITE_OWNER=>q[WRITE_OWNER], KEY_SYNCHRONIZE=>q[SYNCHRONIZE], KEY_WRITE_DAC=>q[WRITE_DAC] }
+#    WRITE_PERL => q[1]
+# Perl files eval'd:
+#    Registry.pm => last if /^\s*(bootstrap|XSLoader::load)\b/
+# C files included:
+#    Registry.xs => last if m#/[/*]\s*CONSTS_DEFINED\b|^\s*MODULE\b#
+sub HKEY_CLASSES_ROOT () { 0x80000000 }
+sub HKEY_CURRENT_CONFIG () { 0x80000005 }
+sub HKEY_CURRENT_USER () { 0x80000001 }
+sub HKEY_DYN_DATA () { 0x80000006 }
+sub HKEY_LOCAL_MACHINE () { 0x80000002 }
+sub HKEY_PERFORMANCE_DATA () { 0x80000004 }
+sub HKEY_USERS () { 0x80000003 }
+sub KEY_ALL_ACCESS () { 983103 }
+sub KEY_CREATE_LINK () { 32 }
+sub KEY_CREATE_SUB_KEY () { 4 }
+sub KEY_DELETE () { 65536 }
+sub KEY_ENUMERATE_SUB_KEYS () { 8 }
+sub KEY_EXECUTE () { 131097 }
+sub KEY_NOTIFY () { 16 }
+sub KEY_QUERY_VALUE () { 1 }
+sub KEY_READ () { 131097 }
+sub KEY_READ_CONTROL () { 131072 }
+sub KEY_SET_VALUE () { 2 }
+sub KEY_SYNCHRONIZE () { 1048576 }
+sub KEY_WRITE () { 131078 }
+sub KEY_WRITE_DAC () { 262144 }
+sub KEY_WRITE_OWNER () { 524288 }
+sub REG_BINARY () { 3 }
+sub REG_CREATED_NEW_KEY () { 1 }
+sub REG_DWORD () { 4 }
+sub REG_DWORD_BIG_ENDIAN () { 5 }
+sub REG_DWORD_LITTLE_ENDIAN () { 4 }
+sub REG_EXPAND_SZ () { 2 }
+sub REG_FULL_RESOURCE_DESCRIPTOR () { 9 }
+sub REG_LEGAL_CHANGE_FILTER () { 15 }
+sub REG_LEGAL_OPTION () { 15 }
+sub REG_LINK () { 6 }
+sub REG_MULTI_SZ () { 7 }
+sub REG_NONE () { 0 }
+sub REG_NOTIFY_CHANGE_ATTRIBUTES () { 2 }
+sub REG_NOTIFY_CHANGE_LAST_SET () { 4 }
+sub REG_NOTIFY_CHANGE_NAME () { 1 }
+sub REG_NOTIFY_CHANGE_SECURITY () { 8 }
+sub REG_NO_LAZY_FLUSH () { 4 }
+sub REG_OPENED_EXISTING_KEY () { 2 }
+sub REG_OPTION_BACKUP_RESTORE () { 4 }
+sub REG_OPTION_CREATE_LINK () { 2 }
+sub REG_OPTION_NON_VOLATILE () { 0 }
+sub REG_OPTION_OPEN_LINK () { 8 }
+sub REG_OPTION_RESERVED () { 0 }
+sub REG_OPTION_VOLATILE () { 1 }
+sub REG_REFRESH_HIVE () { 2 }
+sub REG_RESOURCE_LIST () { 8 }
+sub REG_RESOURCE_REQUIREMENTS_LIST () { 10 }
+sub REG_SZ () { 1 }
+sub REG_WHOLE_HIVE_VOLATILE () { 1 }
+sub SE_ASSIGNPRIMARYTOKEN_NAME () { 'SeAssignPrimaryTokenPrivilege' }
+sub SE_AUDIT_NAME () { 'SeAuditPrivilege' }
+sub SE_BACKUP_NAME () { 'SeBackupPrivilege' }
+sub SE_CHANGE_NOTIFY_NAME () { 'SeChangeNotifyPrivilege' }
+sub SE_CREATE_PAGEFILE_NAME () { 'SeCreatePagefilePrivilege' }
+sub SE_CREATE_PERMANENT_NAME () { 'SeCreatePermanentPrivilege' }
+sub SE_CREATE_TOKEN_NAME () { 'SeCreateTokenPrivilege' }
+sub SE_DEBUG_NAME () { 'SeDebugPrivilege' }
+sub SE_INCREASE_QUOTA_NAME () { 'SeIncreaseQuotaPrivilege' }
+sub SE_INC_BASE_PRIORITY_NAME () { 'SeIncreaseBasePriorityPrivilege' }
+sub SE_LOAD_DRIVER_NAME () { 'SeLoadDriverPrivilege' }
+sub SE_LOCK_MEMORY_NAME () { 'SeLockMemoryPrivilege' }
+sub SE_MACHINE_ACCOUNT_NAME () { 'SeMachineAccountPrivilege' }
+sub SE_PROF_SINGLE_PROCESS_NAME () { 'SeProfileSingleProcessPrivilege' }
+sub SE_REMOTE_SHUTDOWN_NAME () { 'SeRemoteShutdownPrivilege' }
+sub SE_RESTORE_NAME () { 'SeRestorePrivilege' }
+sub SE_SECURITY_NAME () { 'SeSecurityPrivilege' }
+sub SE_SHUTDOWN_NAME () { 'SeShutdownPrivilege' }
+sub SE_SYSTEMTIME_NAME () { 'SeSystemtimePrivilege' }
+sub SE_SYSTEM_ENVIRONMENT_NAME () { 'SeSystemEnvironmentPrivilege' }
+sub SE_SYSTEM_PROFILE_NAME () { 'SeSystemProfilePrivilege' }
+sub SE_TAKE_OWNERSHIP_NAME () { 'SeTakeOwnershipPrivilege' }
+sub SE_TCB_NAME () { 'SeTcbPrivilege' }
+sub SE_UNSOLICITED_INPUT_NAME () { 'SeUnsolicitedInputPrivilege' }
+1;
diff --git a/lib/xPL_Items.pm b/lib/xPL_Items.pm
index 8598f7a34..5f9c7ea70 100644
--- a/lib/xPL_Items.pm
+++ b/lib/xPL_Items.pm
@@ -1,1366 +1,1366 @@
-
-=begin comment
-
-xPL_Items.pm - Misterhouse interface for the xPL protocol
-
-Info:
-
- xPL websites:
-    http://www.xplproject.org.uk
-    http://www.xaphal.com
-
-Authors:
- 10/26/2002  Created by Bruce Winter bruce@misterhouse.net
-
-
-xPL works by using the xPL Hub built in misterhouse and listening for
-xPL connections. See:
-http://misterhouse.wikispaces.com/xAP+and+xPL+-+Getting+Started
-
-Relevant variables for mh.private.ini are:
-#ipaddress_xpl_broadcast = 192.168.205.255
-#ipaddress_xpl = 192.168.205.3
-#xpl_disable = 1
-#xpl_nohub = 1
-#xpl_enable_items = 1
-
-You can disable the mh internal xPL hub if you are running a more capable one.
-To get data input, you can use something like
-
-xpl-rfxcom-rx --verbose --rfxcom-rx-verbose --rfxcom-rx-tty /dev/rfxcom --interface eth1
-
-from xPL-Perl. Then watch for sensor updates passing by and paste their info
-in your device table, like so:
-XPL_SENSOR, bnz-rfxcomrx.gargamel:bthr918n.e6, oregon_intemp, XPL_temp, temp
-
-Another option to figure out the name to use in XPL_SENSOR is to use
-xpl-logger -head -body -i ethx 2>&1 | grep "xpl-trig\/"
-(or without the grep for more details on which field is called what).
-
-A few samples:
-XPL_SENSOR, iranger-rfx.*:WGR918, oregon_winddir, , direction
-XPL_SENSOR, iranger-rfx.*:BHTR968, oregon_intemp, , temp
-XPL_SENSOR, bnz-owfs.*:10.2223EF010800, owfs_temp, , temp
-XPL_SENSOR, bnz-owfs.*:26.2E4DF5000000, owfs_humidity, , humidity
-XPL_SENSOR, bnz-owfs.*:26.2E4DF5000000.1, owfs_humidity1, , humidity
-XPL_X10SECURITY, iranger-rfx.*:F8, x10sec_garage1, , ds10
-
-Note that XPL_SENSOR should just be used for XPL messages of the x10.basic
-type. XPL_X10SECURITY is for x10.security schema, while there is no way to
-currently read x10.basic messages (see this file for more supported schemas).
-
-Once it is running, objects get variables including these:
-'state' => '17.9',
-'states_nosubstate' => 1,
-'states_substate' ?
-'address' => 'bnz-rfxcomrx.gargamel',
-'states_nomultistate' => 1,
-'states_multistate' ?
-'target_address' => '*',
-'_device_id' => 'bthr918n.e6'
-'set_time' => 1285555578,
-'m_timerHeartBeat' => bless( {}, 'Timer' ),
-'m_timeoutHeartBeat' => 0,
-
-
-So, you would write this to print temperature:
-print_log $oregon_intemp->state
-=cut
-
-use strict;
-
-package xPL;
-
-#@xPL::ISA = ('Generic_Item');
-
-my (
-    @xpl_item_names, $started,            %hub_ports,
-    $xpl_listen,     $xpl_hub_listen,     $xpl_send,
-    %xpl_hub_ports,  $xpl_hbeat_interval, $xpl_hbeat_counter
-);
-
-# Create sockets and add hook to check incoming data
-sub startup {
-    return
-      if $started++
-    ;    # Allows us to call with $Reload or with xpl_module mh.ini parm
-
-    # In case you don't want xpl for some reason
-    return if $::config_parms{xpl_disable};
-
-    # determine our local ipaddress(es)
-    @xpl_item_names = ();
-    my ($port);
-
-    # init the hbeat intervals and counters
-    $xpl_hbeat_interval = $::config_parms{xpl_hbeat_interval};
-    $xpl_hbeat_interval = 5 unless $xpl_hbeat_interval;
-    $xpl_hbeat_counter  = $xpl_hbeat_interval;
-
-    if ( !( $::config_parms{xpl_disable} ) ) {
-        undef $port;
-        $port = $::config_parms{xpl_port};
-        $port = 3865 unless $port;
-
-        # open the sending port
-        &open_port( $port, 'send', 'xpl_send', 0, 1 );
-        $xpl_send = new Socket_Item( undef, undef, 'xpl_send' );
-
-        # Find and use the first open port
-        my $port_listen;
-	for my $p (49352 .. 65535) {
-	    $port_listen = $p;
-	    last if &open_port( $port_listen, 'listen', 'xpl_listen', 1, 1);
-	}
-	# The socket code will select a free local port if given 0
-	# not working on ubuntu 12.04
-        #&open_port( 0, 'listen', 'xpl_listen', 1, 1 );
-        #$port_listen = $::Socket_Ports{'xpl_listen'}{port};
-        $xpl_listen = new Socket_Item( undef, undef, 'xpl_listen' );
-
-        # initialize the hub (listen) port
-        if ( $::config_parms{xpl_nohub} ) {
-            $xpl_hub_listen = undef;
-        }
-        else {
-            if ( &open_port( $port, 'listen', 'xpl_hub_listen', 0, 1 ) ) {
-                $xpl_hub_listen =
-                  new Socket_Item( undef, undef, 'xpl_hub_listen' );
-                print " - mh in xPL Hub mode\n";
-
-                # now set up the hub port that will send to mh
-                $xpl_hub_ports{$port_listen} = &xPL::get_xpl_mh_source_info();
-                my $port_name = "xpl_send_$port_listen";
-                &open_port( $port_listen, 'send', $port_name, 1, 1 );
-            }
-            else {
-                print " - mh automatically switching out of xPL Hub mode.  " .
-                  "Another application is binding to the hub port ($port)\n";
-		$xpl_hub_listen = undef;
-            }
-        }
-
-        # now that a listen port exists, advertise it w/ the first hbeat msg
-        &xPL::send_xpl_heartbeat() if $xpl_send;
-
-    }
-
-    &::MainLoop_pre_add_hook( \&xPL::check_for_data, 1 );
-
-    # add reload hook so that xpl_item_names list is reset
-    &::Reload_pre_add_hook( \&xPL::reload_hook, 1 );
-}
-
-sub reload_hook {
-    @xpl_item_names = ();
-}
-
-sub main::display_xpl {
-    my (%args) = @_;
-    my $schema = lc ${args}{schema};
-    $schema = 'osd.basic' unless $schema;
-    if ( $schema eq 'osd.basic' ) {
-        &main::display_xpl_osd_basic(%args);
-    }
-    else {
-        &main::print_log(
-            "Display support for the schema, $schema, does not yet exist");
-    }
-}
-
-sub main::display_xpl_osd_basic {
-    my (%args) = @_;
-    my ( $text, $duration, $address );
-    $text = $args{raw_text};
-    $text = $args{text} unless $text;
-    $text =~ s/[\n\r ]+/ /gm;    # strip out new lines and extra space
-    $text =~ s/\n/\\n/gm;        # escape new lines
-    $duration = $args{duration};
-    $duration = $args{display}
-      unless $duration;          # this apparently is the original param?
-    $duration = 10 unless $duration;              # default to 10 sec display
-    $address  = $args{to};
-    $address  = $args{address} unless $address;
-    $address  = '*' unless $address;
-
-    # auto pre-pend text w/ a newline if the target is a squeezebox and
-    # doesn't already have one
-    if ( $address =~ /^slimdev-slimserv/i ) {
-        $text = "\\n$text" unless $text =~ /\\n\S+/i;
-    }
-    &xPL::send( 'xPL', $address,
-        'osd.basic' => { command => 'write', delay => $duration, text => $text }
-    );
-}
-
-sub open_port {
-    my ( $port, $send_listen, $port_name, $local, $verbose ) = @_;
-
-    # Need to re-open the port, if client app has been re-started??
-    close $::Socket_Ports{$port_name}{sock}
-      if $::Socket_Ports{$port_name}{sock};
-
-    my $sock;
-    if ( $send_listen eq 'send' ) {
-        my $dest_address;
-        if ($local) {
-            if ($main::OS_win || $::Info{'OS_name'} eq 'cygwin') {
-                $dest_address = $::Info{IPAddress_local} unless $dest_address;
-            }
-            else {
-                $dest_address = '0.0.0.0';
-            }
-        }
-        else {
-            $dest_address = $::config_parms{'ipaddress_xpl_broadcast'};
-            $dest_address = '255.255.255.255' unless $dest_address;
-        }
-        $sock = new IO::Socket::INET->new(
-            PeerPort  => $port,
-            Proto     => 'udp',
-            PeerAddr  => $dest_address,
-            Broadcast => 1
-        );
-
-        print "db xPL_Items open_port: pn=$port_name l=$local PeerPort=$port " .
-          "PeerAddr=$dest_address" if $main::Debug{xpl};
-    }
-    else {
-        my $listen_address;
-        if ( !($local) ) {
-            $listen_address = $::config_parms{'ipaddress_xpl'};
-            $listen_address = $::config_parms{'xpl_address'}
-              unless $listen_address;
-        }
-        if ($main::OS_win || $::Info{'OS_name'} eq 'cygwin') {
-            $listen_address = $::Info{IPAddress_local} unless $listen_address;
-        }
-        else {
-            # can't get *nix to bind to a specific address; defaults to
-            # kernel assigned default IP
-            $listen_address = '0.0.0.0';
-        }
-        $sock = new IO::Socket::INET->new(
-            LocalPort => $port,
-            Proto     => 'udp',
-            LocalAddr => $listen_address,
-            Broadcast => 1
-        );
-        $port = $sock->sockport() if ($port == 0);
-		
-        print "db xPL_Items open_port: pn=$port_name l=$local LocalPort=$port " .
-          "LocalAddr=$listen_address" if $main::Debug{xpl};
-    }
-    unless ($sock) {
-        print " -- FAILED\n" if $main::Debug{xpl};
-        print "\nError:  Could not start a udp xPL send server on $port: $@\n\n"
-          if $send_listen eq 'send';
-        return 0;
-    }
-    print "\n" if $main::Debug{xpl};
-
-    printf " - creating %-15s on %3s %5s %s\n", $port_name, 'udp', $port,
-      $send_listen
-      if $verbose;
-
-    $::Socket_Ports{$port_name}{protocol} = 'udp';
-    $::Socket_Ports{$port_name}{datatype} = 'raw';
-    $::Socket_Ports{$port_name}{port}     = $port;
-    $::Socket_Ports{$port_name}{sock}     = $sock;
-    $::Socket_Ports{$port_name}{socka} = $sock; # UDP ports are always "active"
-
-    return $sock;
-}
-
-sub check_for_data {
-
-    if ( $xpl_hub_listen && ( my $xpl_hub_data = said $xpl_hub_listen) ) {
-        &_process_incoming_xpl_hub_data($xpl_hub_data);
-    }
-    if ( $xpl_listen && ( my $xpl_data = said $xpl_listen) ) {
-        &_process_incoming_xpl_data($xpl_data);
-    }
-
-    # check to see if hbeats need to be sent
-    if ( &::new_minute($xpl_hbeat_interval) ) {
-        if ($xpl_send) {
-            if ( $xpl_hbeat_counter == 5 ) {
-                &xPL::send_xpl_heartbeat();
-                $xpl_hbeat_counter = $xpl_hbeat_interval;
-            }
-            else {
-                $xpl_hbeat_counter = $xpl_hbeat_counter - 1;
-            }
-        }
-    }
-}
-
-# Parse incoming xPL records
-sub parse_data {
-    my ($data) = @_;
-    my ( $source, $class, $target, $msg_type, $section, %d );
-    print "db4 xPL data:\n$data\n"
-      if $main::Debug{xpl} and $main::Debug{xpl} == 4;
-    for my $r ( split /[\r\n]/, $data ) {
-        next if $r =~ /^[\{\} ]*$/;
-
-        # Store xpl-header, xpl-heartbeat, and other data
-        if ( my ( $key, $value ) = $r =~ /(.+?)=(.*)/ ) {
-            $key   = lc $key;
-            $value = lc $value
-              if ( $section =~ /^xpl/ );    # Do not lc real data;
-            $source = $value if $section =~ /^xpl/ and $key =~ /^source$/i;
-            $target = $value if $section =~ /^xpl/ and $key =~ /^target$/i;
-            if ( exists( $d{$section}{$key} ) ) {
-                $d{$section}{$key} .= ","
-                  . $value;        # xpl allows "continuation lines"
-            }
-            else {
-                $d{$section}{$key} = $value;
-            }
-            print "db4 xpl parsed c=$section k=$key v=$value\n"
-              if ( $main::Debug{xpl} and $main::Debug{xpl} == 4 );
-        }
-
-        # section (e.g. xpl-header, xpl-heartbeat, source.instance
-        else {
-            $section = lc $r;
-            $msg_type ? $class = $section : $msg_type = $section;
-        }
-    }
-    # define target as '*' if undefined
-    $target = '*' if !($target);
-
-    return(\%d, $source, $class, $target, $msg_type);
-}
-
-sub _process_incoming_xpl_hub_data {
-    my ($data) = @_;
-    my $ip_address = $::config_parms{'ipaddress_xpl'};
-    $ip_address = $::Info{IPAddress_local} unless $ip_address;
-
-    my ($xpl_data, $source, $class, $target, $msg_type) = &parse_data($data);
-
-    return unless $source;
-
-    my ($port);
-
-    # Log hearbeats of other apps; ignore hbeat.basic messages as these
-    # should not be handled by the hub
-    if ( $$xpl_data{'hbeat.app'} ) {
-        # rely on the xPL-message's remote-ip attribute in the hbeat.app
-        # as the basis for performing IP comparisons
-        my $sender_ip_address = $$xpl_data{'hbeat.app'}{'remote-ip'};
-
-        # Open/re-open the port on every hbeat if it posts a listening port.
-        # Skip if it is our own hbeat (port = listen port)
-        if ( ( $sender_ip_address eq $ip_address ) ) {
-            $port = $$xpl_data{'hbeat.app'}{port};
-            if ($port) {
-                $xpl_hub_ports{$port} = $source;
-                my $port_name = "xpl_send_$port";
-                my $msg =
-                  ( $::Socket_Ports{$port_name}{sock} )
-                  ? 'renewing'
-                  : 'registering';
-                print "db xpl $msg port=$port to xPL client $source\n"
-                  if $main::Debug{xpl};
-
-                # xPL apps want local
-                &open_port( $port, 'send', $port_name, 1,
-                    $msg eq 'registering' );
-            }
-        }
-    }
-
-    # As a hub, echo data to other xpl listeners unless it's our transmission
-    for $port ( keys %xpl_hub_ports ) {
-        my $sock = $::Socket_Ports{"xpl_send_$port"}{sock};
-        print "db2 xpl hub: sending xpl data to p=$port destination=" .
-          "$xpl_hub_ports{$port} s=$sock d=\n$data.\n"
-          if $main::Debug{xpl} and $main::Debug{xpl} == 2;
-        print $sock $data if defined($sock);
-    }
-}
-
-sub _process_incoming_xpl_data {
-    my ($data) = @_;
-
-    my ($xpl_data, $source, $class, $target, $msg_type) = &parse_data($data);
-
-    print "db1 xpl check: s=$source c=$class t=$target d=\n$data\n"
-      if $main::Debug{xpl} and $main::Debug{xpl} == 1;
-
-    # the first time that this sub is called, the xpl_item_names array
-    # needs to be filled
-    if ( !(@xpl_item_names) ) {
-        foreach my $object_type (&::list_object_types) {
-            foreach my $object_name ( &::list_objects_by_type($object_type) ) {
-                my $object = &::get_object_by_name("$object_name");
-                if ( $object and $object->isa('xPL_Item') ) {
-                    push @xpl_item_names, $object_name;
-                }
-            }
-        }
-    }
-
-    return unless $source;
-
-    # continue processing unless we are the source (e.g., heart-beat)
-    if ( !( $source eq &xPL::get_xpl_mh_source_info() ) ) {
-        # Set states in matching xPL objects
-        for my $name (@xpl_item_names)
-        {    #(&::list_objects_by_type('xPL_Item')) {
-            my $o = &main::get_object_by_name($name);
-            $o = $name unless $o;    # In case we stored object directly
-            print "db3 xpl test  o=$name s=$source oa=$$o{source}\n"
-              if $main::Debug{xpl} and $main::Debug{xpl} == 3;
-
-            # skip this object unless the source matches if a stat or trig
-            # otherwise, we check the target for a cmnd
-            # NOTE: the object's hash reference for "source" is "address"
-            my $regex_address = &wildcard_2_regex( $$o{address} );
-            if ( $$o{set_state_on_cmnd} and $msg_type eq 'xpl-cmnd' ) {
-                my $regex_target = &wildcard_2_regex($target);
-                next
-                  unless ( $target =~ /^$regex_address$/i )
-                  or ( $$o{address} =~ /^$regex_target$/i );
-            }
-            else {
-                if ( $source =~ /^$regex_address$/i ) {
-
-                    # handle hbeat data
-                    for my $section ( keys %{$xpl_data} ) {
-                        if ( $section =~ /^hbeat./i ) {
-                            if ( lc $section eq 'hbeat.app' ) {
-                                $o->_handle_alive_app();
-                            }
-                            else {
-                                $o->_handle_dead_app();
-                            }
-                        }
-                    }
-                }
-                else {
-                    next;
-                }
-            }
-
-            # skip this object unless the class matches
-            if ( $class && $$o{class} ) {
-                my $regex_class = &wildcard_2_regex( $$o{class} );
-                next unless $class =~ /^$regex_class$/i;
-            }
-
-            # check if device monitoring is enabled
-            if ( !( $class =~ /hbeat./i ) ) {
-                next if $o->ignore_message($xpl_data);
-            }
-
-            # Find and set the state variable
-            my $state_value;
-            $$o{changed} = '';
-            for my $section ( keys %{$xpl_data} ) {
-                $$o{sections}{$section} = 'received'
-                  unless $$o{sections}{$section};
-                for my $key ( keys %{ $$xpl_data{$section} } ) {
-                    my $value = $$xpl_data{$section}{$key};
-
-                    # does a tied value convertor exist for this key and object?
-                    my $value_convertor = $$o{_value_convertors}{$key}
-                      if defined( $$o{_value_convertors} );
-                    if ($value_convertor) {
-                        print
-                          "db xpl: located value convertor: $value_convertor\n"
-                          if $main::Debug{xpl};
-                        my $converted_value = eval $value_convertor;
-                        if ($@) {
-                            print $@;
-                        }
-                        else {
-                            print
-                              "db xpl: converted value is: $converted_value\n"
-                              if $main::Debug{xpl};
-                        }
-                        $value = $converted_value if $converted_value;
-                    }
-                    $$o{$section}{$key} = $value;
-
-                    # Monitor what changed (real data, and include hbeat as
-                    # it may include useful info, e.g., slimserver).
-                    $$o{changed} .= "$section : $key = $value | "
-                      unless $section eq 'xpl-stat'
-                          or $section eq 'xpl-trig'
-                          or $section eq 'xpl-cmnd'
-                          or ( $section eq 'hbeat.app' and $key ne 'status' );
-                    print "db3 xpl state check m=$$o{state_monitor} key=" .
-                      "$section : $key  value=$value\n"
-                      if $main::Debug{xpl};    # and $main::Debug{xpl} == 3;
-                    if ( $$o{state_monitor} ) {
-                        foreach my $state_monitor (
-                            split( /\|/, $$o{state_monitor} ) )
-                        {
-                            if ( $state_monitor =~ /$section\s*[:=]\s*$key/i
-                                and defined $value )
-                            {
-                                print "db3 xpl setting state to $value\n"
-                                  if $main::Debug{xpl}
-                                      and $main::Debug{xpl} == 3;
-                                $state_value = $value;
-                            }
-                        }
-                    }
-                }
-            }
-
-            # assign the "summary" of the message to state_value unless
-            # state_monitor is being used
-            $state_value = $$o{changed} unless $$o{state_monitor};
-            print "db3 xpl set: n=$name to state=$state_value\n\n"
-              if $main::Debug{xpl};    # and $main::Debug{xpl} == 3;
-
-            # Can not use Generic_Item set method, as state_next_pass
-            # only carries state, not all other $section data, to the next pass
-#           $o -> SUPER::set($state_value, 'xPL') if defined $state_value;
-
-            $o->received( $data );
-            if ( defined $state_value and $state_value ne '' ) {
-                my $set_by_name = 'xPL';
-                $set_by_name .= " [$source]";
-                $o->set_now( $state_value, $set_by_name );
-                #$o->SUPER::set_now( $state_value, $set_by_name );
-                $o->state_now_msg_type("$msg_type");
-            }
-        }
-    }
-}
-
-sub get_mh_vendor_info {
-    return 'mhouse';
-}
-
-sub get_mh_device_info {
-    return 'mh';
-}
-
-sub get_xpl_mh_source_info {
-    my $instance = $::config_parms{xpl_title};
-    $instance = $::config_parms{title} unless $instance;
-    $instance =
-      ( $instance =~ /misterhouse(.*)pid/i ) ? 'misterhouse' : $instance;
-    $instance = &xPL::get_ok_name_part($instance);
-    return
-        &get_mh_vendor_info() . '-'
-      . &get_mh_device_info() . '.'
-      . $instance;
-}
-
-sub get_ok_name_part {
-    my ($in_name) = @_;
-    my $out_name = lc $in_name;
-    $out_name =~ tr/ /_/;
-    $out_name =~ s/[^a-z0-9\-_]//g;
-    return $out_name;
-}
-
-sub wildcard_2_regex {
-    my ($expr) = @_;
-    return unless $expr;
-
-    # convert all periods
-    $expr =~ s/\./(\\\.)/g;
-
-    # convert all asterisks
-    $expr =~ s/\*/(\.\*)/g;
-
-    # treat all :> as asterisks
-    $expr =~ s/:>/(\.\*)/g;
-
-    # convert all greater than symbols
-    $expr =~ s/>/(\.\*)/g;
-
-    return $expr;
-}
-
-sub send {
-    my ( $protocol, $class_address, @data ) = @_;
-
-    print "db5 xPL send: ca=$class_address d=@data xpl_send=$xpl_send\n"
-      if ($main::Debug{xpl} and $main::Debug{xpl} == 5);
-
-    my $target = $class_address;
-    &sendXpl( $target, 'cmnd', @data );
-}
-
-sub sendXpl {
-    if ( defined($xpl_send) ) {
-        my ( $target, $msg_type, @data ) = @_;
-        my ( $parms, $msg );
-        $msg = "xpl-$msg_type\n{\nhop=1\nsource="
-          . &xPL::get_xpl_mh_source_info() . "\n";
-        if ( defined($target) ) {
-            $msg .= "target=$target\n";
-        }
-        $msg .= "}\n";
-        while (@data) {
-            my $section = shift @data;
-            $msg .= "$section\n{\n";
-            my $ptr = shift @data;
-            if ($ptr) {
-                my %parms = %$ptr;
-                for my $key ( sort keys %parms ) {
-
-                    # order is important for many xPL clients
-                    # allow a sort key delimitted by ## to drive the order
-                    my ( $subkey1, $subkey2 ) = $key =~ /^(\S+)##(.*)/;
-                    if ( defined $subkey1 and defined $subkey2 ) {
-                        $msg .= "$subkey2=$parms{$key}\n";
-                    }
-                    else {
-                        $msg .= "$key=$parms{$key}\n";
-                    }
-                }
-            }
-            $msg .= "}\n";
-        }
-        print "db5 xpl msg: $msg"
-          if $main::Debug{xpl};    # and $main::Debug{xpl} == 5;
-        if ($xpl_send) {
-
-            # check to see if the socket is still valid
-            if ( !( $::Socket_Ports{'xpl_send'}{socka} ) ) {
-                &xPL::_handleStaleXplSockets();
-            }
-            $xpl_send->set($msg) if $::Socket_Ports{'xpl_send'}{socka};
-        }
-    }
-    else {
-        print "WARNING! xPL is disabled and you are trying to send xPL " .
-          "data!! (xPL::sendXpl())\n";
-    }
-}
-
-sub send_xpl_heartbeat {
-    my ($protocol) = @_;
-    my $port       = $::Socket_Ports{xpl_listen}{port};
-    my $ip_address = $::config_parms{'xpl_address'};
-    $ip_address = $::config_parms{'ipaddress_xpl'} unless $ip_address;
-    $ip_address = $::Info{IPAddress_local}
-      unless $ip_address and $ip_address ne '0.0.0.0';
-
-    my $msg;
-    if ($xpl_send) {
-        $msg = "xpl-stat\n{\nhop=1\nsource=" . &xPL::get_xpl_mh_source_info()
-          . "\ntarget=*\n}\nhbeat.app\n{\ninterval=$xpl_hbeat_interval\nport="
-          . "$port\nremote-ip=$ip_address\n}\n";
-
-        # check to see if all of the sockets are still valid
-        &xPL::_handleStaleXplSockets();
-        if ($::Socket_Ports{'xpl_send'}{socka}) {
-            $xpl_send->set($msg);
-            print "db6 xPL heartbeat: $msg.\n"
-              if $main::Debug{xpl} and $main::Debug{xpl} == 6;
-        } else {
-            print "Error in xPL_Item::send_heartbeat.  send socket not active\n";
-        }
-    }
-    else {
-        print "Error in xPL_Item::send_heartbeat.  "
-          . "xPL send socket not available.\n"
-          . "Either disable xPL (xpl_disable = 1) or resolve "
-          . "system network problem (UDP port 3865).\n";
-    }
-}
-
-sub _handleStaleXplSockets {
-
-    # check main sending socket
-    my $port_name = 'xpl_send';
-    if ( !( $::Socket_Ports{$port_name}{socka} ) ) {
-        if (
-            &xPL::open_port(
-                $::Socket_Ports{$port_name}{port},
-                'send', $port_name, 0, 1
-            )
-          )
-        {
-            print "Notice. xPL socket ($port_name) had been closed and "
-              . "has been reopened\n";
-        }
-        else {
-            print "WARNING! xPL socket ($port_name) had been closed and "
-              . "can not be reopened\n";
-        }
-    }
-
-    # check main listening socket
-    $port_name = 'xpl_listen';
-    if ( !( $::Socket_Ports{$port_name}{socka} ) ) {
-        if (
-            &xPL::open_port(
-                $::Socket_Ports{$port_name}{port},
-                'listen', $port_name, 0, 1
-            )
-          )
-        {
-            print "Notice. xPL socket ($port_name) had been closed and "
-              . "has been reopened\n";
-        }
-        else {
-            print "WARNING! xPL socket ($port_name) had been closed and "
-              . "can not be reopened\n";
-        }
-    }
-
-    # check the hub listening socket if hub mode is enabled
-    if ( !( $::config_parms{xpl_nohub} ) and defined($xpl_hub_listen) ) {
-        $port_name = 'xpl_hub_listen';
-        if ( !( $::Socket_Ports{$port_name}{socka} ) ) {
-            if (
-                &xPL::open_port(
-                    $::Socket_Ports{$port_name}{port},
-                    'listen', $port_name, 0, 1
-                )
-              )
-            {
-                print "Notice. xPL socket ($port_name) had been closed and "
-                  . "has been reopened\n";
-            }
-            else {
-                print "WARNING! xPL socket ($port_name) had been closed and "
-                  . "can not be reopened\n";
-            }
-        }
-
-    # no need to check each hub "responder" socket as it is automatically
-    # reopened on receipt of client's heartbeat
-    }
-}
-
-package xPL_Item;
-
-=head1 NAME
-
-xPL_Item - Misterhouse base xPL Item
-
-=head1 SYNOPSIS
-
-   IMPORTANT: Mark uses of following methods if for init purposes w/ # noloop.  Sample use follows:
-
-   $mySqueezebox = new xPL_Item('slimdev-slimserv.squeezebox');
-   $mySqueezebox->manage_heartbeat_timeout(360, "speak 'Squeezebox is not reporting'",1); # noloop
-
-=head1 DESCRIPTION
-=begin comment
-
-
-   If # noloop is not used on manage_heartbeat_timeout, you will see many attempts to start the timer
-
-   state_now(): returns all current section data using the following form (unless otherwise
-	set via state monitor):
-	<section_name1> : <key1> = <value1> | <section_name_n> : <key_n> = <value_n>
-
-   state_now(section_name): returns undef if not defined; otherwise, returns current data for
-	section name using the following form (unless otherwise set via state_monitor):
-	<key1> = <value1> | <key_n> = <value_n>
-
-   current_section_names: returns the list of current section names delimitted by the pipe character
-
-   tie_value_convertor(keyname, expr): ties the code reference in expr to keyname.  The returned
-      value from expr is substituted into the key value. The reference in expr may use the variables
-      $section and $value for processing (where $section is the section name and $value is the
-      original value.
-
-      e.g., $xpl_obj->tie_value_convertor('temp','$main::convert_c_to_f_degrees($value');
-      note: the reference to '$main::' allows access to the user code sub - convert_c_to_f_degrees
-
-   class_name(class_name): Sets/Gets the classname.  Classname is actually the <classname>.<typename>
-      for xPL.  It is also often referred to as the schema name.  Used to filter
-      inbound messages.  Except for generic "monitors", this shoudl be set.
-
-   source(source): Sets/Gets the source (name).  This is normally <vendor_id>.<device_id>.<instance_id>.
-      It is used to filter inbound messages. Except for generic "monitors", this should be set.
-
-   target_address(target_address): Sets/Gets the target (name).  Syntax is similar to source.  Used to direct (target)
-      the message to a specific device.  Use "*" (default) for broadcast messages.
-
-   manage_heartbeat_timeout(timeout, action, repeat).  Sets the timeout interval (in secs) and action to be performed
-      on expiration of a timer w/ no corresponding heart-beat messages.  Used to enable warnings/notices
-      of absent heart-beats. See comments on using # noloop above.  Timeout should be set to a value
-      greater than the actual device heartbeat interval. Action/timer is not repeated unless
-      repeat is -1 (probably the only thing that makes sense for a heartbeat check).
-
-   dead_action(action).  Sets/gets the action to be applied on receipt of a "dead" heartbeat (the app
-      indicates that it is stopping/dying). Not all devices supply a "dead" heartbeat message;
-      therefore, use manage_heartbeat_timeout as the primary safeguard.
-
-   app_status().  Gets the app status. Initially, set to "unknown" until receipt of first "alive"
-      heartbeat (then, set to "alive"). Set to "dead" on first dead heart-beat.
-
-   send_cmnd(data).  Sends xPL message to target device using data hash.
-
-   device_monitor(deviceinfo): constrains state updates to only messages w/ a devicekey=devicevalue
-       pair. A common example is where deviceinfo is set to 'someid'.  In this case, state updates
-       are constrained to occur only when a message constains "device=someid".  deviceinfo can also
-       take the literal 'somekey = someid' for messages that use a key other than the literal: 'device'.
-
-
-=cut
-
-@xPL_Item::ISA = ('Generic_Item');
-
-=item $h = xPL_Item->new('tag', 'attrname' => 'value',...)
-
-The object constructor.  Takes a tag name as argument. Optionally,
-allows you to specify initial attributes at object creation time.
-
-=cut
-
-# Support both send and receive objects
-sub new {
-    my ( $object_class, $xpl_source, @data, $xpl_class ) = @_;
-    my $self = {};
-    bless $self, $object_class;
-
-    $xpl_source = '*' if !$xpl_source or $xpl_source eq '*';
-
-    $$self{state}          = '';
-    $$self{address}        = $xpl_source;           # left in place for legacy
-    $$self{address}        = '*' if !$xpl_source;
-    $$self{target_address} = '*';
-    $$self{class}                = $xpl_class unless !$xpl_class;
-    $$self{m_timeoutHeartBeat}   = 0;
-    $$self{m_appStatus}          = 'unknown';
-    $$self{m_timerHeartBeat}     = new Timer();
-    $$self{m_state_now_msg_type} = 'unknown';
-    $$self{m_allow_empty_state}  = 0;
-
-    &xPL_Item::store_data( $self, @data );
-
-    $self->state_overload('off')
-      ;    # By default, do not process ~;: strings as substate/multistate
-
-    return $self;
-}
-
-sub source {
-    my ( $self, $p_strSource ) = @_;
-    $$self{address} = $p_strSource if defined $p_strSource;
-    return $$self{address};
-}
-
-sub class_name {
-
-    my ( $self, $p_strClassName ) = @_;
-    $$self{class} = $p_strClassName if defined $p_strClassName;
-    return $$self{class};
-}
-
-sub target_address {
-    my ( $self, $p_strTarget ) = @_;
-    $$self{target_address} = $p_strTarget if defined $p_strTarget;
-    return $$self{target_address};
-}
-
-sub received {
-    my ( $self, $received ) = @_;
-    $$self{received} = $received if defined $received;
-    return $$self{received};
-}
-
-sub device_name {
-    my ( $self, $p_strDeviceName ) = @_;
-    $$self{m_device_name} = $p_strDeviceName if $p_strDeviceName;
-    return $$self{m_device_name};
-}
-
-sub on_set_message {
-    my ( $self, @data ) = @_;
-    while (@data) {
-        my $section = shift @data;
-        my $ptr     = shift @data;
-        my %parms   = %$ptr;
-        for my $key ( sort keys %parms ) {
-            my $value = $parms{$key};
-            $$self{_on_set_message}{$section}{$key} = $value;
-        }
-    }
-    return $$self{_on_set_message};
-}
-
-sub allow_empty_state {
-    my ( $self, $p_allowEmptyState ) = @_;
-    $$self{m_allow_empty_state} = $p_allowEmptyState
-      if defined($p_allowEmptyState);
-    return $$self{m_allow_empty_state};
-}
-
-sub manage_heartbeat_timeout {
-    my ( $self, $p_timeoutHeartBeat, $p_actionHeartBeat, $p_repeatAction ) = @_;
-    if ( defined($p_timeoutHeartBeat) and defined($p_actionHeartBeat) ) {
-        my $m_repeatAction = 0;
-        $m_repeatAction = $p_repeatAction if $p_repeatAction;
-        $$self{m_actionHeartBeat}  = $p_actionHeartBeat;
-        $$self{m_timeoutHeartBeat} = $p_timeoutHeartBeat;
-        $$self{m_timerHeartBeat}->set(
-            $$self{m_timeoutHeartBeat},
-            $$self{m_actionHeartBeat},
-            $m_repeatAction
-        );
-        $$self{m_timerHeartBeat}->start();
-    }
-}
-
-sub dead_action {
-    my ( $self, $p_actionDeadApp ) = @_;
-    if ( defined $p_actionDeadApp ) {
-        $$self{m_actionDeadApp} = $p_actionDeadApp;
-    }
-    return $$self{m_actionDeadApp};
-}
-
-sub _handle_dead_app {
-    my ($self) = @_;
-    $$self{m_appStatus} = 'dead';
-    return $$self{m_actionDeadApp}->() if defined( $$self{m_actionDeadApp} );
-}
-
-sub _handle_alive_app {
-    my ($self) = @_;
-    $$self{m_appStatus} = 'alive';
-    if ( $$self{m_timeoutHeartBeat} != 0 ) {
-        $$self{m_timerHeartBeat}->restart()
-          unless $$self{m_timerHeartBeat}->inactive();
-        return 1;
-    }
-    else {
-        $$self{m_timerHeartBeat}->stop()
-          unless $$self{m_timerHeartBeat}->inactive();
-        return 0;
-    }
-}
-
-sub app_status {
-    my ($self) = @_;
-    return $$self{m_appStatus};
-}
-
-sub store_data {
-    my ( $self, @data ) = @_;
-    while (@data) {
-        my $section = shift @data;
-        $$self{class} = $section;
-        $$self{sections}{$section} = 'send';
-        my $ptr   = shift @data;
-        my %parms = %$ptr;
-        for my $key ( sort keys %parms ) {
-            my $value = $parms{$key};
-            $$self{$section}{$key} = $value;
-            $$self{state_monitor} = "$section : $key" if $value eq '$state';
-        }
-    }
-}
-
-sub state_now {
-    my ( $self, $section_name ) = @_;
-    my $state_now = $self->SUPER::state_now();
-    if ($section_name) {
-
-        # default section_state_now to undef unless it actually exists
-        my $section_state_now = undef;
-        for my $section ( split( /\s+\|\s+/, $state_now ) ) {
-            my @section_data = split( /\s+:\s+/, $section );
-            my $section_ref = $section_data[0];
-            next if $section_ref eq '';
-            if ( $section_ref eq $section_name ) {
-                if ( defined($section_state_now) ) {
-                    $section_state_now .= " | $section_data[1]";
-                }
-                else {
-                    $section_state_now = $section_data[1];
-                }
-            }
-        }
-        print "db xPL_Item:state_now: section data for $section_name is: "
-          . "$section_state_now\n"
-          if $main::Debug{xpl} and $section_state_now;
-        $state_now = $section_state_now;
-    }
-    return $state_now;
-}
-
-sub current_section_names {
-    my ($self)                = @_;
-    my $changed               = $$self{changed};
-    my $current_section_names = undef;
-    if ($changed) {
-        for my $section ( split( /\s+\|\s+/, $changed ) ) {
-            my @section_data = split( /\s+:\s+/, $section );
-            if ( defined($current_section_names) ) {
-                $current_section_names .= " | $section_data[0]";
-            }
-            else {
-                $current_section_names = $section_data[0];
-            }
-        }
-
-    }
-    print "db xPL_Item:current_section_names : $current_section_names\n"
-      if $main::Debug{xpl};
-    return $current_section_names;
-}
-
-sub tie_value_convertor {
-    my ( $self, $key_name, $convertor ) = @_;
-    $$self{_value_convertors}{$key_name} = $convertor
-      if ( defined($key_name) && defined($convertor) );
-
-}
-
-sub device_monitor {
-    my ( $self, $monitor_info ) = @_;
-    if ($monitor_info) {
-	my ($key,$value) = $monitor_info =~ /(\S+)\s*[:=]\s*(.+)/;
-        if ( !( $value or $value =~ /^0/ ) ) {
-            $value = ($key) ? $key : $monitor_info;
-            $key = 'device';
-        }
-        $$self{_device_id}     = lc $value;
-        $$self{_device_id_key} = lc $key;
-    }
-    if ( defined $$self{_device_id} ) {
-        return (
-            ( $$self{_device_id_key} ) ? $$self{_device_id_key} : 'device' )
-          . $$self{_device_id};
-    }
-    else {
-        return;
-    }
-}
-
-sub default_setstate {
-    my ( $self, $state, $substate, $set_by ) = @_;
-    # Send data, unless we are processing incoming data
-    return if !(ref $set_by) and $set_by =~ /^xpl/i;
-    my @parms;
-
-    if ( $$self{_on_set_message} ) {
-        for my $class_name ( sort keys %{ $$self{_on_set_message} } ) {
-            my $block;
-            for my $msg_key (
-                sort keys %{ $$self{_on_set_message}{$class_name} } )
-            {
-                my $field_value =
-                  eval( $$self{_on_set_message}{$class_name}{$msg_key} );
-                $block->{$msg_key} = $field_value;
-            }
-            push @parms, $class_name, $block;
-        }
-    }
-    else {
-        if ( $$self{state_monitor} ) {
-            foreach my $state_monitor ( split( /\|/, $$self{state_monitor} ) ) {
-                my ( $section, $key ) =
-                  $$self{state_monitor} =~ /(\S+)\s*[:=]\s*(\S+)/;
-                $$self{$section}{$key} = $state;
-            }
-        }
-        for my $section ( sort keys %{ $$self{sections} } ) {
-            next
-              unless $$self{sections}{$section} eq
-                  'send';    # Do not echo received data
-            push @parms, $section, $$self{$section};
-        }
-    }
-
-    if (@parms) {
-
-        # sending stat info about ourselves?
-        if ( lc $$self{source} eq &xPL::get_xpl_mh_source_info() ) {
-            $self->send_trig(@parms);
-        }
-        else {
-
-            # must be cmnd info to another device addressed by address
-            $self->send_cmnd(@parms);
-        }
-    }
-}
-
-sub state_now_msg_type {
-    my ( $self, $p_msgType ) = @_;
-    $$self{m_state_now_msg_type} = $p_msgType if defined($p_msgType);
-    return $$self{m_state_now_msg_type};
-}
-
-# DO NOT use the following sub
-# Instead, DO use either send_cmnd, send_trig or send_stat
-sub send_message {
-    my ( $self, $p_strTarget, @p_data ) = @_;
-    $self->send_cmnd(@p_data);
-}
-
-sub send_cmnd {
-    my ( $self, @p_data ) = @_;
-    if ( defined $$self{_device_id} ) {
-        my $classname = shift @p_data;
-        my $ptr       = shift @p_data;
-        my @new_data  = ();
-        $ptr->{ $$self{_device_id_key} } = $$self{_device_id};
-        push @new_data, $classname, $ptr;
-        &xPL::sendXpl( $self->source, 'cmnd', @new_data );
-    }
-    else {
-        &xPL::sendXpl( $self->source, 'cmnd', @p_data );
-    }
-}
-
-sub send_stat {
-    my ( $self, @p_data ) = @_;
-    if ( defined $$self{_device_id} ) {
-        my $classname = shift @p_data;
-        my $ptr       = shift @p_data;
-        my @new_data  = ();
-        $ptr->{ $$self{_device_id_key} } = $$self{_device_id};
-        push @new_data, $classname, $ptr;
-        &xPL::sendXpl( '*', 'stat', @new_data );
-    }
-    else {
-        &xPL::sendXpl( '*', 'stat', @p_data );
-    }
-}
-
-sub send_trig {
-    my ( $self, @p_data ) = @_;
-    if ( defined $$self{_device_id} ) {
-        my $classname = shift @p_data;
-        my $ptr       = shift @p_data;
-        my @new_data  = ();
-        $ptr->{ $$self{_device_id_key} } = $$self{_device_id};
-        push @new_data, $classname, $ptr;
-        &xPL::sendXpl( '*', 'trig', @new_data );
-    }
-    else {
-        &xPL::sendXpl( '*', 'trig', @p_data );
-    }
-}
-
-sub ignore_message {
-    my ( $self, $p_data ) = @_;
-    my $ignore_message = 0;
-    if ( $$self{_device_id_key} and $self->class_name ) {
-        print
-"Device monitoring enabled: key=$$self{_device_id_key}, id=$$self{_device_id}, tested value="
-          . $$p_data{ $self->class_name }{ $$self{_device_id_key} } . "\n"
-          if $main::Debug{xpl};
-        $ignore_message =
-          ( $$self{_device_id} ne
-              lc $$p_data{ $self->class_name }{ $$self{_device_id_key} } )
-          ? 1
-          : 0;
-    }
-    return $ignore_message;
-}
-
-package xPL_Sensor;
-
-@xPL_Sensor::ISA = ('xPL_Item');
-
-sub new {
-    my ( $class, $p_source, $p_type, $p_statekey ) = @_;
-    my ( $source, $deviceid ) = $p_source =~ /(\S+)?:([\S ]+)/;
-    $source = $p_source unless $source;
-    my $self = $class->SUPER::new($source);
-    if ($p_type)
-    {
-       $$self{sensor_type} = $p_type;
-       if ($p_type eq 'output') # define a default message to be sent out on a call to the "set" method
-       {
-         # the following can always be overwritten
-          $self->on_set_message('control.basic' => { 'z##current' => '$state' });
-       }
-    }
-    else
-    {
-       $$self{sensor_type} = 'input'; # set a default
-    }
-    my $statekey = 'current';
-    $statekey = $p_statekey if $p_statekey;
-    $self->SUPER::class_name('sensor.basic');
-    $$self{state_monitor} = "sensor.basic : $statekey";
-    $self->SUPER::device_monitor("device=$deviceid") if defined $deviceid;
-    return $self;
-}
-
-sub type {
-    my ( $self, $p_type ) = @_;
-    $$self{sensor_type} = $p_type if $p_type;
-    return $$self{sensor_type};
-}
-
-sub current {
-    my ($self) = @_;
-    return $$self{'sensor.basic'}{current};
-}
-
-sub units {
-    my ($self) = @_;
-    return $$self{'sensor.basic'}{units};
-}
-
-sub lowest {
-    my ($self) = @_;
-    return $$self{'sensor.basic'}{lowest};
-}
-
-sub highest {
-    my ($self) = @_;
-    return $$self{'sensor.basic'}{highest};
-}
-
-sub ignore_message {
-    my ( $self, $p_data ) = @_;
-    return 1
-      if $self->SUPER::ignore_message($p_data)
-    ;    # user xPL_Item's filter against deviceid
-    return ( $$p_data{'sensor.basic'}{type} ne $$self{sensor_type} ) ? 1 : 0;
-}
-
-sub request_stat {
-    my ($self) = @_;
-    $self->SUPER::send_cmnd( 'sensor.request' =>
-          { 'request' => 'current', 'type' => "'$$self{sensor_type}'" } );
-}
-
-package xPL_UPS;
-
-@xPL_UPS::ISA = ('xPL_Item');
-
-sub new {
-    my ( $class, $p_source, $p_statekey ) = @_;
-    my ( $source, $deviceid ) = $p_source =~ /(\S+):(\S+)/;
-    $source = $p_source unless $source;
-    my $self     = $class->SUPER::new($source);
-    my $statekey = $p_statekey;
-    $statekey = 'status';
-
-    #    $self->SUPER::class_name('ups.basic');
-    $$self{state_monitor} = "ups.basic : $statekey|hbeat.app : $statekey";
-    $self->SUPER::device_monitor("device=$deviceid") if defined $deviceid;
-    return $self;
-}
-
-sub status {
-    my ( $self, $p_status ) = @_;
-    return ( $$self{'ups.basic'}{status} )
-      ? $$self{'ups.basic'}{status}
-      : $$self{'hbeat.app'}{status};
-}
-
-sub event {
-    my ($self) = @_;
-    return $$self{'ups.basic'}{event};
-}
-
-sub ignore_message {
-    my ( $self, $p_data ) = @_;
-    return 1
-      if $self->SUPER::ignore_message($p_data)
-    ;    # user xPL_Item's filter against deviceid
-    return ( $$p_data{'ups.basic'} or $$p_data{'hbeat.app'} ) ? 0 : 1;
-}
-
-package xPL_X10Security;
-
-@xPL_X10Security::ISA = ('xPL_Item');
-
-sub new {
-    my ( $class, $p_source, $p_type, $p_statekey ) = @_;
-    my ( $source, $deviceid ) = $p_source =~ /(\S+):(\S+)/;
-    $source = $p_source unless $source;
-    my $self = $class->SUPER::new($source);
-    $$self{type} = $p_type if $p_type;
-    my $statekey = $p_statekey;
-    $statekey = 'command';
-    $self->SUPER::class_name('x10.security');
-    $$self{state_monitor} = "x10.security : $statekey";
-    $self->SUPER::device_monitor("device=$deviceid") if defined $deviceid;
-    return $self;
-}
-
-sub type {
-    my ( $self, $p_type ) = @_;
-    $$self{type} = $p_type if $p_type;
-    return $$self{type};
-}
-
-sub command {
-    my ($self) = @_;
-    return $$self{'x10.security'}{command};
-}
-
-sub tamper {
-    my ($self) = @_;
-    return $$self{'x10.security'}{tamper};
-}
-
-sub low_battery {
-    my ($self) = @_;
-    return $$self{'x10.security'}{'low-battery'};
-}
-
-sub delay {
-    my ($self) = @_;
-    return $$self{'x10.security'}{delay};
-}
-
-sub ignore_message {
-    my ( $self, $p_data ) = @_;
-    return 1
-      if $self->SUPER::ignore_message($p_data)
-    ;    # user xPL_Item's filter against deviceid
-    if ( $$self{type} ) {
-        return ( $$p_data{'x10.security'}{type} ne $$self{type} ) ? 1 : 0;
-    }
-    else {
-        return 0;
-    }
-}
-
-package xPL_Rio;
-
-@xPL_Rio::ISA = ('xPL_Item');
-
-# Support both send and receive objects
-sub new {
-    my ( $object_class, $xpl_source, $xpl_target ) = @_;
-    my $self = {};
-    bless $self, $object_class;
-
-    $$self{state}          = '';
-    $$self{source}         = $xpl_source;
-    $$self{target_address} = $xpl_target unless !$xpl_target;
-
-    &xPL_Item::store_data( $self, 'rio.basic' => { sel => '$state' } );
-
-    @{ $$self{states} } = (
-        'play',
-        'stop',
-        'mute',
-        'volume +20',
-        'volume -20',
-        'volume 100',
-        'skip',
-        'back',
-        'random',
-        'power on',
-        'power off',
-        'light on',
-        'light off'
-    );
-
-    return $self;
-
-}
-
-1;
+
+=begin comment
+
+xPL_Items.pm - Misterhouse interface for the xPL protocol
+
+Info:
+
+ xPL websites:
+    http://www.xplproject.org.uk
+    http://www.xaphal.com
+
+Authors:
+ 10/26/2002  Created by Bruce Winter bruce@misterhouse.net
+
+
+xPL works by using the xPL Hub built in misterhouse and listening for
+xPL connections. See:
+http://misterhouse.wikispaces.com/xAP+and+xPL+-+Getting+Started
+
+Relevant variables for mh.private.ini are:
+#ipaddress_xpl_broadcast = 192.168.205.255
+#ipaddress_xpl = 192.168.205.3
+#xpl_disable = 1
+#xpl_nohub = 1
+#xpl_enable_items = 1
+
+You can disable the mh internal xPL hub if you are running a more capable one.
+To get data input, you can use something like
+
+xpl-rfxcom-rx --verbose --rfxcom-rx-verbose --rfxcom-rx-tty /dev/rfxcom --interface eth1
+
+from xPL-Perl. Then watch for sensor updates passing by and paste their info
+in your device table, like so:
+XPL_SENSOR, bnz-rfxcomrx.gargamel:bthr918n.e6, oregon_intemp, XPL_temp, temp
+
+Another option to figure out the name to use in XPL_SENSOR is to use
+xpl-logger -head -body -i ethx 2>&1 | grep "xpl-trig\/"
+(or without the grep for more details on which field is called what).
+
+A few samples:
+XPL_SENSOR, iranger-rfx.*:WGR918, oregon_winddir, , direction
+XPL_SENSOR, iranger-rfx.*:BHTR968, oregon_intemp, , temp
+XPL_SENSOR, bnz-owfs.*:10.2223EF010800, owfs_temp, , temp
+XPL_SENSOR, bnz-owfs.*:26.2E4DF5000000, owfs_humidity, , humidity
+XPL_SENSOR, bnz-owfs.*:26.2E4DF5000000.1, owfs_humidity1, , humidity
+XPL_X10SECURITY, iranger-rfx.*:F8, x10sec_garage1, , ds10
+
+Note that XPL_SENSOR should just be used for XPL messages of the x10.basic
+type. XPL_X10SECURITY is for x10.security schema, while there is no way to
+currently read x10.basic messages (see this file for more supported schemas).
+
+Once it is running, objects get variables including these:
+'state' => '17.9',
+'states_nosubstate' => 1,
+'states_substate' ?
+'address' => 'bnz-rfxcomrx.gargamel',
+'states_nomultistate' => 1,
+'states_multistate' ?
+'target_address' => '*',
+'_device_id' => 'bthr918n.e6'
+'set_time' => 1285555578,
+'m_timerHeartBeat' => bless( {}, 'Timer' ),
+'m_timeoutHeartBeat' => 0,
+
+
+So, you would write this to print temperature:
+print_log $oregon_intemp->state
+=cut
+
+use strict;
+
+package xPL;
+
+#@xPL::ISA = ('Generic_Item');
+
+my (
+    @xpl_item_names, $started,            %hub_ports,
+    $xpl_listen,     $xpl_hub_listen,     $xpl_send,
+    %xpl_hub_ports,  $xpl_hbeat_interval, $xpl_hbeat_counter
+);
+
+# Create sockets and add hook to check incoming data
+sub startup {
+    return
+      if $started++
+    ;    # Allows us to call with $Reload or with xpl_module mh.ini parm
+
+    # In case you don't want xpl for some reason
+    return if $::config_parms{xpl_disable};
+
+    # determine our local ipaddress(es)
+    @xpl_item_names = ();
+    my ($port);
+
+    # init the hbeat intervals and counters
+    $xpl_hbeat_interval = $::config_parms{xpl_hbeat_interval};
+    $xpl_hbeat_interval = 5 unless $xpl_hbeat_interval;
+    $xpl_hbeat_counter  = $xpl_hbeat_interval;
+
+    if ( !( $::config_parms{xpl_disable} ) ) {
+        undef $port;
+        $port = $::config_parms{xpl_port};
+        $port = 3865 unless $port;
+
+        # open the sending port
+        &open_port( $port, 'send', 'xpl_send', 0, 1 );
+        $xpl_send = new Socket_Item( undef, undef, 'xpl_send' );
+
+        # Find and use the first open port
+        my $port_listen;
+	for my $p (49352 .. 65535) {
+	    $port_listen = $p;
+	    last if &open_port( $port_listen, 'listen', 'xpl_listen', 1, 1);
+	}
+	# The socket code will select a free local port if given 0
+	# not working on ubuntu 12.04
+        #&open_port( 0, 'listen', 'xpl_listen', 1, 1 );
+        #$port_listen = $::Socket_Ports{'xpl_listen'}{port};
+        $xpl_listen = new Socket_Item( undef, undef, 'xpl_listen' );
+
+        # initialize the hub (listen) port
+        if ( $::config_parms{xpl_nohub} ) {
+            $xpl_hub_listen = undef;
+        }
+        else {
+            if ( &open_port( $port, 'listen', 'xpl_hub_listen', 0, 1 ) ) {
+                $xpl_hub_listen =
+                  new Socket_Item( undef, undef, 'xpl_hub_listen' );
+                print " - mh in xPL Hub mode\n";
+
+                # now set up the hub port that will send to mh
+                $xpl_hub_ports{$port_listen} = &xPL::get_xpl_mh_source_info();
+                my $port_name = "xpl_send_$port_listen";
+                &open_port( $port_listen, 'send', $port_name, 1, 1 );
+            }
+            else {
+                print " - mh automatically switching out of xPL Hub mode.  " .
+                  "Another application is binding to the hub port ($port)\n";
+		$xpl_hub_listen = undef;
+            }
+        }
+
+        # now that a listen port exists, advertise it w/ the first hbeat msg
+        &xPL::send_xpl_heartbeat() if $xpl_send;
+
+    }
+
+    &::MainLoop_pre_add_hook( \&xPL::check_for_data, 1 );
+
+    # add reload hook so that xpl_item_names list is reset
+    &::Reload_pre_add_hook( \&xPL::reload_hook, 1 );
+}
+
+sub reload_hook {
+    @xpl_item_names = ();
+}
+
+sub main::display_xpl {
+    my (%args) = @_;
+    my $schema = lc ${args}{schema};
+    $schema = 'osd.basic' unless $schema;
+    if ( $schema eq 'osd.basic' ) {
+        &main::display_xpl_osd_basic(%args);
+    }
+    else {
+        &main::print_log(
+            "Display support for the schema, $schema, does not yet exist");
+    }
+}
+
+sub main::display_xpl_osd_basic {
+    my (%args) = @_;
+    my ( $text, $duration, $address );
+    $text = $args{raw_text};
+    $text = $args{text} unless $text;
+    $text =~ s/[\n\r ]+/ /gm;    # strip out new lines and extra space
+    $text =~ s/\n/\\n/gm;        # escape new lines
+    $duration = $args{duration};
+    $duration = $args{display}
+      unless $duration;          # this apparently is the original param?
+    $duration = 10 unless $duration;              # default to 10 sec display
+    $address  = $args{to};
+    $address  = $args{address} unless $address;
+    $address  = '*' unless $address;
+
+    # auto pre-pend text w/ a newline if the target is a squeezebox and
+    # doesn't already have one
+    if ( $address =~ /^slimdev-slimserv/i ) {
+        $text = "\\n$text" unless $text =~ /\\n\S+/i;
+    }
+    &xPL::send( 'xPL', $address,
+        'osd.basic' => { command => 'write', delay => $duration, text => $text }
+    );
+}
+
+sub open_port {
+    my ( $port, $send_listen, $port_name, $local, $verbose ) = @_;
+
+    # Need to re-open the port, if client app has been re-started??
+    close $::Socket_Ports{$port_name}{sock}
+      if $::Socket_Ports{$port_name}{sock};
+
+    my $sock;
+    if ( $send_listen eq 'send' ) {
+        my $dest_address;
+        if ($local) {
+            if ($main::OS_win || $::Info{'OS_name'} eq 'cygwin') {
+                $dest_address = $::Info{IPAddress_local} unless $dest_address;
+            }
+            else {
+                $dest_address = '0.0.0.0';
+            }
+        }
+        else {
+            $dest_address = $::config_parms{'ipaddress_xpl_broadcast'};
+            $dest_address = '255.255.255.255' unless $dest_address;
+        }
+        $sock = new IO::Socket::INET->new(
+            PeerPort  => $port,
+            Proto     => 'udp',
+            PeerAddr  => $dest_address,
+            Broadcast => 1
+        );
+
+        print "db xPL_Items open_port: pn=$port_name l=$local PeerPort=$port " .
+          "PeerAddr=$dest_address" if $main::Debug{xpl};
+    }
+    else {
+        my $listen_address;
+        if ( !($local) ) {
+            $listen_address = $::config_parms{'ipaddress_xpl'};
+            $listen_address = $::config_parms{'xpl_address'}
+              unless $listen_address;
+        }
+        if ($main::OS_win || $::Info{'OS_name'} eq 'cygwin') {
+            $listen_address = $::Info{IPAddress_local} unless $listen_address;
+        }
+        else {
+            # can't get *nix to bind to a specific address; defaults to
+            # kernel assigned default IP
+            $listen_address = '0.0.0.0';
+        }
+        $sock = new IO::Socket::INET->new(
+            LocalPort => $port,
+            Proto     => 'udp',
+            LocalAddr => $listen_address,
+            Broadcast => 1
+        );
+        $port = $sock->sockport() if ($port == 0);
+		
+        print "db xPL_Items open_port: pn=$port_name l=$local LocalPort=$port " .
+          "LocalAddr=$listen_address" if $main::Debug{xpl};
+    }
+    unless ($sock) {
+        print " -- FAILED\n" if $main::Debug{xpl};
+        print "\nError:  Could not start a udp xPL send server on $port: $@\n\n"
+          if $send_listen eq 'send';
+        return 0;
+    }
+    print "\n" if $main::Debug{xpl};
+
+    printf " - creating %-15s on %3s %5s %s\n", $port_name, 'udp', $port,
+      $send_listen
+      if $verbose;
+
+    $::Socket_Ports{$port_name}{protocol} = 'udp';
+    $::Socket_Ports{$port_name}{datatype} = 'raw';
+    $::Socket_Ports{$port_name}{port}     = $port;
+    $::Socket_Ports{$port_name}{sock}     = $sock;
+    $::Socket_Ports{$port_name}{socka} = $sock; # UDP ports are always "active"
+
+    return $sock;
+}
+
+sub check_for_data {
+
+    if ( $xpl_hub_listen && ( my $xpl_hub_data = said $xpl_hub_listen) ) {
+        &_process_incoming_xpl_hub_data($xpl_hub_data);
+    }
+    if ( $xpl_listen && ( my $xpl_data = said $xpl_listen) ) {
+        &_process_incoming_xpl_data($xpl_data);
+    }
+
+    # check to see if hbeats need to be sent
+    if ( &::new_minute($xpl_hbeat_interval) ) {
+        if ($xpl_send) {
+            if ( $xpl_hbeat_counter == 5 ) {
+                &xPL::send_xpl_heartbeat();
+                $xpl_hbeat_counter = $xpl_hbeat_interval;
+            }
+            else {
+                $xpl_hbeat_counter = $xpl_hbeat_counter - 1;
+            }
+        }
+    }
+}
+
+# Parse incoming xPL records
+sub parse_data {
+    my ($data) = @_;
+    my ( $source, $class, $target, $msg_type, $section, %d );
+    print "db4 xPL data:\n$data\n"
+      if $main::Debug{xpl} and $main::Debug{xpl} == 4;
+    for my $r ( split /[\r\n]/, $data ) {
+        next if $r =~ /^[\{\} ]*$/;
+
+        # Store xpl-header, xpl-heartbeat, and other data
+        if ( my ( $key, $value ) = $r =~ /(.+?)=(.*)/ ) {
+            $key   = lc $key;
+            $value = lc $value
+              if ( $section =~ /^xpl/ );    # Do not lc real data;
+            $source = $value if $section =~ /^xpl/ and $key =~ /^source$/i;
+            $target = $value if $section =~ /^xpl/ and $key =~ /^target$/i;
+            if ( exists( $d{$section}{$key} ) ) {
+                $d{$section}{$key} .= ","
+                  . $value;        # xpl allows "continuation lines"
+            }
+            else {
+                $d{$section}{$key} = $value;
+            }
+            print "db4 xpl parsed c=$section k=$key v=$value\n"
+              if ( $main::Debug{xpl} and $main::Debug{xpl} == 4 );
+        }
+
+        # section (e.g. xpl-header, xpl-heartbeat, source.instance
+        else {
+            $section = lc $r;
+            $msg_type ? $class = $section : $msg_type = $section;
+        }
+    }
+    # define target as '*' if undefined
+    $target = '*' if !($target);
+
+    return(\%d, $source, $class, $target, $msg_type);
+}
+
+sub _process_incoming_xpl_hub_data {
+    my ($data) = @_;
+    my $ip_address = $::config_parms{'ipaddress_xpl'};
+    $ip_address = $::Info{IPAddress_local} unless $ip_address;
+
+    my ($xpl_data, $source, $class, $target, $msg_type) = &parse_data($data);
+
+    return unless $source;
+
+    my ($port);
+
+    # Log hearbeats of other apps; ignore hbeat.basic messages as these
+    # should not be handled by the hub
+    if ( $$xpl_data{'hbeat.app'} ) {
+        # rely on the xPL-message's remote-ip attribute in the hbeat.app
+        # as the basis for performing IP comparisons
+        my $sender_ip_address = $$xpl_data{'hbeat.app'}{'remote-ip'};
+
+        # Open/re-open the port on every hbeat if it posts a listening port.
+        # Skip if it is our own hbeat (port = listen port)
+        if ( ( $sender_ip_address eq $ip_address ) ) {
+            $port = $$xpl_data{'hbeat.app'}{port};
+            if ($port) {
+                $xpl_hub_ports{$port} = $source;
+                my $port_name = "xpl_send_$port";
+                my $msg =
+                  ( $::Socket_Ports{$port_name}{sock} )
+                  ? 'renewing'
+                  : 'registering';
+                print "db xpl $msg port=$port to xPL client $source\n"
+                  if $main::Debug{xpl};
+
+                # xPL apps want local
+                &open_port( $port, 'send', $port_name, 1,
+                    $msg eq 'registering' );
+            }
+        }
+    }
+
+    # As a hub, echo data to other xpl listeners unless it's our transmission
+    for $port ( keys %xpl_hub_ports ) {
+        my $sock = $::Socket_Ports{"xpl_send_$port"}{sock};
+        print "db2 xpl hub: sending xpl data to p=$port destination=" .
+          "$xpl_hub_ports{$port} s=$sock d=\n$data.\n"
+          if $main::Debug{xpl} and $main::Debug{xpl} == 2;
+        print $sock $data if defined($sock);
+    }
+}
+
+sub _process_incoming_xpl_data {
+    my ($data) = @_;
+
+    my ($xpl_data, $source, $class, $target, $msg_type) = &parse_data($data);
+
+    print "db1 xpl check: s=$source c=$class t=$target d=\n$data\n"
+      if $main::Debug{xpl} and $main::Debug{xpl} == 1;
+
+    # the first time that this sub is called, the xpl_item_names array
+    # needs to be filled
+    if ( !(@xpl_item_names) ) {
+        foreach my $object_type (&::list_object_types) {
+            foreach my $object_name ( &::list_objects_by_type($object_type) ) {
+                my $object = &::get_object_by_name("$object_name");
+                if ( $object and $object->isa('xPL_Item') ) {
+                    push @xpl_item_names, $object_name;
+                }
+            }
+        }
+    }
+
+    return unless $source;
+
+    # continue processing unless we are the source (e.g., heart-beat)
+    if ( !( $source eq &xPL::get_xpl_mh_source_info() ) ) {
+        # Set states in matching xPL objects
+        for my $name (@xpl_item_names)
+        {    #(&::list_objects_by_type('xPL_Item')) {
+            my $o = &main::get_object_by_name($name);
+            $o = $name unless $o;    # In case we stored object directly
+            print "db3 xpl test  o=$name s=$source oa=$$o{source}\n"
+              if $main::Debug{xpl} and $main::Debug{xpl} == 3;
+
+            # skip this object unless the source matches if a stat or trig
+            # otherwise, we check the target for a cmnd
+            # NOTE: the object's hash reference for "source" is "address"
+            my $regex_address = &wildcard_2_regex( $$o{address} );
+            if ( $$o{set_state_on_cmnd} and $msg_type eq 'xpl-cmnd' ) {
+                my $regex_target = &wildcard_2_regex($target);
+                next
+                  unless ( $target =~ /^$regex_address$/i )
+                  or ( $$o{address} =~ /^$regex_target$/i );
+            }
+            else {
+                if ( $source =~ /^$regex_address$/i ) {
+
+                    # handle hbeat data
+                    for my $section ( keys %{$xpl_data} ) {
+                        if ( $section =~ /^hbeat./i ) {
+                            if ( lc $section eq 'hbeat.app' ) {
+                                $o->_handle_alive_app();
+                            }
+                            else {
+                                $o->_handle_dead_app();
+                            }
+                        }
+                    }
+                }
+                else {
+                    next;
+                }
+            }
+
+            # skip this object unless the class matches
+            if ( $class && $$o{class} ) {
+                my $regex_class = &wildcard_2_regex( $$o{class} );
+                next unless $class =~ /^$regex_class$/i;
+            }
+
+            # check if device monitoring is enabled
+            if ( !( $class =~ /hbeat./i ) ) {
+                next if $o->ignore_message($xpl_data);
+            }
+
+            # Find and set the state variable
+            my $state_value;
+            $$o{changed} = '';
+            for my $section ( keys %{$xpl_data} ) {
+                $$o{sections}{$section} = 'received'
+                  unless $$o{sections}{$section};
+                for my $key ( keys %{ $$xpl_data{$section} } ) {
+                    my $value = $$xpl_data{$section}{$key};
+
+                    # does a tied value convertor exist for this key and object?
+                    my $value_convertor = $$o{_value_convertors}{$key}
+                      if defined( $$o{_value_convertors} );
+                    if ($value_convertor) {
+                        print
+                          "db xpl: located value convertor: $value_convertor\n"
+                          if $main::Debug{xpl};
+                        my $converted_value = eval $value_convertor;
+                        if ($@) {
+                            print $@;
+                        }
+                        else {
+                            print
+                              "db xpl: converted value is: $converted_value\n"
+                              if $main::Debug{xpl};
+                        }
+                        $value = $converted_value if $converted_value;
+                    }
+                    $$o{$section}{$key} = $value;
+
+                    # Monitor what changed (real data, and include hbeat as
+                    # it may include useful info, e.g., slimserver).
+                    $$o{changed} .= "$section : $key = $value | "
+                      unless $section eq 'xpl-stat'
+                          or $section eq 'xpl-trig'
+                          or $section eq 'xpl-cmnd'
+                          or ( $section eq 'hbeat.app' and $key ne 'status' );
+                    print "db3 xpl state check m=$$o{state_monitor} key=" .
+                      "$section : $key  value=$value\n"
+                      if $main::Debug{xpl};    # and $main::Debug{xpl} == 3;
+                    if ( $$o{state_monitor} ) {
+                        foreach my $state_monitor (
+                            split( /\|/, $$o{state_monitor} ) )
+                        {
+                            if ( $state_monitor =~ /$section\s*[:=]\s*$key/i
+                                and defined $value )
+                            {
+                                print "db3 xpl setting state to $value\n"
+                                  if $main::Debug{xpl}
+                                      and $main::Debug{xpl} == 3;
+                                $state_value = $value;
+                            }
+                        }
+                    }
+                }
+            }
+
+            # assign the "summary" of the message to state_value unless
+            # state_monitor is being used
+            $state_value = $$o{changed} unless $$o{state_monitor};
+            print "db3 xpl set: n=$name to state=$state_value\n\n"
+              if $main::Debug{xpl};    # and $main::Debug{xpl} == 3;
+
+            # Can not use Generic_Item set method, as state_next_pass
+            # only carries state, not all other $section data, to the next pass
+#           $o -> SUPER::set($state_value, 'xPL') if defined $state_value;
+
+            $o->received( $data );
+            if ( defined $state_value and $state_value ne '' ) {
+                my $set_by_name = 'xPL';
+                $set_by_name .= " [$source]";
+                $o->set_now( $state_value, $set_by_name );
+                #$o->SUPER::set_now( $state_value, $set_by_name );
+                $o->state_now_msg_type("$msg_type");
+            }
+        }
+    }
+}
+
+sub get_mh_vendor_info {
+    return 'mhouse';
+}
+
+sub get_mh_device_info {
+    return 'mh';
+}
+
+sub get_xpl_mh_source_info {
+    my $instance = $::config_parms{xpl_title};
+    $instance = $::config_parms{title} unless $instance;
+    $instance =
+      ( $instance =~ /misterhouse(.*)pid/i ) ? 'misterhouse' : $instance;
+    $instance = &xPL::get_ok_name_part($instance);
+    return
+        &get_mh_vendor_info() . '-'
+      . &get_mh_device_info() . '.'
+      . $instance;
+}
+
+sub get_ok_name_part {
+    my ($in_name) = @_;
+    my $out_name = lc $in_name;
+    $out_name =~ tr/ /_/;
+    $out_name =~ s/[^a-z0-9\-_]//g;
+    return $out_name;
+}
+
+sub wildcard_2_regex {
+    my ($expr) = @_;
+    return unless $expr;
+
+    # convert all periods
+    $expr =~ s/\./(\\\.)/g;
+
+    # convert all asterisks
+    $expr =~ s/\*/(\.\*)/g;
+
+    # treat all :> as asterisks
+    $expr =~ s/:>/(\.\*)/g;
+
+    # convert all greater than symbols
+    $expr =~ s/>/(\.\*)/g;
+
+    return $expr;
+}
+
+sub send {
+    my ( $protocol, $class_address, @data ) = @_;
+
+    print "db5 xPL send: ca=$class_address d=@data xpl_send=$xpl_send\n"
+      if ($main::Debug{xpl} and $main::Debug{xpl} == 5);
+
+    my $target = $class_address;
+    &sendXpl( $target, 'cmnd', @data );
+}
+
+sub sendXpl {
+    if ( defined($xpl_send) ) {
+        my ( $target, $msg_type, @data ) = @_;
+        my ( $parms, $msg );
+        $msg = "xpl-$msg_type\n{\nhop=1\nsource="
+          . &xPL::get_xpl_mh_source_info() . "\n";
+        if ( defined($target) ) {
+            $msg .= "target=$target\n";
+        }
+        $msg .= "}\n";
+        while (@data) {
+            my $section = shift @data;
+            $msg .= "$section\n{\n";
+            my $ptr = shift @data;
+            if ($ptr) {
+                my %parms = %$ptr;
+                for my $key ( sort keys %parms ) {
+
+                    # order is important for many xPL clients
+                    # allow a sort key delimitted by ## to drive the order
+                    my ( $subkey1, $subkey2 ) = $key =~ /^(\S+)##(.*)/;
+                    if ( defined $subkey1 and defined $subkey2 ) {
+                        $msg .= "$subkey2=$parms{$key}\n";
+                    }
+                    else {
+                        $msg .= "$key=$parms{$key}\n";
+                    }
+                }
+            }
+            $msg .= "}\n";
+        }
+        print "db5 xpl msg: $msg"
+          if $main::Debug{xpl};    # and $main::Debug{xpl} == 5;
+        if ($xpl_send) {
+
+            # check to see if the socket is still valid
+            if ( !( $::Socket_Ports{'xpl_send'}{socka} ) ) {
+                &xPL::_handleStaleXplSockets();
+            }
+            $xpl_send->set($msg) if $::Socket_Ports{'xpl_send'}{socka};
+        }
+    }
+    else {
+        print "WARNING! xPL is disabled and you are trying to send xPL " .
+          "data!! (xPL::sendXpl())\n";
+    }
+}
+
+sub send_xpl_heartbeat {
+    my ($protocol) = @_;
+    my $port       = $::Socket_Ports{xpl_listen}{port};
+    my $ip_address = $::config_parms{'xpl_address'};
+    $ip_address = $::config_parms{'ipaddress_xpl'} unless $ip_address;
+    $ip_address = $::Info{IPAddress_local}
+      unless $ip_address and $ip_address ne '0.0.0.0';
+
+    my $msg;
+    if ($xpl_send) {
+        $msg = "xpl-stat\n{\nhop=1\nsource=" . &xPL::get_xpl_mh_source_info()
+          . "\ntarget=*\n}\nhbeat.app\n{\ninterval=$xpl_hbeat_interval\nport="
+          . "$port\nremote-ip=$ip_address\n}\n";
+
+        # check to see if all of the sockets are still valid
+        &xPL::_handleStaleXplSockets();
+        if ($::Socket_Ports{'xpl_send'}{socka}) {
+            $xpl_send->set($msg);
+            print "db6 xPL heartbeat: $msg.\n"
+              if $main::Debug{xpl} and $main::Debug{xpl} == 6;
+        } else {
+            print "Error in xPL_Item::send_heartbeat.  send socket not active\n";
+        }
+    }
+    else {
+        print "Error in xPL_Item::send_heartbeat.  "
+          . "xPL send socket not available.\n"
+          . "Either disable xPL (xpl_disable = 1) or resolve "
+          . "system network problem (UDP port 3865).\n";
+    }
+}
+
+sub _handleStaleXplSockets {
+
+    # check main sending socket
+    my $port_name = 'xpl_send';
+    if ( !( $::Socket_Ports{$port_name}{socka} ) ) {
+        if (
+            &xPL::open_port(
+                $::Socket_Ports{$port_name}{port},
+                'send', $port_name, 0, 1
+            )
+          )
+        {
+            print "Notice. xPL socket ($port_name) had been closed and "
+              . "has been reopened\n";
+        }
+        else {
+            print "WARNING! xPL socket ($port_name) had been closed and "
+              . "can not be reopened\n";
+        }
+    }
+
+    # check main listening socket
+    $port_name = 'xpl_listen';
+    if ( !( $::Socket_Ports{$port_name}{socka} ) ) {
+        if (
+            &xPL::open_port(
+                $::Socket_Ports{$port_name}{port},
+                'listen', $port_name, 0, 1
+            )
+          )
+        {
+            print "Notice. xPL socket ($port_name) had been closed and "
+              . "has been reopened\n";
+        }
+        else {
+            print "WARNING! xPL socket ($port_name) had been closed and "
+              . "can not be reopened\n";
+        }
+    }
+
+    # check the hub listening socket if hub mode is enabled
+    if ( !( $::config_parms{xpl_nohub} ) and defined($xpl_hub_listen) ) {
+        $port_name = 'xpl_hub_listen';
+        if ( !( $::Socket_Ports{$port_name}{socka} ) ) {
+            if (
+                &xPL::open_port(
+                    $::Socket_Ports{$port_name}{port},
+                    'listen', $port_name, 0, 1
+                )
+              )
+            {
+                print "Notice. xPL socket ($port_name) had been closed and "
+                  . "has been reopened\n";
+            }
+            else {
+                print "WARNING! xPL socket ($port_name) had been closed and "
+                  . "can not be reopened\n";
+            }
+        }
+
+    # no need to check each hub "responder" socket as it is automatically
+    # reopened on receipt of client's heartbeat
+    }
+}
+
+package xPL_Item;
+
+=head1 NAME
+
+xPL_Item - Misterhouse base xPL Item
+
+=head1 SYNOPSIS
+
+   IMPORTANT: Mark uses of following methods if for init purposes w/ # noloop.  Sample use follows:
+
+   $mySqueezebox = new xPL_Item('slimdev-slimserv.squeezebox');
+   $mySqueezebox->manage_heartbeat_timeout(360, "speak 'Squeezebox is not reporting'",1); # noloop
+
+=head1 DESCRIPTION
+=begin comment
+
+
+   If # noloop is not used on manage_heartbeat_timeout, you will see many attempts to start the timer
+
+   state_now(): returns all current section data using the following form (unless otherwise
+	set via state monitor):
+	<section_name1> : <key1> = <value1> | <section_name_n> : <key_n> = <value_n>
+
+   state_now(section_name): returns undef if not defined; otherwise, returns current data for
+	section name using the following form (unless otherwise set via state_monitor):
+	<key1> = <value1> | <key_n> = <value_n>
+
+   current_section_names: returns the list of current section names delimitted by the pipe character
+
+   tie_value_convertor(keyname, expr): ties the code reference in expr to keyname.  The returned
+      value from expr is substituted into the key value. The reference in expr may use the variables
+      $section and $value for processing (where $section is the section name and $value is the
+      original value.
+
+      e.g., $xpl_obj->tie_value_convertor('temp','$main::convert_c_to_f_degrees($value');
+      note: the reference to '$main::' allows access to the user code sub - convert_c_to_f_degrees
+
+   class_name(class_name): Sets/Gets the classname.  Classname is actually the <classname>.<typename>
+      for xPL.  It is also often referred to as the schema name.  Used to filter
+      inbound messages.  Except for generic "monitors", this shoudl be set.
+
+   source(source): Sets/Gets the source (name).  This is normally <vendor_id>.<device_id>.<instance_id>.
+      It is used to filter inbound messages. Except for generic "monitors", this should be set.
+
+   target_address(target_address): Sets/Gets the target (name).  Syntax is similar to source.  Used to direct (target)
+      the message to a specific device.  Use "*" (default) for broadcast messages.
+
+   manage_heartbeat_timeout(timeout, action, repeat).  Sets the timeout interval (in secs) and action to be performed
+      on expiration of a timer w/ no corresponding heart-beat messages.  Used to enable warnings/notices
+      of absent heart-beats. See comments on using # noloop above.  Timeout should be set to a value
+      greater than the actual device heartbeat interval. Action/timer is not repeated unless
+      repeat is -1 (probably the only thing that makes sense for a heartbeat check).
+
+   dead_action(action).  Sets/gets the action to be applied on receipt of a "dead" heartbeat (the app
+      indicates that it is stopping/dying). Not all devices supply a "dead" heartbeat message;
+      therefore, use manage_heartbeat_timeout as the primary safeguard.
+
+   app_status().  Gets the app status. Initially, set to "unknown" until receipt of first "alive"
+      heartbeat (then, set to "alive"). Set to "dead" on first dead heart-beat.
+
+   send_cmnd(data).  Sends xPL message to target device using data hash.
+
+   device_monitor(deviceinfo): constrains state updates to only messages w/ a devicekey=devicevalue
+       pair. A common example is where deviceinfo is set to 'someid'.  In this case, state updates
+       are constrained to occur only when a message constains "device=someid".  deviceinfo can also
+       take the literal 'somekey = someid' for messages that use a key other than the literal: 'device'.
+
+
+=cut
+
+@xPL_Item::ISA = ('Generic_Item');
+
+=item $h = xPL_Item->new('tag', 'attrname' => 'value',...)
+
+The object constructor.  Takes a tag name as argument. Optionally,
+allows you to specify initial attributes at object creation time.
+
+=cut
+
+# Support both send and receive objects
+sub new {
+    my ( $object_class, $xpl_source, @data, $xpl_class ) = @_;
+    my $self = {};
+    bless $self, $object_class;
+
+    $xpl_source = '*' if !$xpl_source or $xpl_source eq '*';
+
+    $$self{state}          = '';
+    $$self{address}        = $xpl_source;           # left in place for legacy
+    $$self{address}        = '*' if !$xpl_source;
+    $$self{target_address} = '*';
+    $$self{class}                = $xpl_class unless !$xpl_class;
+    $$self{m_timeoutHeartBeat}   = 0;
+    $$self{m_appStatus}          = 'unknown';
+    $$self{m_timerHeartBeat}     = new Timer();
+    $$self{m_state_now_msg_type} = 'unknown';
+    $$self{m_allow_empty_state}  = 0;
+
+    &xPL_Item::store_data( $self, @data );
+
+    $self->state_overload('off')
+      ;    # By default, do not process ~;: strings as substate/multistate
+
+    return $self;
+}
+
+sub source {
+    my ( $self, $p_strSource ) = @_;
+    $$self{address} = $p_strSource if defined $p_strSource;
+    return $$self{address};
+}
+
+sub class_name {
+
+    my ( $self, $p_strClassName ) = @_;
+    $$self{class} = $p_strClassName if defined $p_strClassName;
+    return $$self{class};
+}
+
+sub target_address {
+    my ( $self, $p_strTarget ) = @_;
+    $$self{target_address} = $p_strTarget if defined $p_strTarget;
+    return $$self{target_address};
+}
+
+sub received {
+    my ( $self, $received ) = @_;
+    $$self{received} = $received if defined $received;
+    return $$self{received};
+}
+
+sub device_name {
+    my ( $self, $p_strDeviceName ) = @_;
+    $$self{m_device_name} = $p_strDeviceName if $p_strDeviceName;
+    return $$self{m_device_name};
+}
+
+sub on_set_message {
+    my ( $self, @data ) = @_;
+    while (@data) {
+        my $section = shift @data;
+        my $ptr     = shift @data;
+        my %parms   = %$ptr;
+        for my $key ( sort keys %parms ) {
+            my $value = $parms{$key};
+            $$self{_on_set_message}{$section}{$key} = $value;
+        }
+    }
+    return $$self{_on_set_message};
+}
+
+sub allow_empty_state {
+    my ( $self, $p_allowEmptyState ) = @_;
+    $$self{m_allow_empty_state} = $p_allowEmptyState
+      if defined($p_allowEmptyState);
+    return $$self{m_allow_empty_state};
+}
+
+sub manage_heartbeat_timeout {
+    my ( $self, $p_timeoutHeartBeat, $p_actionHeartBeat, $p_repeatAction ) = @_;
+    if ( defined($p_timeoutHeartBeat) and defined($p_actionHeartBeat) ) {
+        my $m_repeatAction = 0;
+        $m_repeatAction = $p_repeatAction if $p_repeatAction;
+        $$self{m_actionHeartBeat}  = $p_actionHeartBeat;
+        $$self{m_timeoutHeartBeat} = $p_timeoutHeartBeat;
+        $$self{m_timerHeartBeat}->set(
+            $$self{m_timeoutHeartBeat},
+            $$self{m_actionHeartBeat},
+            $m_repeatAction
+        );
+        $$self{m_timerHeartBeat}->start();
+    }
+}
+
+sub dead_action {
+    my ( $self, $p_actionDeadApp ) = @_;
+    if ( defined $p_actionDeadApp ) {
+        $$self{m_actionDeadApp} = $p_actionDeadApp;
+    }
+    return $$self{m_actionDeadApp};
+}
+
+sub _handle_dead_app {
+    my ($self) = @_;
+    $$self{m_appStatus} = 'dead';
+    return $$self{m_actionDeadApp}->() if defined( $$self{m_actionDeadApp} );
+}
+
+sub _handle_alive_app {
+    my ($self) = @_;
+    $$self{m_appStatus} = 'alive';
+    if ( $$self{m_timeoutHeartBeat} != 0 ) {
+        $$self{m_timerHeartBeat}->restart()
+          unless $$self{m_timerHeartBeat}->inactive();
+        return 1;
+    }
+    else {
+        $$self{m_timerHeartBeat}->stop()
+          unless $$self{m_timerHeartBeat}->inactive();
+        return 0;
+    }
+}
+
+sub app_status {
+    my ($self) = @_;
+    return $$self{m_appStatus};
+}
+
+sub store_data {
+    my ( $self, @data ) = @_;
+    while (@data) {
+        my $section = shift @data;
+        $$self{class} = $section;
+        $$self{sections}{$section} = 'send';
+        my $ptr   = shift @data;
+        my %parms = %$ptr;
+        for my $key ( sort keys %parms ) {
+            my $value = $parms{$key};
+            $$self{$section}{$key} = $value;
+            $$self{state_monitor} = "$section : $key" if $value eq '$state';
+        }
+    }
+}
+
+sub state_now {
+    my ( $self, $section_name ) = @_;
+    my $state_now = $self->SUPER::state_now();
+    if ($section_name) {
+
+        # default section_state_now to undef unless it actually exists
+        my $section_state_now = undef;
+        for my $section ( split( /\s+\|\s+/, $state_now ) ) {
+            my @section_data = split( /\s+:\s+/, $section );
+            my $section_ref = $section_data[0];
+            next if $section_ref eq '';
+            if ( $section_ref eq $section_name ) {
+                if ( defined($section_state_now) ) {
+                    $section_state_now .= " | $section_data[1]";
+                }
+                else {
+                    $section_state_now = $section_data[1];
+                }
+            }
+        }
+        print "db xPL_Item:state_now: section data for $section_name is: "
+          . "$section_state_now\n"
+          if $main::Debug{xpl} and $section_state_now;
+        $state_now = $section_state_now;
+    }
+    return $state_now;
+}
+
+sub current_section_names {
+    my ($self)                = @_;
+    my $changed               = $$self{changed};
+    my $current_section_names = undef;
+    if ($changed) {
+        for my $section ( split( /\s+\|\s+/, $changed ) ) {
+            my @section_data = split( /\s+:\s+/, $section );
+            if ( defined($current_section_names) ) {
+                $current_section_names .= " | $section_data[0]";
+            }
+            else {
+                $current_section_names = $section_data[0];
+            }
+        }
+
+    }
+    print "db xPL_Item:current_section_names : $current_section_names\n"
+      if $main::Debug{xpl};
+    return $current_section_names;
+}
+
+sub tie_value_convertor {
+    my ( $self, $key_name, $convertor ) = @_;
+    $$self{_value_convertors}{$key_name} = $convertor
+      if ( defined($key_name) && defined($convertor) );
+
+}
+
+sub device_monitor {
+    my ( $self, $monitor_info ) = @_;
+    if ($monitor_info) {
+	my ($key,$value) = $monitor_info =~ /(\S+)\s*[:=]\s*(.+)/;
+        if ( !( $value or $value =~ /^0/ ) ) {
+            $value = ($key) ? $key : $monitor_info;
+            $key = 'device';
+        }
+        $$self{_device_id}     = lc $value;
+        $$self{_device_id_key} = lc $key;
+    }
+    if ( defined $$self{_device_id} ) {
+        return (
+            ( $$self{_device_id_key} ) ? $$self{_device_id_key} : 'device' )
+          . $$self{_device_id};
+    }
+    else {
+        return;
+    }
+}
+
+sub default_setstate {
+    my ( $self, $state, $substate, $set_by ) = @_;
+    # Send data, unless we are processing incoming data
+    return if !(ref $set_by) and $set_by =~ /^xpl/i;
+    my @parms;
+
+    if ( $$self{_on_set_message} ) {
+        for my $class_name ( sort keys %{ $$self{_on_set_message} } ) {
+            my $block;
+            for my $msg_key (
+                sort keys %{ $$self{_on_set_message}{$class_name} } )
+            {
+                my $field_value =
+                  eval( $$self{_on_set_message}{$class_name}{$msg_key} );
+                $block->{$msg_key} = $field_value;
+            }
+            push @parms, $class_name, $block;
+        }
+    }
+    else {
+        if ( $$self{state_monitor} ) {
+            foreach my $state_monitor ( split( /\|/, $$self{state_monitor} ) ) {
+                my ( $section, $key ) =
+                  $$self{state_monitor} =~ /(\S+)\s*[:=]\s*(\S+)/;
+                $$self{$section}{$key} = $state;
+            }
+        }
+        for my $section ( sort keys %{ $$self{sections} } ) {
+            next
+              unless $$self{sections}{$section} eq
+                  'send';    # Do not echo received data
+            push @parms, $section, $$self{$section};
+        }
+    }
+
+    if (@parms) {
+
+        # sending stat info about ourselves?
+        if ( lc $$self{source} eq &xPL::get_xpl_mh_source_info() ) {
+            $self->send_trig(@parms);
+        }
+        else {
+
+            # must be cmnd info to another device addressed by address
+            $self->send_cmnd(@parms);
+        }
+    }
+}
+
+sub state_now_msg_type {
+    my ( $self, $p_msgType ) = @_;
+    $$self{m_state_now_msg_type} = $p_msgType if defined($p_msgType);
+    return $$self{m_state_now_msg_type};
+}
+
+# DO NOT use the following sub
+# Instead, DO use either send_cmnd, send_trig or send_stat
+sub send_message {
+    my ( $self, $p_strTarget, @p_data ) = @_;
+    $self->send_cmnd(@p_data);
+}
+
+sub send_cmnd {
+    my ( $self, @p_data ) = @_;
+    if ( defined $$self{_device_id} ) {
+        my $classname = shift @p_data;
+        my $ptr       = shift @p_data;
+        my @new_data  = ();
+        $ptr->{ $$self{_device_id_key} } = $$self{_device_id};
+        push @new_data, $classname, $ptr;
+        &xPL::sendXpl( $self->source, 'cmnd', @new_data );
+    }
+    else {
+        &xPL::sendXpl( $self->source, 'cmnd', @p_data );
+    }
+}
+
+sub send_stat {
+    my ( $self, @p_data ) = @_;
+    if ( defined $$self{_device_id} ) {
+        my $classname = shift @p_data;
+        my $ptr       = shift @p_data;
+        my @new_data  = ();
+        $ptr->{ $$self{_device_id_key} } = $$self{_device_id};
+        push @new_data, $classname, $ptr;
+        &xPL::sendXpl( '*', 'stat', @new_data );
+    }
+    else {
+        &xPL::sendXpl( '*', 'stat', @p_data );
+    }
+}
+
+sub send_trig {
+    my ( $self, @p_data ) = @_;
+    if ( defined $$self{_device_id} ) {
+        my $classname = shift @p_data;
+        my $ptr       = shift @p_data;
+        my @new_data  = ();
+        $ptr->{ $$self{_device_id_key} } = $$self{_device_id};
+        push @new_data, $classname, $ptr;
+        &xPL::sendXpl( '*', 'trig', @new_data );
+    }
+    else {
+        &xPL::sendXpl( '*', 'trig', @p_data );
+    }
+}
+
+sub ignore_message {
+    my ( $self, $p_data ) = @_;
+    my $ignore_message = 0;
+    if ( $$self{_device_id_key} and $self->class_name ) {
+        print
+"Device monitoring enabled: key=$$self{_device_id_key}, id=$$self{_device_id}, tested value="
+          . $$p_data{ $self->class_name }{ $$self{_device_id_key} } . "\n"
+          if $main::Debug{xpl};
+        $ignore_message =
+          ( $$self{_device_id} ne
+              lc $$p_data{ $self->class_name }{ $$self{_device_id_key} } )
+          ? 1
+          : 0;
+    }
+    return $ignore_message;
+}
+
+package xPL_Sensor;
+
+@xPL_Sensor::ISA = ('xPL_Item');
+
+sub new {
+    my ( $class, $p_source, $p_type, $p_statekey ) = @_;
+    my ( $source, $deviceid ) = $p_source =~ /(\S+)?:([\S ]+)/;
+    $source = $p_source unless $source;
+    my $self = $class->SUPER::new($source);
+    if ($p_type)
+    {
+       $$self{sensor_type} = $p_type;
+       if ($p_type eq 'output') # define a default message to be sent out on a call to the "set" method
+       {
+         # the following can always be overwritten
+          $self->on_set_message('control.basic' => { 'z##current' => '$state' });
+       }
+    }
+    else
+    {
+       $$self{sensor_type} = 'input'; # set a default
+    }
+    my $statekey = 'current';
+    $statekey = $p_statekey if $p_statekey;
+    $self->SUPER::class_name('sensor.basic');
+    $$self{state_monitor} = "sensor.basic : $statekey";
+    $self->SUPER::device_monitor("device=$deviceid") if defined $deviceid;
+    return $self;
+}
+
+sub type {
+    my ( $self, $p_type ) = @_;
+    $$self{sensor_type} = $p_type if $p_type;
+    return $$self{sensor_type};
+}
+
+sub current {
+    my ($self) = @_;
+    return $$self{'sensor.basic'}{current};
+}
+
+sub units {
+    my ($self) = @_;
+    return $$self{'sensor.basic'}{units};
+}
+
+sub lowest {
+    my ($self) = @_;
+    return $$self{'sensor.basic'}{lowest};
+}
+
+sub highest {
+    my ($self) = @_;
+    return $$self{'sensor.basic'}{highest};
+}
+
+sub ignore_message {
+    my ( $self, $p_data ) = @_;
+    return 1
+      if $self->SUPER::ignore_message($p_data)
+    ;    # user xPL_Item's filter against deviceid
+    return ( $$p_data{'sensor.basic'}{type} ne $$self{sensor_type} ) ? 1 : 0;
+}
+
+sub request_stat {
+    my ($self) = @_;
+    $self->SUPER::send_cmnd( 'sensor.request' =>
+          { 'request' => 'current', 'type' => "'$$self{sensor_type}'" } );
+}
+
+package xPL_UPS;
+
+@xPL_UPS::ISA = ('xPL_Item');
+
+sub new {
+    my ( $class, $p_source, $p_statekey ) = @_;
+    my ( $source, $deviceid ) = $p_source =~ /(\S+):(\S+)/;
+    $source = $p_source unless $source;
+    my $self     = $class->SUPER::new($source);
+    my $statekey = $p_statekey;
+    $statekey = 'status';
+
+    #    $self->SUPER::class_name('ups.basic');
+    $$self{state_monitor} = "ups.basic : $statekey|hbeat.app : $statekey";
+    $self->SUPER::device_monitor("device=$deviceid") if defined $deviceid;
+    return $self;
+}
+
+sub status {
+    my ( $self, $p_status ) = @_;
+    return ( $$self{'ups.basic'}{status} )
+      ? $$self{'ups.basic'}{status}
+      : $$self{'hbeat.app'}{status};
+}
+
+sub event {
+    my ($self) = @_;
+    return $$self{'ups.basic'}{event};
+}
+
+sub ignore_message {
+    my ( $self, $p_data ) = @_;
+    return 1
+      if $self->SUPER::ignore_message($p_data)
+    ;    # user xPL_Item's filter against deviceid
+    return ( $$p_data{'ups.basic'} or $$p_data{'hbeat.app'} ) ? 0 : 1;
+}
+
+package xPL_X10Security;
+
+@xPL_X10Security::ISA = ('xPL_Item');
+
+sub new {
+    my ( $class, $p_source, $p_type, $p_statekey ) = @_;
+    my ( $source, $deviceid ) = $p_source =~ /(\S+):(\S+)/;
+    $source = $p_source unless $source;
+    my $self = $class->SUPER::new($source);
+    $$self{type} = $p_type if $p_type;
+    my $statekey = $p_statekey;
+    $statekey = 'command';
+    $self->SUPER::class_name('x10.security');
+    $$self{state_monitor} = "x10.security : $statekey";
+    $self->SUPER::device_monitor("device=$deviceid") if defined $deviceid;
+    return $self;
+}
+
+sub type {
+    my ( $self, $p_type ) = @_;
+    $$self{type} = $p_type if $p_type;
+    return $$self{type};
+}
+
+sub command {
+    my ($self) = @_;
+    return $$self{'x10.security'}{command};
+}
+
+sub tamper {
+    my ($self) = @_;
+    return $$self{'x10.security'}{tamper};
+}
+
+sub low_battery {
+    my ($self) = @_;
+    return $$self{'x10.security'}{'low-battery'};
+}
+
+sub delay {
+    my ($self) = @_;
+    return $$self{'x10.security'}{delay};
+}
+
+sub ignore_message {
+    my ( $self, $p_data ) = @_;
+    return 1
+      if $self->SUPER::ignore_message($p_data)
+    ;    # user xPL_Item's filter against deviceid
+    if ( $$self{type} ) {
+        return ( $$p_data{'x10.security'}{type} ne $$self{type} ) ? 1 : 0;
+    }
+    else {
+        return 0;
+    }
+}
+
+package xPL_Rio;
+
+@xPL_Rio::ISA = ('xPL_Item');
+
+# Support both send and receive objects
+sub new {
+    my ( $object_class, $xpl_source, $xpl_target ) = @_;
+    my $self = {};
+    bless $self, $object_class;
+
+    $$self{state}          = '';
+    $$self{source}         = $xpl_source;
+    $$self{target_address} = $xpl_target unless !$xpl_target;
+
+    &xPL_Item::store_data( $self, 'rio.basic' => { sel => '$state' } );
+
+    @{ $$self{states} } = (
+        'play',
+        'stop',
+        'mute',
+        'volume +20',
+        'volume -20',
+        'volume 100',
+        'skip',
+        'back',
+        'random',
+        'power on',
+        'power off',
+        'light on',
+        'light off'
+    );
+
+    return $self;
+
+}
+
+1;
diff --git a/web/bin/mhsoap.wsdl b/web/bin/mhsoap.wsdl
index 38d00e998..8434fe27e 100644
--- a/web/bin/mhsoap.wsdl
+++ b/web/bin/mhsoap.wsdl
@@ -12,20 +12,20 @@
 	targetNamespace="urn:mhsoap">
 
 	<!-- types block begins -->
-	<types>
-      <schema xmlns="http://www.w3.org/2001/XMLSchema"
-         targetNamespace="urn:mhsoap/schema"
-         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-         xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
- 
-         <complexType name="ArrayOfString">
-            <complexContent>
-               <restriction base="soapenc:Array">
-                  <attribute ref="soapenc:arrayType" wsdl:arrayType="string[]"/>
-               </restriction>
-            </complexContent>
-         </complexType>         
-      </schema>
+	<types>
+      <schema xmlns="http://www.w3.org/2001/XMLSchema"
+         targetNamespace="urn:mhsoap/schema"
+         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+         xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ 
+         <complexType name="ArrayOfString">
+            <complexContent>
+               <restriction base="soapenc:Array">
+                  <attribute ref="soapenc:arrayType" wsdl:arrayType="string[]"/>
+               </restriction>
+            </complexContent>
+         </complexType>         
+      </schema>
    </types>
    
 	<!-- message block begins -->
diff --git a/web/comics/dailystrips/strips.def.old b/web/comics/dailystrips/strips.def.old
index 378f7973e..2fa94f43c 100644
--- a/web/comics/dailystrips/strips.def.old
+++ b/web/comics/dailystrips/strips.def.old
@@ -1,4627 +1,4627 @@
-# Strip Groups
-group andrews
-	desc Andrew's Favorite Strips
-	include userfriendly dilbert foxtrot
-	include pennyarcade joyoftech thefifthwave monty bc
-	include wizardofid garfield adamathome
-end
-
-group michael
-	desc Michael's Favorite Strips
-	include foxtrot boondocks doonesbury zits dilbert babyblues
-	include monty bc blondie calvinandhobbes funkywinkerbean
-	include zippythecolorpinhead peanuts adamathome forbetter bizarro
-	include userfriendly geech shoe wizardofid
-end
-
-group gloucestertimes
-	desc Gloucester Daily Times Strips
-	include garfield broomhilda bc wizardofid roseisrose
-	include dilbert cathy sallyforth monty grimmy peanuts
-	include forbetter foxtrot offthemark
-end
-
-group bgsunday
-	desc Boston Globe Sunday Comics
-	include dilbert doonesbury garfield getfuzzy adamathome grimmy forbetter
-	include foxtrot jumpstart zits zippythecolorpinhead curtis
-	include rhymeswithorange boondocks nonsequitur stonesoup roseisrose monty
-	include arlonjanis askshagg
-end
-
-# Class definitions
-class ucomics-srch
-	homepage http://www.ucomics.com/$strip/view$1.htm
-	type search
-	searchpattern <img.+?src=".+?(/$1/(\d+)/$1(\d+).+?)"
-	baseurl http://images.ucomics.com/comics
-	provides latest
-end
-
-class ucomics-gen
-    homepage http://www.ucomics.com/$strip/view$1.phtml
-	type generate
-	imageurl http://images.ucomics.com/comics/$1/%Y/$1%y%m%d.gif
-	provides any
-
-end
-
-class unitedmedia-srch-comics
-	homepage http://www.unitedmedia.com/comics/$strip/index.html
-	type search
-	searchpage http://www.unitedmedia.com/comics/$strip/archive/$strip-%Y%m%d.html
-	searchpattern <img.+?src="(/comics/$strip/archive/images/$strip.+?)"
-	baseurl http://www.unitedmedia.com
-	provides any
-end
-
-class unitedmedia-srch-comics-lag
-	homepage http://www.unitedmedia.com/comics/$strip/index.html
-	type search
-	searchpattern <img.+?src="(/comics/$strip/archive/images/$strip.+?)"
-	baseurl http://www.unitedmedia.com
-	provides latest
-end
-
-class unitedmedia-srch-creators
-	homepage http://www.unitedmedia.com/creators/$strip/index.html
-	type search
-	searchpattern <img.+?src="?(/creators/$strip/archive/images/.+?\.(gif|jpg))"?
-	baseurl http://www.unitedmedia.com
-	provides latest
-end
-
-class unitedmedia-srch-wash
-	homepage http://www.unitedmedia.com/wash/$strip/index.html
-	type search
-	searchpattern (/wash/$strip/archive/images/(.*?)\.(gif|jpg))
-	baseurl http://www.unitedmedia.com
-	provides latest
-end
-
-class unitedmedia-srch-editoons
-	homepage http://www.unitedmedia.com/editoons/$1/index.html
-	type search
-	searchpattern <img src="(/editoons/$1/archive/images/$1\d+\..+?)"
-	baseurl http://www.unitedmedia.com
-	provides latest
-end
-
-class sfgate-gen-zippy
-	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
-	type generate
-	imageurl http://pst.rbma.com/content/$3
-	provides latest
-	prefetch $homepage
-end
-
-class sfgate-gen-zippycolor
-	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
-	type generate
-	imageurl http://pst.rbma.com/content/$2
-	provides latest
-end
-
-class sfgate-gen
-	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
-	type generate
-	imageurl http://pst.rbma.com/content/$1
-	provides latest
-	prefetch $homepage
-end
-
-class sfgate-srch
-	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
-	type search
-	searchpattern <img.+?src=".+?(/comics/graphics/$2/.+?\..+?)"
-	baseurl http://www.sfgate.com
-	provides latest
-end
-
-class sfgate-columnists
-	homepage http://www.sfgate.com/columnists/$1/
-	type search
-	provides latest
-	searchpattern <IMG.+?SRC="(http://www.sfgate.com/chronicle/pictures/\d+/\d+/\d+/.+?-farley.gif)"
-end
-
-class comicspage-strips-gen
-        # $1 - more or less the real name
-        # $2 - 3-letter abbreviation of $1
-        referer http://www.comicspage.com/$1/index.html
-        homepage http://www.comicspage.com/$1/index.html
-        type generate
-        imageurl http://www.tmsfeatures.com/tmsfeatures/servlet/com.featureserv.util.Download?file=%Y%m%dcs$2-<code:"s" if %w==0><code:"a" if %w!=0>-p.jpg&code=cs$2
-        provides any
-end
-
-class comicspage-panels-gen
-	# $1 - more or less the real name
-	# $2 - 3-letter abbreviation of $1
-	homepage http://www.comicspage.com/$1/index.html
-	#type search
-	#searchpage http://www.comicspage.com/$1/main.html
-	#searchpattern <img.+?src="(http://www.comicspage.com/daily/cp$2/\d+cp$2((-\w)?)\..+?)"
-	type generate
-	imageurl http://www.tmsfeatures.com/tmsfeatures/servlet/com.featureserv.util.Download?file=%Y%m%dcp$2-<code:"s" if %w==0><code:"a" if %w!=0>-p.jpg&code=cp$2
-	#provides latest
-	provides any
-end
-
-class comicspage-editorial-gen
-	# $1 - more or less the real name
-	# $2 - 3-letter abbreviation of $1
-	homepage http://www.comicspage.com/$1/index.html
-	#type search
-	#searchpage http://www.comicspage.com/$1/main.html
-	#searchpattern <img.+?src="(http://www.comicspage.com/daily/ed$2/\d+ed$2((-\w)?)\..+?)"
-	#provides latest
-	type generate
-	imageurl http://www.tmsfeatures.com/tmsfeatures/servlet/com.featureserv.util.Download?file=%Y%m%ded$2-a-p.jpg&code=ed$2
-	provides any
-end
-
-class mercurycenter
-        # $1 - number of strip (unique to Mercury Center?)
-        # $2 - name of strip spaces=_?
-        homepage http://cgi.mercurycenter.com/cgi-bin/comics/show.cgi?ID=$1&DATE=TODAY
-        type generate
-        imageurl http://cgi.mercurycenter.com/premium/comics/%m_%d/$2.gif
-        provides any
-end
-
-class sev-comics
-        homepage http://www.sev.com.au/toonzone/$strip.asp
-        type generate
-        imageurl http://www.sev.com.au/toonzone/$strip.jpg
-        provides latest
-end
-
-class washpost-creators
-        homepage http://featurepage.creators.com/washpost.html?name=$1
-        type generate
-	prefetch $homepage
-        imageurl http://www.creators.com/<code:use POSIX;my$o=0;while(strftime("\%"."w",localtime($time_today-86400*$o))!=0){$o++}my$d=strftime("\%"."m"."\%"."d",localtime($time_today-86400*$o));"$d">/$1/$1%m%dg.gif
-        provides any
-end
-
-class washpost-king
-        homepage http://www.washingtonpost.com/wp-srv/style/comics/king.htm?$1
-        prefetch $homepage
-        imageurl http://est.rbma.com/content/$1
-        type generate
-        provides latest
-end
-
-class washpost-uclick
-	homepage http://www2.uclick.com/client/wpc/$1/
-	type search
-	searchpattern <IMG.+?SRC="(http://images.ucomics.com/comics/$1/\d+/$1\d+.gif)">
-	provides latest
-end
-
-class slate-cagle
-	homepage http://cagle.slate.msn.com/politicalcartoons/PCcartoons/$1.asp
-	type search
-	searchpattern <IMG.+?SRC=.+?(/comics/updating/$2\.(gif|jpg))"
-	baseurl http://cagle.slate.msn.com
-	provides latest
-end
-
-# Non-standard strips
-
-# should be possible to generate?
-# sometimes multi-image - need a new way to handle this
-strip avalonhigh
-	name Avalon High
-	homepage http://www.avalonhigh.com/
-	type search
-	searchpattern <IMG.+?SRC="(/?comics/avalon\d{8}.*?\.gif)"
-	baseurl $homepage
-	provides latest
-end
-
-strip drfun
-	name Doctor Fun
-	homepage http://www.ibiblio.org/Dave/Dr-Fun/html/
-	type generate
-	imageurl http://www.ibiblio.org/Dave/Dr-Fun/latest.jpg
-	provides latest
-end
-
-strip goats
-	name Goats
-	homepage http://www.goats.com/
-	type search
-	searchpattern <IMG.+?SRC="(/comix/\d+/goats\d+.gif)"
-	baseurl http://www.goats.com/
-	provides latest
-end
-
-strip jokesonyou
-	name The Joke's on You
-	homepage http://www.thefunnypages.com/
-	type search
-	searchpattern <img.+src="(http://www.thefunnypages.com/archives/.+?\.gif)"
-	#updated daily or not? - check - seems to be, but check weekend
-	provides latest
-end
-
-strip innies
-	name Innies and Outies
-	homepage http://www.inniesandoutties.com/
-	type generate
-	#updated M/W/F - no sense searching
-	imageurl http://www.inniesandoutties.com/images/front.jpg
-	provides latest
-end
-
-strip joyoftech
-	name The Joy of Tech
-	homepage http://www.joyoftech.com/joyoftech/
-	type search
-	searchpattern <IMG.+?src="(joyimages/\d+\.(gif|jpg))\"
-	baseurl http://www.joyoftech.com/joyoftech/
-	provides latest
-end
-
-strip megatokyo
-	name MegaTokyo
-	homepage http://www.megatokyo.com/
-	type search
-	searchpattern <IMG.+?SRC="(/?strips/\d+\..+?)"
-	baseurl http://www.megatokyo.com/
-	provides latest
-
-end
-
-strip mostlybusiness
-	name Mostly Business
-	homepage http://www.tedgoff.com/
-	type generate
-	#fix to use more precise addr - maybe not possible?
-	imageurl http://www.tedgoff.com/mb/images/today.gif
-	provides latest
-end
-
-# website gone (?) 2002-05-24
-#strip notquiteright
-#	name Not Quite Right
-#	homepage http://www.notquiteright.com/
-#	type generate
-#	imageurl http://www.notquiteright.com/wow/todaystoon.gif
-#	provides latest
-#end
-
-strip pennyarcade
-	name Penny Arcade
-	homepage http://www.penny-arcade.com/
-	type search
-	searchpage http://www.penny-arcade.com/view.php3
-	searchpattern <img.+?src="(images/\d{4}/\d{8}l\..{3})"
-	#searchpattern <IMG.+?src="(images/200.+?\.gif)"></TD>
-	baseurl http://www.penny-arcade.com/
-	provides latest
-end
-
-strip plif
-      name Parking Lot is Full
-      homepage http://www.plif.com
-      type generate
-      imageurl http://www.plif.com/thisweek.gif
-      provides latest
-end
-
-# gone? 2002-04-02
-#strip punc
-#	name Punc & Mark
-#	homepage http://byteus.com/pm/
-#	type search
-#	searchpage http://artiztik.com/cgi-bin/pmviewer.cgi?list=pm&config=pm.cfg&slide=999&style=pm
-#	searchpattern <img.+?src=(/pm/strips/.+?\.jpg)
-#	baseurl http://artiztik.com/
-#	provides latest
-#end
-
-strip pvp
-	name Player vs. Player
-	homepage http://www.pvponline.com/
-	type generate
-	imageurl http://www.pvponline.com/archive/%Y/pvp%Y%m%d.gif
-	provides any
-end
-
-strip pvpcurrent
-	name Player vs. Player - Current
-	homepage http://www.pvponline.com/
-	type search
-	searchpattern <img SRC="(archive/%Y/pvp%Y\d{4}\.gif)">
-	baseurl $homepage
-	provides latest
-end
-
-strip redmeat
-	name Redmeat
-	homepage http://www.redmeat.com/redmeat/current/
-	type generate
-	imageurl http://www.redmeat.com/redmeat/current/index-1.gif
-	provides latest
-end
-
-
-strip rudypark
-	name Rudy Park
-	homepage http://www.rudypark.com/
-	type generate
-	imageurl http://www.rudypark.com/comics/rudy%Y%m%d.gif
-	provides latest
-end
-
-strip sinfest
-	name Sinfest
-	homepage http://sinfest.net
-	type generate
-	imageurl http://sinfest.net/comics/sf%Y%m%d.gif
-	provides any
-end
-
-strip sluggy
-	name Sluggy Freelance
-	homepage http://www.sluggy.com/
-	type search
-	searchpage http://www.sluggy.com/daily.php?date=%y%m%d
-	searchpattern <img.+?src="?(http://pics.sluggy.com/comics/%y%m%d.+?\.(gif|jpg))
-	provides any
-end
-
-# only updated M-F, but no better way to handle it
-strip squinkers
-	name Squinkers
-	homepage http://www.squinkers.com/
-	type generate
-	imageurl http://www.squinkers.com/sqkrs/Images/today.gif
-	provides latest
-end
-
-strip superosity
-	name Superosity
-	homepage http://www.superosity.com/
-	type generate
-	imageurl http://www.superosity.com/comics/sup%Y%m%d.gif
-	provides any
-end
-
-#every day except sunday
-strip theweedpatch
-	name The WeedPatch
-	homepage http://www.jpjennings.com/toons/
-	type generate
-	imageurl http://www.jpjennings.com/toons/%m%d%Y.gif
-	provides any
-end
-
-strip userfriendly
-	name User Friendly
-	homepage http://www.userfriendly.org/static/
-	type search
-	searchpage http://ars.userfriendly.org/cartoons/?id=%Y%m%d&mode=classic
-	searchpattern <img.+?src="(http://www.userfriendly.org/cartoons/archives/%y.+?/uf.+?\.gif)"
-	provides any
-end
-
-# done
-#strip exploitnow
-#	name Exploitation Now
-#	homepage http://www.exploitationnow.com/
-#	type search
-#	searchpattern <IMG.+?SRC="(/comics/rb\d+\..+?)"
-#	baseurl $homepage
-#	provides latest
-#end
-
-#nothing new since april 2002 - ruled dead
-#strip coolcat
-#	name Cool Cat Studio
-#	homepage http://www.coolcatstudio.com/
-#	type search
-#	searchpattern <IMG.+?SRC="(/comics/ccs\d+\..+?)"
-#	baseurl http://www.coolcatstudio.com/
-#	provides latest
-#end
-
-strip classm
-	name The Class Menagerie
-	homepage http://www.theclassm.com/
-	type search
-	searchpattern <IMG.+?SRC="(/comics/cmc\d+\..+?)"
-	baseurl http://www.theclassm.com/
-	provides latest
-end
-
-strip bruno
-	name The Bruno Daily Times
-	homepage http://www.brunostrip.com/bruno.html
-	type generate
-	imageurl http://www.brunostrip.com/%Ypics/%Y%m%d.gif
-	provides any
-end
-
-strip nukees
-	name Nukees
-	homepage http://www.nukees.com
-	type search
-	searchpattern <IMG.+?SRC="(/comics/\d+\..+?)"
-	baseurl http://www.nukees.com/
-	provides latest
-end
-
-strip joeaverage
-	name Joe Average
-	homepage http://www.joeaverage.org
-	type search
-	searchpattern <IMG.+?SRC="(/comics/\d+\..+?)"
-	baseurl http://www.joeaverage.org/
-	provides latest
-end
-
-# seems to be gone: 10/26/01
-#strip hotzp
-#	name Bad Boys of Computer Science
-#	homepage http://hotzp.com/badboys/
-#	type generate
-#	imageurl http://hotzp.com/badboys/new.jpg
-#	provides latest
-#end
-
-strip angst
-	name Angst Technology
-	homepage http://www.inktank.com/AT/
-	type generate
-	imageurl http://www.inktank.com/images/AT/cartoons/%m-%d-%y.gif
-	provides any
-end
-
-# superceded by kscarborough's
-#strip zapiro
-#	name Zapiro
-#	homepage http://www.mg.co.za/mg/zapiro/
-#	type generate
-#	imageurl http://www.chico.mweb.co.za/images/zapiro/%y-<code:lc(strftime("\%b", @localtime_today))>%d.gif
-#	provides any
-#end
-
-strip clanofthecats
-	name Clan of the cats
-	homepage http://www.clanofthecats.com/
-	#type generate
-	#imageurl http://www.clanofthecats.com/comics/%Y%m%da.gif
-	#provides any
-	type search
-	searchpage http://www.clanofthecats.com/d/%Y%m%d.html
-	searchpattern <img.+?SRC="/(comics/%Y%m%d.+?)"
-	baseurl $homepage
-	provides any
-end
-
-strip gpf
-	name General Protection Fault
-	homepage http://www.gpf-comics.com/
-	type search
-	searchpattern <IMG.+?SRC="(/comics/gpf\d+.+?\..+?)"
-	baseurl http://www.gpf-comics.com
-	provides latest
-end
-
-#note: doesn't work perfectly - some strips are broken up into multiple images
-# this is not yet supported, but could be done
-strip crfh
-	name College Roomies from Hell
-	homepage http://www.crfh.net
-	type generate
-	imageurl http://www.crfh.net/comics/crfh%Y%m%d.jpg
-	provides any
-end
-
-#generatable?
-strip striptease
-	name Strip Tease Comic
-	homepage http://www.stripteasecomic.com/
-	type search
-	searchpattern <img.+?src="(/?strips\d+/\d+\..+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip dorktower
-	name Dork Tower
-	homepage http://www.dorktower.com/
-	type search
-	searchpattern <img.+?src="(/?images/comics/.+?\..+?)"
-	baseurl http://www.gamespy.com/comics/dorktower/
-	provides latest
-end
-
-strip jerkcity
-	name Jerkcity
-	homepage http://www.jerkcity.com/
-  	type generate
-	imageurl http://www.jerkcity.com/today.gif
-	provides latest
-end
-
-strip kevinandkell
-	name Kevin and Kell
-	homepage http://www.kevinandkell.com/
-	type generate
-	imageurl http://www.kevinandkell.com/%Y/strips/kk%Y%m%d.gif
-	provides any
-end
-
-strip freefall
-	name Freefall
-	homepage http://www.purrsia.com/freefall/
-	type generate
-	imageurl $homepage<code:use POSIX;my $w=strftime("\%"."u",localtime($time_today));my $s=517+3*floor(($time_today-995839200)/604800);$s++if$w\>2;$s++if$w\>4;my$c=int(($s+99)/100);"ff${c}00/fv00$s.gif">
-	provides any
-end
-
-strip 8bit
-	name 8-Bit Theater
-	homepage http://www.nuklearpower.com/latest.php
-	type search
-	searchpattern <img.+?src="(http://www.nuklearpower.com/comics/\d+\..+?)">
-	provides latest
-end
-
-strip apodbig
-	name Astronomy Picture of the Day (big image)
-	homepage http://antwrp.gsfc.nasa.gov/apod/
-	type search
-	searchpattern <a.+?href="(image/\d{4}/.+?\.(jpg|gif))"
-	baseurl $homepage
-	provides latest
-end
-
-strip apod
-	name Astronomy Picture of the Day
-	homepage http://antwrp.gsfc.nasa.gov/apod/
-	type search
-	searchpattern <img.+?SRC="(image/\d{4}/.+?\..+?)"
-	baseurl $homepage
-	provides latest
-end
-
-
-strip pgs
-	name Pathetic Geek Stories
-	homepage http://www.theonionavclub.com/
-	type search
-	#searchpattern <a.+?HREF="/avclub\d+/pgs(\d+).html"
-	#imageurl http://graphics.theonion.com/avpics_$match/pgs_$match.gif
-
-	#window.open('/comics.php?img_article_id=1192','pgs'
-        #http://www.theonionavclub.com/images/229/image_article1192.jpg
-	searchpattern issue_id=(\d+).+?window.open\('/comics.php\?img_article_id=(\d+)','pgs'
-	imageurl http://www.theonionavclub.com/images/$match_1/image_article$match_2.jpg
-
-	provides latest
-end
-
-# seems to be '....a.gif' now.
-strip adventurers
-	name Adventurers!
-	homepage http://www.adventurers-comic.com/
-	type generate
-	imageurl http://www.adventurers-comic.com/comics/adventurers%Y%m%da.gif
-	provides any
-end
-
-# discontinued 2002-05-24
-# may be updated to download old strips
-#strip basement
-#	name Basement Studios
-#	homepage http://www.basement-studios.com/
-#	type generate
-#	imageurl http://www.basement-studios.com/archive/images/%m%d%y.gif
-#	provides any
-#end
-
-strip btaf
-	name Bob, The Angry Flower
-	homepage http://angryflower.com/
-	type search
-	searchpage http://angryflower.com/archive.html
-	searchpattern <a href="(.+?.gif)"
-	provides latest
-	baseurl http://angryflower.com/
-end
-
-strip boasas
-	name Boy on a Stick and Slither
-	homepage http://www.boasas.com/
-	type search
-	searchpattern <img.+?src="(boasas/\d+\..+?)"
-	provides latest
-	baseurl http://www.boasas.com/
-end
-
-strip brunothebandit
-	name Bruno the Bandit
-	homepage http://www.brunothebandit.com
-	type generate
-	imageurl http://www.brunothebandit.com/comics/%Y%m%da.GIF
-	provides any
-end
-
-strip brunothebanditcurrent
-	name Bruno the Bandit - Current
-	homepage http://www.brunothebandit.com
-	type search
-	searchpattern <IMG ALT="comic" BORDER=0 SRC="(/comics/%Y\d{4}[a-z]{0,1}\.GIF)"
-	baseurl $homepage
-	provides latest
-end
-
-strip dieselsweeties
-	name Diesel Sweeties
-	homepage http://www.dieselsweeties.com/gif.php
-	type search
-	searchpattern <img.+?src="(http://images.clango.org/strips/sw\d+\..+?)"
-	#<img src="http://images.clango.org/strips/sw625.gif" border="0" alt="newest cartoon">
-	provides latest
-end
-
-strip fuzzylogic
-	name Fuzzy Logic
-	homepage http://www.bbspot.com/comics/fuzzy_logic/index.html
-	type generate
-	imageurl http://www.bbspot.com/Images/comics/fuzzy_logic/%Y/%Y%m%d.jpg
-	provides any
-end
-
-strip littlegamers
-	name Little Gamers
-	homepage http://www.little-gamers.com/
-	#type generate
-	#imageurl http://www.little-gamers.com/comics/%Y%m%d.gif
-	#provides any
-	type search
-	searchpattern <img.+?src='/(index.php\?do_command=show_strip&strip_id=\d+.+?)'
-	baseurl $homepage
-	provides latest
-	#img src='/index.php?do_command=show_strip&strip_id=540&auth=89345-28462-18353-19853-12612' border=0>
-end
-
-# tuesdays, thursdays, sundays
-strip machall
-	name Mac Hall
-	homepage http://www.MacHall.com/
-	type search
-	searchpattern <img.+?src='(/index.php\?do_command=show_strip\&strip_id=\d+\&auth=.+?)'
-	baseurl $homepage
-	provides latest
-end
-
-# not daily
-strip mrchuckshow
-	name Mr. Chuck Show
-	homepage http://www.mrchuckshow.com/
-	type generate
-	imageurl http://www.mrchuckshow.com/strips/mcs%Y%m%db.png
-	provides any
-end
-
-strip pentasmal
-	name Pentasmal
-	homepage http://www.pentasmal.com/
-	type generate
-	imageurl http://www.pentasmal.com/comics/%Y%m%d.png
-	provides any
-end
-
-strip rpgworld
-	name RPG World
-	homepage http://www.rpgworldcomic.com/
-	#type generate
-	#imageurl http://www.rpgworldcomic.com/comics/%Y%m%d.jpg
-	#provides any
-	type search
-	searchpattern <IMG.+?SRC="(/comics/.+?\..+?)"
-	provides latest
-	baseurl $homepage
-end
-
-# Ubersoft - multi-strip
-strip ubersoft1
-	name Ubersoft-1
-	homepage http://www.ubersoft.net/
-	type generate
-	imageurl http://www.ubersoft.net/comics/hd%Y%m%da.png
-	provides any
-end
-
-strip ubersoft2
-	name Ubersoft-2
-	homepage http://www.ubersoft.net/
-	type generate
-	imageurl http://www.ubersoft.net/comics/hd%Y%m%dc.png
-	provides any
-end
-
-strip ubersoft3
-	name Ubersoft-3
-	homepage http://www.ubersoft.net/
-	type generate
-	imageurl http://www.ubersoft.net/comics/hd%Y%m%de.png
-	provides any
-end
-
-strip ubersoft4
-	name Ubersoft-4
-	homepage http://www.ubersoft.net/
-	type generate
-	imageurl http://www.ubersoft.net/comics/hd%Y%m%dg.png
-	provides any
-end
-
-strip spazlabs
-	name Spaz Labs
-	homepage http://www.stonebrokestudios.com
-	type generate
-	imageurl http://www.stonebrokestudios.com/archives/spaz/%y%m%dspaz.gif
-	provides any
-end
-
-strip glasbergen
-	name Randy Glasbergen
-	homepage http://www.glasbergen.com
-	type generate
-	imageurl http://www.glasbergen.com/images/toon.gif
-	provides latest
-end
-
-strip spiderman
-	name Spider Man
-	homepage http://www.kingfeatures.com/features/comics/spidermn/about.htm
-	type search
-	searchpage http://www.kingfeatures.com/features/comics/spidermn/aboutMaina.php
-	searchpattern <img.+?src='(http://est.rbma.com/content/Spiderman\?date=\d{8})'
-	provides latest
-	prefetch http://www.kingfeatures.com/images/clear.gif
-end
-
-# can be made into a class
-strip tuma
-	name Kevin Tuma Cartoon
-	homepage http://www.cnsnews.com/cartoon/Tuma.asp
-	type search
-	searchpage http://www.cnsnews.com/cartoon/tuma.asp
-	searchpattern <img.+?src="/cartoon/(tumaimages/\d+/\w+\..+?)"
-	baseurl http://www.cnsnews.com/cartoon/
-	provides latest
-end
-
-strip nowak
-	name Paul Nowak Cartoon
-	homepage http://www.cnsnews.com/cartoon/nowak.asp
-	type search
-	searchpattern <img.+?src=".+?(Nowakimages/%Y/\w+\..+?)"
-	#<img border="0" src="/cartoon/nowakimages/2003/rightwing.jpg"></td>
-	baseurl http://www.cnsnews.com/cartoon/
-	provides latest
-end
-
-
-
-strip lang
-	name Bob Lang Cartoon
-	homepage http://www.cnsnews.com/cartoon/lang.asp
-	type search
-	searchpage http://www.cnsnews.com/cartoon/Lang.asp
-	searchpattern <img.+?src="/?(cartoon/langimages/\d+/.+?\..+?)"
-	#<img border="0" src="/cartoon/langimages/2003/lastdays.jpg"></td>
-	baseurl http://www.cnsnews.com/
-	provides latest
-end
-
-strip shelton
-	name Barry Shelton Cartoon
-	homepage http://www.cnsnews.com/cartoon/shelton.asp
-	type search
-	searchpattern <img.+?border="0".+?src="(Sheltonimages/%Y/.+?\..+?)"
-	baseurl http://www.cnsnews.com/cartoon/
-	provides latest
-end
-
-strip elflifeadult
-	name Elf Life: R Rated
-	homepage http://www.elflife.com/adults.html
-	type generate
-	imageurl http://www.elflife.com/current/%Y%m%dm.gif
-	provides any
-end
-
-strip funnyfarm
-	name Funny Farm
-	homepage http://www.funnyfarmcomics.com/
-	type search
-	searchpage http://www.funnyfarmcomics.com/d/%Y%m%d.html
-	searchpattern <IMG.+?SRC="(/comics/%Y%m%da\..+?)"
-	baseurl $homepage
-	provides any
-end
-
-strip elflife
-	name Elf Life
-	homepage http://www.elflife.com/
-	type generate
-	imageurl http://www.elflife.com/comics/%Y%m%dm.gif
-	provides any
-end
-
-strip ozyandmillie
-	name Ozy and Millie
-	homepage http://www.ozyandmillie.org/
-	type generate
-	imageurl http://www.ozyandmillie.org/comics/om%Y%m%d.gif
-	provides any
-end
-
-strip suburbanjungle
-	name Suburban Jungle
-	homepage http://www.suburbanjungle.com/
-	type search
-	searchpage http://suburbanjungle.com/d/%Y%m%d.html
-	searchpattern <img.+?SRC="(/comics/sj%Y%m%d\..+?)"
-	baseurl http://www.suburbanjungle.com
-	provides any
-end
-
-strip acidreflux
-	name Acid Reflux
-	homepage http://www.acidrefluxcomic.com/
-	type search
-	baseurl http://www.acidrefluxcomic.com/
-	searchpattern <img.+?src="(archive/c\d+\..+?)"
-	provides latest
-end
-
-strip whenigrowup
-	name When I Grow Up
-	homepage http://www.whenigrowup.net/
-	type generate
-	imageurl http://www.whenigrowup.net/comics/wigu%Y%m%d.png
-	provides any
-end
-
-strip walky
-	name It's Walky
-	homepage http://www.itswalky.com/
-	baseurl $homepage
-	type search
-	searchpattern <img.+?SRC="/(comics/.+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip jackiesfridge
-	name Jackie's Fridge
-	type generate
-	homepage http://jackiesfridge.keenspace.com/
-	imageurl http://jackiesfridge.keenspace.com/comics/jf%Y%m%da.jpg
-	provides any
-end
-
-strip schlockmercenary
-	name Schlock Mercenary
-	type generate
-	homepage http://www.schlockmercenary.com/
-	imageurl http://www.schlockmercenary.com/comics/schlock%Y%m%d.png
-	provides any
-end
-
-# finished
-#strip unicornjelly
-#	name Unicorn Jelly
-#	type search
-#	homepage http://unicornjelly.com/
-#	searchpattern <IMG.+?SRC="(images\/uni\d+\..+?)"
-#	baseurl $homepage
-#	provides latest
-#end
-
-strip downtoearth
-	name Down To Earth
-	homepage http://downtoearth.ncbuy.com
-	type generate
-	imageurl http://downtoearth.ncbuy.com/img/syndicate/nav1_dte_today.gif
-	provides latest
-end
-
-# website gone (?) 2002-05-24
-#strip wandering
-#	name Wandering Ones
-#	homepage http://www.wanderingones.com/
-#	type generate
-#	imageurl http://www.wanderingones.com/comics/wan%Y%m%d.gif
-#	provides any
-#end
-
-strip rvfun
-	name Reverend Fun
-	homepage http://rev-fun.gospelcom.net/
-	type generate
-	#imageurl http://rev-fun.gospelcom.net/%Y/%m/%Y%m%d.gif
-	imageurl http://rev-fun.gospelcom.net/add_toon_info.php?date=%Y%m%d
-	provides any
-end
-
-# no longer updated 2002-05-24
-strip greytown
-        name Living in Greytown
-        homepage http://www.livingingreytown.com/
-        type generate
-        imageurl $homepage/comics/grey%Y%m%d.jpg
-        provides any
-end
-
-strip slowwave
-        name Slow Wave
-        homepage http://www.slowwave.com/
-        type generate
-        imageurl $homepage/img.cgi?thisweek.gif
-        provides latest
-end
-
-# formerly "The Thin H Line". NC-17. Vertical format.
-strip sexylosers
-	name Sexy Losers
-	homepage http://sexylosers.keenspace.com/
-	type search
-	#searchpattern <IMG.+?SRC.*?=.*?"(http://sexylosers\.(keenspace\.)?com/)?(images/sl\d+\.jpg)"
-	#searchpattern <IMG.+?SRC="http://sexylosers=com/(images/sl\d+\.jpg)"
-	#searchpattern <table.+?width.*?=.*?325.+?<img.+?src.*?=.*?"(http://sexylosers.keenspace.com/images/.+?)"
-	searchpattern <A.+?HREF="http://sexylosers.keenspace.com/(\d+).html"
-	imageurl http://sexylosers.keenspace.com/comics/sl$match_1.jpg
-	provides latest
-end
-
-# weekly
-strip youdamnkid
-        name You Damn Kid
-        homepage http://www.youdamnkid.com/
-        type search
-        baseurl $homepage
-        provides latest
-        searchpattern <IMG.+?SRC="/(comics/ydk\d+\.gif)"
-end
-
-# weekly, moving daily soon?
-strip houndshome
-        name Hound's Home
-        homepage http://www.houndshome.com/
-        type search
-        baseurl $homepage
-        provides latest
-        searchpattern <IMG.+?SRC="/(comics/hh.+?)"
-end
-
-strip cutewendy
-        name CuteWendy
-        homepage http://www.wendycomic.com/
-        type generate
-        imageurl http://www.wendycomic.com/comics/wendy%Y%m%d.gif
-        provides any
-end
-
-# sporadic
-strip lifesorad
-        name Life's So Rad
-        homepage http://www.radcomics.com/
-        type search
-        baseurl $homepage
-        provides latest
-        searchpattern <IMG.+?SRC="/(comics/\d+.+?)"
-end
-
-# formerly known as otakufeh. NC-17.
-strip bigones
-        name Big Ones
-        homepage http://otakufeh.keenspace.com/
-        type generate
-        provides any
-        imageurl $homepage/comics/big%Y%m%d.gif
-end
-
-strip offthemark
-	name Off the Mark
-	homepage http://www.offthemark.com/
-	type search
-	provides latest
-	searchpage $homepage/daily.asp
-	searchpattern <img.+?src="(http://www.offthemark.com/rotate/\d+.gif)"
-end
-
-strip asif
-	name As If
-	homepage http://www.asifcomic.com/
-	type search
-	searchpage http://www.asifcomic.com/current.html
-	searchpattern <img.+?src=".*?_left\.jpg".+?><img.+?src="(\d+\..{3})".+?alt="Comic
-	baseurl $homepage
-	provides latest
-end
-
-strip nipandtuck
-	name Nip 'N Tuck
-	homepage http://nipandtuck.keenspace.com
-	type search
-	searchpattern SRC=".+?(/comics/nt(\d{8})\.gif)"
-	baseurl $homepage
-	provides latest
-end
-
-strip lemontree
-	name Under The Lemon Tree
-	homepage http://utlt.keenspace.com
-	type search
-	searchpattern <IMG.+?SRC=".+?(/comics/.+?\d{8}\..+?)"
-	#<IMG ALT="comic" BORDER=0 SRC="http://utlt.keenspace.com/comics/bn20030824.gif" HEIGHT="360" WIDTH="994">
-	baseurl $homepage
-	provides latest
-end
-
-strip winter
-	name Winter
-	homepage http://www.wintercomic.com/
-	type search
-	#searchpattern img src='(pages/page(\d+)\.gif)'
-	searchpattern <img.+?src='(/index.php\?do_command=show_strip&.+?)'
-	baseurl $homepage
-	provides latest
-end
-
-#strip pcnpixel
-#	name PC and Pixel
-#	homepage http://www.pccomix.com/PCandPixel/
-#	type search
-#	searchpage http://www.pccomix.com/PCandPixel/pc_dailystrip/PCdaily.html
-#	searchpattern <p><img SRC="pc(\w+).gif".+?WIDTH=
-#	matchpart 1
-#	imageurl http://www.pccomix.com/PCandPixel/pc_dailystrip/pc$match.gif
-#	provides latest
-#end
-
-#discontinued may 2002
-#strip bobbins
-#	name Bobbins
-#	homepage http://www.bobbins.org/
-#	type search
-#	searchpage http://bobbins.org/d/%Y%m%d.html
-#	searchpattern <img.+?SRC="(/comics/%Y%m%d\..+?)"
-#	baseurl http://www.bobbins.org
-#	provides any
-#end
-
-strip brainbuzz
-	name Brainbuzz
-	homepage http://cramsession.brainbuzz.com/lists/cartoon/
-	type generate
-	imageurl http://i.brainbuzz.com/CS/Lists/Cartoon/%y%m%d.gif
-	#every day except saturday, sunday
-	provides any
-end
-
-#they win... for now (8394022423 levels of frames and i don't feel like building a full-blown web browser right now)
-strip swamp
-	name Swamp
-	homepage http://www.swamp.com.au
-	type search
-	searchpage http://s1.emcs.com.au/SwampStrips/Strips/Strip.asp?Date=<code:strftime("%-d-%b-%Y", @localtime_today)
-	searchpattern <img.+?src="(http://s1.emcs.com.au/swampstrips/Strips_Images/\d+\..+?)"
-	provides any
-end
-
-strip thenorm
-	name The Norm
-	homepage http://www.thenorm.com/
-	type generate
-	imageurl http://www.thenorm.com/arch/%y%m%d.gif
-	provides any
-end
-
-strip somethingpositive
-	name Something Positive
-	homepage http://www.somethingpositive.net/
-	type generate
-	imageurl http://www.somethingpositive.net/arch/sp%m%d%Y.gif
-	provides latest
-end
-
-strip melonpool
-	name Melonpool
-	homepage http://www.melonpool.com/
-	type generate
-	imageurl http://www.melonpool.com/comics/MM%Y%m%d.gif
-	provides any
-end
-
-strip flem
-        name FLEM!
-        homepage http://www.flemcomics.com/
-        type generate
-        imageurl http://flem.dhs.org/new.jpg
-        provides latest
-end
-
-#replaced
-# Updated Mon - Fri
-#strip reallife
-#        name Real Life
-#        homepage http://www.reallifecomics.com/
-#        type generate
-#        imageurl http://www.reallifecomics.com/comics/%Y%m%da.jpg
-#        provides any
-#end
-
-# Updated Mon - Sat
-strip sheldon
-        name Sheldon
-        useclass unitedmedia-srch-comics
-end
-
-# Updated Mon
-strip weakendwarriors
-        name Weak-end Warriors
-        homepage http://www.inktank.com/WW/
-        type generate
-        imageurl http://www.inktank.com/images/WW/cartoons/%m-%d-%y.gif
-        provides any
-end
-
-strip alice
-	name Alice!
-	homepage http://www.alicecomics.com/today.html
-	type search
-	searchpattern <IMG.+?SRC="(/comics/alice.+?\..+?)"
-	baseurl http://www.alicecomics.com/
-	provides latest
-end
-
-strip theshadows
-	name The Shadows
-	homepage http://www.alicecomics.com/shadows.html
-	type search
-	searchpattern <IMG.+?SRC="(/shadcomics/shad.+?\..+?)"
-	baseurl http://www.alicecomics.com/
-	provides latest
-end
-
-strip lcd
-	name Lowest Common Denominator
-	homepage http://lcd.keenspace.com
-	type search
-	searchpattern <IMG.+?SRC=".+?(/comics/(lcd|soph).+?\..+?)"
-	#<IMG ALT="" BORDER=0 SRC="http://lcd.keenspace.com/comics/soph20030810.png" WIDTH="732" HEIGHT="262">
-	baseurl http://lcd.keenspace.com
-	provides latest
-end
-
-# could easily generate
-strip devilspanties
-	name The Devil's Panties
-	homepage http://thedevilspanties.keenspace.com
-	type search
-	searchpattern <IMG.+?SRC="(http://thedevilspanties.keenspace.com/comics/.+?\..+?)"
-	#baseurl http://thedevilspanties.keenspace.com
-	provides latest
-end
-
-
-strip fatjesus
-	name Fat Jesus
-	homepage http://www.fat-jesus.com
-	type search
-	searchpattern <IMG.+?SRC="(/comics/fatjesus.+?)"
-	baseurl http://fatjesus.keenspace.com
-	provides latest
-end
-
-strip sexandviolence
-	name Sex and Violence
-	homepage http://www.mrbang.net
-	type search
-	searchpattern <IMG.+?SRC="(/comics/.+?\..+?)"
-	baseurl http://www.mrbang.net
-	provides latest
-end
-
-strip fans
-	name Fans!
-	homepage http://faans.com
-	type search
-	searchpattern <IMG.+?SRC="(http://faans.com/images/.+?\..+?)"
-	#<IMG SRC="http://faans.com/images/mad1.gif" WIDTH=650 HEIGHT=300>
-	provides latest
-end
-
-strip spooner
-        name Spooner
-        homepage http://www.hookedoncomics.com/
-        type generate
-        imageurl http://www.hookedoncomics.com/comics/Sp%Y%m%d.gif
-        provides any
-end
-
-strip underpower
-        name Under Power
-        artist Jorge "Vaz" Rivas and David "vanishing" Trischuk
-        homepage http://underpower.non-essential.com/
-        type generate
-        imageurl http://underpower.non-essential.com/comics/%Y%m%d.jpg
-        provides any
-end
-
-strip nekobox
-        name Nekobox
-        artist Jorge "Vaz" Rivas and David "vanishing" Trischuk
-        homepage http://www.nekobox.org
-        type generate
-        imageurl http://www.nekobox.org/comic/%Y-%m-%d.jpg
-        provides any
-end
-
-strip perscheid
-	name Perscheids Abgruende
-	artist Martin Perscheid -> www.martin-perscheid.de
-	homepage http://portale.web.de/Boulevard/Comics/Perscheid/
-	type search
-	searchpattern <img.+?src="[h]*[t]*[t]*[p]*[:]*//(img.web.de/c/00.+?)"
-	provides latest
-end
-
-strip harmbengen
-	name Harm Bengen's Alltagsskizzen
-	artist Harm Bergen -> www.harmbengen.de
-	homepage http://portale.web.de/Boulevard/Comics/Bengen/
-	type search
-	searchpattern <img.+?src="[h]*[t]*[t]*[p]*[:]*//(img.web.de/c/00.+?)"
-	provides latest
-end
-
-strip weyershausenwelt
-	name Weyershausen - Wunderbare Welt
-	artist Karsten Weyershausen -> www.weyershausen.de
-	homepage http://portale.web.de/Boulevard/Comics/Weyershausen/
-	type search
-	searchpattern <img.+?src="[h]*[t]*[t]*[p]*[:]*//(img.web.de/c/00.+?)"
-	provides latest
-end
-
-strip quirit
-	name Quirit - alltaegliches auf den Punkt gebracht
-	artist Quirit -> www.quirit.com
-	homepage http://portale.web.de/Boulevard/Comics/Quirit/
-	type search
-	searchpattern <img.+?src="[h]*[t]*[t]*[p]*[:]*//(img.web.de/c/00.+?)"
-	provides latest
-end
-
-
-strip touche
-        name Touche
-        artist Tom
-        homepage http://www.drive-in-cartoons.de/touche/
-        type search
-        searchpage http://www.drive-in-cartoons.de/touche/hauptteil.php
-        searchpattern <img.+?src='(.+?)'
-        baseurl http://www.drive-in-cartoons.de/touche/
-        provides latest
-end
-
-strip achewood
-	name Achewood
-	artist Chris Onstad
-	homepage http://www.achewood.com
-	type generate
-	imageurl $homepage/i/%m%d%Y.gif
-	provides any
-end
-
-# ucomics.com strips
-strip adamathome
-	name Adam@home
-	useclass ucomics-gen
-	$1 ad
-end
-
-strip baldo
-	name Baldo
-	useclass ucomics-gen
-	$1 ba
-end
-
-strip bizarro
-	name Bizarro
-	useclass ucomics-gen
-	$1 bz
-end
-
-strip thebigpicture
-	name The Big Picture
-	useclass ucomics-gen
-	$1 bi
-end
-
-strip boondocks
-	name The Boondocks
-	useclass ucomics-gen
-	$1 bo
-end
-
-strip calvinandhobbes
-	name Calvin and Hobbes
-	useclass ucomics-srch
-	$1 ch
-end
-
-strip cathy
-	name Cathy
-	useclass ucomics-gen
-	$1 ca
-end
-
-strip closetohome
-	name Close to Home
-	useclass ucomics-gen
-	$1 cl
-end
-
-strip cornered
-	name Cornered
-	useclass ucomics-gen
-	$1 co
-end
-
-strip crankshaft
-	name Crankshaft
-	useclass ucomics-gen
-	$1 cs
-end
-
-strip doonesbury
-	name Doonesbury
-	useclass ucomics-gen
-	$1 db
-end
-
-strip thefifthwave
-	name The 5th Wave
-	useclass ucomics-srch
-	$1 fw
-end
-
-strip bensargent
-	name Ben Sargent
-	useclass ucomics-srch
-	$1 bs
-end
-
-strip patoliphant
-	name Pat Oliphant
-	useclass ucomics-srch
-	$1 po
-end
-
-strip foxtrot
-	name FoxTrot
-	useclass ucomics-gen
-	$1 ft
-end
-
-strip thefuscobrothers
-	name The Fusco Brothers
-	useclass ucomics-gen
-	$1 fu
-end
-
-strip garfield
-	name Garfield
-	useclass ucomics-gen
-	$1 ga
-end
-
-strip heartofthecity
-	name Heart of the City
-	useclass ucomics-gen
-	$1 hc
-end
-
-strip inthebleachers
-	name In the Bleachers
-	useclass ucomics-gen
-	$1 bl
-end
-
-strip james
-	name James
-	useclass ucomics-gen
-	$1 jm
-end
-
-strip mrpotatohead
-        name Mr. Potato Head
-        useclass ucomics-gen
-        $1 mrp
-end
-
-strip nonsequitur
-	name Non Sequitur
-	useclass ucomics-gen
-	$1 nq
-end
-
-strip oddlyenough
-	name Oddly Enough
-	useclass ucomics-gen
-	$1 oe
-end
-
-strip overboard
-	name Overboard
-	useclass ucomics-gen
-	$1 ob
-end
-
-strip reallifeadventures
-	name Real Life Adventures
-	useclass ucomics-gen
-	$1 rl
-end
-
-strip reynoldsunwrapped
-	name Reynolds Unwrapped
-	useclass ucomics-gen
-	$1 rw
-end
-
-strip stonesoup
-	name Stone Soup
-	useclass ucomics-gen
-	$1 ss
-end
-
-strip tankmcnamara
-	name Tank McNamara
-	useclass ucomics-gen
-	$1 tm
-end
-
-strip tomthedancingbug
-	name Tom the Dancing Bug
-	useclass ucomics-srch
-	$1 td
-end
-
-strip ziggy
-	name Ziggy
-	useclass ucomics-gen
-	$1 zi
-end
-
-strip theduplex
-        name The Duplex
-        useclass ucomics-gen
-        $1 dp
-end
-
-strip psmueller
-	name P. S. Mueller
-	useclass ucomics-gen
-	$1 psm
-end
-
-strip misterboffo
-	name Mister Boffo
-	useclass ucomics-gen
-	$1 mb
-end
-
-# unitedmedia.com strips
-strip alleyoop
-	name Alley Oop
-	useclass unitedmedia-srch-comics
-end
-
-strip arlonjanis
-	name Arlo & Janis
-	useclass unitedmedia-srch-comics
-end
-
-strip betty
-	name Betty
-	useclass unitedmedia-srch-comics
-end
-
-strip bignate
-	name Big Nate
-	useclass unitedmedia-srch-comics
-end
-
-strip bornloser
-	name The Born Loser
-	useclass unitedmedia-srch-comics
-end
-
-strip buckets
-	name The Buckets
-	useclass unitedmedia-srch-comics
-end
-
-strip bullsnbears
-	name Bull$ 'N' Bear$
-	useclass unitedmedia-srch-comics
-end
-
-strip cheapthrills
-	name Cheap Thrills
-	useclass unitedmedia-srch-wash
-end
-
-strip chickweed
-	name 9 Chickweed Lane
-	useclass unitedmedia-srch-comics
-end
-
-strip committed
-	name Committed
-	useclass unitedmedia-srch-comics
-end
-
-strip drabble
-	name Drabble
-	useclass unitedmedia-srch-comics
-end
-
-#strip dilbert
-#       name Dilbert
-#       useclass unitedmedia-srch-comics
-#end
-
-strip dilbert
-        name Dilbert
-        artist Scott Adams
-        homepage http://www.dilbert.com/comics/dilbert/
-        baseurl $homepage
-        type search
-        searchpattern <IMG SRC="(/comics/dilbert/archive/images/.+?\.gif)"
-        provides latest
-end
-
-strip fatcats
-	name Fat Cats
-	useclass unitedmedia-srch-comics-lag
-end
-
-strip ferdnand
-	name Ferd'nand
-	useclass unitedmedia-srch-comics
-end
-
-strip forbetter
-	name For Better or For Worse
-	useclass unitedmedia-srch-comics
-end
-
-strip franknernest
-	name Frank & Ernest
-	useclass unitedmedia-srch-comics
-end
-
-strip frazz
-        name Frazz
-        useclass unitedmedia-srch-comics
-end
-
-#discontinued at unitedmedia
-#can't use the class - dates are 66 years ago
-#strip freckles
-#	name Freckles and His Friends
-#	homepage http://www.unitedmedia.com/comics/freckles/index.html
-#	type search
-#	searchpattern <IMG.+?SRC="(/comics/freckles/archive/images/freckles.+?\..+?)"
-#	baseurl http://www.unitedmedia.com
-#	provides latest
-#end
-
-strip geech
-	name Geech
-	useclass unitedmedia-srch-comics
-end
-
-strip getfuzzy
-	name Get Fuzzy
-	useclass unitedmedia-srch-comics
-end
-
-strip gingermeggs
-	name Ginger Meggs
-	useclass unitedmedia-srch-comics
-end
-
-strip graffiti
-	name Graffiti
-	useclass unitedmedia-srch-comics
-end
-
-strip grandave
-	name Grand Avenue
-	useclass unitedmedia-srch-comics
-end
-
-strip grizzwells
-	name The Grizzwells
-	useclass unitedmedia-srch-comics
-end
-
-strip hedge
-	name Over the Hedge
-	useclass unitedmedia-srch-comics
-end
-
-strip herman
-	name Herman
-	useclass unitedmedia-srch-comics
-end
-
-strip janesworld
-        name Jane's World
-        useclass unitedmedia-srch-comics
-end
-
-strip jumpstart
-	name Jump Start
-	useclass unitedmedia-srch-comics
-end
-
-strip kitncarlyle
-	name Kit 'N' Carlyle
-	useclass unitedmedia-srch-comics
-end
-
-#can't use the class - dates are 53 years ago
-strip lilabner
-	name Li'l Abner
-	homepage http://www.unitedmedia.com/comics/lilabner/index.html
-	type search
-	searchpattern <img.+?src="(/comics/lilabner/archive/images/lilabner.+?\..+?)"
-	baseurl http://www.unitedmedia.com
-	provides latest
-end
-
-strip luann
-	name Luann
-	useclass unitedmedia-srch-comics
-end
-
-strip lupo
-	name Lupo Alberto
-	useclass unitedmedia-srch-comics
-end
-
-strip marmaduke
-	name Marmaduke
-	useclass unitedmedia-srch-comics
-end
-
-strip meatloaf
-	name Meatloaf Night
-	useclass unitedmedia-srch-comics
-end
-
-strip meg
-	name Meg!
-	useclass unitedmedia-srch-comics-lag
-end
-
-# lags ~1 week
-strip motley
-	name Motley
-	useclass unitedmedia-srch-comics-lag
-end
-
-strip nancy
-	name Nancy
-	useclass unitedmedia-srch-comics
-end
-
-strip peanuts
-	name Peanuts
-	useclass unitedmedia-srch-comics
-end
-
-strip pearls
-	name Pearls Before Swine
-	useclass unitedmedia-srch-comics
-end
-
-strip pibgorn
-	name Pibgorn
-	useclass unitedmedia-srch-comics
-end
-
-strip pickles
-	name Pickles
-	useclass unitedmedia-srch-wash
-end
-
-strip potluck
-	name Potluck Parish
-	useclass unitedmedia-srch-comics
-end
-
-strip raisingduncan
-	name Raising Duncan
-	useclass unitedmedia-srch-comics
-end
-
-#discontinued at um
-#strip randolphitch
-#	name Randolph Itch 2 a.m.
-#	useclass unitedmedia-srch-comics
-#end
-
-strip reality
-	name Reality Check
-	useclass unitedmedia-srch-comics
-end
-
-strip redandrover
-	name Red and Rover
-	useclass unitedmedia-srch-wash
-end
-
-strip ripleys
-	name Ripley's Believe It or Not!
-	useclass unitedmedia-srch-comics
-end
-
-strip monty
-	name Monty
-	useclass unitedmedia-srch-comics
-end
-
-strip roseisrose
-	name Rose Is Rose
-	useclass unitedmedia-srch-comics
-end
-
-strip shirleynson
-	name Shirley And Son
-	useclass unitedmedia-srch-comics
-end
-
-strip soup2nutz
-	name Soup To Nutz
-	useclass unitedmedia-srch-comics
-end
-
-
-# only once-weekly
-strip stockcartoons
-	name StockcarToons
-	useclass unitedmedia-srch-comics
-	#searchpage http://www.unitedmedia.com/comics/stockcartoons/archive/stockcartoons-<code:strftime("\%Y\%m\%d", localtime($time_today - 604800))>.html
-	searchpage $homepage
-	provides latest
-end
-
-strip tarzan
-	name Tarzan
-	useclass unitedmedia-srch-comics
-end
-
-strip thatslife
-	name That's Life
-	useclass unitedmedia-srch-wash
-end
-
-strip topofworld
-	name Top of the World!
-	useclass unitedmedia-srch-comics-lag
-end
-
-# done!
-#strip usplay
-#	name The US of Play
-#	useclass unitedmedia-srch-comics
-#end
-
-# also done!
-#strip warped
-#	name Warped
-#	useclass unitedmedia-srch-comics
-#end
-
-strip workingdaze
-	name Working Daze
-	useclass unitedmedia-srch-comics
-end
-
-strip pcnpixel
-	name PC and Pixel
-	useclass unitedmedia-srch-wash
-	provides latest
-end
-
-strip billday
-	name Bill Day
-	useclass unitedmedia-srch-editoons
-	$1 day
-end
-
-strip billschorr
-	name Bill Schorr
-	useclass unitedmedia-srch-editoons
-	$1 schorr
-end
-
-strip claybennett
-	name Clay Bennett
-	useclass unitedmedia-srch-editoons
-	$1 bennett
-end
-
-strip drewlitton
-	name Drew Litton
-	useclass unitedmedia-srch-editoons
-	$1 litton
-end
-
-strip edstein
-	name Ed Stein
-	useclass unitedmedia-srch-editoons
-	$1 stein
-end
-
-strip ettahulme
-	name Etta Hulme
-	useclass unitedmedia-srch-editoons
-	$1 hulme
-end
-
-strip henrypayne
-	name Henry Payne
-	useclass unitedmedia-srch-editoons
-	$1 payne
-end
-
-strip jeffstahler
-	name Jeff Stahler
-	useclass unitedmedia-srch-editoons
-	$1 stahler
-end
-
-strip jerryholbert
-	name Jerry Holbert
-	useclass unitedmedia-srch-editoons
-	$1 holbert
-end
-
-strip jimberry
-	name Jim Berry
-	useclass unitedmedia-srch-editoons
-	$1 berry
-end
-
-strip mikesmith
-	name Mike Smith
-	useclass unitedmedia-srch-editoons
-	$1 smith
-end
-
-strip robrogers
-	name Rob Rogers
-	useclass unitedmedia-srch-editoons
-	$1 rogers
-end
-
-#strip robertariail
-#	name Robert Ariail
-#	useclass unitedmedia-srch-editoons
-#	$1 ariail
-#end
-
-strip stevebenson
-	name Steve Benson
-	useclass unitedmedia-srch-editoons
-	$1 benson
-end
-
-# sfgate strips
-strip babyblues
-	name Baby Blues
-	useclass sfgate-gen
-	$1 Baby_Blues
-end
-
-strip beetlebailey
-	name Beetle Bailey
-	useclass sfgate-gen
-	$1 Beetle_Bailey
-end
-
-strip blondie
-	name Blondie
-	useclass sfgate-gen
-	$1 $name
-end
-
-strip crock
-	name Crock
-	useclass sfgate-gen
-	$1 $name
-end
-
-strip curtis
-	name Curtis
-	useclass sfgate-gen
-	$1 $name
-end
-
-strip dennisthemenace
-	name Dennis the Menace
-	useclass sfgate-gen
-	$1 Dennis_The_Menace
-end
-
-#non-standard
-strip farley
-	name Farley
-        homepage http://www.sfgate.com/columnists/farley/
-        type search
-        provides latest
-        searchpattern <IMG.+?SRC="(http://www.sfgate.com/chronicle/pictures/\d+/\d+/\d+/.+?-farley.gif)"
-end
-
-strip fastrack
-	name On The Fast Track
-	useclass sfgate-gen
-	$1 Fast_Track
-end
-
-strip funkywinkerbean
-	name Funky Winkerbean
-	useclass sfgate-gen
-	$1 Funky_Winkerbean
-end
-
-strip hagarthehorrible
-	name Hagar the Horrible
-	useclass sfgate-gen
-	$1 Hagar_The_Horrible
-end
-
-strip ineedhelp
-	name I Need Help
-	useclass sfgate-gen
-	$1 Hagar_The_Horrible
-end
-
-strip mallardfillmore
-	name Mallard Fillmore
-	useclass sfgate-gen
-	$1 Mallard_Fillmore
-end
-
-strip mutts
-	name Mutts
-	useclass sfgate-gen
-	$1 $name
-end
-
-strip newbreed
-	name New Breed
-	useclass sfgate-gen
-	$1 New_Breed
-end
-
-strip thephantom
-	name The Phantom
-	useclass sfgate-gen
-	$1 Phantom
-end
-
-strip piranhaclub
-	name Piranha Club
-	useclass sfgate-gen
-	$1 Piranha
-end
-
-strip popeye
-	name Popeye
-	useclass sfgate-gen
-	$1 $name
-end
-
-strip rhymeswithorange
-	name Rhymes with Orange
-	useclass sfgate-gen
-	$1 Rhymes_with_Orange
-end
-
-strip sallyforth
-	name Sally Forth
-	useclass sfgate-gen
-	$1 Sally_Forth
-end
-
-strip safehavn
-	name Safe Havens
-	useclass sfgate-gen
-	$1 Safe_Havens
-end
-
-#strip shermanslagoon
-#	name Sherman's Lagoon
-#	useclass sfgate-gen
-#	$1 Shermans_Lagoon
-#end
-
-strip sixchix
-	name Six Chix
-	useclass sfgate-gen
-	$1 6Chix
-end
-
-#strip willynethel
-#	name Willy 'n' Ethel
-#	useclass sfgate-gen
-#	$1 Willy_n_Ethel
-#end
-
-strip zippythecolorpinhead
-	name Zippy the Pinhead (in color)
-	useclass sfgate-gen-zippycolor
-	$1 Zippy_the_Pinhead_Color
-	$2 Zippy_the_Pinhead
-end
-
-#strip zippythepinhead
-#	name Zippy the Pinhead
-#	useclass sfgate-gen
-#	$1 Zippy_the_Pinhead
-#	$2 zippy
-#end
-
-strip zippythepinhead
-	name Zippy the Pinhead
-	useclass sfgate-gen-zippy
-	$1 Zippy_the_Pinhead
-	$3 Zippy_BW
-	$2 zippy
-end
-
-
-strip zits
-	name Zits
-	useclass sfgate-gen
-	$1 $name
-end
-
-#comicspage.com strips
-strip animal
-	name Animal Crackers
-	useclass comicspage-strips-gen
-	$1 animal
-	$2 ack
-end
-
-strip annie
-	name Annie
-	useclass comicspage-strips-gen
-	$1 annie
-	$2 ann
-end
-
-strip bound
-	name Bound and Gagged
-	useclass comicspage-strips-gen
-	$1 bound
-	$2 bgg
-end
-
-strip brenda
-	name Brenda Starr
-	useclass comicspage-strips-gen
-	$1 brenda
-	$2 bsr
-end
-
-strip broomhilda
-	name Broom Hilda
-	useclass comicspage-strips-gen
-	$1 broomhilda
-	$2 bhl
-end
-
-strip cats
-	name Cats with Hands
-	useclass comicspage-strips-gen
-	$1 cats
-	$2 cwh
-end
-
-strip dicktracy
-	name Dick Tracy
-	useclass comicspage-strips-gen
-	$1 dicktracy
-	$2 dty
-end
-
-strip doodles
-	name Doodles
-	useclass comicspage-strips-gen
-	$1 profdoodles
-	$2 dod
-end
-
-strip fred
-	name Fred Basset
-	useclass comicspage-strips-gen
-	$1 fred
-	$2 fbt
-end
-
-strip gasolinealley
-	name Gasoline Alley
-	useclass comicspage-strips-gen
-	$1 gasolinealley
-	$2 gas
-end
-
-strip gilthorp
-	name Gil Thorp
-	useclass comicspage-strips-gen
-	$1 gilthorp
-	$2 gtp
-end
-
-strip helen
-	name Helen, Sweetheart of the Internet
-	useclass comicspage-strips-gen
-	$1 helen
-	$2 hln
-end
-
-strip kudzu
-	name Kudzu
-	useclass comicspage-strips-gen
-	$1 kudzu
-	$2 kdz
-end
-
-strip lewis
-	name Lewis
-	useclass comicspage-strips-gen
-	$1 lewis
-	$2 lew
-end
-
-strip lola
-	name Lola
-	useclass comicspage-strips-gen
-	$1 lola
-	$2 lol
-end
-
-strip looseparts
-	name Loose Parts
-	useclass comicspage-strips-gen
-	$1 looseparts2
-	$2 lsp
-end
-
-strip meehan
-	name Meehan Streak
-	useclass comicspage-strips-gen
-	$1 meehan
-	$2 mst
-end
-
-strip middletons
-	name The Middletons
-	useclass comicspage-strips-gen
-	$1 middletons
-	$2 mid
-end
-
-#strip misterboffo
-#	name Mister Boffo
-#	useclass comicspage-strips-gen
-#	$1 misterboffo
-#	#2 bfo
-#end
-
-strip mixedmedia
-	name Mixed Media
-	useclass comicspage-strips-gen
-	$1 mixedmedia
-	$2 mix
-end
-
-strip monkeyhouse
-	name Monkeyhouse
-	useclass comicspage-strips-gen
-	$1 monkeyhouse
-	$2 mhs
-end
-
-#no longer carried by comicspage
-#strip grimmy
-#	name Mother Goose and Grimm
-#	useclass comicspage-strips-gen
-#	$1 grimmy
-#	$2 mgg
-#end
-
-strip shoe
-	name Shoe
-	useclass comicspage-strips-gen
-	$1 shoe
-	$2 sho
-end
-
-strip sylvia
-	name Sylvia
-	useclass comicspage-strips-gen
-	$1 sylvia
-	$2 syl
-end
-
-strip willynethel
-	name Willy 'n' Ethel
-	useclass comicspage-strips-gen
-	$1 willynethel
-	$2 wil
-end
-
-
-strip 9to5
-	name 9 to 5
-	useclass comicspage-panels-gen
-	$1 9to5
-	$2 ntf
-end
-
-strip bottomliners
-	name Bottom Liners
-	useclass comicspage-panels-gen
-	$1 bottomliners
-	$2 bls
-end
-
-strip computoon
-	name Compu-toon
-	useclass comicspage-panels-gen
-	$1 computoon
-	$2 cpt
-end
-
-#strip looseparts
-#	name Loose Parts
-#	useclass comicspage-panels-gen
-#	$1 looseparts
-#	$2 lsp
-#end
-
-strip loveis
-	name Love Is...
-	useclass comicspage-panels-gen
-	$1 loveis
-	$2 lis
-end
-
-strip pluggers
-	name Pluggers
-	useclass comicspage-panels-gen
-	$1 pluggers
-	$2 plg
-end
-
-strip quigmans
-	name The Quiqmans
-	useclass comicspage-panels-gen
-	$1 quigmans
-	$2 qgm
-end
-
-# gone? 2002-05-24
-strip thatsjake
-	name That's Jake
-	useclass comicspage-panels-gen
-	$1 thatsjake
-	$2 tjk
-end
-
-strip conrad
-	name Paul Conrad
-	useclass comicspage-editorial-gen
-	$1 conrad
-	$2 con
-end
-
-strip danziger
-	name Jeff Danziger
-	useclass comicspage-editorial-gen
-	$1 danziger
-	$2 dan
-end
-
-strip davies
-	name Matt Davies
-	useclass comicspage-editorial-gen
-	$1 davies
-	$2 dav
-end
-
-strip handelsman
-	name Walt Handelsman
-	useclass comicspage-editorial-gen
-	$1 handelsman
-	$2 han
-end
-
-strip horsey
-	name David Horsey
-	useclass comicspage-editorial-gen
-	$1 horsey
-	$2 hor
-end
-
-strip jones
-	name Taylor Jones
-	useclass comicspage-editorial-gen
-	$1 jones
-	$2 jon
-end
-
-strip locher
-	name Dick Locher
-	useclass comicspage-editorial-gen
-	$1 locher
-	$2 dik
-end
-
-strip lowe
-	name Chan Lowe
-	useclass comicspage-editorial-gen
-	$1 lowe
-	$2 low
-end
-
-strip marlette
-	name Doug Marlette
-	useclass comicspage-editorial-gen
-	$1 marlette
-	$2 mar
-end
-
-# superceded by kscarborough's
-#strip ohman
-#	name Jack Ohman
-#	useclass comicspage-editorial-gen
-#	$1 ohman
-#	$2 ohm
-#end
-
-strip peters
-	name Mike Peters
-	useclass comicspage-editorial-gen
-	$1 peters
-	$2 pet
-end
-
-strip sack
-	name Steve Sack
-	useclass comicspage-editorial-gen
-	$1 sack
-	$2 sak
-end
-
-strip sheneman
-	name Drew Sheneman
-	useclass comicspage-editorial-gen
-	$1 sheneman
-	$2 she
-end
-
-
-strip stayskal
-	name Wayne Stayskal
-	useclass comicspage-editorial-gen
-	$1 stayskal
-	$2 sty
-end
-
-
-# superceded by kscarborough's
-#strip summers
-#	name Dana Summers
-#	useclass comicspage-editorial-gen
-#	$1 summers
-#	$2 sum
-#end
-
-strip telnaes
-	name Ann Telnaes
-	useclass comicspage-editorial-gen
-	$1 telnaes
-	$2 tel
-end
-
-strip wasserman
-	name Dan Wasserman
-	useclass comicspage-editorial-gen
-	$1 wasserman
-	$2 was
-end
-
-strip wrightd
-	name Dick Wright
-	useclass comicspage-editorial-gen
-	$1 wrightd
-	$2 dwr
-end
-
-strip wright
-	name Don Wright
-	useclass comicspage-editorial-gen
-	$1 wright
-	$2 wrt
-end
-
-strip captainribman
-	name Captain RibMan
-	homepage http://www.comicspage.com/ribman/index.html
-	type search
-	searchpage http://www.supercomics.com/strips/new.html
-	searchpattern <img.+?src="(.+?)".+?ALT="Captain RibMan"
-	baseurl http://www.supercomics.com/strips/
-	provides latest
-end
-
-#mercury center strips
-strip bfriends
-	name Between Friends
-	useclass mercurycenter
-	$1 14
-	$2 bfriends
-end
-
-
-# sev.com.au strips
-strip sevtrek
-        name Sev Trek
-        useclass sev-comics
-end
-
-strip fotr
-        name Fraud of the Rings
-        useclass sev-comics
-end
-
-strip sevgate
-        name Sevgate SEV1
-        useclass sev-comics
-end
-
-strip bluffy
-        name Bluffy the Vampedup Stunner
-        useclass sev-comics
-end
-
-strip sevfiles
-        name The Sev Files
-        useclass sev-comics
-end
-
-strip sevwars
-        name Sev Wars
-        useclass sev-comics
-end
-
-strip sevylon5
-        name Sevylon 5
-        useclass sev-comics
-end
-
-# doesn't fit class
-strip sevscifi
-        name Sev Sci-Fi TV
-        homepage http://www.sev.com.au/toonzone/
-        type generate
-        imageurl http://www.sev.com.au/toonzone/scifitv.jpg
-        provides latest
-end
-
-#washpost strips
-strip andycapp
-        name Andy Capp
-        useclass washpost-creators
-        $1 cap
-end
-
-strip wizardofid
-        name Wizard of Id
-        useclass washpost-creators
-        $1 wiz
-end
-
-strip bc
-        name BC
-        useclass washpost-creators
-        $1 bc
-end
-
-strip marvin
-        name Marvin
-        useclass washpost-king
-        $1 $name
-end
-
-#creators.com strips
-strip agnes
-	name Agnes
-	homepage http://www.creators.com/comics_show.cfm?comicname=agn
-	type search
-	searchpattern <img.+?alt="Agnes".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip archie
-	name Archie
-	homepage http://www.creators.com/comics_show.cfm?comicname=arc
-	type search
-	searchpattern <img.+?alt="Archie".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip askshagg
-	name Ask Shagg
-	homepage http://www.creators.com/comics_show.cfm?comicname=shg
-	type search
-	searchpattern <img.+?alt="Ask Shagg".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip ballardstreet
-	name Ballard Street
-	homepage http://www.creators.com/comics_show.cfm?comicname=bs
-	type search
-	searchpattern <img.+?alt="Ballard Street".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip bachelorparty
-	name Bachelor Party
-	homepage http://www.creators.com/comics_show.cfm?comicname=bch
-	type search
-	searchpattern <img.+?alt="Bachelor Party".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip charlie
-	name Charlie
-	homepage http://www.creators.com/comics_show.cfm?comicname=cha
-	type search
-	searchpattern <img.+?alt="Charlie".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-# available at pay site mycomicspage.com
-#strip drawingacrowd
-#	name Drawing a Crowd
-#	homepage http://www.creators.com/comics_show.cfm?comicname=dac
-#	type search
-#	searchpattern <img.+?alt="Drawing a Crowd".+?src="(.+?)"
-#	baseurl http://www.creators.com/
-#	provides latest
-#end
-
-strip flightdeck
-	name Flight Deck
-	homepage http://www.creators.com/comics_show.cfm?comicname=fli
-	type search
-	searchpattern <img.+?alt="Flight Deck".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip flofriends
-	name Flo & Friends
-	homepage http://www.creators.com/comics_show.cfm?comicname=flo
-	type search
-	searchpattern <img.+?alt="Flo & Friends".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip forheavenssake
-	name For Heaven's Sake
-	homepage http://www.creators.com/comics_show.cfm?comicname=hev
-	type search
-	searchpattern <img.+?alt="For Heavens Sake".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip heathcliff
-	name Heathcliff
-	homepage http://www.creators.com/comics_show.cfm?comicname=hth
-	type search
-	searchpattern <img.+?alt="Heathcliff".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip herbandjamaal
-	name Herb and Jamaal
-	homepage http://www.creators.com/comics_show.cfm?comicname=hrb
-	type search
-	searchpattern <img.+?alt="Herb and Jamal".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip libertymeadows
-	name Liberty Meadows
-	homepage http://www.creators.com/comics_show.cfm?comicname=lib
-	type search
-	searchpattern <img.+?alt="Liberty Meadows".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip momma
-	name Momma
-	homepage http://www.creators.com/comics_show.cfm?comicname=mom
-	type search
-	searchpattern <img.+?alt="Momma".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip mrhousewife
-	name Mr. Housewife
-	homepage http://www.creators.com/comics_show.cfm?comicname=mrh
-	type search
-	searchpattern <img.+?alt="Mr. Housewife".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip naturalselection
-	name Natural Selection
-	homepage http://www.creators.com/comics_show.cfm?comicname=nat
-	type search
-	searchpattern <img.+?alt="Natural Selection".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip onebighappy
-	name One Big Happy
-	homepage http://www.creators.com/comics_show.cfm?comicname=obh
-	type search
-	searchpattern <img.+?alt="One Big Happy".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip theothercoast
-	name The Other Coast
-	homepage http://www.creators.com/comics_show.cfm?comicname=oc
-	type search
-	searchpattern <img.+?alt="The Other Coast".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip rubes
-	name Rubes
-	homepage http://www.creators.com/comics_show.cfm?comicname=rub
-	type search
-	searchpattern <img.+?alt="Rubes".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip rugrats
-	name Rugrats
-	homepage http://www.creators.com/comics_show.cfm?comicname=rug
-	type search
-	searchpattern <img.+?alt="Rugrats".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip speedbump
-	name Speed Bump
-	homepage http://www.creators.com/comics_show.cfm?comicname=bmp
-	type search
-	searchpattern <img.+?alt="Speed Bump".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip strangebrew
-	name Strange Brew
-	homepage http://www.creators.com/comics_show.cfm?comicname=brw
-	type search
-	searchpattern <img.+?alt="Strange Brew".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip weepals
-	name Wee Pals
-	homepage http://www.creators.com/comics_show.cfm?comicname=wee
-	type search
-	searchpattern <img.+?alt="Wee Pals".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-#strip chuckasay
-#	name Chuck Asay
-#	homepage http://www.creators.com/editorial_show.cfm?comicname=ca
-#	type search
-#	searchpattern <img.+?alt="Chuck Asay".+?src="(.+?)"
-#	baseurl http://www.creators.com/
-#	provides latest
-#end
-
-#strip chipbok
-#	name Chip Bok
-#	homepage http://www.creators.com/editorial_show.cfm?comicname=cb
-#	type search
-#	searchpattern <img.+?alt="Chip Bok".+?src="(.+?)"
-#	baseurl http://www.creators.com/
-#	provides latest
-#end
-
-#strip kencatalino
-#	name Ken Catalino
-#	homepage http://www.creators.com/editorial_show.cfm?comicname=kn
-#	type search
-#	searchpattern <img.+?alt="Ken Catalino".+?src="(.+?)"
-#	baseurl http://www.creators.com/
-#	provides latest
-#end
-
-#strip johndeering
-#	name John Deering
-#	homepage http://www.creators.com/editorial_show.cfm?comicname=jd
-#	type search
-#	searchpattern <img.+?alt="John Deering".+?src="(.+?)"
-#	baseurl http://www.creators.com/
-#	provides latest
-#end
-
-strip bobgorrell
-	name Bob Gorrell
-	homepage http://www.creators.com/editorial_show.cfm?comicname=bg
-	type search
-	searchpattern <img.+?alt="Bob Gorrell".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip clayjones
-	name Clay Jones
-	homepage http://www.creators.com/editorial_show.cfm?comicname=cj
-	type search
-	searchpattern <img.+?alt="Clay Jones".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip mikeluckovich
-	name Mike Luckovich
-	homepage http://www.creators.com/editorial_show.cfm?comicname=lk
-	type search
-	searchpattern <img.+?alt="Mike Luckovich".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip jimmymargulies
-	name Jimmy Margulies
-	homepage http://www.creators.com/editorial_show.cfm?comicname=jm
-	type search
-	searchpattern <img.+?alt="Jimmy Margulies".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip dwanepowell
-	name Dwane Powell
-	homepage http://www.creators.com/editorial_show.cfm?comicname=dp
-	type search
-	searchpattern <img.+?alt="Dwane Powell".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip paulszep
-	name Paul Szep
-	homepage http://www.creators.com/editorial_show.cfm?comicname=ps
-	type search
-	searchpattern <img.+?alt="Paul Szep".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip geoffreymoss
-	name Geoffrey Moss
-	homepage http://www.creators.com/editorial_show.cfm?comicname=gm
-	type search
-	searchpattern <img.+?alt="Mossprints".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip juliasuits
-	name Julia Suits
-	homepage http://www.creators.com/editorial_show.cfm?comicname=su
-	type search
-	searchpattern <img.+?alt="Suits".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip garyvarvel
-	name Gary Varvel
-	homepage http://www.creators.com/editorial_show.cfm?comicname=gv
-	type search
-	searchpattern <img.+?alt="Varvel".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-#additional non-standard strips
-strip dtte
-	name Death to the Extremist
-	homepage http://www.zole.org/extremist/
-	type search
-	searchpage http://www.zole.org/extremist/
-	searchpattern <img.+?src="comics/(.+?)"
-	baseurl http://www.zole.org/extremist/comics/
-	provides latest
-end
-
-strip jack
-	name Jack
-	artist David Hopkins
-	homepage http://jack.keenspace.com
-	type generate
-	imageurl $homepage/comics/Jack%Y%m%d.jpg
-	provides any
-end
-
-strip errantstory
-	name Errant Story
-	artist Michael Poe
-	homepage http://www.errantstory.com
-	type search
-	searchpattern <IMG.+?SRC="(/comics/es.+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip catandgirl
-        name Cat and Girl
-        artist Dorothy Gambrell
-        homepage http://www.catandgirl.com/
-        type search
-        searchpattern <img.+?src="(archive/cg.+?\.gif)"
-        baseurl http://www.catandgirl.com/
-        provides latest
-end
-
-strip scarygoround
-      name Scary Go Round
-      artist John Allison
-      homepage http://scarygoround.com/
-      type search
-      searchpattern <img src="(strips/\d+.+?)"
-      baseurl $homepage
-      provides latest
-end
-
-strip erniepook
-      name Ernie Pook's Comeek
-      artist Lynda Barry
-      homepage http://www.marlysmagazine.com/
-      type search
-      searchpage http://www.marlysmagazine.com/main.html
-      searchpattern <img.+?src='(strips/comeek..\.gif)'
-      baseurl $homepage
-      provides latest
-end
-
-strip erniepookbig
-      name Ernie Pook's Comeek (big image)
-      artist Lynda Barry
-      homepage http://www.marlysmagazine.com/
-      type search
-      searchpage http://www.marlysmagazine.com/main.html
-      searchpattern <a.+?href='(strips/bigcomeek..\.gif)'
-      baseurl $homepage
-      provides latest
-end
-
-strip raeside
-      name Adrian Raeside
-      homepage http://www.raesidecartoon.com/
-      type generate
-      imageurl http://www.raesidecartoon.com/images/today.gif
-      provides latest
-end
-
-strip chappatte
-      name Patrick Chappatte
-      homepage http://www.globecartoon.com/
-      type generate
-      imageurl http://www.globecartoon.com/Images/week.gif
-      provides latest
-end
-
-strip cranandlerma
-      name Cran and Lerma
-      artist Nik Scott
-      homepage http://toons.net/
-      type generate
-      imageurl http://toons.net/toon.gif
-      provides latest
-end
-
-strip curiousmoments
-      name Curious Moments
-      artist Nik Scott
-      homepage http://toons.net/
-      type generate
-      imageurl http://www.toons.net/cur.gif
-      provides latest
-end
-
-strip wolvertoon
-      name The Wolvertoon
-      artist Monte Wolverton
-      homepage http://www.pacificnet.net/toons/
-      type generate
-      imageurl http://www.pacificnet.net/toons/wolvertoon.gif
-      provides latest
-end
-
-strip toles
-	name Tom Toles
-	useclass washpost-uclick
-	$1 tt
-end
-
-strip auth
-	name Tony Auth
-	useclass washpost-uclick
-	$1 ta
-end
-
-strip carlson
-	name Stuart Carlson
-	useclass washpost-uclick
-	$1 sc
-end
-
-strip deore
-	name Bill Deore
-	useclass washpost-uclick
-	$1 bd
-end
-
-strip oliphant
-	Name Pat Oliphant
-	useclass washpost-uclick
-	$1 po
-end
-
-strip rall
-	name Ted Rall
-	useclass washpost-uclick
-	$1 tr
-end
-
-#strip sargent
-#	name Ben Sargent
-#	useclass washpost-uclick
-#	$1 bs
-#end
-
-#cagle strips
-strip topsyturvey
-	name Topsy Turvey
-	artist Peter Kuper
-	useclass slate-cagle
-	$1 kuper
-	$2 kuper
-end
-
-strip toomuchcoffeeman
-	name Too Much Coffee Man
-	artist Shannon Wheeler
-	useclass slate-cagle
-	$1 wheeler
-	$2 wheeler
-end
-
-strip alcarez
-	name Lalo Alcarez
-	useclass slate-cagle
-	$1 lalo
-	$2 lalo
-end
-
-strip andersonk
-	name Kirk Anderson
-	useclass slate-cagle
-	$1 anderson
-	$2 kirk
-end
-
-strip andersonn
-	name Nick Anderson
-	useclass slate-cagle
-	$1 andersonNICK
-	$2 nick
-end
-
-strip asay
-	name Chuck Asay
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ariail
-	name Robert Ariail
-	useclass slate-cagle
-	# Yes, they misspell his name in the URL
-	$1 arial
-	$2 arial
-end
-
-strip babin
-	name Rex Babin
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip bateman
-	name Scott Bateman
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip beattie
-	name Bruce Beattie
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip bish
-	name Randy Bish
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip bok
-	name Chip Bok
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip breen
-	name Steve Breen
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip britt
-	name Chris Britt
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip brookins
-	name Gary Brookins
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip brown
-	name Jonathan Brown
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip cagle
-	name Daryl Cagle
-	useclass slate-cagle
-	$1 $strip
-	$2 cagle00
-end
-
-strip casciari
-	name James Casciari
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip catalino
-	name Ken Catalino
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip catrow
-	name David Catrow
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-#strip cole
-#	name John Cole
-#	useclass slate-cagle
-#	$1 $strip
-#	#$2 $strip
-#	$2 coletoon
-#end
-
-#non-template
-strip cole
-	name John Cole
-	homepage http://cagle.slate.msn.com/politicalcartoons/PCcartoons/cole.asp
-	type generate
-	provides latest
-	imageurl http://www.heraldsun.com/images/photos/live/coletoon.jpg
-end
-
-strip crowe
-	name J.D. Crowe
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip curry
-	name Tom Curry
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip day
-	name Jim Day
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip deering
-	name John Deering
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip duffy
-	name Brian Duffy
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip englehart
-	name Bob Englehart
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-#strip gorrell
-#	name Bob Gorrell
-#	useclass slate-cagle
-#	$1 $strip
-#	$2 $strip
-#end
-
-strip greenberg
-	name Steve Greenberg
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip harville
-	name Vic Harville
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip heller
-	name Joe Heller
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip jacobson
-	name David Jacobson
-	useclass slate-cagle
-	$1 davidjacobson
-	$2 davidjacobson
-end
-
-#strip jonesc
-#	name Clay Jones
-#	useclass slate-cagle
-#	$1 jones
-#	$2 jones
-#end
-
-strip kallaugher
-	name Kevin Kallaugher
-	useclass slate-cagle
-	$1 $strip
-	$2 kal
-end
-
-strip keefe
-	name Mike Keefe
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip koterba
-	name Jeff Koterba
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip lane
-	name Mike Lane
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip macgregor
-	name Doug MacGregor
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip markstein
-	name Gary Markstein
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip matson
-	name R.J. Matson
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip mccloskey
-	name Jim McCloskey
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip mckee
-	name Rick McKee
-	useclass slate-cagle
-	$1 $strip
-	# I have no idea where they get "wells" from.
-	$2 wells
-end
-
-strip menees
-	name Tim Menees
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip morin
-	name Jim Morin
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ohman
-	name Jack Ohman
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip parker
-	name Jeff Parker
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip plante
-	name Bruce Plante
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-#redundant - see dwanepowell entry
-#strip powell
-#	name Dwane Powell
-#	useclass slate-cagle
-#	$1 $strip
-#	$2 $strip
-#end
-
-strip priggee
-	name Milt Priggee
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ramirez
-	name Mike Ramirez
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ramsey
-	name Marshall Ramsey
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip reddick
-	name David Reddick
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ritter
-	name Mike Ritter
-	useclass slate-cagle
-	$1 $strip
-	$2 ritter00
-end
-
-strip sherffius
-	name John Sherffius
-	useclass slate-cagle
-	$1 $strip
-	$2 sherffius21
-end
-
-strip siers
-	name Kevin Siers
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip stantis
-	name Scott Stantis
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip summers
-	name Dana Summers
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip streeter
-	name Mark Streeter
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip thompson
-	name Mike Thompson
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip trever
-	name John Trever
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip trinidad
-	name Corky Trinidad
-	useclass slate-cagle
-	$1 corky
-	$2 corky
-end
-
-#strip varvel
-#	name Gary Varvel
-#	useclass slate-cagle
-#	$1 $strip
-#	$2 $strip
-#end
-
-strip walters
-	name Kirk Walters
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip wilkinson
-	name Signe Wilkinson
-	useclass slate-cagle
-	$1 signe
-	$2 signe
-end
-
-strip wrightl
-	name Larry Wright
-	useclass slate-cagle
-	$1 wright
-	$2 wright
-end
-
-strip bizwit
-	name Bizwit
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip troubletown
-	name Troubletown
-	artist Lloyd Dangle
-	useclass slate-cagle
-	$1 dangle
-	$2 dangle
-end
-
-strip grondahl
-	name Cal Grondahl
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip huffaker
-	name Sandy Huffaker
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip randompropaganda
-	name Random Propaganda
-	artist Ryan Inzana
-	useclass slate-cagle
-	$1 inzana
-	$2 inzana
-end
-
-strip swill
-	name Swill
-	artist Peter Kohlsaat
-	useclass slate-cagle
-	$1 kohlsaat
-	$2 kohlsaat
-end
-
-strip cartoonfix
-	name Cartoonfix
-	artist John Kurtz
-	useclass slate-cagle
-	$1 kurtz
-	$2 kurtz
-end
-
-strip incontempt
-	name In Contempt
-	artist Kevin Moore
-	useclass slate-cagle
-	$1 moore
-	$2 moore
-end
-
-strip noexit
-	name No Exit
-	artist Andy Singer
-	useclass slate-cagle
-	$1 singer
-	$2 singer
-end
-
-strip slowpoke
-	name Slowpoke
-	artist Jen Sorenson
-	useclass slate-cagle
-	$1 sorenson
-	$2 sorenson
-end
-
-strip snibbe
-	name Kurt Snibbe
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip spencer
-	name John Spencer
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip wallace
-	name Russ Wallace
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip linttrap
-	name Lint Trap
-	artist Matt Wuerker
-	useclass slate-cagle
-	$1 wuerker
-	$2 wuerker
-end
-
-strip aislin
-	name Aislin
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip bado
-	name Bado
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip cardow
-	name Cameron Cardow
-	useclass slate-cagle
-	$1 cam
-	$2 cam
-end
-
-strip corrigan
-	name Patrick Corrigan
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip clement
-	name Gary Clement
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip cummings
-	name Dale Cummings
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip deadder
-	name Michael DeAdder
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip dolighan
-	name Tim Dolighan
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip donato
-	name Andy Donato
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip gable
-	name Brian Gable
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip graston
-	name Michael Graston
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip mackay
-	name Graeme MacKay
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip mackinnon
-	name Bruce MacKinnon
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip moudakis
-	name Theo Moudakis
-	useclass slate-cagle
-	$1 $strip
-	$2 mou
-end
-
-strip peterson
-	name Roy Peterson
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip rodewalt
-	name Vance Rodewalt
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ammer
-	name Wolfgang Ammer
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip anjornooz
-	name Sepideh Anjornooz
-	useclass slate-cagle
-	$1 sepideh
-	$2 sepideh
-end
-
-strip esquivel
-	name Arcadio Esquivel
-	useclass slate-cagle
-	$1 arcadio
-	$2 arcadio
-end
-
-strip ares
-	name Ares
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip mitropoulos
-	name Bas Mitropoulos
-	useclass slate-cagle
-	$1 bas
-	$2 bas
-end
-
-strip behrendt
-	name Fritz Behrendt
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip bertrams
-	name Joep Bertrams
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip boligan
-	name Angel Boligan
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip boyle
-	name Francis Boyle
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip cajas
-	name Pancho Cajas
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip carlucho
-	name Carlucho
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip cherepanov
-	name Yuri Cherepanov
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip coco
-	name Coco
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip corax
-	name Corax
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip deangelis
-	name Marco DeAngelis
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip doloricon
-	name Doloricon
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip drybones
-	name Dry Bones
-	artist Yaakov Kirschen
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip emmerson
-	name Rod Emmerson
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip evans
-	name Malcolm Evans
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip gado
-	name Gado
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip garrincha
-	name Garrincha
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip gomaa
-	name Gomaa
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip graff
-	name Finn Graff
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip hachfeld
-	name Rainer Hachfeld
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip hajjaj
-	name Emad Hajjaj
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip hansson
-	name Riber Hansson
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip hervi
-	name Hervi
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip kazanevsky
-	name Vladmir Kazanevsky
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip heng
-	name Heng Kim Song
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip olle
-	name Olle
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip keshav
-	name Keshav
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip christo
-	name Christo
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip kowsar
-	name Nik Kowsar
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip langer
-	name Langer
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip leahy
-	name Sean Leahy
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip moir
-	name Alan Moir
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip medi
-	name Medi
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip molina
-	name Pedro Molina
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip miel
-	name Deng Coy Miel
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip alimov
-	name Murat Alimov
-	useclass slate-cagle
-	$1 murat
-	$2 murat
-end
-
-strip paresh
-	name Paresh
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip nicholson
-	name Peter Nicholson
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ofarrell
-	name Vince O'Farrell
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip obi
-	name Obi
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip palomo
-	name Palomo
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip pancho
-	name Pancho
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip peel
-	name Peel
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip pismestrovic
-	name Petar Pismestrovic
-	useclass slate-cagle
-	$1 petar
-	$2 petar
-end
-
-strip plantu
-	name Jean Plantu
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip persitoons
-	name Persitoons
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ricardo
-	name Ricaro
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ronnen
-	name Meir Ronnen
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip rowe
-	name David Rowe
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip sakurai
-	name Heiko Sakurai
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip schopf
-	name Oliver Schopf
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip schot
-	name Bas van der Schot
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip serguei
-	name Serguei
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip slane
-	name Chris Slane
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip kim
-	name Kim Gyung Soo
-	useclass slate-cagle
-	$1 soo
-	$2 soo
-end
-
-strip stavro
-	name Stavro
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip tayo
-	name Tayo
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip tom
-	name Tom
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip touka
-	name Touka
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip turner
-	name Martyn Turner
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip wonsoo
-	name Wonsoo Li
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip zapiro
-	name Zapiro
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip zeev
-	name Ze'ev
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip zetterling
-	name Leif Zetterling
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip zudin
-	name Alexandr Zudin
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-
-# azcentral strips
-class azcentral-srch
-	homepage http://www.azcentral.com/ent/comics/$strip.html
-	type search
-	searchpattern <img.+?SRC="(http://mst.rbma.com/content/$1)"
-	prefetch $homepage
-	provides latest
-end
-
-strip apt3g
-	name Apartment 3-G
-	useclass azcentral-srch
-	$1 Apartment_3-G
-end
-
-strip barneygoogle
-	name Barney Google
-	useclass azcentral-srch
-	$1 Barney_Google
-end
-
-strip betterhalf
-	name Better Half
-	useclass azcentral-srch
-	$1 Better_Half
-end
-
-strip buckles
-	name Buckles
-	useclass azcentral-srch
-	$1 Buckles
-end
-
-strip dinetteset
-	name Dinette Set
-	useclass azcentral-srch
-	$1 Dinette_Set
-end
-
-strip grinandbearit
-	name Grin and Bear It
-	useclass azcentral-srch
-	$1 Grin_and_Bear_It
-end
-
-strip hiandlois
-	name Hi and Lois
-	useclass azcentral-srch
-	$1 Hi_and_Lois
-end
-
-strip judgeparker
-	name Judge Parker
-	useclass azcentral-srch
-	$1 Judge_Parker
-end
-
-strip lockhorns
-	name Lockhorns
-	useclass azcentral-srch
-	$1 Lockhorns
-end
-
-strip marktrail
-	name Mark Trail
-	useclass azcentral-srch
-	$1 Mark_Trail
-end
-
-strip maryworth
-	name Mary Worth
-	useclass azcentral-srch
-	$1 Mary_Worth
-end
-
-strip pardonmyplanet
-	name Pardon My Planet
-	useclass azcentral-srch
-	$1 Pardon_My_Planet
-end
-
-strip redeye
-	name Redeye
-	useclass azcentral-srch
-	$1 Redeye
-end
-
-strip rexmorgan
-	name Rex Morgan, MD
-	useclass azcentral-srch
-	$1 Rex_Morgan
-end
-
-strip steveroper
-	name Steve Roper
-	useclass azcentral-srch
-	$1 Steve_Roper
-end
-
-strip theylldoiteverytime
-	name They'll Do It Every Time
-	useclass azcentral-srch
-	$1 TDIE
-end
-
-strip tiger
-	name Tiger
-	useclass azcentral-srch
-	$1 Tiger
-end
-
-strip tinasgroove
-	name Tina's Groove
-	useclass azcentral-srch
-	$1 Tinas_Groove
-end
-
-strip tumbleweeds
-	name Tumbleweeds
-	useclass azcentral-srch
-	$1 Tumbleweeds
-end
-
-strip edgecity
-	name Edge City
-	useclass sfgate-gen
-	$1 Edge_City
-end
-
-
-
-# more non-standard
-strip fleem
-	name fleem
-	homepage http://flem.keenspace.com/
-	type generate
-	imageurl http://flem.keenspace.com/comics/%Y%m%d.jpg
-	provides any
-end
-
-strip queenofwands
-	name Queen of Wands
-	homepage http://www.queenofwands.net/
-	type generate
-	imageurl http://www.queenofwands.net/comics/%Y%m%d.gif
-	provides any
-end
-
-strip wigu
-	name WIGU
-	artist Jeffrey Rowland
-	homepage http://www.wigu.com/
-	type generate
-	imageurl http://www.wigu.com/strips/%Y%m%d.png
-	provides any
-end
-
-strip overdue
-	name Overdue
-	artist Bill Barnes and Gene Ambaum
-	homepage http://www.overduemedia.com/
-	type generate
-	imageurl http://www.overduemedia.com/strips/%Y%m%d.gif
-	provides latest
-end
-
-strip nichtlustig
-	name Nicht Lustig
-	homepage http://www.nichtlustig.de/
-	type generate
-	imageurl http://www.nichtlustig.de/comics/full/%y%m%d.jpg
-	provides any
-end
-
-strip hackles
-	name Hackles
-	homepage http://hackles.org
-	type generate
-	imageurl http://hackles.org/latest/cartoon.png
-	provides latest
-end
-
-strip aford
-	name Aford Turtle
-	homepage http://www.afordturtle.com
-	type generate
-	imageurl http://www.afordturtle.com.cnchost.com/comicstrips/neweststrip.gif
-	provides latest
-end
-
-strip dragontails
-	name Dragon Tails
-	artist Tim Dawson
-	homepage http://www.dragon-tails.com/
-	type search
-	searchpattern SRC="(comics/.+?\..+?)"
-	provides latest
-	baseurl $homepage
-end
-
-strip shermanslagoon
-	name Sherman's Lagoon
-	artist Jim Toomey
-	homepage http://www.slagoon.com
-	type generate
-	imageurl $homepage/dailies/SL%y.%m.%d.gif
-	provides latest
-end
-
-strip dicebox
-	name Dicebox
-	homepage http://www.girlamatic.com/series.php?name=dicebox
-	type search
-	searchpattern <img src=(http://www.girlamatic.com/jmlee/\w+?\.jpg)
-	provides latest
-end
-
-strip nothingnice
-	name Nothing Nice to Say
-	homepage http://www.nothingnice.com/
-	type generate
-	imageurl http://www.nothingnice.com/strips/%y/%m-%d-%y.gif
-	provides any
-end
-
-strip ctrlaltdel
-	name Ctrl+Alt+Del
-	artist Tim Buckley
-	homepage http://www.ctrlaltdel-online.com/
-	type generate
-	imageurl http://www.ctrlaltdel-online.com/images/comics/%Y%m%d.jpg
-	provides any
-end
-
-strip tasteslikegravel
-	name Tastes Like Gravel
-	artist Todd Oliver
-	homepage http://www.tasteslikegravel.com/
-	type generate
-	imageurl http://www.tasteslikegravel.com/strips/%Y%m%d.png
-	provides any
-end
-
-strip instantclassic
-	name Instant Classic
-	artist Brian Carroll
-	homepage http://www.briworld.com
-	type generate
-	imageurl http://www.briworld.com/ICimages/IC%Y%m%d.jpg
-	provides any
-end
-
-strip geeksalad
-	name Geek Salad
-	artist Warwick Rendell
-	homepage http://www.geeksalad.net/
-	type generate
-	imageurl http://www.geeksalad.net/strips/%Y%m%d.png
-	provides any
-end
-
-strip reallife
-	name Real Life Comics
-	artist Greg Dean
-	homepage http://www.reallifecomics.com/
-	type search
-	searchpattern src=.(/index.php.*?00000-00000-11111-00000-00000)
-	baseurl http://www.reallifecomics.com/
-	provides latest
-end
-
-strip comet7
-	name Comet 7
-	artist David Tekiela
-	homepage http://www.comet7.moreevolved.com/index.htm
-	type search
-	searchpattern (strips/c7_\d*\.gif)
-	baseurl http://www.comet7.moreevolved.com/
-	provides latest
-end
-
-strip moviepunks
-	name Movie Punks
-	artist Carrington Vanston
-	homepage http://www.moviepunks.com/
-	type search
-	searchpattern (http://www.moviepunks.com/comics/\d*\.png)
-	provides latest
-end
-
-strip building12
-	name Building 12
-	artist Chris Hazelton
-	homepage http://www.building12.net/
-	type search
-	searchpattern (http://www.building12.net/issue\d/page\d*.jpg)
-	provides latest
-end
-
-strip sarahanddavid
-	name Sarah And David
-	artist Alex Aberle
-	homepage http://www.sara-and-david.com/comic.php?comic=latest
-	type search
-	searchpattern (comics/\d*\.jpg)
-	baseurl http://www.sara-and-david.com/
-	provides latest
-end
-
-strip haiopeis
-	name Haiopeis
-	homepage http://www.drive-in-cartoons.de/haiopeis/hauptteil.php
-	type search
-	searchpattern <img src=http://www.drive-in-cartoons.de/albums/haiopeis/(\S+.png)
-	baseurl http://www.drive-in-cartoons.de/albums/haiopeis/
-	provides latest
-end
-
-
-strip grimmy
-    name Mother Goose and Grimm
-    homepage http://www.grimmy.com/comics.php
-    type generate
-    imageurl http://www.grimmy.com/images/MGG_Archive/MGG_%Y/MGG%m%d.gif
-    provides any
-end
-
-strip biloynano
-	name Tira ecol de Bilo y Nano
-	homepage http://tira.escomposlinux.org/
-	type generate
-	imageurl http://tira.escomposlinux.org/tira.png
-	provides latest
-end
-
-strip gallegoyrey
-	name Gallego Y Rey
-	homepage http://www.elmundo.es/diario/opinion/humor.html
-	type generate
-	imageurl http://estaticos.elmundo.es/diario/Library/chiste1.gif
-	provides latest
-end
-
-strip ricardomundo
-	name Ricardo (El Mundo)
-	homepage http://www.elmundo.es/diario/opinion/humor2.html
-	type generate
-	imageurl http://estaticos.elmundo.es/diario/Library/%dchiste2.gif
-	provides latest
-end
-
-strip idigoras
-	name Idigoras
-	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/idigoras.gif
-	type generate
-	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/idigoras.gif
-	provides latest
-end
-
-strip zulet
-	name Zulet
-	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/zulet.gif
-	type generate
-	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/zulet.gif
-	provides latest
-end
-
-strip elgar
-	name Elgar
-	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/elgar.gif
-	type generate
-	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/elgar.gif
-	provides latest
-end
-
-strip pachideportes
-	name Pachi
-	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/pachideportes.gif
-	type generate
-	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/pachideportes.gif
-	provides latest
-end
-
-strip biloynanoenglish
-	name Tira ecol de Bilo y Nano (english)
-	homepage http://comic.escomposlinux.org/
-	type generate
-	imageurl http://comic.escomposlinux.org/strip.png
-	provides latest
-end
-
-
-strip amores
-	name Amor es...
-	useclass comicspage-panels-gen
-	$1 amores
-	$2 amr
-end
+# Strip Groups
+group andrews
+	desc Andrew's Favorite Strips
+	include userfriendly dilbert foxtrot
+	include pennyarcade joyoftech thefifthwave monty bc
+	include wizardofid garfield adamathome
+end
+
+group michael
+	desc Michael's Favorite Strips
+	include foxtrot boondocks doonesbury zits dilbert babyblues
+	include monty bc blondie calvinandhobbes funkywinkerbean
+	include zippythecolorpinhead peanuts adamathome forbetter bizarro
+	include userfriendly geech shoe wizardofid
+end
+
+group gloucestertimes
+	desc Gloucester Daily Times Strips
+	include garfield broomhilda bc wizardofid roseisrose
+	include dilbert cathy sallyforth monty grimmy peanuts
+	include forbetter foxtrot offthemark
+end
+
+group bgsunday
+	desc Boston Globe Sunday Comics
+	include dilbert doonesbury garfield getfuzzy adamathome grimmy forbetter
+	include foxtrot jumpstart zits zippythecolorpinhead curtis
+	include rhymeswithorange boondocks nonsequitur stonesoup roseisrose monty
+	include arlonjanis askshagg
+end
+
+# Class definitions
+class ucomics-srch
+	homepage http://www.ucomics.com/$strip/view$1.htm
+	type search
+	searchpattern <img.+?src=".+?(/$1/(\d+)/$1(\d+).+?)"
+	baseurl http://images.ucomics.com/comics
+	provides latest
+end
+
+class ucomics-gen
+    homepage http://www.ucomics.com/$strip/view$1.phtml
+	type generate
+	imageurl http://images.ucomics.com/comics/$1/%Y/$1%y%m%d.gif
+	provides any
+
+end
+
+class unitedmedia-srch-comics
+	homepage http://www.unitedmedia.com/comics/$strip/index.html
+	type search
+	searchpage http://www.unitedmedia.com/comics/$strip/archive/$strip-%Y%m%d.html
+	searchpattern <img.+?src="(/comics/$strip/archive/images/$strip.+?)"
+	baseurl http://www.unitedmedia.com
+	provides any
+end
+
+class unitedmedia-srch-comics-lag
+	homepage http://www.unitedmedia.com/comics/$strip/index.html
+	type search
+	searchpattern <img.+?src="(/comics/$strip/archive/images/$strip.+?)"
+	baseurl http://www.unitedmedia.com
+	provides latest
+end
+
+class unitedmedia-srch-creators
+	homepage http://www.unitedmedia.com/creators/$strip/index.html
+	type search
+	searchpattern <img.+?src="?(/creators/$strip/archive/images/.+?\.(gif|jpg))"?
+	baseurl http://www.unitedmedia.com
+	provides latest
+end
+
+class unitedmedia-srch-wash
+	homepage http://www.unitedmedia.com/wash/$strip/index.html
+	type search
+	searchpattern (/wash/$strip/archive/images/(.*?)\.(gif|jpg))
+	baseurl http://www.unitedmedia.com
+	provides latest
+end
+
+class unitedmedia-srch-editoons
+	homepage http://www.unitedmedia.com/editoons/$1/index.html
+	type search
+	searchpattern <img src="(/editoons/$1/archive/images/$1\d+\..+?)"
+	baseurl http://www.unitedmedia.com
+	provides latest
+end
+
+class sfgate-gen-zippy
+	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
+	type generate
+	imageurl http://pst.rbma.com/content/$3
+	provides latest
+	prefetch $homepage
+end
+
+class sfgate-gen-zippycolor
+	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
+	type generate
+	imageurl http://pst.rbma.com/content/$2
+	provides latest
+end
+
+class sfgate-gen
+	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
+	type generate
+	imageurl http://pst.rbma.com/content/$1
+	provides latest
+	prefetch $homepage
+end
+
+class sfgate-srch
+	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
+	type search
+	searchpattern <img.+?src=".+?(/comics/graphics/$2/.+?\..+?)"
+	baseurl http://www.sfgate.com
+	provides latest
+end
+
+class sfgate-columnists
+	homepage http://www.sfgate.com/columnists/$1/
+	type search
+	provides latest
+	searchpattern <IMG.+?SRC="(http://www.sfgate.com/chronicle/pictures/\d+/\d+/\d+/.+?-farley.gif)"
+end
+
+class comicspage-strips-gen
+        # $1 - more or less the real name
+        # $2 - 3-letter abbreviation of $1
+        referer http://www.comicspage.com/$1/index.html
+        homepage http://www.comicspage.com/$1/index.html
+        type generate
+        imageurl http://www.tmsfeatures.com/tmsfeatures/servlet/com.featureserv.util.Download?file=%Y%m%dcs$2-<code:"s" if %w==0><code:"a" if %w!=0>-p.jpg&code=cs$2
+        provides any
+end
+
+class comicspage-panels-gen
+	# $1 - more or less the real name
+	# $2 - 3-letter abbreviation of $1
+	homepage http://www.comicspage.com/$1/index.html
+	#type search
+	#searchpage http://www.comicspage.com/$1/main.html
+	#searchpattern <img.+?src="(http://www.comicspage.com/daily/cp$2/\d+cp$2((-\w)?)\..+?)"
+	type generate
+	imageurl http://www.tmsfeatures.com/tmsfeatures/servlet/com.featureserv.util.Download?file=%Y%m%dcp$2-<code:"s" if %w==0><code:"a" if %w!=0>-p.jpg&code=cp$2
+	#provides latest
+	provides any
+end
+
+class comicspage-editorial-gen
+	# $1 - more or less the real name
+	# $2 - 3-letter abbreviation of $1
+	homepage http://www.comicspage.com/$1/index.html
+	#type search
+	#searchpage http://www.comicspage.com/$1/main.html
+	#searchpattern <img.+?src="(http://www.comicspage.com/daily/ed$2/\d+ed$2((-\w)?)\..+?)"
+	#provides latest
+	type generate
+	imageurl http://www.tmsfeatures.com/tmsfeatures/servlet/com.featureserv.util.Download?file=%Y%m%ded$2-a-p.jpg&code=ed$2
+	provides any
+end
+
+class mercurycenter
+        # $1 - number of strip (unique to Mercury Center?)
+        # $2 - name of strip spaces=_?
+        homepage http://cgi.mercurycenter.com/cgi-bin/comics/show.cgi?ID=$1&DATE=TODAY
+        type generate
+        imageurl http://cgi.mercurycenter.com/premium/comics/%m_%d/$2.gif
+        provides any
+end
+
+class sev-comics
+        homepage http://www.sev.com.au/toonzone/$strip.asp
+        type generate
+        imageurl http://www.sev.com.au/toonzone/$strip.jpg
+        provides latest
+end
+
+class washpost-creators
+        homepage http://featurepage.creators.com/washpost.html?name=$1
+        type generate
+	prefetch $homepage
+        imageurl http://www.creators.com/<code:use POSIX;my$o=0;while(strftime("\%"."w",localtime($time_today-86400*$o))!=0){$o++}my$d=strftime("\%"."m"."\%"."d",localtime($time_today-86400*$o));"$d">/$1/$1%m%dg.gif
+        provides any
+end
+
+class washpost-king
+        homepage http://www.washingtonpost.com/wp-srv/style/comics/king.htm?$1
+        prefetch $homepage
+        imageurl http://est.rbma.com/content/$1
+        type generate
+        provides latest
+end
+
+class washpost-uclick
+	homepage http://www2.uclick.com/client/wpc/$1/
+	type search
+	searchpattern <IMG.+?SRC="(http://images.ucomics.com/comics/$1/\d+/$1\d+.gif)">
+	provides latest
+end
+
+class slate-cagle
+	homepage http://cagle.slate.msn.com/politicalcartoons/PCcartoons/$1.asp
+	type search
+	searchpattern <IMG.+?SRC=.+?(/comics/updating/$2\.(gif|jpg))"
+	baseurl http://cagle.slate.msn.com
+	provides latest
+end
+
+# Non-standard strips
+
+# should be possible to generate?
+# sometimes multi-image - need a new way to handle this
+strip avalonhigh
+	name Avalon High
+	homepage http://www.avalonhigh.com/
+	type search
+	searchpattern <IMG.+?SRC="(/?comics/avalon\d{8}.*?\.gif)"
+	baseurl $homepage
+	provides latest
+end
+
+strip drfun
+	name Doctor Fun
+	homepage http://www.ibiblio.org/Dave/Dr-Fun/html/
+	type generate
+	imageurl http://www.ibiblio.org/Dave/Dr-Fun/latest.jpg
+	provides latest
+end
+
+strip goats
+	name Goats
+	homepage http://www.goats.com/
+	type search
+	searchpattern <IMG.+?SRC="(/comix/\d+/goats\d+.gif)"
+	baseurl http://www.goats.com/
+	provides latest
+end
+
+strip jokesonyou
+	name The Joke's on You
+	homepage http://www.thefunnypages.com/
+	type search
+	searchpattern <img.+src="(http://www.thefunnypages.com/archives/.+?\.gif)"
+	#updated daily or not? - check - seems to be, but check weekend
+	provides latest
+end
+
+strip innies
+	name Innies and Outies
+	homepage http://www.inniesandoutties.com/
+	type generate
+	#updated M/W/F - no sense searching
+	imageurl http://www.inniesandoutties.com/images/front.jpg
+	provides latest
+end
+
+strip joyoftech
+	name The Joy of Tech
+	homepage http://www.joyoftech.com/joyoftech/
+	type search
+	searchpattern <IMG.+?src="(joyimages/\d+\.(gif|jpg))\"
+	baseurl http://www.joyoftech.com/joyoftech/
+	provides latest
+end
+
+strip megatokyo
+	name MegaTokyo
+	homepage http://www.megatokyo.com/
+	type search
+	searchpattern <IMG.+?SRC="(/?strips/\d+\..+?)"
+	baseurl http://www.megatokyo.com/
+	provides latest
+
+end
+
+strip mostlybusiness
+	name Mostly Business
+	homepage http://www.tedgoff.com/
+	type generate
+	#fix to use more precise addr - maybe not possible?
+	imageurl http://www.tedgoff.com/mb/images/today.gif
+	provides latest
+end
+
+# website gone (?) 2002-05-24
+#strip notquiteright
+#	name Not Quite Right
+#	homepage http://www.notquiteright.com/
+#	type generate
+#	imageurl http://www.notquiteright.com/wow/todaystoon.gif
+#	provides latest
+#end
+
+strip pennyarcade
+	name Penny Arcade
+	homepage http://www.penny-arcade.com/
+	type search
+	searchpage http://www.penny-arcade.com/view.php3
+	searchpattern <img.+?src="(images/\d{4}/\d{8}l\..{3})"
+	#searchpattern <IMG.+?src="(images/200.+?\.gif)"></TD>
+	baseurl http://www.penny-arcade.com/
+	provides latest
+end
+
+strip plif
+      name Parking Lot is Full
+      homepage http://www.plif.com
+      type generate
+      imageurl http://www.plif.com/thisweek.gif
+      provides latest
+end
+
+# gone? 2002-04-02
+#strip punc
+#	name Punc & Mark
+#	homepage http://byteus.com/pm/
+#	type search
+#	searchpage http://artiztik.com/cgi-bin/pmviewer.cgi?list=pm&config=pm.cfg&slide=999&style=pm
+#	searchpattern <img.+?src=(/pm/strips/.+?\.jpg)
+#	baseurl http://artiztik.com/
+#	provides latest
+#end
+
+strip pvp
+	name Player vs. Player
+	homepage http://www.pvponline.com/
+	type generate
+	imageurl http://www.pvponline.com/archive/%Y/pvp%Y%m%d.gif
+	provides any
+end
+
+strip pvpcurrent
+	name Player vs. Player - Current
+	homepage http://www.pvponline.com/
+	type search
+	searchpattern <img SRC="(archive/%Y/pvp%Y\d{4}\.gif)">
+	baseurl $homepage
+	provides latest
+end
+
+strip redmeat
+	name Redmeat
+	homepage http://www.redmeat.com/redmeat/current/
+	type generate
+	imageurl http://www.redmeat.com/redmeat/current/index-1.gif
+	provides latest
+end
+
+
+strip rudypark
+	name Rudy Park
+	homepage http://www.rudypark.com/
+	type generate
+	imageurl http://www.rudypark.com/comics/rudy%Y%m%d.gif
+	provides latest
+end
+
+strip sinfest
+	name Sinfest
+	homepage http://sinfest.net
+	type generate
+	imageurl http://sinfest.net/comics/sf%Y%m%d.gif
+	provides any
+end
+
+strip sluggy
+	name Sluggy Freelance
+	homepage http://www.sluggy.com/
+	type search
+	searchpage http://www.sluggy.com/daily.php?date=%y%m%d
+	searchpattern <img.+?src="?(http://pics.sluggy.com/comics/%y%m%d.+?\.(gif|jpg))
+	provides any
+end
+
+# only updated M-F, but no better way to handle it
+strip squinkers
+	name Squinkers
+	homepage http://www.squinkers.com/
+	type generate
+	imageurl http://www.squinkers.com/sqkrs/Images/today.gif
+	provides latest
+end
+
+strip superosity
+	name Superosity
+	homepage http://www.superosity.com/
+	type generate
+	imageurl http://www.superosity.com/comics/sup%Y%m%d.gif
+	provides any
+end
+
+#every day except sunday
+strip theweedpatch
+	name The WeedPatch
+	homepage http://www.jpjennings.com/toons/
+	type generate
+	imageurl http://www.jpjennings.com/toons/%m%d%Y.gif
+	provides any
+end
+
+strip userfriendly
+	name User Friendly
+	homepage http://www.userfriendly.org/static/
+	type search
+	searchpage http://ars.userfriendly.org/cartoons/?id=%Y%m%d&mode=classic
+	searchpattern <img.+?src="(http://www.userfriendly.org/cartoons/archives/%y.+?/uf.+?\.gif)"
+	provides any
+end
+
+# done
+#strip exploitnow
+#	name Exploitation Now
+#	homepage http://www.exploitationnow.com/
+#	type search
+#	searchpattern <IMG.+?SRC="(/comics/rb\d+\..+?)"
+#	baseurl $homepage
+#	provides latest
+#end
+
+#nothing new since april 2002 - ruled dead
+#strip coolcat
+#	name Cool Cat Studio
+#	homepage http://www.coolcatstudio.com/
+#	type search
+#	searchpattern <IMG.+?SRC="(/comics/ccs\d+\..+?)"
+#	baseurl http://www.coolcatstudio.com/
+#	provides latest
+#end
+
+strip classm
+	name The Class Menagerie
+	homepage http://www.theclassm.com/
+	type search
+	searchpattern <IMG.+?SRC="(/comics/cmc\d+\..+?)"
+	baseurl http://www.theclassm.com/
+	provides latest
+end
+
+strip bruno
+	name The Bruno Daily Times
+	homepage http://www.brunostrip.com/bruno.html
+	type generate
+	imageurl http://www.brunostrip.com/%Ypics/%Y%m%d.gif
+	provides any
+end
+
+strip nukees
+	name Nukees
+	homepage http://www.nukees.com
+	type search
+	searchpattern <IMG.+?SRC="(/comics/\d+\..+?)"
+	baseurl http://www.nukees.com/
+	provides latest
+end
+
+strip joeaverage
+	name Joe Average
+	homepage http://www.joeaverage.org
+	type search
+	searchpattern <IMG.+?SRC="(/comics/\d+\..+?)"
+	baseurl http://www.joeaverage.org/
+	provides latest
+end
+
+# seems to be gone: 10/26/01
+#strip hotzp
+#	name Bad Boys of Computer Science
+#	homepage http://hotzp.com/badboys/
+#	type generate
+#	imageurl http://hotzp.com/badboys/new.jpg
+#	provides latest
+#end
+
+strip angst
+	name Angst Technology
+	homepage http://www.inktank.com/AT/
+	type generate
+	imageurl http://www.inktank.com/images/AT/cartoons/%m-%d-%y.gif
+	provides any
+end
+
+# superceded by kscarborough's
+#strip zapiro
+#	name Zapiro
+#	homepage http://www.mg.co.za/mg/zapiro/
+#	type generate
+#	imageurl http://www.chico.mweb.co.za/images/zapiro/%y-<code:lc(strftime("\%b", @localtime_today))>%d.gif
+#	provides any
+#end
+
+strip clanofthecats
+	name Clan of the cats
+	homepage http://www.clanofthecats.com/
+	#type generate
+	#imageurl http://www.clanofthecats.com/comics/%Y%m%da.gif
+	#provides any
+	type search
+	searchpage http://www.clanofthecats.com/d/%Y%m%d.html
+	searchpattern <img.+?SRC="/(comics/%Y%m%d.+?)"
+	baseurl $homepage
+	provides any
+end
+
+strip gpf
+	name General Protection Fault
+	homepage http://www.gpf-comics.com/
+	type search
+	searchpattern <IMG.+?SRC="(/comics/gpf\d+.+?\..+?)"
+	baseurl http://www.gpf-comics.com
+	provides latest
+end
+
+#note: doesn't work perfectly - some strips are broken up into multiple images
+# this is not yet supported, but could be done
+strip crfh
+	name College Roomies from Hell
+	homepage http://www.crfh.net
+	type generate
+	imageurl http://www.crfh.net/comics/crfh%Y%m%d.jpg
+	provides any
+end
+
+#generatable?
+strip striptease
+	name Strip Tease Comic
+	homepage http://www.stripteasecomic.com/
+	type search
+	searchpattern <img.+?src="(/?strips\d+/\d+\..+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip dorktower
+	name Dork Tower
+	homepage http://www.dorktower.com/
+	type search
+	searchpattern <img.+?src="(/?images/comics/.+?\..+?)"
+	baseurl http://www.gamespy.com/comics/dorktower/
+	provides latest
+end
+
+strip jerkcity
+	name Jerkcity
+	homepage http://www.jerkcity.com/
+  	type generate
+	imageurl http://www.jerkcity.com/today.gif
+	provides latest
+end
+
+strip kevinandkell
+	name Kevin and Kell
+	homepage http://www.kevinandkell.com/
+	type generate
+	imageurl http://www.kevinandkell.com/%Y/strips/kk%Y%m%d.gif
+	provides any
+end
+
+strip freefall
+	name Freefall
+	homepage http://www.purrsia.com/freefall/
+	type generate
+	imageurl $homepage<code:use POSIX;my $w=strftime("\%"."u",localtime($time_today));my $s=517+3*floor(($time_today-995839200)/604800);$s++if$w\>2;$s++if$w\>4;my$c=int(($s+99)/100);"ff${c}00/fv00$s.gif">
+	provides any
+end
+
+strip 8bit
+	name 8-Bit Theater
+	homepage http://www.nuklearpower.com/latest.php
+	type search
+	searchpattern <img.+?src="(http://www.nuklearpower.com/comics/\d+\..+?)">
+	provides latest
+end
+
+strip apodbig
+	name Astronomy Picture of the Day (big image)
+	homepage http://antwrp.gsfc.nasa.gov/apod/
+	type search
+	searchpattern <a.+?href="(image/\d{4}/.+?\.(jpg|gif))"
+	baseurl $homepage
+	provides latest
+end
+
+strip apod
+	name Astronomy Picture of the Day
+	homepage http://antwrp.gsfc.nasa.gov/apod/
+	type search
+	searchpattern <img.+?SRC="(image/\d{4}/.+?\..+?)"
+	baseurl $homepage
+	provides latest
+end
+
+
+strip pgs
+	name Pathetic Geek Stories
+	homepage http://www.theonionavclub.com/
+	type search
+	#searchpattern <a.+?HREF="/avclub\d+/pgs(\d+).html"
+	#imageurl http://graphics.theonion.com/avpics_$match/pgs_$match.gif
+
+	#window.open('/comics.php?img_article_id=1192','pgs'
+        #http://www.theonionavclub.com/images/229/image_article1192.jpg
+	searchpattern issue_id=(\d+).+?window.open\('/comics.php\?img_article_id=(\d+)','pgs'
+	imageurl http://www.theonionavclub.com/images/$match_1/image_article$match_2.jpg
+
+	provides latest
+end
+
+# seems to be '....a.gif' now.
+strip adventurers
+	name Adventurers!
+	homepage http://www.adventurers-comic.com/
+	type generate
+	imageurl http://www.adventurers-comic.com/comics/adventurers%Y%m%da.gif
+	provides any
+end
+
+# discontinued 2002-05-24
+# may be updated to download old strips
+#strip basement
+#	name Basement Studios
+#	homepage http://www.basement-studios.com/
+#	type generate
+#	imageurl http://www.basement-studios.com/archive/images/%m%d%y.gif
+#	provides any
+#end
+
+strip btaf
+	name Bob, The Angry Flower
+	homepage http://angryflower.com/
+	type search
+	searchpage http://angryflower.com/archive.html
+	searchpattern <a href="(.+?.gif)"
+	provides latest
+	baseurl http://angryflower.com/
+end
+
+strip boasas
+	name Boy on a Stick and Slither
+	homepage http://www.boasas.com/
+	type search
+	searchpattern <img.+?src="(boasas/\d+\..+?)"
+	provides latest
+	baseurl http://www.boasas.com/
+end
+
+strip brunothebandit
+	name Bruno the Bandit
+	homepage http://www.brunothebandit.com
+	type generate
+	imageurl http://www.brunothebandit.com/comics/%Y%m%da.GIF
+	provides any
+end
+
+strip brunothebanditcurrent
+	name Bruno the Bandit - Current
+	homepage http://www.brunothebandit.com
+	type search
+	searchpattern <IMG ALT="comic" BORDER=0 SRC="(/comics/%Y\d{4}[a-z]{0,1}\.GIF)"
+	baseurl $homepage
+	provides latest
+end
+
+strip dieselsweeties
+	name Diesel Sweeties
+	homepage http://www.dieselsweeties.com/gif.php
+	type search
+	searchpattern <img.+?src="(http://images.clango.org/strips/sw\d+\..+?)"
+	#<img src="http://images.clango.org/strips/sw625.gif" border="0" alt="newest cartoon">
+	provides latest
+end
+
+strip fuzzylogic
+	name Fuzzy Logic
+	homepage http://www.bbspot.com/comics/fuzzy_logic/index.html
+	type generate
+	imageurl http://www.bbspot.com/Images/comics/fuzzy_logic/%Y/%Y%m%d.jpg
+	provides any
+end
+
+strip littlegamers
+	name Little Gamers
+	homepage http://www.little-gamers.com/
+	#type generate
+	#imageurl http://www.little-gamers.com/comics/%Y%m%d.gif
+	#provides any
+	type search
+	searchpattern <img.+?src='/(index.php\?do_command=show_strip&strip_id=\d+.+?)'
+	baseurl $homepage
+	provides latest
+	#img src='/index.php?do_command=show_strip&strip_id=540&auth=89345-28462-18353-19853-12612' border=0>
+end
+
+# tuesdays, thursdays, sundays
+strip machall
+	name Mac Hall
+	homepage http://www.MacHall.com/
+	type search
+	searchpattern <img.+?src='(/index.php\?do_command=show_strip\&strip_id=\d+\&auth=.+?)'
+	baseurl $homepage
+	provides latest
+end
+
+# not daily
+strip mrchuckshow
+	name Mr. Chuck Show
+	homepage http://www.mrchuckshow.com/
+	type generate
+	imageurl http://www.mrchuckshow.com/strips/mcs%Y%m%db.png
+	provides any
+end
+
+strip pentasmal
+	name Pentasmal
+	homepage http://www.pentasmal.com/
+	type generate
+	imageurl http://www.pentasmal.com/comics/%Y%m%d.png
+	provides any
+end
+
+strip rpgworld
+	name RPG World
+	homepage http://www.rpgworldcomic.com/
+	#type generate
+	#imageurl http://www.rpgworldcomic.com/comics/%Y%m%d.jpg
+	#provides any
+	type search
+	searchpattern <IMG.+?SRC="(/comics/.+?\..+?)"
+	provides latest
+	baseurl $homepage
+end
+
+# Ubersoft - multi-strip
+strip ubersoft1
+	name Ubersoft-1
+	homepage http://www.ubersoft.net/
+	type generate
+	imageurl http://www.ubersoft.net/comics/hd%Y%m%da.png
+	provides any
+end
+
+strip ubersoft2
+	name Ubersoft-2
+	homepage http://www.ubersoft.net/
+	type generate
+	imageurl http://www.ubersoft.net/comics/hd%Y%m%dc.png
+	provides any
+end
+
+strip ubersoft3
+	name Ubersoft-3
+	homepage http://www.ubersoft.net/
+	type generate
+	imageurl http://www.ubersoft.net/comics/hd%Y%m%de.png
+	provides any
+end
+
+strip ubersoft4
+	name Ubersoft-4
+	homepage http://www.ubersoft.net/
+	type generate
+	imageurl http://www.ubersoft.net/comics/hd%Y%m%dg.png
+	provides any
+end
+
+strip spazlabs
+	name Spaz Labs
+	homepage http://www.stonebrokestudios.com
+	type generate
+	imageurl http://www.stonebrokestudios.com/archives/spaz/%y%m%dspaz.gif
+	provides any
+end
+
+strip glasbergen
+	name Randy Glasbergen
+	homepage http://www.glasbergen.com
+	type generate
+	imageurl http://www.glasbergen.com/images/toon.gif
+	provides latest
+end
+
+strip spiderman
+	name Spider Man
+	homepage http://www.kingfeatures.com/features/comics/spidermn/about.htm
+	type search
+	searchpage http://www.kingfeatures.com/features/comics/spidermn/aboutMaina.php
+	searchpattern <img.+?src='(http://est.rbma.com/content/Spiderman\?date=\d{8})'
+	provides latest
+	prefetch http://www.kingfeatures.com/images/clear.gif
+end
+
+# can be made into a class
+strip tuma
+	name Kevin Tuma Cartoon
+	homepage http://www.cnsnews.com/cartoon/Tuma.asp
+	type search
+	searchpage http://www.cnsnews.com/cartoon/tuma.asp
+	searchpattern <img.+?src="/cartoon/(tumaimages/\d+/\w+\..+?)"
+	baseurl http://www.cnsnews.com/cartoon/
+	provides latest
+end
+
+strip nowak
+	name Paul Nowak Cartoon
+	homepage http://www.cnsnews.com/cartoon/nowak.asp
+	type search
+	searchpattern <img.+?src=".+?(Nowakimages/%Y/\w+\..+?)"
+	#<img border="0" src="/cartoon/nowakimages/2003/rightwing.jpg"></td>
+	baseurl http://www.cnsnews.com/cartoon/
+	provides latest
+end
+
+
+
+strip lang
+	name Bob Lang Cartoon
+	homepage http://www.cnsnews.com/cartoon/lang.asp
+	type search
+	searchpage http://www.cnsnews.com/cartoon/Lang.asp
+	searchpattern <img.+?src="/?(cartoon/langimages/\d+/.+?\..+?)"
+	#<img border="0" src="/cartoon/langimages/2003/lastdays.jpg"></td>
+	baseurl http://www.cnsnews.com/
+	provides latest
+end
+
+strip shelton
+	name Barry Shelton Cartoon
+	homepage http://www.cnsnews.com/cartoon/shelton.asp
+	type search
+	searchpattern <img.+?border="0".+?src="(Sheltonimages/%Y/.+?\..+?)"
+	baseurl http://www.cnsnews.com/cartoon/
+	provides latest
+end
+
+strip elflifeadult
+	name Elf Life: R Rated
+	homepage http://www.elflife.com/adults.html
+	type generate
+	imageurl http://www.elflife.com/current/%Y%m%dm.gif
+	provides any
+end
+
+strip funnyfarm
+	name Funny Farm
+	homepage http://www.funnyfarmcomics.com/
+	type search
+	searchpage http://www.funnyfarmcomics.com/d/%Y%m%d.html
+	searchpattern <IMG.+?SRC="(/comics/%Y%m%da\..+?)"
+	baseurl $homepage
+	provides any
+end
+
+strip elflife
+	name Elf Life
+	homepage http://www.elflife.com/
+	type generate
+	imageurl http://www.elflife.com/comics/%Y%m%dm.gif
+	provides any
+end
+
+strip ozyandmillie
+	name Ozy and Millie
+	homepage http://www.ozyandmillie.org/
+	type generate
+	imageurl http://www.ozyandmillie.org/comics/om%Y%m%d.gif
+	provides any
+end
+
+strip suburbanjungle
+	name Suburban Jungle
+	homepage http://www.suburbanjungle.com/
+	type search
+	searchpage http://suburbanjungle.com/d/%Y%m%d.html
+	searchpattern <img.+?SRC="(/comics/sj%Y%m%d\..+?)"
+	baseurl http://www.suburbanjungle.com
+	provides any
+end
+
+strip acidreflux
+	name Acid Reflux
+	homepage http://www.acidrefluxcomic.com/
+	type search
+	baseurl http://www.acidrefluxcomic.com/
+	searchpattern <img.+?src="(archive/c\d+\..+?)"
+	provides latest
+end
+
+strip whenigrowup
+	name When I Grow Up
+	homepage http://www.whenigrowup.net/
+	type generate
+	imageurl http://www.whenigrowup.net/comics/wigu%Y%m%d.png
+	provides any
+end
+
+strip walky
+	name It's Walky
+	homepage http://www.itswalky.com/
+	baseurl $homepage
+	type search
+	searchpattern <img.+?SRC="/(comics/.+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip jackiesfridge
+	name Jackie's Fridge
+	type generate
+	homepage http://jackiesfridge.keenspace.com/
+	imageurl http://jackiesfridge.keenspace.com/comics/jf%Y%m%da.jpg
+	provides any
+end
+
+strip schlockmercenary
+	name Schlock Mercenary
+	type generate
+	homepage http://www.schlockmercenary.com/
+	imageurl http://www.schlockmercenary.com/comics/schlock%Y%m%d.png
+	provides any
+end
+
+# finished
+#strip unicornjelly
+#	name Unicorn Jelly
+#	type search
+#	homepage http://unicornjelly.com/
+#	searchpattern <IMG.+?SRC="(images\/uni\d+\..+?)"
+#	baseurl $homepage
+#	provides latest
+#end
+
+strip downtoearth
+	name Down To Earth
+	homepage http://downtoearth.ncbuy.com
+	type generate
+	imageurl http://downtoearth.ncbuy.com/img/syndicate/nav1_dte_today.gif
+	provides latest
+end
+
+# website gone (?) 2002-05-24
+#strip wandering
+#	name Wandering Ones
+#	homepage http://www.wanderingones.com/
+#	type generate
+#	imageurl http://www.wanderingones.com/comics/wan%Y%m%d.gif
+#	provides any
+#end
+
+strip rvfun
+	name Reverend Fun
+	homepage http://rev-fun.gospelcom.net/
+	type generate
+	#imageurl http://rev-fun.gospelcom.net/%Y/%m/%Y%m%d.gif
+	imageurl http://rev-fun.gospelcom.net/add_toon_info.php?date=%Y%m%d
+	provides any
+end
+
+# no longer updated 2002-05-24
+strip greytown
+        name Living in Greytown
+        homepage http://www.livingingreytown.com/
+        type generate
+        imageurl $homepage/comics/grey%Y%m%d.jpg
+        provides any
+end
+
+strip slowwave
+        name Slow Wave
+        homepage http://www.slowwave.com/
+        type generate
+        imageurl $homepage/img.cgi?thisweek.gif
+        provides latest
+end
+
+# formerly "The Thin H Line". NC-17. Vertical format.
+strip sexylosers
+	name Sexy Losers
+	homepage http://sexylosers.keenspace.com/
+	type search
+	#searchpattern <IMG.+?SRC.*?=.*?"(http://sexylosers\.(keenspace\.)?com/)?(images/sl\d+\.jpg)"
+	#searchpattern <IMG.+?SRC="http://sexylosers=com/(images/sl\d+\.jpg)"
+	#searchpattern <table.+?width.*?=.*?325.+?<img.+?src.*?=.*?"(http://sexylosers.keenspace.com/images/.+?)"
+	searchpattern <A.+?HREF="http://sexylosers.keenspace.com/(\d+).html"
+	imageurl http://sexylosers.keenspace.com/comics/sl$match_1.jpg
+	provides latest
+end
+
+# weekly
+strip youdamnkid
+        name You Damn Kid
+        homepage http://www.youdamnkid.com/
+        type search
+        baseurl $homepage
+        provides latest
+        searchpattern <IMG.+?SRC="/(comics/ydk\d+\.gif)"
+end
+
+# weekly, moving daily soon?
+strip houndshome
+        name Hound's Home
+        homepage http://www.houndshome.com/
+        type search
+        baseurl $homepage
+        provides latest
+        searchpattern <IMG.+?SRC="/(comics/hh.+?)"
+end
+
+strip cutewendy
+        name CuteWendy
+        homepage http://www.wendycomic.com/
+        type generate
+        imageurl http://www.wendycomic.com/comics/wendy%Y%m%d.gif
+        provides any
+end
+
+# sporadic
+strip lifesorad
+        name Life's So Rad
+        homepage http://www.radcomics.com/
+        type search
+        baseurl $homepage
+        provides latest
+        searchpattern <IMG.+?SRC="/(comics/\d+.+?)"
+end
+
+# formerly known as otakufeh. NC-17.
+strip bigones
+        name Big Ones
+        homepage http://otakufeh.keenspace.com/
+        type generate
+        provides any
+        imageurl $homepage/comics/big%Y%m%d.gif
+end
+
+strip offthemark
+	name Off the Mark
+	homepage http://www.offthemark.com/
+	type search
+	provides latest
+	searchpage $homepage/daily.asp
+	searchpattern <img.+?src="(http://www.offthemark.com/rotate/\d+.gif)"
+end
+
+strip asif
+	name As If
+	homepage http://www.asifcomic.com/
+	type search
+	searchpage http://www.asifcomic.com/current.html
+	searchpattern <img.+?src=".*?_left\.jpg".+?><img.+?src="(\d+\..{3})".+?alt="Comic
+	baseurl $homepage
+	provides latest
+end
+
+strip nipandtuck
+	name Nip 'N Tuck
+	homepage http://nipandtuck.keenspace.com
+	type search
+	searchpattern SRC=".+?(/comics/nt(\d{8})\.gif)"
+	baseurl $homepage
+	provides latest
+end
+
+strip lemontree
+	name Under The Lemon Tree
+	homepage http://utlt.keenspace.com
+	type search
+	searchpattern <IMG.+?SRC=".+?(/comics/.+?\d{8}\..+?)"
+	#<IMG ALT="comic" BORDER=0 SRC="http://utlt.keenspace.com/comics/bn20030824.gif" HEIGHT="360" WIDTH="994">
+	baseurl $homepage
+	provides latest
+end
+
+strip winter
+	name Winter
+	homepage http://www.wintercomic.com/
+	type search
+	#searchpattern img src='(pages/page(\d+)\.gif)'
+	searchpattern <img.+?src='(/index.php\?do_command=show_strip&.+?)'
+	baseurl $homepage
+	provides latest
+end
+
+#strip pcnpixel
+#	name PC and Pixel
+#	homepage http://www.pccomix.com/PCandPixel/
+#	type search
+#	searchpage http://www.pccomix.com/PCandPixel/pc_dailystrip/PCdaily.html
+#	searchpattern <p><img SRC="pc(\w+).gif".+?WIDTH=
+#	matchpart 1
+#	imageurl http://www.pccomix.com/PCandPixel/pc_dailystrip/pc$match.gif
+#	provides latest
+#end
+
+#discontinued may 2002
+#strip bobbins
+#	name Bobbins
+#	homepage http://www.bobbins.org/
+#	type search
+#	searchpage http://bobbins.org/d/%Y%m%d.html
+#	searchpattern <img.+?SRC="(/comics/%Y%m%d\..+?)"
+#	baseurl http://www.bobbins.org
+#	provides any
+#end
+
+strip brainbuzz
+	name Brainbuzz
+	homepage http://cramsession.brainbuzz.com/lists/cartoon/
+	type generate
+	imageurl http://i.brainbuzz.com/CS/Lists/Cartoon/%y%m%d.gif
+	#every day except saturday, sunday
+	provides any
+end
+
+#they win... for now (8394022423 levels of frames and i don't feel like building a full-blown web browser right now)
+strip swamp
+	name Swamp
+	homepage http://www.swamp.com.au
+	type search
+	searchpage http://s1.emcs.com.au/SwampStrips/Strips/Strip.asp?Date=<code:strftime("%-d-%b-%Y", @localtime_today)
+	searchpattern <img.+?src="(http://s1.emcs.com.au/swampstrips/Strips_Images/\d+\..+?)"
+	provides any
+end
+
+strip thenorm
+	name The Norm
+	homepage http://www.thenorm.com/
+	type generate
+	imageurl http://www.thenorm.com/arch/%y%m%d.gif
+	provides any
+end
+
+strip somethingpositive
+	name Something Positive
+	homepage http://www.somethingpositive.net/
+	type generate
+	imageurl http://www.somethingpositive.net/arch/sp%m%d%Y.gif
+	provides latest
+end
+
+strip melonpool
+	name Melonpool
+	homepage http://www.melonpool.com/
+	type generate
+	imageurl http://www.melonpool.com/comics/MM%Y%m%d.gif
+	provides any
+end
+
+strip flem
+        name FLEM!
+        homepage http://www.flemcomics.com/
+        type generate
+        imageurl http://flem.dhs.org/new.jpg
+        provides latest
+end
+
+#replaced
+# Updated Mon - Fri
+#strip reallife
+#        name Real Life
+#        homepage http://www.reallifecomics.com/
+#        type generate
+#        imageurl http://www.reallifecomics.com/comics/%Y%m%da.jpg
+#        provides any
+#end
+
+# Updated Mon - Sat
+strip sheldon
+        name Sheldon
+        useclass unitedmedia-srch-comics
+end
+
+# Updated Mon
+strip weakendwarriors
+        name Weak-end Warriors
+        homepage http://www.inktank.com/WW/
+        type generate
+        imageurl http://www.inktank.com/images/WW/cartoons/%m-%d-%y.gif
+        provides any
+end
+
+strip alice
+	name Alice!
+	homepage http://www.alicecomics.com/today.html
+	type search
+	searchpattern <IMG.+?SRC="(/comics/alice.+?\..+?)"
+	baseurl http://www.alicecomics.com/
+	provides latest
+end
+
+strip theshadows
+	name The Shadows
+	homepage http://www.alicecomics.com/shadows.html
+	type search
+	searchpattern <IMG.+?SRC="(/shadcomics/shad.+?\..+?)"
+	baseurl http://www.alicecomics.com/
+	provides latest
+end
+
+strip lcd
+	name Lowest Common Denominator
+	homepage http://lcd.keenspace.com
+	type search
+	searchpattern <IMG.+?SRC=".+?(/comics/(lcd|soph).+?\..+?)"
+	#<IMG ALT="" BORDER=0 SRC="http://lcd.keenspace.com/comics/soph20030810.png" WIDTH="732" HEIGHT="262">
+	baseurl http://lcd.keenspace.com
+	provides latest
+end
+
+# could easily generate
+strip devilspanties
+	name The Devil's Panties
+	homepage http://thedevilspanties.keenspace.com
+	type search
+	searchpattern <IMG.+?SRC="(http://thedevilspanties.keenspace.com/comics/.+?\..+?)"
+	#baseurl http://thedevilspanties.keenspace.com
+	provides latest
+end
+
+
+strip fatjesus
+	name Fat Jesus
+	homepage http://www.fat-jesus.com
+	type search
+	searchpattern <IMG.+?SRC="(/comics/fatjesus.+?)"
+	baseurl http://fatjesus.keenspace.com
+	provides latest
+end
+
+strip sexandviolence
+	name Sex and Violence
+	homepage http://www.mrbang.net
+	type search
+	searchpattern <IMG.+?SRC="(/comics/.+?\..+?)"
+	baseurl http://www.mrbang.net
+	provides latest
+end
+
+strip fans
+	name Fans!
+	homepage http://faans.com
+	type search
+	searchpattern <IMG.+?SRC="(http://faans.com/images/.+?\..+?)"
+	#<IMG SRC="http://faans.com/images/mad1.gif" WIDTH=650 HEIGHT=300>
+	provides latest
+end
+
+strip spooner
+        name Spooner
+        homepage http://www.hookedoncomics.com/
+        type generate
+        imageurl http://www.hookedoncomics.com/comics/Sp%Y%m%d.gif
+        provides any
+end
+
+strip underpower
+        name Under Power
+        artist Jorge "Vaz" Rivas and David "vanishing" Trischuk
+        homepage http://underpower.non-essential.com/
+        type generate
+        imageurl http://underpower.non-essential.com/comics/%Y%m%d.jpg
+        provides any
+end
+
+strip nekobox
+        name Nekobox
+        artist Jorge "Vaz" Rivas and David "vanishing" Trischuk
+        homepage http://www.nekobox.org
+        type generate
+        imageurl http://www.nekobox.org/comic/%Y-%m-%d.jpg
+        provides any
+end
+
+strip perscheid
+	name Perscheids Abgruende
+	artist Martin Perscheid -> www.martin-perscheid.de
+	homepage http://portale.web.de/Boulevard/Comics/Perscheid/
+	type search
+	searchpattern <img.+?src="[h]*[t]*[t]*[p]*[:]*//(img.web.de/c/00.+?)"
+	provides latest
+end
+
+strip harmbengen
+	name Harm Bengen's Alltagsskizzen
+	artist Harm Bergen -> www.harmbengen.de
+	homepage http://portale.web.de/Boulevard/Comics/Bengen/
+	type search
+	searchpattern <img.+?src="[h]*[t]*[t]*[p]*[:]*//(img.web.de/c/00.+?)"
+	provides latest
+end
+
+strip weyershausenwelt
+	name Weyershausen - Wunderbare Welt
+	artist Karsten Weyershausen -> www.weyershausen.de
+	homepage http://portale.web.de/Boulevard/Comics/Weyershausen/
+	type search
+	searchpattern <img.+?src="[h]*[t]*[t]*[p]*[:]*//(img.web.de/c/00.+?)"
+	provides latest
+end
+
+strip quirit
+	name Quirit - alltaegliches auf den Punkt gebracht
+	artist Quirit -> www.quirit.com
+	homepage http://portale.web.de/Boulevard/Comics/Quirit/
+	type search
+	searchpattern <img.+?src="[h]*[t]*[t]*[p]*[:]*//(img.web.de/c/00.+?)"
+	provides latest
+end
+
+
+strip touche
+        name Touche
+        artist Tom
+        homepage http://www.drive-in-cartoons.de/touche/
+        type search
+        searchpage http://www.drive-in-cartoons.de/touche/hauptteil.php
+        searchpattern <img.+?src='(.+?)'
+        baseurl http://www.drive-in-cartoons.de/touche/
+        provides latest
+end
+
+strip achewood
+	name Achewood
+	artist Chris Onstad
+	homepage http://www.achewood.com
+	type generate
+	imageurl $homepage/i/%m%d%Y.gif
+	provides any
+end
+
+# ucomics.com strips
+strip adamathome
+	name Adam@home
+	useclass ucomics-gen
+	$1 ad
+end
+
+strip baldo
+	name Baldo
+	useclass ucomics-gen
+	$1 ba
+end
+
+strip bizarro
+	name Bizarro
+	useclass ucomics-gen
+	$1 bz
+end
+
+strip thebigpicture
+	name The Big Picture
+	useclass ucomics-gen
+	$1 bi
+end
+
+strip boondocks
+	name The Boondocks
+	useclass ucomics-gen
+	$1 bo
+end
+
+strip calvinandhobbes
+	name Calvin and Hobbes
+	useclass ucomics-srch
+	$1 ch
+end
+
+strip cathy
+	name Cathy
+	useclass ucomics-gen
+	$1 ca
+end
+
+strip closetohome
+	name Close to Home
+	useclass ucomics-gen
+	$1 cl
+end
+
+strip cornered
+	name Cornered
+	useclass ucomics-gen
+	$1 co
+end
+
+strip crankshaft
+	name Crankshaft
+	useclass ucomics-gen
+	$1 cs
+end
+
+strip doonesbury
+	name Doonesbury
+	useclass ucomics-gen
+	$1 db
+end
+
+strip thefifthwave
+	name The 5th Wave
+	useclass ucomics-srch
+	$1 fw
+end
+
+strip bensargent
+	name Ben Sargent
+	useclass ucomics-srch
+	$1 bs
+end
+
+strip patoliphant
+	name Pat Oliphant
+	useclass ucomics-srch
+	$1 po
+end
+
+strip foxtrot
+	name FoxTrot
+	useclass ucomics-gen
+	$1 ft
+end
+
+strip thefuscobrothers
+	name The Fusco Brothers
+	useclass ucomics-gen
+	$1 fu
+end
+
+strip garfield
+	name Garfield
+	useclass ucomics-gen
+	$1 ga
+end
+
+strip heartofthecity
+	name Heart of the City
+	useclass ucomics-gen
+	$1 hc
+end
+
+strip inthebleachers
+	name In the Bleachers
+	useclass ucomics-gen
+	$1 bl
+end
+
+strip james
+	name James
+	useclass ucomics-gen
+	$1 jm
+end
+
+strip mrpotatohead
+        name Mr. Potato Head
+        useclass ucomics-gen
+        $1 mrp
+end
+
+strip nonsequitur
+	name Non Sequitur
+	useclass ucomics-gen
+	$1 nq
+end
+
+strip oddlyenough
+	name Oddly Enough
+	useclass ucomics-gen
+	$1 oe
+end
+
+strip overboard
+	name Overboard
+	useclass ucomics-gen
+	$1 ob
+end
+
+strip reallifeadventures
+	name Real Life Adventures
+	useclass ucomics-gen
+	$1 rl
+end
+
+strip reynoldsunwrapped
+	name Reynolds Unwrapped
+	useclass ucomics-gen
+	$1 rw
+end
+
+strip stonesoup
+	name Stone Soup
+	useclass ucomics-gen
+	$1 ss
+end
+
+strip tankmcnamara
+	name Tank McNamara
+	useclass ucomics-gen
+	$1 tm
+end
+
+strip tomthedancingbug
+	name Tom the Dancing Bug
+	useclass ucomics-srch
+	$1 td
+end
+
+strip ziggy
+	name Ziggy
+	useclass ucomics-gen
+	$1 zi
+end
+
+strip theduplex
+        name The Duplex
+        useclass ucomics-gen
+        $1 dp
+end
+
+strip psmueller
+	name P. S. Mueller
+	useclass ucomics-gen
+	$1 psm
+end
+
+strip misterboffo
+	name Mister Boffo
+	useclass ucomics-gen
+	$1 mb
+end
+
+# unitedmedia.com strips
+strip alleyoop
+	name Alley Oop
+	useclass unitedmedia-srch-comics
+end
+
+strip arlonjanis
+	name Arlo & Janis
+	useclass unitedmedia-srch-comics
+end
+
+strip betty
+	name Betty
+	useclass unitedmedia-srch-comics
+end
+
+strip bignate
+	name Big Nate
+	useclass unitedmedia-srch-comics
+end
+
+strip bornloser
+	name The Born Loser
+	useclass unitedmedia-srch-comics
+end
+
+strip buckets
+	name The Buckets
+	useclass unitedmedia-srch-comics
+end
+
+strip bullsnbears
+	name Bull$ 'N' Bear$
+	useclass unitedmedia-srch-comics
+end
+
+strip cheapthrills
+	name Cheap Thrills
+	useclass unitedmedia-srch-wash
+end
+
+strip chickweed
+	name 9 Chickweed Lane
+	useclass unitedmedia-srch-comics
+end
+
+strip committed
+	name Committed
+	useclass unitedmedia-srch-comics
+end
+
+strip drabble
+	name Drabble
+	useclass unitedmedia-srch-comics
+end
+
+#strip dilbert
+#       name Dilbert
+#       useclass unitedmedia-srch-comics
+#end
+
+strip dilbert
+        name Dilbert
+        artist Scott Adams
+        homepage http://www.dilbert.com/comics/dilbert/
+        baseurl $homepage
+        type search
+        searchpattern <IMG SRC="(/comics/dilbert/archive/images/.+?\.gif)"
+        provides latest
+end
+
+strip fatcats
+	name Fat Cats
+	useclass unitedmedia-srch-comics-lag
+end
+
+strip ferdnand
+	name Ferd'nand
+	useclass unitedmedia-srch-comics
+end
+
+strip forbetter
+	name For Better or For Worse
+	useclass unitedmedia-srch-comics
+end
+
+strip franknernest
+	name Frank & Ernest
+	useclass unitedmedia-srch-comics
+end
+
+strip frazz
+        name Frazz
+        useclass unitedmedia-srch-comics
+end
+
+#discontinued at unitedmedia
+#can't use the class - dates are 66 years ago
+#strip freckles
+#	name Freckles and His Friends
+#	homepage http://www.unitedmedia.com/comics/freckles/index.html
+#	type search
+#	searchpattern <IMG.+?SRC="(/comics/freckles/archive/images/freckles.+?\..+?)"
+#	baseurl http://www.unitedmedia.com
+#	provides latest
+#end
+
+strip geech
+	name Geech
+	useclass unitedmedia-srch-comics
+end
+
+strip getfuzzy
+	name Get Fuzzy
+	useclass unitedmedia-srch-comics
+end
+
+strip gingermeggs
+	name Ginger Meggs
+	useclass unitedmedia-srch-comics
+end
+
+strip graffiti
+	name Graffiti
+	useclass unitedmedia-srch-comics
+end
+
+strip grandave
+	name Grand Avenue
+	useclass unitedmedia-srch-comics
+end
+
+strip grizzwells
+	name The Grizzwells
+	useclass unitedmedia-srch-comics
+end
+
+strip hedge
+	name Over the Hedge
+	useclass unitedmedia-srch-comics
+end
+
+strip herman
+	name Herman
+	useclass unitedmedia-srch-comics
+end
+
+strip janesworld
+        name Jane's World
+        useclass unitedmedia-srch-comics
+end
+
+strip jumpstart
+	name Jump Start
+	useclass unitedmedia-srch-comics
+end
+
+strip kitncarlyle
+	name Kit 'N' Carlyle
+	useclass unitedmedia-srch-comics
+end
+
+#can't use the class - dates are 53 years ago
+strip lilabner
+	name Li'l Abner
+	homepage http://www.unitedmedia.com/comics/lilabner/index.html
+	type search
+	searchpattern <img.+?src="(/comics/lilabner/archive/images/lilabner.+?\..+?)"
+	baseurl http://www.unitedmedia.com
+	provides latest
+end
+
+strip luann
+	name Luann
+	useclass unitedmedia-srch-comics
+end
+
+strip lupo
+	name Lupo Alberto
+	useclass unitedmedia-srch-comics
+end
+
+strip marmaduke
+	name Marmaduke
+	useclass unitedmedia-srch-comics
+end
+
+strip meatloaf
+	name Meatloaf Night
+	useclass unitedmedia-srch-comics
+end
+
+strip meg
+	name Meg!
+	useclass unitedmedia-srch-comics-lag
+end
+
+# lags ~1 week
+strip motley
+	name Motley
+	useclass unitedmedia-srch-comics-lag
+end
+
+strip nancy
+	name Nancy
+	useclass unitedmedia-srch-comics
+end
+
+strip peanuts
+	name Peanuts
+	useclass unitedmedia-srch-comics
+end
+
+strip pearls
+	name Pearls Before Swine
+	useclass unitedmedia-srch-comics
+end
+
+strip pibgorn
+	name Pibgorn
+	useclass unitedmedia-srch-comics
+end
+
+strip pickles
+	name Pickles
+	useclass unitedmedia-srch-wash
+end
+
+strip potluck
+	name Potluck Parish
+	useclass unitedmedia-srch-comics
+end
+
+strip raisingduncan
+	name Raising Duncan
+	useclass unitedmedia-srch-comics
+end
+
+#discontinued at um
+#strip randolphitch
+#	name Randolph Itch 2 a.m.
+#	useclass unitedmedia-srch-comics
+#end
+
+strip reality
+	name Reality Check
+	useclass unitedmedia-srch-comics
+end
+
+strip redandrover
+	name Red and Rover
+	useclass unitedmedia-srch-wash
+end
+
+strip ripleys
+	name Ripley's Believe It or Not!
+	useclass unitedmedia-srch-comics
+end
+
+strip monty
+	name Monty
+	useclass unitedmedia-srch-comics
+end
+
+strip roseisrose
+	name Rose Is Rose
+	useclass unitedmedia-srch-comics
+end
+
+strip shirleynson
+	name Shirley And Son
+	useclass unitedmedia-srch-comics
+end
+
+strip soup2nutz
+	name Soup To Nutz
+	useclass unitedmedia-srch-comics
+end
+
+
+# only once-weekly
+strip stockcartoons
+	name StockcarToons
+	useclass unitedmedia-srch-comics
+	#searchpage http://www.unitedmedia.com/comics/stockcartoons/archive/stockcartoons-<code:strftime("\%Y\%m\%d", localtime($time_today - 604800))>.html
+	searchpage $homepage
+	provides latest
+end
+
+strip tarzan
+	name Tarzan
+	useclass unitedmedia-srch-comics
+end
+
+strip thatslife
+	name That's Life
+	useclass unitedmedia-srch-wash
+end
+
+strip topofworld
+	name Top of the World!
+	useclass unitedmedia-srch-comics-lag
+end
+
+# done!
+#strip usplay
+#	name The US of Play
+#	useclass unitedmedia-srch-comics
+#end
+
+# also done!
+#strip warped
+#	name Warped
+#	useclass unitedmedia-srch-comics
+#end
+
+strip workingdaze
+	name Working Daze
+	useclass unitedmedia-srch-comics
+end
+
+strip pcnpixel
+	name PC and Pixel
+	useclass unitedmedia-srch-wash
+	provides latest
+end
+
+strip billday
+	name Bill Day
+	useclass unitedmedia-srch-editoons
+	$1 day
+end
+
+strip billschorr
+	name Bill Schorr
+	useclass unitedmedia-srch-editoons
+	$1 schorr
+end
+
+strip claybennett
+	name Clay Bennett
+	useclass unitedmedia-srch-editoons
+	$1 bennett
+end
+
+strip drewlitton
+	name Drew Litton
+	useclass unitedmedia-srch-editoons
+	$1 litton
+end
+
+strip edstein
+	name Ed Stein
+	useclass unitedmedia-srch-editoons
+	$1 stein
+end
+
+strip ettahulme
+	name Etta Hulme
+	useclass unitedmedia-srch-editoons
+	$1 hulme
+end
+
+strip henrypayne
+	name Henry Payne
+	useclass unitedmedia-srch-editoons
+	$1 payne
+end
+
+strip jeffstahler
+	name Jeff Stahler
+	useclass unitedmedia-srch-editoons
+	$1 stahler
+end
+
+strip jerryholbert
+	name Jerry Holbert
+	useclass unitedmedia-srch-editoons
+	$1 holbert
+end
+
+strip jimberry
+	name Jim Berry
+	useclass unitedmedia-srch-editoons
+	$1 berry
+end
+
+strip mikesmith
+	name Mike Smith
+	useclass unitedmedia-srch-editoons
+	$1 smith
+end
+
+strip robrogers
+	name Rob Rogers
+	useclass unitedmedia-srch-editoons
+	$1 rogers
+end
+
+#strip robertariail
+#	name Robert Ariail
+#	useclass unitedmedia-srch-editoons
+#	$1 ariail
+#end
+
+strip stevebenson
+	name Steve Benson
+	useclass unitedmedia-srch-editoons
+	$1 benson
+end
+
+# sfgate strips
+strip babyblues
+	name Baby Blues
+	useclass sfgate-gen
+	$1 Baby_Blues
+end
+
+strip beetlebailey
+	name Beetle Bailey
+	useclass sfgate-gen
+	$1 Beetle_Bailey
+end
+
+strip blondie
+	name Blondie
+	useclass sfgate-gen
+	$1 $name
+end
+
+strip crock
+	name Crock
+	useclass sfgate-gen
+	$1 $name
+end
+
+strip curtis
+	name Curtis
+	useclass sfgate-gen
+	$1 $name
+end
+
+strip dennisthemenace
+	name Dennis the Menace
+	useclass sfgate-gen
+	$1 Dennis_The_Menace
+end
+
+#non-standard
+strip farley
+	name Farley
+        homepage http://www.sfgate.com/columnists/farley/
+        type search
+        provides latest
+        searchpattern <IMG.+?SRC="(http://www.sfgate.com/chronicle/pictures/\d+/\d+/\d+/.+?-farley.gif)"
+end
+
+strip fastrack
+	name On The Fast Track
+	useclass sfgate-gen
+	$1 Fast_Track
+end
+
+strip funkywinkerbean
+	name Funky Winkerbean
+	useclass sfgate-gen
+	$1 Funky_Winkerbean
+end
+
+strip hagarthehorrible
+	name Hagar the Horrible
+	useclass sfgate-gen
+	$1 Hagar_The_Horrible
+end
+
+strip ineedhelp
+	name I Need Help
+	useclass sfgate-gen
+	$1 Hagar_The_Horrible
+end
+
+strip mallardfillmore
+	name Mallard Fillmore
+	useclass sfgate-gen
+	$1 Mallard_Fillmore
+end
+
+strip mutts
+	name Mutts
+	useclass sfgate-gen
+	$1 $name
+end
+
+strip newbreed
+	name New Breed
+	useclass sfgate-gen
+	$1 New_Breed
+end
+
+strip thephantom
+	name The Phantom
+	useclass sfgate-gen
+	$1 Phantom
+end
+
+strip piranhaclub
+	name Piranha Club
+	useclass sfgate-gen
+	$1 Piranha
+end
+
+strip popeye
+	name Popeye
+	useclass sfgate-gen
+	$1 $name
+end
+
+strip rhymeswithorange
+	name Rhymes with Orange
+	useclass sfgate-gen
+	$1 Rhymes_with_Orange
+end
+
+strip sallyforth
+	name Sally Forth
+	useclass sfgate-gen
+	$1 Sally_Forth
+end
+
+strip safehavn
+	name Safe Havens
+	useclass sfgate-gen
+	$1 Safe_Havens
+end
+
+#strip shermanslagoon
+#	name Sherman's Lagoon
+#	useclass sfgate-gen
+#	$1 Shermans_Lagoon
+#end
+
+strip sixchix
+	name Six Chix
+	useclass sfgate-gen
+	$1 6Chix
+end
+
+#strip willynethel
+#	name Willy 'n' Ethel
+#	useclass sfgate-gen
+#	$1 Willy_n_Ethel
+#end
+
+strip zippythecolorpinhead
+	name Zippy the Pinhead (in color)
+	useclass sfgate-gen-zippycolor
+	$1 Zippy_the_Pinhead_Color
+	$2 Zippy_the_Pinhead
+end
+
+#strip zippythepinhead
+#	name Zippy the Pinhead
+#	useclass sfgate-gen
+#	$1 Zippy_the_Pinhead
+#	$2 zippy
+#end
+
+strip zippythepinhead
+	name Zippy the Pinhead
+	useclass sfgate-gen-zippy
+	$1 Zippy_the_Pinhead
+	$3 Zippy_BW
+	$2 zippy
+end
+
+
+strip zits
+	name Zits
+	useclass sfgate-gen
+	$1 $name
+end
+
+#comicspage.com strips
+strip animal
+	name Animal Crackers
+	useclass comicspage-strips-gen
+	$1 animal
+	$2 ack
+end
+
+strip annie
+	name Annie
+	useclass comicspage-strips-gen
+	$1 annie
+	$2 ann
+end
+
+strip bound
+	name Bound and Gagged
+	useclass comicspage-strips-gen
+	$1 bound
+	$2 bgg
+end
+
+strip brenda
+	name Brenda Starr
+	useclass comicspage-strips-gen
+	$1 brenda
+	$2 bsr
+end
+
+strip broomhilda
+	name Broom Hilda
+	useclass comicspage-strips-gen
+	$1 broomhilda
+	$2 bhl
+end
+
+strip cats
+	name Cats with Hands
+	useclass comicspage-strips-gen
+	$1 cats
+	$2 cwh
+end
+
+strip dicktracy
+	name Dick Tracy
+	useclass comicspage-strips-gen
+	$1 dicktracy
+	$2 dty
+end
+
+strip doodles
+	name Doodles
+	useclass comicspage-strips-gen
+	$1 profdoodles
+	$2 dod
+end
+
+strip fred
+	name Fred Basset
+	useclass comicspage-strips-gen
+	$1 fred
+	$2 fbt
+end
+
+strip gasolinealley
+	name Gasoline Alley
+	useclass comicspage-strips-gen
+	$1 gasolinealley
+	$2 gas
+end
+
+strip gilthorp
+	name Gil Thorp
+	useclass comicspage-strips-gen
+	$1 gilthorp
+	$2 gtp
+end
+
+strip helen
+	name Helen, Sweetheart of the Internet
+	useclass comicspage-strips-gen
+	$1 helen
+	$2 hln
+end
+
+strip kudzu
+	name Kudzu
+	useclass comicspage-strips-gen
+	$1 kudzu
+	$2 kdz
+end
+
+strip lewis
+	name Lewis
+	useclass comicspage-strips-gen
+	$1 lewis
+	$2 lew
+end
+
+strip lola
+	name Lola
+	useclass comicspage-strips-gen
+	$1 lola
+	$2 lol
+end
+
+strip looseparts
+	name Loose Parts
+	useclass comicspage-strips-gen
+	$1 looseparts2
+	$2 lsp
+end
+
+strip meehan
+	name Meehan Streak
+	useclass comicspage-strips-gen
+	$1 meehan
+	$2 mst
+end
+
+strip middletons
+	name The Middletons
+	useclass comicspage-strips-gen
+	$1 middletons
+	$2 mid
+end
+
+#strip misterboffo
+#	name Mister Boffo
+#	useclass comicspage-strips-gen
+#	$1 misterboffo
+#	#2 bfo
+#end
+
+strip mixedmedia
+	name Mixed Media
+	useclass comicspage-strips-gen
+	$1 mixedmedia
+	$2 mix
+end
+
+strip monkeyhouse
+	name Monkeyhouse
+	useclass comicspage-strips-gen
+	$1 monkeyhouse
+	$2 mhs
+end
+
+#no longer carried by comicspage
+#strip grimmy
+#	name Mother Goose and Grimm
+#	useclass comicspage-strips-gen
+#	$1 grimmy
+#	$2 mgg
+#end
+
+strip shoe
+	name Shoe
+	useclass comicspage-strips-gen
+	$1 shoe
+	$2 sho
+end
+
+strip sylvia
+	name Sylvia
+	useclass comicspage-strips-gen
+	$1 sylvia
+	$2 syl
+end
+
+strip willynethel
+	name Willy 'n' Ethel
+	useclass comicspage-strips-gen
+	$1 willynethel
+	$2 wil
+end
+
+
+strip 9to5
+	name 9 to 5
+	useclass comicspage-panels-gen
+	$1 9to5
+	$2 ntf
+end
+
+strip bottomliners
+	name Bottom Liners
+	useclass comicspage-panels-gen
+	$1 bottomliners
+	$2 bls
+end
+
+strip computoon
+	name Compu-toon
+	useclass comicspage-panels-gen
+	$1 computoon
+	$2 cpt
+end
+
+#strip looseparts
+#	name Loose Parts
+#	useclass comicspage-panels-gen
+#	$1 looseparts
+#	$2 lsp
+#end
+
+strip loveis
+	name Love Is...
+	useclass comicspage-panels-gen
+	$1 loveis
+	$2 lis
+end
+
+strip pluggers
+	name Pluggers
+	useclass comicspage-panels-gen
+	$1 pluggers
+	$2 plg
+end
+
+strip quigmans
+	name The Quiqmans
+	useclass comicspage-panels-gen
+	$1 quigmans
+	$2 qgm
+end
+
+# gone? 2002-05-24
+strip thatsjake
+	name That's Jake
+	useclass comicspage-panels-gen
+	$1 thatsjake
+	$2 tjk
+end
+
+strip conrad
+	name Paul Conrad
+	useclass comicspage-editorial-gen
+	$1 conrad
+	$2 con
+end
+
+strip danziger
+	name Jeff Danziger
+	useclass comicspage-editorial-gen
+	$1 danziger
+	$2 dan
+end
+
+strip davies
+	name Matt Davies
+	useclass comicspage-editorial-gen
+	$1 davies
+	$2 dav
+end
+
+strip handelsman
+	name Walt Handelsman
+	useclass comicspage-editorial-gen
+	$1 handelsman
+	$2 han
+end
+
+strip horsey
+	name David Horsey
+	useclass comicspage-editorial-gen
+	$1 horsey
+	$2 hor
+end
+
+strip jones
+	name Taylor Jones
+	useclass comicspage-editorial-gen
+	$1 jones
+	$2 jon
+end
+
+strip locher
+	name Dick Locher
+	useclass comicspage-editorial-gen
+	$1 locher
+	$2 dik
+end
+
+strip lowe
+	name Chan Lowe
+	useclass comicspage-editorial-gen
+	$1 lowe
+	$2 low
+end
+
+strip marlette
+	name Doug Marlette
+	useclass comicspage-editorial-gen
+	$1 marlette
+	$2 mar
+end
+
+# superceded by kscarborough's
+#strip ohman
+#	name Jack Ohman
+#	useclass comicspage-editorial-gen
+#	$1 ohman
+#	$2 ohm
+#end
+
+strip peters
+	name Mike Peters
+	useclass comicspage-editorial-gen
+	$1 peters
+	$2 pet
+end
+
+strip sack
+	name Steve Sack
+	useclass comicspage-editorial-gen
+	$1 sack
+	$2 sak
+end
+
+strip sheneman
+	name Drew Sheneman
+	useclass comicspage-editorial-gen
+	$1 sheneman
+	$2 she
+end
+
+
+strip stayskal
+	name Wayne Stayskal
+	useclass comicspage-editorial-gen
+	$1 stayskal
+	$2 sty
+end
+
+
+# superceded by kscarborough's
+#strip summers
+#	name Dana Summers
+#	useclass comicspage-editorial-gen
+#	$1 summers
+#	$2 sum
+#end
+
+strip telnaes
+	name Ann Telnaes
+	useclass comicspage-editorial-gen
+	$1 telnaes
+	$2 tel
+end
+
+strip wasserman
+	name Dan Wasserman
+	useclass comicspage-editorial-gen
+	$1 wasserman
+	$2 was
+end
+
+strip wrightd
+	name Dick Wright
+	useclass comicspage-editorial-gen
+	$1 wrightd
+	$2 dwr
+end
+
+strip wright
+	name Don Wright
+	useclass comicspage-editorial-gen
+	$1 wright
+	$2 wrt
+end
+
+strip captainribman
+	name Captain RibMan
+	homepage http://www.comicspage.com/ribman/index.html
+	type search
+	searchpage http://www.supercomics.com/strips/new.html
+	searchpattern <img.+?src="(.+?)".+?ALT="Captain RibMan"
+	baseurl http://www.supercomics.com/strips/
+	provides latest
+end
+
+#mercury center strips
+strip bfriends
+	name Between Friends
+	useclass mercurycenter
+	$1 14
+	$2 bfriends
+end
+
+
+# sev.com.au strips
+strip sevtrek
+        name Sev Trek
+        useclass sev-comics
+end
+
+strip fotr
+        name Fraud of the Rings
+        useclass sev-comics
+end
+
+strip sevgate
+        name Sevgate SEV1
+        useclass sev-comics
+end
+
+strip bluffy
+        name Bluffy the Vampedup Stunner
+        useclass sev-comics
+end
+
+strip sevfiles
+        name The Sev Files
+        useclass sev-comics
+end
+
+strip sevwars
+        name Sev Wars
+        useclass sev-comics
+end
+
+strip sevylon5
+        name Sevylon 5
+        useclass sev-comics
+end
+
+# doesn't fit class
+strip sevscifi
+        name Sev Sci-Fi TV
+        homepage http://www.sev.com.au/toonzone/
+        type generate
+        imageurl http://www.sev.com.au/toonzone/scifitv.jpg
+        provides latest
+end
+
+#washpost strips
+strip andycapp
+        name Andy Capp
+        useclass washpost-creators
+        $1 cap
+end
+
+strip wizardofid
+        name Wizard of Id
+        useclass washpost-creators
+        $1 wiz
+end
+
+strip bc
+        name BC
+        useclass washpost-creators
+        $1 bc
+end
+
+strip marvin
+        name Marvin
+        useclass washpost-king
+        $1 $name
+end
+
+#creators.com strips
+strip agnes
+	name Agnes
+	homepage http://www.creators.com/comics_show.cfm?comicname=agn
+	type search
+	searchpattern <img.+?alt="Agnes".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip archie
+	name Archie
+	homepage http://www.creators.com/comics_show.cfm?comicname=arc
+	type search
+	searchpattern <img.+?alt="Archie".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip askshagg
+	name Ask Shagg
+	homepage http://www.creators.com/comics_show.cfm?comicname=shg
+	type search
+	searchpattern <img.+?alt="Ask Shagg".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip ballardstreet
+	name Ballard Street
+	homepage http://www.creators.com/comics_show.cfm?comicname=bs
+	type search
+	searchpattern <img.+?alt="Ballard Street".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip bachelorparty
+	name Bachelor Party
+	homepage http://www.creators.com/comics_show.cfm?comicname=bch
+	type search
+	searchpattern <img.+?alt="Bachelor Party".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip charlie
+	name Charlie
+	homepage http://www.creators.com/comics_show.cfm?comicname=cha
+	type search
+	searchpattern <img.+?alt="Charlie".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+# available at pay site mycomicspage.com
+#strip drawingacrowd
+#	name Drawing a Crowd
+#	homepage http://www.creators.com/comics_show.cfm?comicname=dac
+#	type search
+#	searchpattern <img.+?alt="Drawing a Crowd".+?src="(.+?)"
+#	baseurl http://www.creators.com/
+#	provides latest
+#end
+
+strip flightdeck
+	name Flight Deck
+	homepage http://www.creators.com/comics_show.cfm?comicname=fli
+	type search
+	searchpattern <img.+?alt="Flight Deck".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip flofriends
+	name Flo & Friends
+	homepage http://www.creators.com/comics_show.cfm?comicname=flo
+	type search
+	searchpattern <img.+?alt="Flo & Friends".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip forheavenssake
+	name For Heaven's Sake
+	homepage http://www.creators.com/comics_show.cfm?comicname=hev
+	type search
+	searchpattern <img.+?alt="For Heavens Sake".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip heathcliff
+	name Heathcliff
+	homepage http://www.creators.com/comics_show.cfm?comicname=hth
+	type search
+	searchpattern <img.+?alt="Heathcliff".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip herbandjamaal
+	name Herb and Jamaal
+	homepage http://www.creators.com/comics_show.cfm?comicname=hrb
+	type search
+	searchpattern <img.+?alt="Herb and Jamal".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip libertymeadows
+	name Liberty Meadows
+	homepage http://www.creators.com/comics_show.cfm?comicname=lib
+	type search
+	searchpattern <img.+?alt="Liberty Meadows".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip momma
+	name Momma
+	homepage http://www.creators.com/comics_show.cfm?comicname=mom
+	type search
+	searchpattern <img.+?alt="Momma".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip mrhousewife
+	name Mr. Housewife
+	homepage http://www.creators.com/comics_show.cfm?comicname=mrh
+	type search
+	searchpattern <img.+?alt="Mr. Housewife".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip naturalselection
+	name Natural Selection
+	homepage http://www.creators.com/comics_show.cfm?comicname=nat
+	type search
+	searchpattern <img.+?alt="Natural Selection".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip onebighappy
+	name One Big Happy
+	homepage http://www.creators.com/comics_show.cfm?comicname=obh
+	type search
+	searchpattern <img.+?alt="One Big Happy".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip theothercoast
+	name The Other Coast
+	homepage http://www.creators.com/comics_show.cfm?comicname=oc
+	type search
+	searchpattern <img.+?alt="The Other Coast".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip rubes
+	name Rubes
+	homepage http://www.creators.com/comics_show.cfm?comicname=rub
+	type search
+	searchpattern <img.+?alt="Rubes".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip rugrats
+	name Rugrats
+	homepage http://www.creators.com/comics_show.cfm?comicname=rug
+	type search
+	searchpattern <img.+?alt="Rugrats".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip speedbump
+	name Speed Bump
+	homepage http://www.creators.com/comics_show.cfm?comicname=bmp
+	type search
+	searchpattern <img.+?alt="Speed Bump".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip strangebrew
+	name Strange Brew
+	homepage http://www.creators.com/comics_show.cfm?comicname=brw
+	type search
+	searchpattern <img.+?alt="Strange Brew".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip weepals
+	name Wee Pals
+	homepage http://www.creators.com/comics_show.cfm?comicname=wee
+	type search
+	searchpattern <img.+?alt="Wee Pals".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+#strip chuckasay
+#	name Chuck Asay
+#	homepage http://www.creators.com/editorial_show.cfm?comicname=ca
+#	type search
+#	searchpattern <img.+?alt="Chuck Asay".+?src="(.+?)"
+#	baseurl http://www.creators.com/
+#	provides latest
+#end
+
+#strip chipbok
+#	name Chip Bok
+#	homepage http://www.creators.com/editorial_show.cfm?comicname=cb
+#	type search
+#	searchpattern <img.+?alt="Chip Bok".+?src="(.+?)"
+#	baseurl http://www.creators.com/
+#	provides latest
+#end
+
+#strip kencatalino
+#	name Ken Catalino
+#	homepage http://www.creators.com/editorial_show.cfm?comicname=kn
+#	type search
+#	searchpattern <img.+?alt="Ken Catalino".+?src="(.+?)"
+#	baseurl http://www.creators.com/
+#	provides latest
+#end
+
+#strip johndeering
+#	name John Deering
+#	homepage http://www.creators.com/editorial_show.cfm?comicname=jd
+#	type search
+#	searchpattern <img.+?alt="John Deering".+?src="(.+?)"
+#	baseurl http://www.creators.com/
+#	provides latest
+#end
+
+strip bobgorrell
+	name Bob Gorrell
+	homepage http://www.creators.com/editorial_show.cfm?comicname=bg
+	type search
+	searchpattern <img.+?alt="Bob Gorrell".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip clayjones
+	name Clay Jones
+	homepage http://www.creators.com/editorial_show.cfm?comicname=cj
+	type search
+	searchpattern <img.+?alt="Clay Jones".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip mikeluckovich
+	name Mike Luckovich
+	homepage http://www.creators.com/editorial_show.cfm?comicname=lk
+	type search
+	searchpattern <img.+?alt="Mike Luckovich".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip jimmymargulies
+	name Jimmy Margulies
+	homepage http://www.creators.com/editorial_show.cfm?comicname=jm
+	type search
+	searchpattern <img.+?alt="Jimmy Margulies".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip dwanepowell
+	name Dwane Powell
+	homepage http://www.creators.com/editorial_show.cfm?comicname=dp
+	type search
+	searchpattern <img.+?alt="Dwane Powell".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip paulszep
+	name Paul Szep
+	homepage http://www.creators.com/editorial_show.cfm?comicname=ps
+	type search
+	searchpattern <img.+?alt="Paul Szep".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip geoffreymoss
+	name Geoffrey Moss
+	homepage http://www.creators.com/editorial_show.cfm?comicname=gm
+	type search
+	searchpattern <img.+?alt="Mossprints".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip juliasuits
+	name Julia Suits
+	homepage http://www.creators.com/editorial_show.cfm?comicname=su
+	type search
+	searchpattern <img.+?alt="Suits".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip garyvarvel
+	name Gary Varvel
+	homepage http://www.creators.com/editorial_show.cfm?comicname=gv
+	type search
+	searchpattern <img.+?alt="Varvel".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+#additional non-standard strips
+strip dtte
+	name Death to the Extremist
+	homepage http://www.zole.org/extremist/
+	type search
+	searchpage http://www.zole.org/extremist/
+	searchpattern <img.+?src="comics/(.+?)"
+	baseurl http://www.zole.org/extremist/comics/
+	provides latest
+end
+
+strip jack
+	name Jack
+	artist David Hopkins
+	homepage http://jack.keenspace.com
+	type generate
+	imageurl $homepage/comics/Jack%Y%m%d.jpg
+	provides any
+end
+
+strip errantstory
+	name Errant Story
+	artist Michael Poe
+	homepage http://www.errantstory.com
+	type search
+	searchpattern <IMG.+?SRC="(/comics/es.+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip catandgirl
+        name Cat and Girl
+        artist Dorothy Gambrell
+        homepage http://www.catandgirl.com/
+        type search
+        searchpattern <img.+?src="(archive/cg.+?\.gif)"
+        baseurl http://www.catandgirl.com/
+        provides latest
+end
+
+strip scarygoround
+      name Scary Go Round
+      artist John Allison
+      homepage http://scarygoround.com/
+      type search
+      searchpattern <img src="(strips/\d+.+?)"
+      baseurl $homepage
+      provides latest
+end
+
+strip erniepook
+      name Ernie Pook's Comeek
+      artist Lynda Barry
+      homepage http://www.marlysmagazine.com/
+      type search
+      searchpage http://www.marlysmagazine.com/main.html
+      searchpattern <img.+?src='(strips/comeek..\.gif)'
+      baseurl $homepage
+      provides latest
+end
+
+strip erniepookbig
+      name Ernie Pook's Comeek (big image)
+      artist Lynda Barry
+      homepage http://www.marlysmagazine.com/
+      type search
+      searchpage http://www.marlysmagazine.com/main.html
+      searchpattern <a.+?href='(strips/bigcomeek..\.gif)'
+      baseurl $homepage
+      provides latest
+end
+
+strip raeside
+      name Adrian Raeside
+      homepage http://www.raesidecartoon.com/
+      type generate
+      imageurl http://www.raesidecartoon.com/images/today.gif
+      provides latest
+end
+
+strip chappatte
+      name Patrick Chappatte
+      homepage http://www.globecartoon.com/
+      type generate
+      imageurl http://www.globecartoon.com/Images/week.gif
+      provides latest
+end
+
+strip cranandlerma
+      name Cran and Lerma
+      artist Nik Scott
+      homepage http://toons.net/
+      type generate
+      imageurl http://toons.net/toon.gif
+      provides latest
+end
+
+strip curiousmoments
+      name Curious Moments
+      artist Nik Scott
+      homepage http://toons.net/
+      type generate
+      imageurl http://www.toons.net/cur.gif
+      provides latest
+end
+
+strip wolvertoon
+      name The Wolvertoon
+      artist Monte Wolverton
+      homepage http://www.pacificnet.net/toons/
+      type generate
+      imageurl http://www.pacificnet.net/toons/wolvertoon.gif
+      provides latest
+end
+
+strip toles
+	name Tom Toles
+	useclass washpost-uclick
+	$1 tt
+end
+
+strip auth
+	name Tony Auth
+	useclass washpost-uclick
+	$1 ta
+end
+
+strip carlson
+	name Stuart Carlson
+	useclass washpost-uclick
+	$1 sc
+end
+
+strip deore
+	name Bill Deore
+	useclass washpost-uclick
+	$1 bd
+end
+
+strip oliphant
+	Name Pat Oliphant
+	useclass washpost-uclick
+	$1 po
+end
+
+strip rall
+	name Ted Rall
+	useclass washpost-uclick
+	$1 tr
+end
+
+#strip sargent
+#	name Ben Sargent
+#	useclass washpost-uclick
+#	$1 bs
+#end
+
+#cagle strips
+strip topsyturvey
+	name Topsy Turvey
+	artist Peter Kuper
+	useclass slate-cagle
+	$1 kuper
+	$2 kuper
+end
+
+strip toomuchcoffeeman
+	name Too Much Coffee Man
+	artist Shannon Wheeler
+	useclass slate-cagle
+	$1 wheeler
+	$2 wheeler
+end
+
+strip alcarez
+	name Lalo Alcarez
+	useclass slate-cagle
+	$1 lalo
+	$2 lalo
+end
+
+strip andersonk
+	name Kirk Anderson
+	useclass slate-cagle
+	$1 anderson
+	$2 kirk
+end
+
+strip andersonn
+	name Nick Anderson
+	useclass slate-cagle
+	$1 andersonNICK
+	$2 nick
+end
+
+strip asay
+	name Chuck Asay
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ariail
+	name Robert Ariail
+	useclass slate-cagle
+	# Yes, they misspell his name in the URL
+	$1 arial
+	$2 arial
+end
+
+strip babin
+	name Rex Babin
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip bateman
+	name Scott Bateman
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip beattie
+	name Bruce Beattie
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip bish
+	name Randy Bish
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip bok
+	name Chip Bok
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip breen
+	name Steve Breen
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip britt
+	name Chris Britt
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip brookins
+	name Gary Brookins
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip brown
+	name Jonathan Brown
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip cagle
+	name Daryl Cagle
+	useclass slate-cagle
+	$1 $strip
+	$2 cagle00
+end
+
+strip casciari
+	name James Casciari
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip catalino
+	name Ken Catalino
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip catrow
+	name David Catrow
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+#strip cole
+#	name John Cole
+#	useclass slate-cagle
+#	$1 $strip
+#	#$2 $strip
+#	$2 coletoon
+#end
+
+#non-template
+strip cole
+	name John Cole
+	homepage http://cagle.slate.msn.com/politicalcartoons/PCcartoons/cole.asp
+	type generate
+	provides latest
+	imageurl http://www.heraldsun.com/images/photos/live/coletoon.jpg
+end
+
+strip crowe
+	name J.D. Crowe
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip curry
+	name Tom Curry
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip day
+	name Jim Day
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip deering
+	name John Deering
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip duffy
+	name Brian Duffy
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip englehart
+	name Bob Englehart
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+#strip gorrell
+#	name Bob Gorrell
+#	useclass slate-cagle
+#	$1 $strip
+#	$2 $strip
+#end
+
+strip greenberg
+	name Steve Greenberg
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip harville
+	name Vic Harville
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip heller
+	name Joe Heller
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip jacobson
+	name David Jacobson
+	useclass slate-cagle
+	$1 davidjacobson
+	$2 davidjacobson
+end
+
+#strip jonesc
+#	name Clay Jones
+#	useclass slate-cagle
+#	$1 jones
+#	$2 jones
+#end
+
+strip kallaugher
+	name Kevin Kallaugher
+	useclass slate-cagle
+	$1 $strip
+	$2 kal
+end
+
+strip keefe
+	name Mike Keefe
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip koterba
+	name Jeff Koterba
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip lane
+	name Mike Lane
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip macgregor
+	name Doug MacGregor
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip markstein
+	name Gary Markstein
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip matson
+	name R.J. Matson
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip mccloskey
+	name Jim McCloskey
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip mckee
+	name Rick McKee
+	useclass slate-cagle
+	$1 $strip
+	# I have no idea where they get "wells" from.
+	$2 wells
+end
+
+strip menees
+	name Tim Menees
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip morin
+	name Jim Morin
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ohman
+	name Jack Ohman
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip parker
+	name Jeff Parker
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip plante
+	name Bruce Plante
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+#redundant - see dwanepowell entry
+#strip powell
+#	name Dwane Powell
+#	useclass slate-cagle
+#	$1 $strip
+#	$2 $strip
+#end
+
+strip priggee
+	name Milt Priggee
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ramirez
+	name Mike Ramirez
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ramsey
+	name Marshall Ramsey
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip reddick
+	name David Reddick
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ritter
+	name Mike Ritter
+	useclass slate-cagle
+	$1 $strip
+	$2 ritter00
+end
+
+strip sherffius
+	name John Sherffius
+	useclass slate-cagle
+	$1 $strip
+	$2 sherffius21
+end
+
+strip siers
+	name Kevin Siers
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip stantis
+	name Scott Stantis
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip summers
+	name Dana Summers
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip streeter
+	name Mark Streeter
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip thompson
+	name Mike Thompson
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip trever
+	name John Trever
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip trinidad
+	name Corky Trinidad
+	useclass slate-cagle
+	$1 corky
+	$2 corky
+end
+
+#strip varvel
+#	name Gary Varvel
+#	useclass slate-cagle
+#	$1 $strip
+#	$2 $strip
+#end
+
+strip walters
+	name Kirk Walters
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip wilkinson
+	name Signe Wilkinson
+	useclass slate-cagle
+	$1 signe
+	$2 signe
+end
+
+strip wrightl
+	name Larry Wright
+	useclass slate-cagle
+	$1 wright
+	$2 wright
+end
+
+strip bizwit
+	name Bizwit
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip troubletown
+	name Troubletown
+	artist Lloyd Dangle
+	useclass slate-cagle
+	$1 dangle
+	$2 dangle
+end
+
+strip grondahl
+	name Cal Grondahl
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip huffaker
+	name Sandy Huffaker
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip randompropaganda
+	name Random Propaganda
+	artist Ryan Inzana
+	useclass slate-cagle
+	$1 inzana
+	$2 inzana
+end
+
+strip swill
+	name Swill
+	artist Peter Kohlsaat
+	useclass slate-cagle
+	$1 kohlsaat
+	$2 kohlsaat
+end
+
+strip cartoonfix
+	name Cartoonfix
+	artist John Kurtz
+	useclass slate-cagle
+	$1 kurtz
+	$2 kurtz
+end
+
+strip incontempt
+	name In Contempt
+	artist Kevin Moore
+	useclass slate-cagle
+	$1 moore
+	$2 moore
+end
+
+strip noexit
+	name No Exit
+	artist Andy Singer
+	useclass slate-cagle
+	$1 singer
+	$2 singer
+end
+
+strip slowpoke
+	name Slowpoke
+	artist Jen Sorenson
+	useclass slate-cagle
+	$1 sorenson
+	$2 sorenson
+end
+
+strip snibbe
+	name Kurt Snibbe
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip spencer
+	name John Spencer
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip wallace
+	name Russ Wallace
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip linttrap
+	name Lint Trap
+	artist Matt Wuerker
+	useclass slate-cagle
+	$1 wuerker
+	$2 wuerker
+end
+
+strip aislin
+	name Aislin
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip bado
+	name Bado
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip cardow
+	name Cameron Cardow
+	useclass slate-cagle
+	$1 cam
+	$2 cam
+end
+
+strip corrigan
+	name Patrick Corrigan
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip clement
+	name Gary Clement
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip cummings
+	name Dale Cummings
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip deadder
+	name Michael DeAdder
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip dolighan
+	name Tim Dolighan
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip donato
+	name Andy Donato
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip gable
+	name Brian Gable
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip graston
+	name Michael Graston
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip mackay
+	name Graeme MacKay
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip mackinnon
+	name Bruce MacKinnon
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip moudakis
+	name Theo Moudakis
+	useclass slate-cagle
+	$1 $strip
+	$2 mou
+end
+
+strip peterson
+	name Roy Peterson
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip rodewalt
+	name Vance Rodewalt
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ammer
+	name Wolfgang Ammer
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip anjornooz
+	name Sepideh Anjornooz
+	useclass slate-cagle
+	$1 sepideh
+	$2 sepideh
+end
+
+strip esquivel
+	name Arcadio Esquivel
+	useclass slate-cagle
+	$1 arcadio
+	$2 arcadio
+end
+
+strip ares
+	name Ares
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip mitropoulos
+	name Bas Mitropoulos
+	useclass slate-cagle
+	$1 bas
+	$2 bas
+end
+
+strip behrendt
+	name Fritz Behrendt
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip bertrams
+	name Joep Bertrams
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip boligan
+	name Angel Boligan
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip boyle
+	name Francis Boyle
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip cajas
+	name Pancho Cajas
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip carlucho
+	name Carlucho
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip cherepanov
+	name Yuri Cherepanov
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip coco
+	name Coco
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip corax
+	name Corax
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip deangelis
+	name Marco DeAngelis
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip doloricon
+	name Doloricon
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip drybones
+	name Dry Bones
+	artist Yaakov Kirschen
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip emmerson
+	name Rod Emmerson
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip evans
+	name Malcolm Evans
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip gado
+	name Gado
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip garrincha
+	name Garrincha
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip gomaa
+	name Gomaa
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip graff
+	name Finn Graff
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip hachfeld
+	name Rainer Hachfeld
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip hajjaj
+	name Emad Hajjaj
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip hansson
+	name Riber Hansson
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip hervi
+	name Hervi
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip kazanevsky
+	name Vladmir Kazanevsky
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip heng
+	name Heng Kim Song
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip olle
+	name Olle
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip keshav
+	name Keshav
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip christo
+	name Christo
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip kowsar
+	name Nik Kowsar
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip langer
+	name Langer
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip leahy
+	name Sean Leahy
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip moir
+	name Alan Moir
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip medi
+	name Medi
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip molina
+	name Pedro Molina
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip miel
+	name Deng Coy Miel
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip alimov
+	name Murat Alimov
+	useclass slate-cagle
+	$1 murat
+	$2 murat
+end
+
+strip paresh
+	name Paresh
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip nicholson
+	name Peter Nicholson
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ofarrell
+	name Vince O'Farrell
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip obi
+	name Obi
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip palomo
+	name Palomo
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip pancho
+	name Pancho
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip peel
+	name Peel
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip pismestrovic
+	name Petar Pismestrovic
+	useclass slate-cagle
+	$1 petar
+	$2 petar
+end
+
+strip plantu
+	name Jean Plantu
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip persitoons
+	name Persitoons
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ricardo
+	name Ricaro
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ronnen
+	name Meir Ronnen
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip rowe
+	name David Rowe
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip sakurai
+	name Heiko Sakurai
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip schopf
+	name Oliver Schopf
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip schot
+	name Bas van der Schot
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip serguei
+	name Serguei
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip slane
+	name Chris Slane
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip kim
+	name Kim Gyung Soo
+	useclass slate-cagle
+	$1 soo
+	$2 soo
+end
+
+strip stavro
+	name Stavro
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip tayo
+	name Tayo
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip tom
+	name Tom
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip touka
+	name Touka
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip turner
+	name Martyn Turner
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip wonsoo
+	name Wonsoo Li
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip zapiro
+	name Zapiro
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip zeev
+	name Ze'ev
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip zetterling
+	name Leif Zetterling
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip zudin
+	name Alexandr Zudin
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+
+# azcentral strips
+class azcentral-srch
+	homepage http://www.azcentral.com/ent/comics/$strip.html
+	type search
+	searchpattern <img.+?SRC="(http://mst.rbma.com/content/$1)"
+	prefetch $homepage
+	provides latest
+end
+
+strip apt3g
+	name Apartment 3-G
+	useclass azcentral-srch
+	$1 Apartment_3-G
+end
+
+strip barneygoogle
+	name Barney Google
+	useclass azcentral-srch
+	$1 Barney_Google
+end
+
+strip betterhalf
+	name Better Half
+	useclass azcentral-srch
+	$1 Better_Half
+end
+
+strip buckles
+	name Buckles
+	useclass azcentral-srch
+	$1 Buckles
+end
+
+strip dinetteset
+	name Dinette Set
+	useclass azcentral-srch
+	$1 Dinette_Set
+end
+
+strip grinandbearit
+	name Grin and Bear It
+	useclass azcentral-srch
+	$1 Grin_and_Bear_It
+end
+
+strip hiandlois
+	name Hi and Lois
+	useclass azcentral-srch
+	$1 Hi_and_Lois
+end
+
+strip judgeparker
+	name Judge Parker
+	useclass azcentral-srch
+	$1 Judge_Parker
+end
+
+strip lockhorns
+	name Lockhorns
+	useclass azcentral-srch
+	$1 Lockhorns
+end
+
+strip marktrail
+	name Mark Trail
+	useclass azcentral-srch
+	$1 Mark_Trail
+end
+
+strip maryworth
+	name Mary Worth
+	useclass azcentral-srch
+	$1 Mary_Worth
+end
+
+strip pardonmyplanet
+	name Pardon My Planet
+	useclass azcentral-srch
+	$1 Pardon_My_Planet
+end
+
+strip redeye
+	name Redeye
+	useclass azcentral-srch
+	$1 Redeye
+end
+
+strip rexmorgan
+	name Rex Morgan, MD
+	useclass azcentral-srch
+	$1 Rex_Morgan
+end
+
+strip steveroper
+	name Steve Roper
+	useclass azcentral-srch
+	$1 Steve_Roper
+end
+
+strip theylldoiteverytime
+	name They'll Do It Every Time
+	useclass azcentral-srch
+	$1 TDIE
+end
+
+strip tiger
+	name Tiger
+	useclass azcentral-srch
+	$1 Tiger
+end
+
+strip tinasgroove
+	name Tina's Groove
+	useclass azcentral-srch
+	$1 Tinas_Groove
+end
+
+strip tumbleweeds
+	name Tumbleweeds
+	useclass azcentral-srch
+	$1 Tumbleweeds
+end
+
+strip edgecity
+	name Edge City
+	useclass sfgate-gen
+	$1 Edge_City
+end
+
+
+
+# more non-standard
+strip fleem
+	name fleem
+	homepage http://flem.keenspace.com/
+	type generate
+	imageurl http://flem.keenspace.com/comics/%Y%m%d.jpg
+	provides any
+end
+
+strip queenofwands
+	name Queen of Wands
+	homepage http://www.queenofwands.net/
+	type generate
+	imageurl http://www.queenofwands.net/comics/%Y%m%d.gif
+	provides any
+end
+
+strip wigu
+	name WIGU
+	artist Jeffrey Rowland
+	homepage http://www.wigu.com/
+	type generate
+	imageurl http://www.wigu.com/strips/%Y%m%d.png
+	provides any
+end
+
+strip overdue
+	name Overdue
+	artist Bill Barnes and Gene Ambaum
+	homepage http://www.overduemedia.com/
+	type generate
+	imageurl http://www.overduemedia.com/strips/%Y%m%d.gif
+	provides latest
+end
+
+strip nichtlustig
+	name Nicht Lustig
+	homepage http://www.nichtlustig.de/
+	type generate
+	imageurl http://www.nichtlustig.de/comics/full/%y%m%d.jpg
+	provides any
+end
+
+strip hackles
+	name Hackles
+	homepage http://hackles.org
+	type generate
+	imageurl http://hackles.org/latest/cartoon.png
+	provides latest
+end
+
+strip aford
+	name Aford Turtle
+	homepage http://www.afordturtle.com
+	type generate
+	imageurl http://www.afordturtle.com.cnchost.com/comicstrips/neweststrip.gif
+	provides latest
+end
+
+strip dragontails
+	name Dragon Tails
+	artist Tim Dawson
+	homepage http://www.dragon-tails.com/
+	type search
+	searchpattern SRC="(comics/.+?\..+?)"
+	provides latest
+	baseurl $homepage
+end
+
+strip shermanslagoon
+	name Sherman's Lagoon
+	artist Jim Toomey
+	homepage http://www.slagoon.com
+	type generate
+	imageurl $homepage/dailies/SL%y.%m.%d.gif
+	provides latest
+end
+
+strip dicebox
+	name Dicebox
+	homepage http://www.girlamatic.com/series.php?name=dicebox
+	type search
+	searchpattern <img src=(http://www.girlamatic.com/jmlee/\w+?\.jpg)
+	provides latest
+end
+
+strip nothingnice
+	name Nothing Nice to Say
+	homepage http://www.nothingnice.com/
+	type generate
+	imageurl http://www.nothingnice.com/strips/%y/%m-%d-%y.gif
+	provides any
+end
+
+strip ctrlaltdel
+	name Ctrl+Alt+Del
+	artist Tim Buckley
+	homepage http://www.ctrlaltdel-online.com/
+	type generate
+	imageurl http://www.ctrlaltdel-online.com/images/comics/%Y%m%d.jpg
+	provides any
+end
+
+strip tasteslikegravel
+	name Tastes Like Gravel
+	artist Todd Oliver
+	homepage http://www.tasteslikegravel.com/
+	type generate
+	imageurl http://www.tasteslikegravel.com/strips/%Y%m%d.png
+	provides any
+end
+
+strip instantclassic
+	name Instant Classic
+	artist Brian Carroll
+	homepage http://www.briworld.com
+	type generate
+	imageurl http://www.briworld.com/ICimages/IC%Y%m%d.jpg
+	provides any
+end
+
+strip geeksalad
+	name Geek Salad
+	artist Warwick Rendell
+	homepage http://www.geeksalad.net/
+	type generate
+	imageurl http://www.geeksalad.net/strips/%Y%m%d.png
+	provides any
+end
+
+strip reallife
+	name Real Life Comics
+	artist Greg Dean
+	homepage http://www.reallifecomics.com/
+	type search
+	searchpattern src=.(/index.php.*?00000-00000-11111-00000-00000)
+	baseurl http://www.reallifecomics.com/
+	provides latest
+end
+
+strip comet7
+	name Comet 7
+	artist David Tekiela
+	homepage http://www.comet7.moreevolved.com/index.htm
+	type search
+	searchpattern (strips/c7_\d*\.gif)
+	baseurl http://www.comet7.moreevolved.com/
+	provides latest
+end
+
+strip moviepunks
+	name Movie Punks
+	artist Carrington Vanston
+	homepage http://www.moviepunks.com/
+	type search
+	searchpattern (http://www.moviepunks.com/comics/\d*\.png)
+	provides latest
+end
+
+strip building12
+	name Building 12
+	artist Chris Hazelton
+	homepage http://www.building12.net/
+	type search
+	searchpattern (http://www.building12.net/issue\d/page\d*.jpg)
+	provides latest
+end
+
+strip sarahanddavid
+	name Sarah And David
+	artist Alex Aberle
+	homepage http://www.sara-and-david.com/comic.php?comic=latest
+	type search
+	searchpattern (comics/\d*\.jpg)
+	baseurl http://www.sara-and-david.com/
+	provides latest
+end
+
+strip haiopeis
+	name Haiopeis
+	homepage http://www.drive-in-cartoons.de/haiopeis/hauptteil.php
+	type search
+	searchpattern <img src=http://www.drive-in-cartoons.de/albums/haiopeis/(\S+.png)
+	baseurl http://www.drive-in-cartoons.de/albums/haiopeis/
+	provides latest
+end
+
+
+strip grimmy
+    name Mother Goose and Grimm
+    homepage http://www.grimmy.com/comics.php
+    type generate
+    imageurl http://www.grimmy.com/images/MGG_Archive/MGG_%Y/MGG%m%d.gif
+    provides any
+end
+
+strip biloynano
+	name Tira ecol de Bilo y Nano
+	homepage http://tira.escomposlinux.org/
+	type generate
+	imageurl http://tira.escomposlinux.org/tira.png
+	provides latest
+end
+
+strip gallegoyrey
+	name Gallego Y Rey
+	homepage http://www.elmundo.es/diario/opinion/humor.html
+	type generate
+	imageurl http://estaticos.elmundo.es/diario/Library/chiste1.gif
+	provides latest
+end
+
+strip ricardomundo
+	name Ricardo (El Mundo)
+	homepage http://www.elmundo.es/diario/opinion/humor2.html
+	type generate
+	imageurl http://estaticos.elmundo.es/diario/Library/%dchiste2.gif
+	provides latest
+end
+
+strip idigoras
+	name Idigoras
+	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/idigoras.gif
+	type generate
+	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/idigoras.gif
+	provides latest
+end
+
+strip zulet
+	name Zulet
+	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/zulet.gif
+	type generate
+	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/zulet.gif
+	provides latest
+end
+
+strip elgar
+	name Elgar
+	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/elgar.gif
+	type generate
+	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/elgar.gif
+	provides latest
+end
+
+strip pachideportes
+	name Pachi
+	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/pachideportes.gif
+	type generate
+	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/pachideportes.gif
+	provides latest
+end
+
+strip biloynanoenglish
+	name Tira ecol de Bilo y Nano (english)
+	homepage http://comic.escomposlinux.org/
+	type generate
+	imageurl http://comic.escomposlinux.org/strip.png
+	provides latest
+end
+
+
+strip amores
+	name Amor es...
+	useclass comicspage-panels-gen
+	$1 amores
+	$2 amr
+end
diff --git a/web/comics/dailystrips/strips.def.old2 b/web/comics/dailystrips/strips.def.old2
index 85db323c4..742686bed 100644
--- a/web/comics/dailystrips/strips.def.old2
+++ b/web/comics/dailystrips/strips.def.old2
@@ -1,5216 +1,5216 @@
-# Strip Groups
-group andrews
-	desc Andrew's Favorite Strips
-	include userfriendly dilbert foxtrot
-	include pennyarcade joyoftech thefifthwave monty bc
-	include wizardofid garfield adamathome
-end
-
-group michael
-	desc Michael's Favorite Strips
-	include foxtrot boondocks doonesbury zits dilbert babyblues
-	include monty bc blondie calvinandhobbes funkywinkerbean
-	include zippythecolorpinhead peanuts adamathome forbetter bizarro
-	include userfriendly geech shoe wizardofid
-end
-
-group gloucestertimes
-	desc Gloucester Daily Times Strips
-	include garfield broomhilda bc wizardofid roseisrose
-	include dilbert cathy sallyforth monty grimmy peanuts
-	include forbetter foxtrot offthemark
-end
-
-group bgsunday
-	desc Boston Globe Sunday Comics
-	include dilbert doonesbury garfield getfuzzy adamathome grimmy forbetter
-	include foxtrot jumpstart zits zippythecolorpinhead curtis
-	include rhymeswithorange boondocks nonsequitur stonesoup roseisrose monty
-	include arlonjanis askshagg
-end
-
-
-# Class definitions
-class ucomics-srch
-        homepage http://www.ucomics.com/$strip/
-        type search
-        searchpattern <img.+?src=".+?(/$1/(\d+)/$1(\d+).+?)"
-        baseurl http://images.ucomics.com/comics
-        provides latest
-end
-
-class ucomics-gen
-	homepage http://www.ucomics.com/$strip/
-	type generate
-	imageurl http://images.ucomics.com/comics/$1/%Y/$1%y%m%d.gif
-	provides any
-
-end
-
-class unitedmedia-srch-comics
-	homepage http://www.unitedmedia.com/comics/$strip/
-	type search
-	searchpage http://www.unitedmedia.com/comics/$strip/archive/$strip-%Y%m%d.html
-	searchpattern <img.+?src="(/comics/$strip/archive/images/$strip.+?)"
-	baseurl http://www.unitedmedia.com
-	provides any
-end
-
-class unitedmedia-srch-comics-lag
-	homepage http://www.unitedmedia.com/comics/$strip/
-	type search
-	searchpattern <img.+?src="(/comics/$strip/archive/images/$strip.+?)"
-	baseurl http://www.unitedmedia.com
-	provides latest
-end
-
-class unitedmedia-srch-creators
-	homepage http://www.unitedmedia.com/creators/$strip/
-	type search
-	searchpattern <img.+?src="?(/creators/$strip/archive/images/.+?\.(gif|jpg))"?
-	baseurl http://www.unitedmedia.com
-	provides latest
-end
-
-class unitedmedia-srch-wash
-	homepage http://www.unitedmedia.com/wash/$strip/
-	type search
-	searchpattern (/wash/$strip/archive/images/(.*?)\.(gif|jpg))
-	baseurl http://www.unitedmedia.com
-	provides latest
-end
-
-class unitedmedia-srch-editoons
-	homepage http://www.unitedmedia.com/editoons/$1/
-	type search
-	searchpattern <img src="(/editoons/$1/archive/images/$1\d+\..+?)"
-	baseurl http://www.unitedmedia.com
-	provides latest
-end
-
-class sfgate-gen-zippy
-	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
-	type generate
-	imageurl http://pst.rbma.com/content/$3
-	provides latest
-	prefetch $homepage
-end
-
-class sfgate-gen-zippycolor
-	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
-	type generate
-	imageurl http://pst.rbma.com/content/$2
-	provides latest
-end
-
-class sfgate-gen
-	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
-	type generate
-	imageurl http://pst.rbma.com/content/$1
-	provides latest
-	prefetch $homepage
-end
-
-class sfgate-srch
-	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
-	type search
-	searchpattern <img.+?src=".+?(/comics/graphics/$2/.+?\..+?)"
-	baseurl http://www.sfgate.com
-	provides latest
-end
-
-class sfgate-columnists
-	homepage http://www.sfgate.com/columnists/$1/
-	type search
-	provides latest
-	searchpattern <IMG.+?SRC="(http://www\.sfgate\.com/chronicle/pictures/\d+/\d+/\d+/.+?-farley.gif)"
-end
-
-class comicspage-strips-gen
-        # $1 - more or less the real name
-        # $2 - 3-letter abbreviation of $1
-        referer http://www.comicspage.com/$1/
-        homepage http://www.comicspage.com/$1/
-        type generate
-        imageurl http://www.tmsfeatures.com/tmsfeatures/servlet/com.featureserv.util.Download?file=%Y%m%dcs$2-<code:"s" if %w==0><code:"a" if %w!=0>-p.jpg&code=cs$2
-        provides any
-end
-
-class comicspage-panels-gen
-	# $1 - more or less the real name
-	# $2 - 3-letter abbreviation of $1
-	homepage http://www.comicspage.com/$1/
-	type generate
-	imageurl http://www.tmsfeatures.com/tmsfeatures/servlet/com.featureserv.util.Download?file=%Y%m%dcp$2-<code:"s" if %w==0><code:"a" if %w!=0>-p.jpg&code=cp$2
-	provides any
-end
-
-class comicspage-editorial-gen
-	# $1 - more or less the real name
-	# $2 - 3-letter abbreviation of $1
-	homepage http://www.comicspage.com/$1/
-	type generate
-	imageurl http://www.tmsfeatures.com/tmsfeatures/servlet/com.featureserv.util.Download?file=%Y%m%ded$2-a-p.jpg&code=ed$2
-	provides any
-end
-
-class mercurycenter
-        # $1 - number of strip (unique to Mercury Center?)
-        # $2 - name of strip spaces=_?
-        homepage http://cgi.mercurycenter.com/cgi-bin/comics/show.cgi?ID=$1&DATE=TODAY
-        type generate
-        imageurl http://cgi.mercurycenter.com/premium/comics/%m_%d/$2.gif
-        provides any
-end
-
-class sev-comics
-        homepage http://www.sev.com.au/toonzone/$strip.asp
-        type generate
-        imageurl http://www.sev.com.au/toonzone/$strip.jpg
-        provides latest
-end
-
-class washpost-creators
-        homepage http://featurepage.creators.com/washpost.html?name=$1
-        type generate
-	prefetch $homepage
-        imageurl http://www.creators.com/<code:use POSIX;my$o=0;while(strftime("\%"."w",localtime($time_today-86400*$o))!=0){$o++}my$d=strftime("\%"."m"."\%"."d",localtime($time_today-86400*$o));"$d">/$1/$1%m%dg.gif
-        provides any
-end
-
-class washpost-king
-        homepage http://www.washingtonpost.com/wp-srv/style/comics/king.htm?$1
-        prefetch $homepage
-        imageurl http://est.rbma.com/content/$1
-        type generate
-        provides latest
-end
-
-class washpost-uclick
-	homepage http://www2.uclick.com/client/wpc/$1/
-	type search
-	searchpattern <IMG.+?SRC="(http://images\.ucomics\.com/comics/$1/\d+/$1\d+.gif)">
-	provides latest
-end
-
-class slate-cagle
-        homepage http://cagle.slate.msn.com/politicalcartoons/PCcartoons/$1.asp
-        type search
-        searchpattern <IMG.+?SRC=".+?(/working/\d+/$2\d*\.(gif|jpg))"
-        baseurl http://cagle.slate.msn.com
-        provides latest
-end
-
-class slate-cagle-alt
-        homepage http://cagle.slate.msn.com/politicalcartoons/PCcartoons/$1.asp
-        type search
-        searchpattern <IMG.+?SRC=.+?(/comics/updating/$2\d*\.(gif|jpg))"
-        baseurl http://cagle.slate.msn.com
-        provides latest
-end
-
-class kingfeatures
-	homepage http://www.kingfeatures.com/features/comics/$1/about.htm
-	type search
-	searchpage http://www.kingfeatures.com/features/comics/$1/aboutMaina.php
-	searchpattern <img.+?src='(http://est\.rbma\.com/content/$2\?date=\d+)'
-	provides latest
-end
-
-class kingfeatures-alt
-        homepage http://www.kingfeatures.com/features/comics/$1/about.htm
-        type search
-        searchpage http://www.kingfeatures.com/features/comics/$1/aboutMaina.php
-        searchpattern <img.+?src='($2\d+\..+?)'
-	baseurl http://www.kingfeatures.com/features/comics/$1/
-        provides latest
-end
-
-class cnsnews
-	homepage http://www.cnsnews.com/cartoon/$1.asp
-	type search
-	searchpage http://www.cnsnews.com/cartoon/$1.asp
-	searchpattern <img.+?src="(/cartoon/$1images/\d+/.+?\..+?)"
-	baseurl http://www.cnsnews.com
-	provides latest
-end
-
-class graphicsmash
-        type search
-	homepage http://www.graphicsmash.com/series.php?name=$1
-        searchpage http://www.moderntales.com/tooncast.php?series=$1
-        searchpattern <img.+?src=(.+?)>
-        provides latest
-end
-
-class graphicsmash-serializer
-        type search
-        homepage http://www.serializer.net/series.php?name=$1&view=current
-        searchpage http://www.moderntales.com/tooncast.php?series=$1
-        searchpattern <img.+?src=(.+?)>
-        provides latest
-end
-
-
-class graphicsmash-girlamatic
-        type search
-        homepage http://girlamatic.com/series.php?name=$1
-        searchpage http://www.moderntales.com/tooncast.php?series=$1
-        searchpattern <img.+?src=(.+?)>
-        provides latest
-end
-
-class graphicsmash-moderntales
-        type search
-        homepage http://www.moderntales.com/series2.php?name=$1&view=current
-        searchpage http://www.moderntales.com/tooncast.php?series=$1
-        searchpattern <img.+?src=(.+?)>
-        provides latest
-end
-
-# Non-standard strips
-
-# discontinued = removed 20050109
-# should be possible to generate?
-# sometimes multi-image - need a new way to handle this
-#strip avalonhigh
-#	name Avalon High
-#	homepage http://www.avalonhigh.com/
-#	type search
-#	searchpattern <IMG.+?SRC="(/?comics/avalon\d{8}.*?\.gif)"
-#	baseurl $homepage
-#	provides latest
-#end
-
-strip drfun
-	name Doctor Fun
-	homepage http://www.ibiblio.org/Dave/Dr-Fun/html/
-	type generate
-	imageurl http://www.ibiblio.org/Dave/Dr-Fun/latest.jpg
-	provides latest
-end
-
-strip goats
-	name Goats
-	homepage http://www.goats.com/
-	type search
-	searchpattern <IMG.+?SRC="(/comix/\d+/goats\d+.+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip jokesonyou
-	name The Joke's on You
-	homepage http://www.thefunnypages.com/
-	type search
-	searchpattern <img.+src="(http://www\.thefunnypages\.com/archives/.+?\.gif)"
-	provides latest
-end
-
-strip innies
-	name Innies and Outies
-	homepage http://www.inniesandoutties.com/
-	type generate
-	imageurl http://www.inniesandoutties.com/images/front.jpg
-	provides latest
-end
-
-strip joyoftech
-	name The Joy of Tech
-	homepage http://www.joyoftech.com/joyoftech/
-	type search
-	searchpattern <img.+?src="(joyimages/.+?\d+.+?)"
-	baseurl http://www.joyoftech.com/joyoftech/
-	provides latest
-end
-
-strip megatokyo
-	name MegaTokyo
-	homepage http://www.megatokyo.com/
-	type search
-	searchpattern <IMG.+?SRC="(/?strips/\d+\..+?)"
-	baseurl http://www.megatokyo.com/
-	provides latest
-
-end
-
-strip mostlybusiness
-	name Mostly Business
-	homepage http://www.tedgoff.com/
-	type generate
-	imageurl http://www.tedgoff.com/mb/images/today.gif
-	provides latest
-end
-
-strip pennyarcade
-	name Penny Arcade
-	artist Mike Krahulik and Jerry Holkins
-	homepage http://www.penny-arcade.com/
-	type search
-	searchpage http://www.penny-arcade.com/view.php3
-	searchpattern <img.+?src="(http://img.penny-arcade.com/\d{4}/\d{8}[lh]\..{3})
-	provides latest
-end
-
-strip plif
-      name Parking Lot is Full
-      homepage http://www.plif.com
-      type generate
-      imageurl http://www.plif.com/thisweek.gif
-      provides latest
-end
-
-strip pvp
-	name Player vs. Player
-	homepage http://www.pvponline.com/
-	type generate
-	imageurl http://www.pvponline.com/archive/%Y/pvp%Y%m%d.gif
-	provides any
-end
-
-strip pvpcurrent
-	name Player vs. Player - Current
-	homepage http://www.pvponline.com/
-	type search
-	searchpattern <img SRC="(archive/%Y/pvp%Y\d{4}\.gif)">
-	baseurl $homepage
-	provides latest
-end
-
-strip redmeat
-	name Redmeat
-	homepage http://www.redmeat.com/redmeat/current/
-	type generate
-	imageurl http://www.redmeat.com/redmeat/current/index-1.gif
-	provides latest
-end
-
-strip rudypark
-	name Rudy Park
-	homepage http://www.rudypark.com/
-	type generate
-	imageurl http://www.rudypark.com/comics/rudy%Y%m%d.gif
-	provides latest
-end
-
-strip sinfest
-	name Sinfest
-	homepage http://sinfest.net
-	type generate
-	imageurl http://sinfest.net/comics/sf%Y%m%d.gif
-	provides any
-end
-
-strip sluggy
-	name Sluggy Freelance
-	homepage http://www.sluggy.com/
-	type search
-	searchpage http://www.sluggy.com/daily.php?date=%y%m%d
-	searchpattern <img.+?src="?(http://pics\.sluggy\.com/comics/%y%m%d.+?\.(gif|jpg))
-	provides any
-end
-
-strip squinkers
-	name Squinkers
-	homepage http://www.squinkers.com/
-	type generate
-	imageurl http://www.squinkers.com/sqkrs/Images/today.gif
-	provides latest
-end
-
-strip superosity
-	name Superosity
-	homepage http://www.superosity.com/
-	type generate
-	imageurl http://www.superosity.com/comics/sup%Y%m%d.gif
-	provides any
-end
-
-strip theweedpatch
-	name The WeedPatch
-	homepage http://www.jpjennings.com/toons/
-	type generate
-	imageurl http://www.jpjennings.com/toons/%m%d%Y.gif
-	provides any
-end
-
-strip userfriendly
-	name User Friendly
-	homepage http://www.userfriendly.org/static/
-	type search
-	searchpage http://ars.userfriendly.org/cartoons/?id=%Y%m%d&mode=classic
-	searchpattern <img.+?src="(http://www\.userfriendly\.org/cartoons/archives/%y.+?/uf.+?\.gif)"
-	provides any
-end
-
-strip classm
-	name The Class Menagerie
-	homepage http://www.theclassm.com/
-	type search
-	searchpattern <IMG.+?SRC="(/comics/cmc\d+\..+?)"
-	baseurl http://www.theclassm.com/
-	provides latest
-end
-
-strip bruno
-	name The Bruno Daily Times
-	homepage http://www.brunostrip.com/bruno.html
-	type generate
-	imageurl http://www.brunostrip.com/%Ypics/%Y%m%d.gif
-	provides any
-end
-
-strip nukees
-	name Nukees
-	homepage http://www.nukees.com
-	type search
-	searchpattern <IMG.+?SRC="(/comics/\d+\..+?)"
-	baseurl http://www.nukees.com/
-	provides latest
-end
-
-strip joeaverage
-	name Joe Average
-	homepage http://www.joeaverage.org
-	type search
-	searchpattern <IMG.+?SRC="(/comics/\d+\..+?)"
-	baseurl http://www.joeaverage.org/
-	provides latest
-end
-
-strip angst
-	name Angst Technology
-	homepage http://www.inktank.com/AT/
-	type generate
-	imageurl http://www.inktank.com/images/AT/cartoons/%m-%d-%y.gif
-	provides any
-end
-
-strip clanofthecats
-	name Clan of the cats
-	homepage http://www.clanofthecats.com/
-	type search
-	searchpage http://www.clanofthecats.com/d/%Y%m%d.html
-	searchpattern <img.+?SRC="/(comics/%Y%m%d.+?)"
-	baseurl $homepage
-	provides any
-end
-
-strip gpf
-	name General Protection Fault
-	homepage http://www.gpf-comics.com/
-	type search
-	searchpattern <IMG.+?SRC="(/comics/gpf\d+.+?\..+?)"
-	baseurl http://www.gpf-comics.com
-	provides latest
-end
-
-strip crfh
-	name College Roomies from Hell
-	homepage http://www.crfh.net
-	type generate
-	imageurl http://www.crfh.net/comics/crfh%Y%m%d.png
-	provides any
-end
-
-strip striptease
-	name Strip Tease Comic
-	homepage http://www.stripteasecomic.com/
-	type search
-	searchpattern <img.+?src="(/?strips\d+/\d+\..+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip dorktower
-	name Dork Tower
-	homepage http://www.dorktower.com/
-	type search
-	searchpattern <img.+?src="(/?images/comics/.+?\..+?)"
-	baseurl http://www.gamespy.com/comics/dorktower/
-	provides latest
-end
-
-strip jerkcity
-	name Jerkcity
-	homepage http://www.jerkcity.com/
-  	type generate
-	imageurl http://www.jerkcity.com/today.gif
-	provides latest
-end
-
-strip kevinandkell
-	name Kevin and Kell
-	homepage http://www.kevinandkell.com/
-	type generate
-	imageurl http://www.kevinandkell.com/%Y/strips/kk%Y%m%d.gif
-	provides any
-end
-
-# superceded
-#strip freefall
-#	name Freefall
-#	homepage http://www.purrsia.com/freefall/
-#	type generate
-#	imageurl $homepage<code:use POSIX;my $w=strftime("\%"."u",localtime($time_today));my $s=517+3*floor(($time_today-995839200)/604800);$s++if$w\>2;$s++if$w\>4;my$c=int(($s+99)/100);"ff${c}00/fv00$s.gif">
-#	provides any
-#end
-
-strip 8bit
-	name 8-Bit Theater
-	homepage http://www.nuklearpower.com/latest.php
-	type search
-	searchpattern <img.+?src="(http://www\.nuklearpower\.com/comics/\d+\..+?)">
-	provides latest
-end
-
-strip apodbig
-	name Astronomy Picture of the Day (big image)
-	homepage http://antwrp.gsfc.nasa.gov/apod/
-	type search
-	searchpattern <a.+?href="(image/\d{4}/.+?\.(jpg|gif))"
-	baseurl $homepage
-	provides latest
-end
-
-strip apod
-	name Astronomy Picture of the Day
-	homepage http://antwrp.gsfc.nasa.gov/apod/
-	type search
-	searchpattern <img.+?SRC="(image/\d{4}/.+?\..+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip pgs
-	name Pathetic Geek Stories
-	homepage http://www.theonionavclub.com/
-	type search
-	searchpage http://www.theonionavclub.com/current_pgs.html
-	searchpattern <IMG.+?src="(/images/\d+/image_article\d+..+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip adventurers
-	name Adventurers!
-	homepage http://www.adventurers-comic.com/
-	type generate
-	imageurl http://www.adventurers-comic.com/comics/adventurers%Y%m%da.gif
-	provides any
-end
-
-strip btaf
-	name Bob, The Angry Flower
-	homepage http://angryflower.com/
-	type search
-	searchpage http://angryflower.com/archive.html
-	searchpattern <a href="(.+?.gif)"
-	provides latest
-	baseurl http://angryflower.com/
-end
-
-strip boasas
-	name Boy on a Stick and Slither
-	homepage http://www.boasas.com/
-	type search
-	searchpattern <img.+?src="(boasas/\d+\..+?)"
-	provides latest
-	baseurl http://www.boasas.com/
-end
-
-strip brunothebandit
-	name Bruno the Bandit
-	homepage http://www.brunothebandit.com
-	type generate
-	imageurl http://www.brunothebandit.com/comics/%Y%m%da.gif
-	provides any
-end
-
-strip brunothebanditcurrent
-	name Bruno the Bandit - Current
-	homepage http://www.brunothebandit.com
-	type search
-	searchpattern <IMG.+?SRC="(/comics/%Y\d{4}[a-z]{0,1}\.gif)"
-	baseurl $homepage
-	provides latest
-end
-
-strip dieselsweeties
-	name Diesel Sweeties
-	homepage http://www.dieselsweeties.com/
-	type search
-	searchpattern <img.+?src="(/hstrips/.+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip fuzzylogic
-	name Fuzzy Logic
-	homepage http://www.bbspot.com/comics/fuzzy_logic/index.html
-	type generate
-	imageurl http://www.bbspot.com/Images/comics/fuzzy_logic/%Y/%Y%m%d.jpg
-	provides any
-end
-
-strip littlegamers
-	name Little Gamers
-	homepage http://www.little-gamers.com/
-	type search
-	searchpattern <img.+?src='/(index.php\?do_command=show_strip&strip_id=\d+.+?)'
-	baseurl $homepage
-	provides latest
-end
-
-strip machall
-	name Mac Hall
-	homepage http://www.MacHall.com/
-	type search
-	searchpattern <img.+?src='(/index.php\?do_command=show_strip\&strip_id=\d+\&auth=.+?)'
-	baseurl $homepage
-	provides latest
-end
-
-strip mrchuckshow
-	name Mr. Chuck Show
-	homepage http://www.mrchuckshow.com/
-	type generate
-	imageurl http://www.mrchuckshow.com/strips/mcs%Y%m%db.png
-	provides any
-end
-
-strip pentasmal
-	name Pentasmal
-	homepage http://www.pentasmal.com/
-	type generate
-	imageurl http://www.pentasmal.com/comics/%Y%m%d.png
-	provides any
-end
-
-strip rpgworld
-	name RPG World
-	homepage http://www.rpgworldcomic.com/
-	type search
-	searchpattern <IMG.+?SRC="(/comics/.+?\..+?)"
-	provides latest
-	baseurl $homepage
-end
-
-strip spazlabs
-	name Spaz Labs
-	homepage http://www.stonebrokestudios.com
-	type generate
-	imageurl http://www.stonebrokestudios.com/archives/spaz/%y%m%dspaz.gif
-	provides any
-end
-
-strip glasbergen
-	name Randy Glasbergen
-	homepage http://www.glasbergen.com
-	type generate
-	imageurl http://www.glasbergen.com/images/toon.gif
-	provides latest
-end
-
-strip spiderman
-	name Spider Man
-	homepage http://www.kingfeatures.com/features/comics/spidermn/about.htm
-	type search
-	searchpage http://www.kingfeatures.com/features/comics/spidermn/aboutMaina.php
-	searchpattern <img.+?src='(http://est\.rbma\.com/content/Spiderman\?date=\d{8})'
-	provides latest
-	prefetch http://www.kingfeatures.com/images/clear.gif
-end
-
-#dead?
-strip shelton
-	name Barry Shelton Cartoon
-	homepage http://www.cnsnews.com/cartoon/shelton.asp
-	type search
-	searchpattern <img.+?border="0".+?src="(Sheltonimages/%Y/.+?\..+?)"
-	baseurl http://www.cnsnews.com/cartoon/
-	provides latest
-end
-
-strip elflifeadult
-	name Elf Life: R Rated
-	homepage http://www.elflife.com/adults.html
-	type generate
-	imageurl http://www.elflife.com/current/%Y%m%dm.gif
-	provides any
-end
-
-strip funnyfarm
-	name Funny Farm
-	homepage http://www.funnyfarmcomics.com/
-	type search
-	searchpage http://www.funnyfarmcomics.com/d/%Y%m%d.html
-	searchpattern <IMG.+?SRC="(/comics/%Y%m%da\..+?)"
-	baseurl $homepage
-	provides any
-end
-
-strip elflife
-	name Elf Life
-	homepage http://www.elflife.com/
-	type generate
-	imageurl http://www.elflife.com/comics/%Y%m%dm.gif
-	provides any
-end
-
-strip ozyandmillie
-	name Ozy and Millie
-	homepage http://www.ozyandmillie.org/
-	type generate
-	imageurl http://www.ozyandmillie.org/comics/om%Y%m%d.gif
-	provides any
-end
-
-# superceded
-#strip suburbanjungle
-#	name Suburban Jungle
-#	homepage http://www.suburbanjungle.com/
-#	type search
-#	searchpage http://suburbanjungle.com/d/%Y%m%d.html
-#	searchpattern <img.+?SRC="(/comics/sj%Y%m%d\..+?)"
-#	baseurl http://www.suburbanjungle.com
-#	provides any
-#end
-
-#discontinued - removed 20050109
-#strip acidreflux
-#	name Acid Reflux
-#	homepage http://www.acidrefluxcomic.com/
-#	type search
-#	baseurl http://www.acidrefluxcomic.com/
-#	searchpattern <img.+?src="(archive/c\d+\..+?)"
-#	provides latest
-#end
-
-#discontinued - removed 20050227
-#strip whenigrowup
-#	name When I Grow Up
-#	homepage http://www.whenigrowup.net/
-#	type generate
-#	imageurl http://www.whenigrowup.net/comics/wigu%Y%m%d.png
-#	provides any
-#end
-
-strip walky
-	name It's Walky
-	homepage http://www.itswalky.com/
-	baseurl $homepage
-	type search
-	searchpattern <img.+?SRC="/(comics/.+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip jackiesfridge
-	name Jackie's Fridge
-	type generate
-	homepage http://jackiesfridge.keenspace.com/
-	imageurl http://jackiesfridge.keenspace.com/comics/jf%Y%m%da.jpg
-	provides any
-end
-
-strip schlockmercenary
-	name Schlock Mercenary
-	type generate
-	homepage http://www.schlockmercenary.com/
-	imageurl http://www.schlockmercenary.com/comics/schlock%Y%m%d.png
-	provides any
-end
-
-strip downtoearth
-	name Down To Earth
-	homepage http://www.downtoearthcomic.com/
-	artist Gavin Chafin and Steve Wood
-	type search
-	searchpattern <img.+?src="(strips/\d+_72dpi.gif)"
-	baseurl $homepage
-	provides latest
-end
-
-strip wandering
-	name Wandering Ones
-	homepage http://www.wanderingones.com/
-	type generate
-	imageurl http://www.wanderingones.com/comics/wan%Y%m%d.gif
-	provides any
-end
-
-strip rvfun
-	name Reverend Fun
-	homepage http://rev-fun.gospelcom.net/
-	type generate
-	imageurl http://rev-fun.gospelcom.net/add_toon_info.php?date=%Y%m%d
-	provides any
-end
-
-strip slowwave
-        name Slow Wave
-        homepage http://www.slowwave.com/
-        type generate
-	imageurl $homepage/cgi-bin/archive.cgi?thisweek.gif
-        provides latest
-end
-
-strip sexylosers
-	name Sexy Losers
-	homepage http://sexylosers.com/
-	type search
-	searchpattern <A.+?HREF="/(\d+).html"
-	imageurl http://sexylosers.com/comics/sl$match_1.jpg
-	provides latest
-end
-
-# weekly
-strip youdamnkid
-        name You Damn Kid
-        homepage http://www.youdamnkid.com/
-        type search
-        baseurl $homepage
-        provides latest
-        searchpattern <IMG.+?SRC="/(comics/ydk\d+\.gif)"
-end
-
-strip houndshome
-        name Hound's Home
-        homepage http://www.houndshome.com/
-        type search
-        baseurl $homepage
-        provides latest
-        searchpattern <IMG.+?SRC="/(comics/hh.+?)"
-end
-
-strip cutewendy
-        name CuteWendy
-        homepage http://www.wendycomic.com/
-        type generate
-        imageurl http://www.wendycomic.com/comics/wendy%Y%m%d.gif
-        provides any
-end
-
-strip lifesorad
-        name Life's So Rad
-        homepage http://www.radcomics.com/
-        type search
-        baseurl $homepage
-        provides latest
-        searchpattern <IMG.+?SRC="/(comics/\d+.+?)"
-end
-
-# formerly known as otakufeh. NC-17.
-strip bigones
-        name Big Ones
-        homepage http://otakufeh.keenspace.com/
-        type generate
-        provides any
-        imageurl $homepage/comics/big%Y%m%d.gif
-end
-
-strip offthemark
-	name Off the Mark
-	homepage http://www.offthemark.com/
-	type search
-	provides latest
-	searchpage $homepage/daily.asp
-	searchpattern <img.+?src="(http://www\.offthemark\.com/rotate/\d+.gif)"
-end
-
-strip asif
-	name As If
-	homepage http://www.asifcomic.com/
-	type search
-	searchpage http://www.asifcomic.com/main.html
-	searchpattern <img src="(strips/\d+.jpg)"
-	baseurl $homepage
-	provides latest
-end
-
-strip nipandtuck
-	name Nip 'N Tuck
-	homepage http://nipandtuck.keenspace.com
-	type search
-	searchpattern SRC=".+?(/comics/nt(\d{8})\.gif)"
-	baseurl $homepage
-	provides latest
-end
-
-strip lemontree
-	name Under The Lemon Tree
-	homepage http://utlt.keenspace.com
-	type search
-	searchpattern <IMG.+?SRC=".+?(/comics/.+?\d{8}\..+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip winter
-	name Winter
-	homepage http://www.wintercomic.com/
-	type search
-	searchpattern <img.+?src='(/index.php\?do_command=show_strip&.+?)'
-	baseurl $homepage
-	provides latest
-end
-
-#looks gone 2003-11-12
-strip brainbuzz
-	name Brainbuzz
-	homepage http://cramsession.brainbuzz.com/lists/cartoon/
-	type generate
-	imageurl http://i.brainbuzz.com/CS/Lists/Cartoon/%y%m%d.gif
-	provides any
-end
-
-#they win... for now (8394022423 levels of frames and i don't feel like building a full-blown web browser right now)
-strip swamp
-	name Swamp
-	homepage http://www.swamp.com.au
-	type search
-	searchpage http://s1.emcs.com.au/SwampStrips/Strips/Strip.asp?Date=<code:strftime("%-d-%b-%Y", @localtime_today)
-	searchpattern <img.+?src="(http://s1\.emcs\.com\.au/swampstrips/Strips_Images/\d+\..+?)"
-	provides any
-end
-
-strip thenorm
-	name The Norm
-	homepage http://www.thenorm.com/
-	type generate
-	imageurl http://www.thenorm.com/arch/%Y/%y%m%d.gif
-	provides any
-end
-
-strip melonpool
-	name Melonpool
-	homepage http://www.melonpool.com/
-	type generate
-	imageurl http://www.melonpool.com/comics/MM%Y%m%d.gif
-	provides any
-end
-
-strip flem
-        name FLEM!
-        homepage http://www.flemcomics.com/
-        type generate
-        imageurl http://flem.dhs.org/new.jpg
-        provides latest
-end
-
-strip sheldon
-        name Sheldon
-        useclass unitedmedia-srch-comics
-end
-
-strip weakendwarriors
-        name Weak-end Warriors
-        homepage http://www.inktank.com/WW/
-        type generate
-        imageurl http://www.inktank.com/images/WW/cartoons/%m-%d-%y.gif
-        provides any
-end
-
-strip alice
-	name Alice!
-	homepage http://www.alicecomics.com/today.html
-	type search
-	searchpattern <IMG.+?SRC="(/comics/alice.+?\..+?)"
-	baseurl http://www.alicecomics.com/
-	provides latest
-end
-
-strip theshadows
-	name The Shadows
-	homepage http://www.alicecomics.com/shadows.html
-	type search
-	searchpattern <IMG.+?SRC="(/shadcomics/shad.+?\..+?)"
-	baseurl http://www.alicecomics.com/
-	provides latest
-end
-
-strip lcd
-	name Lowest Common Denominator
-	homepage http://lcd.keenspace.com
-	type search
-	searchpattern <IMG.+?SRC=".+?(/comics/(lcd|soph).+?\..+?)"
-	baseurl http://lcd.keenspace.com
-	provides latest
-end
-
-strip devilspanties
-        name The Devil's Panties
-        homepage http://devilspanties.keenspot.com
-        type search
-        searchpattern <IMG.+?SRC="(/comics/.+?\..+?)"
-        baseurl http://devilspanties.keenspot.com
-        provides latest
-end
-
-
-strip fatjesus
-	name Fat Jesus
-	homepage http://www.fat-jesus.com
-	type search
-	searchpattern <IMG.+?SRC="(/comics/fatjesus.+?)"
-	baseurl http://fatjesus.keenspace.com
-	provides latest
-end
-
-strip sexandviolence
-	name Sex and Violence
-	homepage http://www.mrbang.net
-	type search
-	searchpattern <IMG.+?SRC="(/comics/.+?\..+?)"
-	baseurl http://www.mrbang.net
-	provides latest
-end
-
-# not working
-#strip fans
-#	name Fans!
-#	homepage http://faans.com
-#	type search
-#	searchpattern <IMG.+?SRC="?(http://(www\.)?faans.com/\d+/\d+.+?\..+?)[">\s]
-#	provides latest
-#end
-
-strip spooner
-        name Spooner
-        homepage http://www.hookedoncomics.com/
-        type generate
-        imageurl http://www.hookedoncomics.com/comics/Sp%Y%m%d.gif
-        provides any
-end
-
-strip underpower
-        name Under Power
-        artist Jorge "Vaz" Rivas and David "vanishing" Trischuk
-        homepage http://underpower.non-essential.com/
-        type generate
-        imageurl http://underpower.non-essential.com/comics/%Y%m%d.jpg
-        provides any
-end
-
-strip nekobox
-        name Nekobox
-        artist Jorge "Vaz" Rivas and David "vanishing" Trischuk
-        homepage http://www.nekobox.org
-        type generate
-        imageurl http://www.nekobox.org/comic/%Y-%m-%d.jpg
-        provides any
-end
-
-strip perscheid
-	name Perscheids Abgruende
-	artist Martin Perscheid -> www.martin-perscheid.de
-	homepage http://portale.web.de/Boulevard/Comics/Perscheid/
-	type search
-	searchpattern <img.+?src="(http:)?(//)?(img.web.de/c/00.+?)"
-	matchpart 3
-	provides latest
-end
-
-strip harmbengen
-	name Harm Bengen's Alltagsskizzen
-	artist Harm Bergen -> www.harmbengen.de
-	homepage http://portale.web.de/Boulevard/Comics/Bengen/
-	type search
-	searchpattern <img.+?src="(http:)?(//)?(img.web.de/c/00.+?)"
-	matchpart 3
-	provides latest
-end
-
-strip weyershausenwelt
-	name Weyershausen - Wunderbare Welt
-	artist Karsten Weyershausen -> www.weyershausen.de
-	homepage http://portale.web.de/Boulevard/Comics/Weyershausen/
-	type search
-	searchpattern <img.+?src="(http:)?(//)?(img.web.de/c/00.+?)"
-	matchpart 3
-	provides latest
-end
-
-strip quirit
-	name Quirit - alltaegliches auf den Punkt gebracht
-	artist Quirit -> www.quirit.com
-	homepage http://portale.web.de/Boulevard/Comics/Quirit/
-	type search
-	searchpattern <img.+?src="(http:)?(//)?(img.web.de/c/00.+?)"
-	matchpart 3
-	provides latest
-end
-
-strip touche
-        name Touche
-        artist Tom
-        homepage http://www.drive-in-cartoons.de/touche/
-        type search
-        searchpage http://www.drive-in-cartoons.de/touche/hauptteil.php
-        searchpattern <img.+?src='(.+?)'
-        baseurl http://www.drive-in-cartoons.de/touche/
-        provides latest
-end
-
-strip achewood
-	name Achewood
-	artist Chris Onstad
-	homepage http://www.achewood.com
-	type generate
-	imageurl $homepage/dat/comic/%m%d%Y.gif
-	provides any
-end
-
-# ucomics.com strips
-strip adamathome
-	name Adam@home
-	useclass ucomics-gen
-	$1 ad
-end
-
-strip baldo
-	name Baldo
-	useclass ucomics-gen
-	$1 ba
-end
-
-strip thebigpicture
-	name The Big Picture
-	useclass ucomics-gen
-	$1 bi
-end
-
-strip boondocks
-	name The Boondocks
-	useclass ucomics-gen
-	$1 bo
-end
-
-strip calvinandhobbes
-	name Calvin and Hobbes
-	useclass ucomics-srch
-	$1 ch
-end
-
-strip cathy
-	name Cathy
-	useclass ucomics-gen
-	$1 ca
-end
-
-strip closetohome
-	name Close to Home
-	useclass ucomics-gen
-	$1 cl
-end
-
-strip cornered
-	name Cornered
-	useclass ucomics-gen
-	$1 co
-end
-
-strip doonesbury
-	name Doonesbury
-	useclass ucomics-gen
-	$1 db
-end
-
-strip thefifthwave
-	name The 5th Wave
-	useclass ucomics-srch
-	$1 fw
-end
-
-strip bensargent
-	name Ben Sargent
-	useclass ucomics-srch
-	$1 bs
-end
-
-strip patoliphant
-	name Pat Oliphant
-	useclass ucomics-srch
-	$1 po
-end
-
-strip foxtrot
-	name FoxTrot
-	useclass ucomics-gen
-	$1 ft
-end
-
-strip thefuscobrothers
-	name The Fusco Brothers
-	useclass ucomics-gen
-	$1 fu
-end
-
-strip garfield
-	name Garfield
-	useclass ucomics-gen
-	$1 ga
-end
-
-strip heartofthecity
-	name Heart of the City
-	useclass ucomics-gen
-	$1 hc
-end
-
-strip inthebleachers
-	name In the Bleachers
-	useclass ucomics-gen
-	$1 bl
-end
-
-strip james
-	name James
-	useclass ucomics-gen
-	$1 jm
-end
-
-strip mrpotatohead
-        name Mr. Potato Head
-        useclass ucomics-gen
-        $1 mrp
-end
-
-strip nonsequitur
-	name Non Sequitur
-	useclass ucomics-gen
-	$1 nq
-end
-
-strip oddlyenough
-	name Oddly Enough
-	useclass ucomics-gen
-	$1 oe
-end
-
-strip overboard
-	name Overboard
-	useclass ucomics-gen
-	$1 ob
-end
-
-strip reallifeadventures
-	name Real Life Adventures
-	useclass ucomics-gen
-	$1 rl
-end
-
-strip reynoldsunwrapped
-	name Reynolds Unwrapped
-	useclass ucomics-gen
-	$1 rw
-end
-
-strip stonesoup
-	name Stone Soup
-	useclass ucomics-gen
-	$1 ss
-end
-
-strip tankmcnamara
-	name Tank McNamara
-	useclass ucomics-gen
-	$1 tm
-end
-
-strip tomthedancingbug
-	name Tom the Dancing Bug
-	useclass ucomics-srch
-	$1 td
-end
-
-strip ziggy
-	name Ziggy
-	useclass ucomics-gen
-	$1 zi
-end
-
-strip theduplex
-        name The Duplex
-        useclass ucomics-gen
-        $1 dp
-end
-
-strip psmueller
-	name P. S. Mueller
-	useclass ucomics-gen
-	$1 psm
-end
-
-strip misterboffo
-	name Mister Boffo
-	useclass ucomics-gen
-	$1 mb
-end
-
-strip bottomliners
-	name Bottom Liners
-	artist	Eric and Bill Teitelbaum
-        useclass ucomics-gen
-        $1 tmbot
-end
-
-# unitedmedia.com strips
-strip alleyoop
-	name Alley Oop
-	useclass unitedmedia-srch-comics
-end
-
-strip arlonjanis
-	name Arlo & Janis
-	useclass unitedmedia-srch-comics
-end
-
-strip betty
-	name Betty
-	useclass unitedmedia-srch-comics
-end
-
-strip bignate
-	name Big Nate
-	useclass unitedmedia-srch-comics
-end
-
-strip bornloser
-	name The Born Loser
-	useclass unitedmedia-srch-comics
-end
-
-strip buckets
-	name The Buckets
-	useclass unitedmedia-srch-comics
-end
-
-strip bullsnbears
-	name Bull$ 'N' Bear$
-	useclass unitedmedia-srch-comics
-end
-
-strip cheapthrills
-	name Cheap Thrills
-	useclass unitedmedia-srch-wash
-end
-
-strip chickweed
-	name 9 Chickweed Lane
-	useclass unitedmedia-srch-comics
-end
-
-strip committed
-	name Committed
-	useclass unitedmedia-srch-comics
-end
-
-strip drabble
-	name Drabble
-	useclass unitedmedia-srch-comics
-end
-
-#strip dilbert
-#	name Dilbert
-#	useclass unitedmedia-srch-comics
-#end
-
-strip dilbert
-        name Dilbert
-        artist Scott Adams
-        homepage http://www.dilbert.com/comics/dilbert/
-        baseurl $homepage
-        type search
-#       searchpattern <IMG SRC="(/comics/dilbert/archive/images/.+?\.gif)"
-        searchpattern <IMG SRC="(/comics/dilbert/archive/images/.+?\....)"
-        provides latest
-end
-
-strip fatcats
-	name Fat Cats
-	useclass unitedmedia-srch-comics-lag
-end
-
-strip ferdnand
-	name Ferd'nand
-	useclass unitedmedia-srch-comics
-end
-
-strip forbetter
-       name For Better or For Worse
-       homepage http://www.fborfw.com/strip_fix/
-       type search
-       searchpattern <img.+?src="(/strip_fix/.+?\d{6}.{3}\.(gif|jpg))"
-       baseurl http://www.fborfw.com
-       provides latest
-end
-
-
-strip franknernest
-	name Frank & Ernest
-	useclass unitedmedia-srch-comics
-end
-
-strip frazz
-        name Frazz
-        useclass unitedmedia-srch-comics
-end
-
-strip geech
-	name Geech
-	useclass unitedmedia-srch-comics
-end
-
-strip getfuzzy
-	name Get Fuzzy
-	useclass unitedmedia-srch-comics
-end
-
-strip gingermeggs
-	name Ginger Meggs
-	useclass unitedmedia-srch-comics
-end
-
-strip graffiti
-	name Graffiti
-	useclass unitedmedia-srch-comics
-end
-
-strip grandave
-	name Grand Avenue
-	useclass unitedmedia-srch-comics
-end
-
-strip grizzwells
-	name The Grizzwells
-	useclass unitedmedia-srch-comics
-end
-
-strip hedge
-	name Over the Hedge
-	useclass unitedmedia-srch-comics
-end
-
-strip herman
-	name Herman
-	useclass unitedmedia-srch-comics
-end
-
-strip janesworld
-        name Jane's World
-        useclass unitedmedia-srch-comics
-end
-
-strip jumpstart
-	name Jump Start
-	useclass unitedmedia-srch-comics
-end
-
-strip kitncarlyle
-	name Kit 'N' Carlyle
-	useclass unitedmedia-srch-comics
-end
-
-#can't use the class - dates are 53 years ago
-strip lilabner
-	name Li'l Abner
-	homepage http://www.unitedmedia.com/comics/lilabner/index.html
-	type search
-	searchpattern <img.+?src="(/comics/lilabner/archive/images/lilabner.+?\..+?)"
-	baseurl http://www.unitedmedia.com
-	provides latest
-end
-
-strip luann
-	name Luann
-	useclass unitedmedia-srch-comics
-end
-
-strip lupo
-	name Lupo Alberto
-	useclass unitedmedia-srch-comics
-end
-
-strip marmaduke
-	name Marmaduke
-	useclass unitedmedia-srch-comics
-end
-
-strip meatloaf
-	name Meatloaf Night
-	useclass unitedmedia-srch-comics
-end
-
-strip meg
-	name Meg!
-	useclass unitedmedia-srch-comics-lag
-end
-
-strip motley
-	name Motley
-	useclass unitedmedia-srch-comics-lag
-end
-
-strip nancy
-	name Nancy
-	useclass unitedmedia-srch-comics
-end
-
-strip peanuts
-	name Peanuts
-	useclass unitedmedia-srch-comics
-end
-
-strip pearls
-	name Pearls Before Swine
-	useclass unitedmedia-srch-comics
-end
-
-strip pibgorn
-	name Pibgorn
-	useclass unitedmedia-srch-comics
-end
-
-strip pickles
-	name Pickles
-	useclass unitedmedia-srch-wash
-end
-
-strip potluck
-	name Potluck Parish
-	useclass unitedmedia-srch-comics
-end
-
-strip raisingduncan
-	name Raising Duncan
-	useclass unitedmedia-srch-comics
-end
-
-strip reality
-	name Reality Check
-	useclass unitedmedia-srch-comics
-end
-
-strip redandrover
-	name Red and Rover
-	useclass unitedmedia-srch-wash
-end
-
-strip ripleys
-	name Ripley's Believe It or Not!
-	useclass unitedmedia-srch-comics
-end
-
-strip monty
-	name Monty
-	useclass unitedmedia-srch-comics
-end
-
-strip roseisrose
-	name Rose Is Rose
-	useclass unitedmedia-srch-comics
-end
-
-strip shirleynson
-	name Shirley And Son
-	useclass unitedmedia-srch-comics
-end
-
-strip soup2nutz
-	name Soup To Nutz
-	useclass unitedmedia-srch-comics
-end
-
-strip stockcartoons
-	name StockcarToons
-	useclass unitedmedia-srch-comics
-	searchpage $homepage
-	provides latest
-end
-
-strip tarzan
-	name Tarzan
-	useclass unitedmedia-srch-comics
-end
-
-strip thatslife
-	name That's Life
-	useclass unitedmedia-srch-wash
-end
-
-strip topofworld
-	name Top of the World!
-	useclass unitedmedia-srch-comics-lag
-end
-
-strip workingdaze
-	name Working Daze
-	useclass unitedmedia-srch-comics
-end
-
-strip pcnpixel
-	name PC and Pixel
-	useclass unitedmedia-srch-wash
-	provides latest
-end
-
-strip billday
-	name Bill Day
-	useclass unitedmedia-srch-editoons
-	$1 day
-end
-
-strip billschorr
-	name Bill Schorr
-	useclass unitedmedia-srch-editoons
-	$1 schorr
-end
-
-strip claybennett
-	name Clay Bennett
-	useclass unitedmedia-srch-editoons
-	$1 bennett
-end
-
-strip drewlitton
-	name Drew Litton
-	useclass unitedmedia-srch-editoons
-	$1 litton
-end
-
-strip edstein
-	name Ed Stein
-	useclass unitedmedia-srch-editoons
-	$1 stein
-end
-
-strip ettahulme
-	name Etta Hulme
-	useclass unitedmedia-srch-editoons
-	$1 hulme
-end
-
-strip henrypayne
-	name Henry Payne
-	useclass unitedmedia-srch-editoons
-	$1 payne
-end
-
-strip jeffstahler
-	name Jeff Stahler
-	useclass unitedmedia-srch-editoons
-	$1 stahler
-end
-
-strip jerryholbert
-	name Jerry Holbert
-	useclass unitedmedia-srch-editoons
-	$1 holbert
-end
-
-strip jimberry
-	name Jim Berry
-	useclass unitedmedia-srch-editoons
-	$1 berry
-end
-
-strip mikesmith
-	name Mike Smith
-	useclass unitedmedia-srch-editoons
-	$1 smith
-end
-
-strip robrogers
-	name Rob Rogers
-	useclass unitedmedia-srch-editoons
-	$1 rogers
-end
-
-strip stevebenson
-	name Steve Benson
-	useclass unitedmedia-srch-editoons
-	$1 benson
-end
-
-# sfgate strips
-strip babyblues
-	name Baby Blues
-	useclass sfgate-gen
-	$1 Baby_Blues
-end
-
-strip beetlebailey
-	name Beetle Bailey
-	useclass sfgate-gen
-	$1 Beetle_Bailey
-end
-
-strip blondie
-	name Blondie
-	useclass sfgate-gen
-	$1 $name
-end
-
-strip crock
-	name Crock
-	useclass sfgate-gen
-	$1 $name
-end
-
-strip curtis
-	name Curtis
-	useclass sfgate-gen
-	$1 $name
-end
-
-strip dennisthemenace
-	name Dennis the Menace
-	useclass sfgate-gen
-	$1 Dennis_The_Menace
-end
-
-#non-standard
-strip farley
-	name Farley
-        homepage http://www.sfgate.com/columnists/farley/
-        type search
-        provides latest
-        searchpattern <IMG.+?SRC="(http://(www\.)?sfgate\.com/chronicle/pictures/\d+/\d+/\d+/.+?-farley.gif)"
-end
-
-strip fastrack
-	name On The Fast Track
-	useclass sfgate-gen
-	$1 Fast_Track
-end
-
-strip funkywinkerbean
-	name Funky Winkerbean
-	useclass sfgate-gen
-	$1 Funky_Winkerbean
-end
-
-strip hagarthehorrible
-	name Hagar the Horrible
-	useclass sfgate-gen
-	$1 Hagar_The_Horrible
-end
-
-strip mallardfillmore
-	name Mallard Fillmore
-	useclass sfgate-gen
-	$1 Mallard_Fillmore
-end
-
-strip mutts
-	name Mutts
-	useclass sfgate-gen
-	$1 $name
-end
-
-strip newbreed
-	name New Breed
-	useclass sfgate-gen
-	$1 New_Breed
-end
-
-strip thephantom
-	name The Phantom
-	useclass sfgate-gen
-	$1 Phantom
-end
-
-strip piranhaclub
-	name Piranha Club
-	useclass sfgate-gen
-	$1 Piranha
-end
-
-strip popeye
-	name Popeye
-	useclass sfgate-gen
-	$1 $name
-end
-
-strip rhymeswithorange
-	name Rhymes with Orange
-	useclass sfgate-gen
-	$1 Rhymes_with_Orange
-end
-
-strip sallyforth
-	name Sally Forth
-	useclass sfgate-gen
-	$1 Sally_Forth
-end
-
-strip safehavn
-	name Safe Havens
-	useclass sfgate-gen
-	$1 Safe_Havens
-end
-
-strip sixchix
-	name Six Chix
-	useclass sfgate-gen
-	$1 6Chix
-end
-
-strip zippythecolorpinhead
-	name Zippy the Pinhead (in color)
-	useclass sfgate-gen-zippycolor
-	$1 Zippy_the_Pinhead_Color
-	$2 Zippy_the_Pinhead
-end
-
-strip zippythepinhead
-	name Zippy the Pinhead
-	useclass sfgate-gen-zippy
-	$1 Zippy_the_Pinhead
-	$3 Zippy_BW
-	$2 zippy
-end
-
-strip zits
-	name Zits
-	useclass sfgate-gen
-	$1 $name
-end
-
-#comicspage.com strips
-strip animal
-	name Animal Crackers
-	useclass comicspage-strips-gen
-	$1 animal
-	$2 ack
-end
-
-strip annie
-	name Annie
-	useclass comicspage-strips-gen
-	$1 annie
-	$2 ann
-end
-
-strip bound
-	name Bound and Gagged
-	useclass comicspage-strips-gen
-	$1 bound
-	$2 bgg
-end
-
-strip brenda
-	name Brenda Starr
-	useclass comicspage-strips-gen
-	$1 brenda
-	$2 bsr
-end
-
-strip broomhilda
-	name Broom Hilda
-	useclass comicspage-strips-gen
-	$1 broomhilda
-	$2 bhl
-end
-
-strip cats
-	name Cats with Hands
-	useclass comicspage-strips-gen
-	$1 cats
-	$2 cwh
-end
-
-strip dicktracy
-	name Dick Tracy
-	useclass comicspage-strips-gen
-	$1 dicktracy
-	$2 dty
-end
-
-strip doodles
-	name Doodles
-	useclass comicspage-strips-gen
-	$1 profdoodles
-	$2 dod
-end
-
-strip fred
-	name Fred Basset
-	useclass comicspage-strips-gen
-	$1 fred
-	$2 fbt
-end
-
-strip gasolinealley
-	name Gasoline Alley
-	useclass comicspage-strips-gen
-	$1 gasolinealley
-	$2 gas
-end
-
-strip gilthorp
-	name Gil Thorp
-	useclass comicspage-strips-gen
-	$1 gilthorp
-	$2 gtp
-end
-
-strip helen
-	name Helen, Sweetheart of the Internet
-	useclass comicspage-strips-gen
-	$1 helen
-	$2 hln
-end
-
-strip kudzu
-	name Kudzu
-	useclass comicspage-strips-gen
-	$1 kudzu
-	$2 kdz
-end
-
-strip lewis
-	name Lewis
-	useclass comicspage-strips-gen
-	$1 lewis
-	$2 lew
-end
-
-strip lola
-	name Lola
-	useclass comicspage-strips-gen
-	$1 lola
-	$2 lol
-end
-
-strip looseparts
-	name Loose Parts
-	useclass comicspage-strips-gen
-	$1 looseparts2
-	$2 lsp
-end
-
-strip meehan
-	name Meehan Streak
-	useclass comicspage-strips-gen
-	$1 meehan
-	$2 mst
-end
-
-strip middletons
-	name The Middletons
-	useclass comicspage-strips-gen
-	$1 middletons
-	$2 mid
-end
-
-strip mixedmedia
-	name Mixed Media
-	useclass comicspage-strips-gen
-	$1 mixedmedia
-	$2 mix
-end
-
-strip monkeyhouse
-	name Monkeyhouse
-	useclass comicspage-strips-gen
-	$1 monkeyhouse
-	$2 mhs
-end
-
-strip shoe
-	name Shoe
-	useclass comicspage-strips-gen
-	$1 shoe
-	$2 sho
-end
-
-strip sylvia
-	name Sylvia
-	useclass comicspage-strips-gen
-	$1 sylvia
-	$2 syl
-end
-
-strip willynethel
-	name Willy 'n' Ethel
-	useclass comicspage-strips-gen
-	$1 willynethel
-	$2 wil
-end
-
-
-strip 9to5
-	name 9 to 5
-	useclass comicspage-panels-gen
-	$1 9to5
-	$2 ntf
-end
-
-strip computoon
-	name Compu-toon
-	useclass comicspage-panels-gen
-	$1 computoon
-	$2 cpt
-end
-
-strip loveis
-	name Love Is...
-	useclass comicspage-panels-gen
-	$1 loveis
-	$2 lis
-end
-
-strip pluggers
-	name Pluggers
-	useclass comicspage-panels-gen
-	$1 pluggers
-	$2 plg
-end
-
-strip quigmans
-	name The Quiqmans
-	useclass comicspage-panels-gen
-	$1 quigmans
-	$2 qgm
-end
-
-# gone? 2002-05-24
-strip thatsjake
-	name That's Jake
-	useclass comicspage-panels-gen
-	$1 thatsjake
-	$2 tjk
-end
-
-strip conrad
-	name Paul Conrad
-	useclass comicspage-editorial-gen
-	$1 conrad
-	$2 con
-end
-
-strip danziger
-	name Jeff Danziger
-	useclass comicspage-editorial-gen
-	$1 danziger
-	$2 dan
-end
-
-strip davies
-	name Matt Davies
-	useclass comicspage-editorial-gen
-	$1 davies
-	$2 dav
-end
-
-strip handelsman
-	name Walt Handelsman
-	useclass comicspage-editorial-gen
-	$1 handelsman
-	$2 han
-end
-
-strip horsey
-	name David Horsey
-	useclass comicspage-editorial-gen
-	$1 horsey
-	$2 hor
-end
-
-strip jones
-	name Taylor Jones
-	useclass comicspage-editorial-gen
-	$1 jones
-	$2 jon
-end
-
-strip locher
-	name Dick Locher
-	useclass comicspage-editorial-gen
-	$1 locher
-	$2 dik
-end
-
-strip lowe
-	name Chan Lowe
-	useclass comicspage-editorial-gen
-	$1 lowe
-	$2 low
-end
-
-strip marlette
-	name Doug Marlette
-	useclass comicspage-editorial-gen
-	$1 marlette
-	$2 mar
-end
-
-strip peters
-	name Mike Peters
-	useclass comicspage-editorial-gen
-	$1 peters
-	$2 pet
-end
-
-strip sack
-	name Steve Sack
-	useclass comicspage-editorial-gen
-	$1 sack
-	$2 sak
-end
-
-strip sheneman
-	name Drew Sheneman
-	useclass comicspage-editorial-gen
-	$1 sheneman
-	$2 she
-end
-
-strip stayskal
-	name Wayne Stayskal
-	useclass comicspage-editorial-gen
-	$1 stayskal
-	$2 sty
-end
-
-strip telnaes
-	name Ann Telnaes
-	useclass comicspage-editorial-gen
-	$1 telnaes
-	$2 tel
-end
-
-strip wasserman
-	name Dan Wasserman
-	useclass comicspage-editorial-gen
-	$1 wasserman
-	$2 was
-end
-
-strip wrightd
-	name Dick Wright
-	useclass comicspage-editorial-gen
-	$1 wrightd
-	$2 dwr
-end
-
-strip wright
-	name Don Wright
-	useclass comicspage-editorial-gen
-	$1 wright
-	$2 wrt
-end
-
-strip captainribman
-	name Captain RibMan
-	homepage http://www.comicspage.com/ribman/index.html
-	type search
-	searchpage http://www.supercomics.com/strips/new.html
-	searchpattern <img.+?src="(.+?)".+?ALT="Captain RibMan"
-	baseurl http://www.supercomics.com/strips/
-	provides latest
-end
-
-#could possibly provide any with a code block to calculate the right date, but i'm lazy.
-#email me if you want it.
-strip bfriends
-	name Between Friends
-	artist Sandra Bell-lundy
-	homepage http://www.betweenfriendscartoons.com/
-	type search
-	searchpattern <img.+?src='(http://est\.rbma\.com/content/Between_Friends\?date=\d+)'
-	provides latest
-end
-
-# sev.com.au strips
-strip sevtrek
-        name Sev Trek
-        useclass sev-comics
-end
-
-strip fotr
-        name Fraud of the Rings
-        useclass sev-comics
-end
-
-strip sevgate
-        name Sevgate SEV1
-        useclass sev-comics
-end
-
-strip bluffy
-        name Bluffy the Vampedup Stunner
-        useclass sev-comics
-end
-
-strip sevfiles
-        name The Sev Files
-        useclass sev-comics
-end
-
-strip sevwars
-        name Sev Wars
-        useclass sev-comics
-end
-
-strip sevylon5
-        name Sevylon 5
-        useclass sev-comics
-end
-
-# doesn't fit class
-strip sevscifi
-        name Sev Sci-Fi TV
-        homepage http://www.sev.com.au/toonzone/
-        type generate
-        imageurl http://www.sev.com.au/toonzone/scifitv.jpg
-        provides latest
-end
-
-#washpost strips
-strip andycapp
-        name Andy Capp
-        useclass washpost-creators
-        $1 cap
-end
-
-strip wizardofid
-        name Wizard of Id
-        useclass washpost-creators
-        $1 wiz
-end
-
-strip bc
-        name BC
-        useclass washpost-creators
-        $1 bc
-end
-
-strip marvin
-        name Marvin
-        useclass washpost-king
-        $1 $name
-end
-
-#creators.com strips
-strip agnes
-	name Agnes
-	homepage http://www.creators.com/comics_show.cfm?comicname=agn
-	type search
-	searchpattern <img.+?alt="Agnes".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip archie
-	name Archie
-	homepage http://www.creators.com/comics_show.cfm?comicname=arc
-	type search
-	searchpattern <img.+?alt="Archie".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip askshagg
-	name Ask Shagg
-	homepage http://www.creators.com/comics_show.cfm?comicname=shg
-	type search
-	searchpattern <img.+?alt="Ask Shagg".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip ballardstreet
-	name Ballard Street
-	homepage http://www.creators.com/comics_show.cfm?comicname=bs
-	type search
-	searchpattern <img.+?alt="Ballard Street".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-# apparently gone 20050126
-#strip bachelorparty
-#	name Bachelor Party
-#	homepage http://www.creators.com/comics_show.cfm?comicname=bch
-#	type search
-#	searchpattern <img.+?alt="Bachelor Party".+?src="(.+?)"
-#	baseurl http://www.creators.com/
-#	provides latest
-#end
-
-strip charlie
-	name Charlie
-	homepage http://www.creators.com/comics_show.cfm?comicname=cha
-	type search
-	searchpattern <img.+?alt="Charlie".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip flightdeck
-	name Flight Deck
-	homepage http://www.creators.com/comics_show.cfm?comicname=fli
-	type search
-	searchpattern <img.+?alt="Flight Deck".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip flofriends
-	name Flo & Friends
-	homepage http://www.creators.com/comics_show.cfm?comicname=flo
-	type search
-	searchpattern <img.+?alt="Flo & Friends".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip forheavenssake
-	name For Heaven's Sake
-	homepage http://www.creators.com/comics_show.cfm?comicname=hev
-	type search
-	searchpattern <img.+?alt="For Heavens Sake".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip heathcliff
-	name Heathcliff
-	homepage http://www.creators.com/comics_show.cfm?comicname=hth
-	type search
-	searchpattern <img.+?alt="Heathcliff".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip herbandjamaal
-	name Herb and Jamaal
-	homepage http://www.creators.com/comics_show.cfm?comicname=hrb
-	type search
-	searchpattern <img.+?alt="Herb and Jamal".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip libertymeadows
-	name Liberty Meadows
-	homepage http://www.creators.com/comics_show.cfm?comicname=lib
-	type search
-	searchpattern <img.+?alt="Liberty Meadows".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip momma
-	name Momma
-	homepage http://www.creators.com/comics_show.cfm?comicname=mom
-	type search
-	searchpattern <img.+?alt="Momma".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip mrhousewife
-	name Mr. Housewife
-	homepage http://www.creators.com/comics_show.cfm?comicname=mrh
-	type search
-	searchpattern <img.+?alt="Mr. Housewife".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip naturalselection
-	name Natural Selection
-	homepage http://www.creators.com/comics_show.cfm?comicname=nat
-	type search
-	searchpattern <img.+?alt="Natural Selection".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip onebighappy
-	name One Big Happy
-	homepage http://www.creators.com/comics_show.cfm?comicname=obh
-	type search
-	searchpattern <img.+?alt="One Big Happy".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip theothercoast
-	name The Other Coast
-	homepage http://www.creators.com/comics_show.cfm?comicname=oc
-	type search
-	searchpattern <img.+?alt="The Other Coast".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip rubes
-	name Rubes
-	homepage http://www.creators.com/comics_show.cfm?comicname=rub
-	type search
-	searchpattern <img.+?alt="Rubes".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip rugrats
-	name Rugrats
-	homepage http://www.creators.com/comics_show.cfm?comicname=rug
-	type search
-	searchpattern <img.+?alt="Rugrats".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip speedbump
-	name Speed Bump
-	homepage http://www.creators.com/comics_show.cfm?comicname=bmp
-	type search
-	searchpattern <img.+?alt="Speed Bump".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip strangebrew
-	name Strange Brew
-	homepage http://www.creators.com/comics_show.cfm?comicname=brw
-	type search
-	searchpattern <img.+?alt="Strange Brew".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip weepals
-	name Wee Pals
-	homepage http://www.creators.com/comics_show.cfm?comicname=wee
-	type search
-	searchpattern <img.+?alt="Wee Pals".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip bobgorrell
-	name Bob Gorrell
-	homepage http://www.creators.com/editorial_show.cfm?comicname=bg
-	type search
-	searchpattern <img.+?alt="Bob Gorrell".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip clayjones
-	name Clay Jones
-	homepage http://www.creators.com/editorial_show.cfm?comicname=cj
-	type search
-	searchpattern <img.+?alt="Clay Jones".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip mikeluckovich
-	name Mike Luckovich
-	homepage http://www.creators.com/editorial_show.cfm?comicname=lk
-	type search
-	searchpattern <img.+?alt="Mike Luckovich".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip jimmymargulies
-	name Jimmy Margulies
-	homepage http://www.creators.com/editorial_show.cfm?comicname=jm
-	type search
-	searchpattern <img.+?alt="Jimmy Margulies".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip dwanepowell
-	name Dwane Powell
-	homepage http://www.creators.com/editorial_show.cfm?comicname=dp
-	type search
-	searchpattern <img.+?alt="Dwane Powell".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip paulszep
-	name Paul Szep
-	homepage http://www.creators.com/editorial_show.cfm?comicname=ps
-	type search
-	searchpattern <img.+?alt="Paul Szep".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip geoffreymoss
-	name Geoffrey Moss
-	homepage http://www.creators.com/editorial_show.cfm?comicname=gm
-	type search
-	searchpattern <img.+?alt="Mossprints".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip juliasuits
-	name Julia Suits
-	homepage http://www.creators.com/editorial_show.cfm?comicname=su
-	type search
-	searchpattern <img.+?alt="Suits".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-strip garyvarvel
-	name Gary Varvel
-	homepage http://www.creators.com/editorial_show.cfm?comicname=gv
-	type search
-	searchpattern <img.+?alt="Varvel".+?src="(.+?)"
-	baseurl http://www.creators.com/
-	provides latest
-end
-
-#additional non-standard strips
-strip dtte
-	name Death to the Extremist
-	homepage http://www.zole.org/extremist/
-	type search
-	searchpage http://www.zole.org/extremist/
-	searchpattern <img.+?src="comics/(.+?)"
-	baseurl http://www.zole.org/extremist/comics/
-	provides latest
-end
-
-strip jack
-	name Jack
-	artist David Hopkins
-	homepage http://jack.keenspace.com
-	type generate
-	imageurl $homepage/comics/Jack%Y%m%d.jpg
-	provides any
-end
-
-strip errantstory
-	name Errant Story
-	artist Michael Poe
-	homepage http://www.errantstory.com
-	type search
-	searchpattern <IMG.+?SRC="(/comics/es.+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip catandgirl
-        name Cat and Girl
-        artist Dorothy Gambrell
-        homepage http://www.catandgirl.com/
-        type search
-        searchpattern <img.+?src="(archive/cg.+?\.gif)"
-        baseurl http://www.catandgirl.com/
-        provides latest
-end
-
-strip scarygoround
-      name Scary Go Round
-      artist John Allison
-      homepage http://scarygoround.com/
-      type search
-      searchpattern <img src="(strips/\d+.+?)"
-      baseurl $homepage
-      provides latest
-end
-
-strip erniepook
-      name Ernie Pook's Comeek
-      artist Lynda Barry
-      homepage http://www.marlysmagazine.com/
-      type search
-      searchpage http://www.marlysmagazine.com/main.html
-      searchpattern <img.+?src='(strips/comeek..\.gif)'
-      baseurl $homepage
-      provides latest
-end
-
-strip erniepookbig
-      name Ernie Pook's Comeek (big image)
-      artist Lynda Barry
-      homepage http://www.marlysmagazine.com/
-      type search
-      searchpage http://www.marlysmagazine.com/main.html
-      searchpattern <a.+?href='(strips/bigcomeek..\.gif)'
-      baseurl $homepage
-      provides latest
-end
-
-strip raeside
-      name Adrian Raeside
-      homepage http://www.raesidecartoon.com/
-      type generate
-      imageurl http://www.raesidecartoon.com/images/today.gif
-      provides latest
-end
-
-strip chappatte
-      name Patrick Chappatte
-      homepage http://www.globecartoon.com/
-      type generate
-      imageurl http://www.globecartoon.com/Images/week.gif
-      provides latest
-end
-
-strip cranandlerma
-      name Cran and Lerma
-      artist Nik Scott
-      homepage http://toons.net/
-      type generate
-      imageurl http://toons.net/toon.gif
-      provides latest
-end
-
-strip curiousmoments
-      name Curious Moments
-      artist Nik Scott
-      homepage http://toons.net/
-      type generate
-      imageurl http://www.toons.net/cur.gif
-      provides latest
-end
-
-strip wolvertoon
-      name The Wolvertoon
-      artist Monte Wolverton
-      homepage http://www.pacificnet.net/toons/
-      type generate
-      imageurl http://www.pacificnet.net/toons/wolvertoon.gif
-      provides latest
-end
-
-strip toles
-	name Tom Toles
-	useclass washpost-uclick
-	$1 tt
-end
-
-strip auth
-	name Tony Auth
-	useclass washpost-uclick
-	$1 ta
-end
-
-strip carlson
-	name Stuart Carlson
-	useclass washpost-uclick
-	$1 sc
-end
-
-strip deore
-	name Bill Deore
-	useclass washpost-uclick
-	$1 bd
-end
-
-strip oliphant
-	Name Pat Oliphant
-	useclass washpost-uclick
-	$1 po
-end
-
-strip rall
-	name Ted Rall
-	useclass washpost-uclick
-	$1 tr
-end
-
-#cagle strips
-strip topsyturvey
-	name Topsy Turvey
-	artist Peter Kuper
-	useclass slate-cagle
-	$1 kuper
-	$2 kuper
-end
-
-strip toomuchcoffeeman
-	name Too Much Coffee Man
-	artist Shannon Wheeler
-	useclass slate-cagle
-	$1 wheeler
-	$2 wheeler
-end
-
-strip alcarez
-	name Lalo Alcarez
-	useclass slate-cagle
-	$1 lalo
-	$2 lalo
-end
-
-strip andersonk
-	name Kirk Anderson
-	useclass slate-cagle
-	$1 anderson
-	$2 kirk
-end
-
-strip andersonn
-	name Nick Anderson
-	useclass slate-cagle
-	$1 andersonNICK
-	$2 nick
-end
-
-strip asay
-	name Chuck Asay
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ariail
-	name Robert Ariail
-	useclass slate-cagle
-	$1 arial
-	$2 arial
-end
-
-strip babin
-	name Rex Babin
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip bateman
-	name Scott Bateman
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip beattie
-	name Bruce Beattie
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip bish
-	name Randy Bish
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip bok
-	name Chip Bok
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip breen
-	name Steve Breen
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip britt
-	name Chris Britt
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip brookins
-	name Gary Brookins
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip brown
-	name Jonathan Brown
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip cagle
-	name Daryl Cagle
-	useclass slate-cagle
-	$1 $strip
-	$2 cagle00
-end
-
-strip casciari
-	name James Casciari
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip catalino
-	name Ken Catalino
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip catrow
-	name David Catrow
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-#non-template
-strip cole
-	name John Cole
-	homepage http://cagle.slate.msn.com/politicalcartoons/PCcartoons/cole.asp
-	type generate
-	provides latest
-	imageurl http://www.heraldsun.com/images/photos/live/coletoon.jpg
-end
-
-strip crowe
-	name J.D. Crowe
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip curry
-	name Tom Curry
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip day
-	name Jim Day
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip deering
-	name John Deering
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip duffy
-	name Brian Duffy
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip englehart
-	name Bob Englehart
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip greenberg
-	name Steve Greenberg
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip harville
-	name Vic Harville
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip heller
-	name Joe Heller
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip jacobson
-	name David Jacobson
-	useclass slate-cagle
-	$1 davidjacobson
-	$2 davidjacobson
-end
-
-strip kallaugher
-	name Kevin Kallaugher
-	useclass slate-cagle
-	$1 $strip
-	$2 kal
-end
-
-strip keefe
-	name Mike Keefe
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip koterba
-	name Jeff Koterba
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip lane
-	name Mike Lane
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip macgregor
-	name Doug MacGregor
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip markstein
-	name Gary Markstein
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip matson
-	name R.J. Matson
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip mccloskey
-	name Jim McCloskey
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip mckee
-	name Rick McKee
-	useclass slate-cagle
-	$1 $strip
-	$2 wells
-end
-
-strip menees
-	name Tim Menees
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip morin
-	name Jim Morin
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ohman
-	name Jack Ohman
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip parker
-	name Jeff Parker
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip plante
-	name Bruce Plante
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip priggee
-	name Milt Priggee
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ramirez
-	name Mike Ramirez
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ramsey
-	name Marshall Ramsey
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip reddick
-	name David Reddick
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ritter
-	name Mike Ritter
-	useclass slate-cagle
-	$1 $strip
-	$2 ritter00
-end
-
-strip sherffius
-	name John Sherffius
-	useclass slate-cagle
-	$1 $strip
-	$2 sherffius21
-end
-
-strip siers
-	name Kevin Siers
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip stantis
-	name Scott Stantis
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip summers
-	name Dana Summers
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip streeter
-	name Mark Streeter
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip thompson
-	name Mike Thompson
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip trever
-	name John Trever
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip trinidad
-	name Corky Trinidad
-	useclass slate-cagle
-	$1 corky
-	$2 corky
-end
-
-strip walters
-	name Kirk Walters
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip wilkinson
-	name Signe Wilkinson
-	useclass slate-cagle
-	$1 signe
-	$2 signe
-end
-
-strip wrightl
-	name Larry Wright
-	useclass slate-cagle
-	$1 wright
-	$2 wright
-end
-
-strip bizwit
-	name Bizwit
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip troubletown
-	name Troubletown
-	artist Lloyd Dangle
-	useclass slate-cagle
-	$1 dangle
-	$2 dangle
-end
-
-strip grondahl
-	name Cal Grondahl
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip huffaker
-	name Sandy Huffaker
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip randompropaganda
-	name Random Propaganda
-	artist Ryan Inzana
-	useclass slate-cagle
-	$1 inzana
-	$2 inzana
-end
-
-strip swill
-	name Swill
-	artist Peter Kohlsaat
-	useclass slate-cagle-alt
-	$1 kohlsaat
-	$2 kohlsaat
-end
-
-strip cartoonfix
-	name Cartoonfix
-	artist John Kurtz
-	useclass slate-cagle-alt
-	$1 kurtz
-	$2 kurtz
-end
-
-strip incontempt
-	name In Contempt
-	artist Kevin Moore
-	useclass slate-cagle
-	$1 moore
-	$2 moore
-end
-
-strip noexit
-	name No Exit
-	artist Andy Singer
-	useclass slate-cagle
-	$1 singer
-	$2 singer
-end
-
-strip slowpoke
-	name Slowpoke
-	artist Jen Sorenson
-	useclass slate-cagle-alt
-	$1 sorenson
-	$2 sorenson
-end
-
-strip snibbe
-	name Kurt Snibbe
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip spencer
-	name John Spencer
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip wallace
-	name Russ Wallace
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip linttrap
-	name Lint Trap
-	artist Matt Wuerker
-	useclass slate-cagle
-	$1 wuerker
-	$2 wuerker
-end
-
-strip aislin
-	name Aislin
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip bado
-	name Bado
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip cardow
-	name Cameron Cardow
-	useclass slate-cagle
-	$1 cam
-	$2 cam
-end
-
-strip corrigan
-	name Patrick Corrigan
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip clement
-	name Gary Clement
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip cummings
-	name Dale Cummings
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip deadder
-	name Michael DeAdder
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip dolighan
-	name Tim Dolighan
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip donato
-	name Andy Donato
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip gable
-	name Brian Gable
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip graston
-	name Michael Graston
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip mackay
-	name Graeme MacKay
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip mackinnon
-	name Bruce MacKinnon
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip moudakis
-	name Theo Moudakis
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 mou
-end
-
-strip peterson
-	name Roy Peterson
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip rodewalt
-	name Vance Rodewalt
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ammer
-	name Wolfgang Ammer
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip anjornooz
-	name Sepideh Anjornooz
-	useclass slate-cagle
-	$1 sepideh
-	$2 sepideh
-end
-
-strip esquivel
-	name Arcadio Esquivel
-	useclass slate-cagle
-	$1 arcadio
-	$2 arcadio
-end
-
-strip ares
-	name Ares
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip mitropoulos
-	name Bas Mitropoulos
-	useclass slate-cagle-alt
-	$1 bas
-	$2 bas
-end
-
-strip behrendt
-	name Fritz Behrendt
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip bertrams
-	name Joep Bertrams
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip boligan
-	name Angel Boligan
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip boyle
-	name Francis Boyle
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip cajas
-	name Pancho Cajas
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip carlucho
-	name Carlucho
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip cherepanov
-	name Yuri Cherepanov
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip coco
-	name Coco
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip corax
-	name Corax
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip deangelis
-	name Marco DeAngelis
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip doloricon
-	name Doloricon
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip drybones
-	name Dry Bones
-	artist Yaakov Kirschen
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip emmerson
-	name Rod Emmerson
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip evans
-	name Malcolm Evans
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip gado
-	name Gado
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip garrincha
-	name Garrincha
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip gomaa
-	name Gomaa
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip graff
-	name Finn Graff
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip hachfeld
-	name Rainer Hachfeld
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip hajjaj
-	name Emad Hajjaj
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip hansson
-	name Riber Hansson
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip hervi
-	name Hervi
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip kazanevsky
-	name Vladmir Kazanevsky
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip heng
-	name Heng Kim Song
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip olle
-	name Olle
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip keshav
-	name Keshav
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip christo
-	name Christo
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip kowsar
-	name Nik Kowsar
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip langer
-	name Langer
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip leahy
-	name Sean Leahy
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip moir
-	name Alan Moir
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip medi
-	name Medi
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip molina
-	name Pedro Molina
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip miel
-	name Deng Coy Miel
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip alimov
-	name Murat Alimov
-	useclass slate-cagle-alt
-	$1 murat
-	$2 murat
-end
-
-strip paresh
-	name Paresh
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip nicholson
-	name Peter Nicholson
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ofarrell
-	name Vince O'Farrell
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip obi
-	name Obi
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip palomo
-	name Palomo
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip pancho
-	name Pancho
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip peel
-	name Peel
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip pismestrovic
-	name Petar Pismestrovic
-	useclass slate-cagle
-	$1 petar
-	$2 petar
-end
-
-strip plantu
-	name Jean Plantu
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip persitoons
-	name Persitoons
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ricardo
-	name Ricaro
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip ronnen
-	name Meir Ronnen
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip rowe
-	name David Rowe
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip sakurai
-	name Heiko Sakurai
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip schopf
-	name Oliver Schopf
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip schot
-	name Bas van der Schot
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip serguei
-	name Serguei
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip slane
-	name Chris Slane
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip kim
-	name Kim Gyung Soo
-	useclass slate-cagle-alt
-	$1 soo
-	$2 soo
-end
-
-strip stavro
-	name Stavro
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip tayo
-	name Tayo
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip tom
-	name Tom
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip touka
-	name Touka
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip turner
-	name Martyn Turner
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip wonsoo
-	name Wonsoo Li
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip zapiro
-	name Zapiro
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip zeev
-	name Ze'ev
-	useclass slate-cagle-alt
-	$1 $strip
-	$2 $strip
-end
-
-strip zetterling
-	name Leif Zetterling
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-strip zudin
-	name Alexandr Zudin
-	useclass slate-cagle
-	$1 $strip
-	$2 $strip
-end
-
-# azcentral strips
-class azcentral-srch
-	homepage http://www.azcentral.com/ent/comics/$strip.html
-	type search
-	searchpattern <img.+?SRC="(http://mst\.rbma\.com/content/$1)"
-	prefetch $homepage
-	provides latest
-end
-
-strip apt3g
-	name Apartment 3-G
-	useclass azcentral-srch
-	$1 Apartment_3-G
-end
-
-strip barneygoogle
-	name Barney Google
-	useclass azcentral-srch
-	$1 Barney_Google
-end
-
-strip betterhalf
-	name Better Half
-	useclass azcentral-srch
-	$1 Better_Half
-end
-
-strip buckles
-	name Buckles
-	useclass azcentral-srch
-	$1 Buckles
-end
-
-strip dinetteset
-	name Dinette Set
-	useclass azcentral-srch
-	$1 Dinette_Set
-end
-
-strip grinandbearit
-	name Grin and Bear It
-	useclass azcentral-srch
-	$1 Grin_and_Bear_It
-end
-
-strip hiandlois
-	name Hi and Lois
-	useclass azcentral-srch
-	$1 Hi_and_Lois
-end
-
-strip judgeparker
-	name Judge Parker
-	useclass azcentral-srch
-	$1 Judge_Parker
-end
-
-strip lockhorns
-	name Lockhorns
-	useclass azcentral-srch
-	$1 Lockhorns
-end
-
-strip marktrail
-	name Mark Trail
-	useclass azcentral-srch
-	$1 Mark_Trail
-end
-
-strip maryworth
-	name Mary Worth
-	useclass azcentral-srch
-	$1 Mary_Worth
-end
-
-strip pardonmyplanet
-	name Pardon My Planet
-	useclass azcentral-srch
-	$1 Pardon_My_Planet
-end
-
-strip redeye
-	name Redeye
-	useclass azcentral-srch
-	$1 Redeye
-end
-
-strip rexmorgan
-	name Rex Morgan, MD
-	useclass azcentral-srch
-	$1 Rex_Morgan
-end
-
-strip steveroper
-	name Steve Roper
-	useclass azcentral-srch
-	$1 Steve_Roper
-end
-
-strip theylldoiteverytime
-	name They'll Do It Every Time
-	useclass azcentral-srch
-	$1 TDIE
-end
-
-strip tiger
-	name Tiger
-	useclass azcentral-srch
-	$1 Tiger
-end
-
-strip tinasgroove
-	name Tina's Groove
-	useclass azcentral-srch
-	$1 Tinas_Groove
-end
-
-strip tumbleweeds
-	name Tumbleweeds
-	useclass azcentral-srch
-	$1 Tumbleweeds
-end
-
-strip edgecity
-	name Edge City
-	useclass sfgate-gen
-	$1 Edge_City
-end
-
-# more non-standard
-strip fleem
-	name fleem
-	homepage http://flem.keenspace.com/
-	type generate
-	imageurl http://flem.keenspace.com/comics/%Y%m%d.jpg
-	provides any
-end
-
-strip queenofwands
-	name Queen of Wands
-	homepage http://www.queenofwands.net/
-	type generate
-	imageurl http://www.queenofwands.net/comics/%Y%m%d.gif
-	provides any
-end
-
-strip wigu
-	name WIGU
-	artist Jeffrey Rowland
-	homepage http://www.wigu.com/
-	type generate
-	imageurl http://www.wigu.com/strips/%Y%m%d.png
-	provides any
-end
-
-strip overdue
-	name Overdue
-	artist Bill Barnes and Gene Ambaum
-	homepage http://www.overduemedia.com/
-	type generate
-	imageurl http://www.overduemedia.com/strips/%Y%m%d.gif
-	provides latest
-end
-
-strip nichtlustig
-	name Nicht Lustig
-	homepage http://www.nichtlustig.de/
-	type generate
-	imageurl http://www.nichtlustig.de/comics/full/%y%m%d.jpg
-	provides any
-end
-
-strip hackles
-	name Hackles
-	homepage http://hackles.org
-	type generate
-	imageurl http://hackles.org/latest/cartoon.png
-	provides latest
-end
-
-strip aford
-	name Aford Turtle
-	homepage http://www.afordturtle.com
-	type generate
-	imageurl http://www.afordturtle.com.cnchost.com/comicstrips/neweststrip.gif
-	provides latest
-end
-
-strip dragontails
-	name Dragon Tails
-	artist Tim Dawson
-	homepage http://www.dragon-tails.com/
-	type search
-	searchpattern SRC="(comics/.+?\..+?)"
-	provides latest
-	baseurl $homepage
-end
-
-strip shermanslagoon
-	name Sherman's Lagoon
-	artist Jim Toomey
-	homepage http://www.slagoon.com
-	type generate
-	imageurl $homepage/dailies/SL%y.%m.%d.gif
-	provides latest
-end
-
-strip dicebox
-	name Dicebox
-	homepage http://www.girlamatic.com/series.php?name=dicebox
-	type search
-	searchpattern <img src=(http://www\.girlamatic\.com/jmlee/\w+?\.jpg)
-	provides latest
-end
-
-strip nothingnice
-	name Nothing Nice to Say
-	homepage http://www.nothingnice.com/
-	type generate
-	imageurl http://www.nothingnice.com/strips/%y/%m-%d-%y.gif
-	provides any
-end
-
-strip ctrlaltdel
-	name Ctrl+Alt+Del
-	artist Tim Buckley
-	homepage http://www.ctrlaltdel-online.com/
-	type generate
-	imageurl http://www.ctrlaltdel-online.com/images/comics/%Y%m%d.jpg
-	provides any
-end
-
-strip tasteslikegravel
-	name Tastes Like Gravel
-	artist Todd Oliver
-	homepage http://www.tasteslikegravel.com/
-	type generate
-	imageurl http://www.tasteslikegravel.com/strips/%Y%m%d.png
-	provides any
-end
-
-strip instantclassic
-	name Instant Classic
-	artist Brian Carroll
-	homepage http://www.briworld.com
-	type generate
-	imageurl http://www.briworld.com/ICimages/IC%Y%m%d.jpg
-	provides any
-end
-
-strip geeksalad
-	name Geek Salad
-	artist Warwick Rendell
-	homepage http://www.geeksalad.net/
-	type generate
-	imageurl http://www.geeksalad.net/strips/%Y%m%d.png
-	provides any
-end
-
-strip reallife
-	name Real Life Comics
-	artist Greg Dean
-	homepage http://www.reallifecomics.com/
-	type search
-	searchpattern src=.(/index.php.*?00000-00000-11111-00000-00000)
-	baseurl http://www.reallifecomics.com/
-	provides latest
-end
-
-strip comet7
-	name Comet 7
-	artist David Tekiela
-	homepage http://www.comet7.com/
-	type search
-	searchpattern <img src="(http://www.comet7.com/strips/\d+.+?)"
-	provides latest
-end
-
-strip moviepunks
-	name Movie Punks
-	artist Carrington Vanston
-	homepage http://www.moviepunks.com/
-	type search
-	searchpattern "(http://www\.moviepunks\.com/comics/\d+\..+?)"
-	#<img CLASS="COMIC" SRC="http://www.moviepunks.com/comics/242.gif"
-	provides latest
-end
-
-strip building12
-	name Building 12
-	artist Chris Hazelton
-	homepage http://www.building12.net/
-	type search
-	searchpattern <img.+?src="(http://www\.building12\.net/issue\d/page\d+\.jpg)"
-	provides latest
-end
-
-strip saraanddavid
-	name Sara And David
-	artist Alex Aberle
-	homepage http://www.sara-and-david.com/comic.php?comic=latest
-	type search
-	searchpattern (comics/\d+\.(jpg|gif))
-	baseurl http://www.sara-and-david.com/
-	provides latest
-end
-
-strip haiopeis
-	name Haiopeis
-	homepage http://www.drive-in-cartoons.de/haiopeis/hauptteil.php
-	type search
-	searchpattern <img src=http://www\.drive-in-cartoons\.de/albums/haiopeis/(\S+\.png)
-	baseurl http://www.drive-in-cartoons.de/albums/haiopeis/
-	provides latest
-end
-
-strip grimmy
-	name Mother Goose and Grimm
-	homepage http://www.grimmy.com/comics.php
-	type generate
-	imageurl http://www.grimmy.com/images/MGG_Archive/MGG_%Y/MGG%m%d.gif
-	provides any
-end
-
-strip biloynano
-	name Tira ecol de Bilo y Nano
-	homepage http://tira.escomposlinux.org/
-	type generate
-	imageurl http://tira.escomposlinux.org/tira.png
-	provides latest
-end
-
-strip gallegoyrey
-	name Gallego Y Rey
-	homepage http://www.elmundo.es/diario/opinion/humor.html
-	type generate
-	imageurl http://estaticos.elmundo.es/diario/Library/chiste1.gif
-	provides latest
-end
-
-strip ricardomundo
-	name Ricardo (El Mundo)
-	homepage http://www.elmundo.es/diario/opinion/humor2.html
-	type generate
-	imageurl http://estaticos.elmundo.es/diario/Library/%dchiste2.gif
-	provides latest
-end
-
-strip idigoras
-	name Idigoras
-	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/idigoras.gif
-	type generate
-	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/idigoras.gif
-	provides latest
-end
-
-strip zulet
-	name Zulet
-	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/zulet.gif
-	type generate
-	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/zulet.gif
-	provides latest
-end
-
-strip elgar
-	name Elgar
-	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/elgar.gif
-	type generate
-	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/elgar.gif
-	provides latest
-end
-
-strip pachideportes
-	name Pachi
-	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/pachideportes.gif
-	type generate
-	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/pachideportes.gif
-	provides latest
-end
-
-strip biloynanoenglish
-	name Tira ecol de Bilo y Nano (english)
-	homepage http://comic.escomposlinux.org/
-	type generate
-	imageurl http://comic.escomposlinux.org/strip.png
-	provides latest
-end
-
-
-strip amores
-	name Amor es...
-	useclass comicspage-panels-gen
-	$1 amores
-	$2 amr
-end
-strip nemi
-	name Nemi
-	homepage http://spray.nettavisen.no/kultur/tegneserie/nemi/
-	type generate
-	imageurl http://spray.nettavisen.no/shared/nemi/img/%d.%m.%y.gif
-	provides any
-end
-
-strip halge
-	name Halge
-	homepage http://www.halge.com
-	type generate
-	imageurl http://www.halge.com/svenska/strip/strip_vardag/%Y%m%d.gif
-	provides any
-end
-
-strip berglin
-	name Berglin
-	homepage http://www.svd.se/berglin
-	type generate
-	imageurl http://svd.se/images/ettan/berglin/berglin.gif
-	provides latest
-end
-
-strip elvis
-	name Elvis
-	homepage http://www.metro.se/site/metro/cartoons/?cartoon=0
-	type generate
-	imageurl http://www.metro.se/content/cartoons/elvis/%Y%m%d.gif
-	provides any
-end
-
-strip pondus
-	name Pondus
-	homepage http://www.start.no/pondus/
-	type generate
-	imageurl http://www.start.no/pondus/striper/%d%m%Y.gif
-	provides any
-end
-
-strip dela
-	name Dela the Hooda
-	homepage http://www.delathehooda.com/
-	type search
-	searchpage http://www.delathehooda.com
-	searchpattern <img SRC="(<code:"Delac" if %w==0><code:"dela" if %w!=0>~[^"]+)"
-	baseurl http://www.delathehooda.com/
-	provides latest
-end
-
-strip extralife
-	name Extra Life
-	homepage http://dynamic5.gamespy.com/~extralife/
-	type search
-	searchpattern <img.+?src="(strips/\d+-\d+-\d+.+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip forcemonkeys
-	name Force Monkeys
-	homepage http://www.gamespy.com/comics/forcemonkeys/
-	type search
-	searchpage http://www.gamespy.com/comics/forcemonkeys/latest.html
-	searchpattern <img.+?src="(comics/\d+-\d+-\d+/.+?)"
-	baseurl $homepage
-	provides latest
-end
-
-strip irregular
-	name Irregular Webcomic!
-	artist David Morgan-Mar
-	homepage http://www.dangermouse.net/irregular/
-	type search
-	searchpattern <img src="/irregular/(comics/irreg\d+\.jpg)"
-	baseurl $homepage
-	provides latest
-end
-
-strip thismodernworld
-	name This Modern World
-	artist Tom Tomorrow
-	homepage http://www.thismodernworld.com
-	type generate
-	imageurl http://workingforchange.speedera.net/www.workingforchange.com/webgraphics/wfc/TMW%m-%d-%y.gif
-	provides any
-end
-
-strip toytrunkrailroad
-	name Toy Trunk Railroad
-	homepage http://www.toytrunkrailroad.com/
-	type generate
-	imageurl http://www.toytrunkrailroad.com/today.gif
-	provides latest
-end
-
-strip escomposlinux
-	name Escomposlinux
-	homepage http://comic.escomposlinux.org/
-	type generate
-	imageurl http://comic.escomposlinux.org/strip.png
-	provides latest
-end
-
-strip warbucket
-	name Warbucket
-	homepage http://www.warbucket.com/comic.php?state=current&id=0
-	type search
-	searchpattern <img.+?src="(comics/\d+\.gif)">
-	baseurl http://www.warbucket.com/
-	provides latest
-end
-
-strip ghastly
-	name Ghastly's Ghastly Comic
-	homepage http://ghastly.keenspace.com
-	type search
-	searchpattern <img.+?SRC="(http://www\.ghastlycomic\.com/comics/\d+\.jpg)"
-	provides latest
-end
-
-# kingfeatures
-strip crankshaft
-	name Crankshaft
-	useclass kingfeatures
-	$1 crank
-	$2 Crankshaft
-	artist Tom Batiuk and Chuck Ayers
-end
-
-# already handled
-#strip apartment3g
-#	name Apartment 3-G
-#	artist Frank Bolle and Lisa Trusiani
-#	useclass kingfeatures
-#	$1 apt3g
-#	$2 Apartment_3-G
-#end
-
-strip familycircus
-        name Family Circus
-        artist Bil Keane
-        useclass kingfeatures
-        $1 familyc
-        $2 Family_Circus
-end
-
-strip flashgordon
-        name Flash Gordon
-        artist Jim Keefe
-        useclass kingfeatures
-        $1 fgordon
-        $2 Flash
-end
-
-strip hots
-	name The Hots
-	artist Stephen Hersh and Nina Paley
-	useclass kingfeatures
-	$1 hots
-	$2 The_Hots
-end
-
-strip princevaliant
-	name Prince Valiant
-	artist John Cullen Murphy and Cullen Murphy
-	useclass kingfeatures
-	$1 pvaliant
-	$2 Prince_Valiant
-end
-
-strip slylock
-	name Slylock Fox
-	artist Bob Weber Jr.
-	useclass kingfeatures
-	$1 slylock
-	$2 Slylock
-end
-
-# apparently gone 20050126
-#strip babsandaldo
-#	name Babs and Aldo
-#	artist Buddy Valentine
-#	useclass kingfeatures-alt
-#	$1 babs
-#	$2 bvt
-#end
-
-strip hazel
-	name Hazel
-	artist Ted Key
-	useclass kingfeatures-alt
-	$1 hazel
-	$2 hat
-end
-
-strip henry
-	name Henry
-	artist Carl Anderson
-	useclass kingfeatures-alt
-	$1 henry
-	$2 het
-end
-
-strip katzkids
-	name The Katzenjammer Kids
-	artist Hy Eisman
-	useclass kingfeatures-alt
-	$1 katzkids
-	$2 kk
-end
-
-strip mandrake
-	name Mandrake the Magician
-	artist Fred Fredericks -- Created by Lee Falk
-	useclass kingfeatures-alt
-	$1 mandrake
-	$2 mmt
-end
-
-strip moose
-        name Moose & Molly
-        artist Bob Weber Sr.
-        useclass kingfeatures-alt
-        $1 moosemol
-        $2 mot
-end
-
-strip samsilo
-	name Sam and Silo
-        artist Jerry Dumas
-        useclass kingfeatures-alt
-        $1 sam_silo
-        $2 sst
-end
-
-strip trudy
-	name Trudy
-	artist Jerry Marcus
-	useclass kingfeatures-alt
-	$1 trudy
-	$2 trt
-end
-
-strip bizarro
-	name Bizarro
-	artist Dan Piraro
-	useclass kingfeatures
-	$1 bizarro
-	$2 Bizarro
-end
-
-strip leftersons
-        name The Leftersons
-        useclass cnsnews
-	$1 leftersons
-end
-
-strip tuma
-        name Kevin Tuma Cartoon
-        useclass cnsnews
-	$1 tuma
-end
-
-strip nowak
-        name Paul Nowak Cartoon
-        useclass cnsnews
-	$1 nowak
-end
-
-strip lang
-        name Bob Lang Cartoon
-        useclass cnsnews
-	$1 lang
-end
-
-strip politicallycorrect
-        name Politically Correct
-        homepage http://www.conservativecartoons.com
-        type search
-        searchpattern <img.+?SRC="(/%Y/\w+.gif)".+?ALT="This week's cartoon"
-        baseurl http://www.conservativecartoons.com
-        provides latest
-end
-
-strip countyoursheep
-        name Count Your Sheep
-        homepage http://sheep123.keenspace.com/
-        type search
-        searchpattern <img.+?alt="comic".+?src="[^"]*(comics/[^/.]+\.gif)"[^>]*>
-        baseurl http://sheep123.keenspace.com/
-        provides latest
-end
-
-strip catharsis
-        name Catharsis
-        homepage http://catharsiscomic.com/
-        type search
-        searchpattern <img.+?src="(strips/\d{6}-\d+\.jpg)"
-        baseurl http://catharsiscomic.com/
-        provides latest
-end
-
-strip noroomformagic
-        name No Room for Magic
-        homepage http://www.drunkduck.com/No_Room_For_Magic/
-        type search
-        searchpattern <img.+?src='(\d+%Y\d+\.gif)'
-        baseurl $homepage
-        provides latest
-end
-
-#graphicsmash.com strips
-strip gimbley
-	name A Tale From Gimbley
-	artist Paul Elliot
-	useclass graphicsmash-serializer
-	$1 pooltales
-end
-
-strip americanbornchinese
-	name American Born Chinese
-	artist Gene Yang
-	useclass graphicsmash-moderntales
-	$1 americanbornchinese
-end
-
-strip americanelf
-	name American Elf: the Sketchbook Diaries of James Kochalka
-	artist James Kochalka
-	homepage http://www.americanelf.com/
-	useclass graphicsmash
-	$1 americanelf
-end
-
-strip arcaynajaynesoul
-	name Arcana Jayne: A'Soulin
-	artist Lisa Jonte
-	useclass graphicsmash-girlamatic
-	$1 arcaynajaynesoul
-end
-
-strip arcanajayne
-	name Arcana Jayne: Hair of the Dog
-	artist Lisa Jonte
-	useclass graphicsmash-girlamatic
-	$1 arcanajayne
-end
-
-strip athena
-	name Athena Voltaire
-	artist Paul Daly, Steve Bryant, and Chad Fidler
-	useclass graphicsmash-moderntales
-	$1 athena
-end
-
-strip biteme
-	name Bite Me!
-	artist Dylan Meconis
-	useclass graphicsmash-girlamatic
-	$1 biteme
-end
-
-strip crss
-	name Charlie Red Eye Sunday Specials
-	artist Edward J. Grug III and Matthew William Boyd Langfield
- 	useclass graphicsmash-moderntales
-	$1 crss
-end
-
-strip chasingrainbows
-	name Chasing Rainbows
-	artist Svetlana Chmakova
-	useclass graphicsmash-girlamatic
-	$1 svetlanaseries
-end
-
-strip circleweave
-	name Circle Weave
-	artist Indigo Kelleigh
-	useclass graphicsmash-moderntales
-	$1 circleweave
-end
-
-strip doublehappiness
-	name Double Happiness
-	artist Jason Shiga
-	useclass graphicsmash-moderntales
-	$1 2xhappiness
-end
-
-strip edie
-	name Edie in Orbit
-	artist Shaenon K. Garrity
-	homepage http://www.joeymanley.com/edie/series.php
-	useclass graphicsmash
-	$1 edie
-end
-
-strip fancyfroglin
-	name Fancy Froglin
-	artist James Kochalka
-	useclass graphicsmash-moderntales
-	$1 fancyfroglin
-end
-
-strip fearmongers
-	name Fear Mongers
-	artist Joe Zabel
-	useclass graphicsmash-moderntales
-	$1 fearmongers
-end
-
-strip fetusx
-	name Fetus-X
-	artist Eric Millikin and Casey Sorrow
-	useclass graphicsmash-serializer
-	$1 fetusx
-end
-
-strip fredtheclown
-	name Fred the Clown
-	artist Roger Langridge
-	useclass graphicsmash-moderntales
-	$1 fredtheclown
-end
-
-strip hutchowen
-	name HUTCH OWEN - Public Relations!
-	artist Tom Hart
-	useclass graphicsmash-moderntales
-	$1 hutchowen
-end
-
-strip hope
-	name I Was There & Just Returned
-	artist Hope Larson
-	useclass graphicsmash-girlamatic
-	$1 hope
-end
-
-strip jeepers
-	name Jeepers
-	artist Andre Richard
-	useclass graphicsmash-girlamatic
-	$1 jeepers
-end
-
-strip kismet
-	name Kismet: Hunter's Moon
-	artist Layla Lawlor
-	useclass graphicsmash-girlamatic
-	$1 kismet
-end
-
-strip mell
-	name L'il Mell
-	artist Shaenon K. Garrity and Vera Brosgol
-	useclass graphicsmash-girlamatic
-	$1 mell
-end
-
-strip lionel_am
-	name Lionel's Lament - AM
-	artist Josh Neufeld and Dean Haspiel
-	useclass graphicsmash-serializer
-	$1 lionel_am
-end
-
-strip lionel
-	name Lionel's Lament - PM
-	artist Dean Haspiel and Josh Neufeld
-	useclass graphicsmash-serializer
-	$1 lionel
-end
-
-strip locationlocationlocation
-	name Location Location Location
-	artist John Barber
-	useclass graphicsmash-moderntales
-	$1 locationlocationlocation
-end
-
-strip narbonic
-	name Narbonic
-	artist Shaenon K. Garrity
-	useclass graphicsmash-moderntales
-	$1 narbonic
-end
-
-strip nostereotypes
-	name No Stereotypes
-	artist Amber "Glych" Greenlee
-	useclass graphicsmash-moderntales
-	$1 NS
-end
-
-strip oddjobs
-	name Odd Jobs3: Cash and Carry
-	artist Tim Broderick
-	useclass graphicsmash-moderntales
-	$1 oddjobscashandcarry
-end
-
-strip paradigmshift
-	name Paradigm Shift: Part Two
-	artist Dirk Tiede
-	useclass graphicsmash-moderntales
-	$1 PS2
-end
-
-strip pewfell
-	name Pewfell
-	artist Chuck Whelon
-	useclass graphicsmash-moderntales
-	$1 pewfell
-end
-
-strip robotbarber
-	name Robot Barber
-	artist Caleb Sevcik
-	useclass graphicsmash-moderntales
-	$1 robotbarber
-end
-
-strip rogues
-	name Rogues of Clwyd-Rhan
-	artist Reinder Dijkhuis
-	useclass graphicsmash-moderntales
-	$1 rogues
-end
-
-strip northampton
-	name Streets of Northampton
-	artist Chris Shadoian
-	useclass graphicsmash-moderntales
-	$1 northampton
-end
-
-strip charlieredeye
-	name The Bizarre Life of Charlie Red Eye
-	artist Matthew William Boyd Langfield, Esq. and Edward J. Grug III
-	useclass graphicsmash-moderntales
-	$1 charlieredeye
-end
-
-strip death
-	name The New Adventures of Death
-	artist Dorothy Gambrell
-	useclass graphicsmash-moderntales
-	$1 death
-end
-
-strip thestiff
-	name The Stiff
-	artist Jason Thompson
-	homepage http://girlamatic.com/series.php?name=thestiff
-	useclass graphicsmash-girlamatic
-	$1 thestiff
-end
-
-strip tokyohigh
-	name TokyoHigh
-	artist George Panella
-	useclass graphicsmash-moderntales
-	$1 tokyohigh
-end
-
-strip tokyohighdayout
-	name TokyoHigh: A Day Out
-	artist Amber "Glych" Greenlee
-	useclass graphicsmash-moderntales
-	$1 tokyohighguestrun
-end
-
-strip tween
-	name Tween: The Bad Mojo Saga
-	artist Anthony P. Furtado
-	useclass graphicsmash-moderntales
-	$1 tween
-end
-
-strip yeslogo
-	name Yes Logo!
-	artist Paulo Patricio
-	useclass graphicsmash-serializer
-	$1 yeslogo
-end
-
-strip digger
-	name Digger
-	artist Ursula Vernon
-	useclass graphicsmash
-	$1 digger
-end
-
-# not running right now?
-#strip fans
-#	name Fans
-#	homepage
-#	useclass graphicsmash
-#	$1 fans
-#end
-
-strip felicity
-	name Felicity
-	artist John Troutman
-	useclass graphicsmash
-	$1 felicity
-end
-
-strip flick
-	name Flick
-	artist Mikael Oskarsson
-	useclass graphicsmash
-	$1 flick
-end
-
-strip gsg
-	name Gun Street Girl
-	artist Barb Lien and Ryan Howe
-	useclass graphicsmash
-	$1 gsg
-end
-
-strip grift
-	name Interplanetary Grift
-	artist Jim Keplinger and Scott Story
-	useclass graphicsmash
-	$1 grift
-end
-
-strip killroyandtina
-	name Killroy and Tina
-	artist Justin Pierce
-	useclass graphicsmash
-	$1 killroyandtina
-end
-
-strip mam
-	name Mythos and Magick
-	artist Brynn Sheridan
-	useclass graphicsmash
-	$1 mam
-end
-
-strip nonpersons
-	name NonPersons
-	artist Amber "Glych" Greenlee
-	useclass graphicsmash
-	$1 nonpersons
-end
-
-strip rip
-	name Rip & Teri
-	artist T Campbell and John Waltrip
-	useclass graphicsmash
-	$1 rip
-end
-
-strip ram
-	name Saga of The Ram
-	artist Brian Daniel
-	useclass graphicsmash
-	$1 ram
-end
-
-strip shesanightmare
-	name She's a Nightmare
-	artist Jesse Chen
-	useclass graphicsmash
-	$1 shesanightmare
-end
-
-strip skirting
-	name Skirting Danger
-	artist Meredith Gran
-	useclass graphicsmash
-	$1 skirting
-end
-
-strip skritch
-	name Skritch
-	artist Lucas Phelps
-	useclass graphicsmash
-	$1 skritch
-end
-
-strip soulchaserbetty
-	name Soul Chaser Betty
-	artist Brian Babendererde
-	useclass graphicsmash
-	$1 soulchaserbetty
-end
-
-strip stealingjustice
-	name Stealing Justice
-	artist Paul D. Storrie and Jason Howard with Terri Boyle
-	useclass graphicsmash
-	$1 stealingjustice
-end
-
-strip guardians
-	name The Guardians
-	artist Graveyard Greg and Webtroll
-	useclass graphicsmash
-	$1 guardians
-end
-
-strip thetwisting
-	name The Twisting
-	artist Patric Lewandowski
-	useclass graphicsmash
-	$1 thetwisting
-end
-
-strip vigilanteho
-	name Vigilante, Ho!
-	artist Meaghan Quinn and John Troutman
-	useclass graphicsmash
-	$1 vigilanteho
-end
-
-strip krakow
-	name Krakow
-	artist Krazy Krow
-	type search
-	homepage http://www.krakowstudios.com
-	searchpattern <img.+?src="http://www.krakowstudios.com(/comicpro/strips/\d+-\d+\.jpg)
-	baseurl http://www.krakowstudios.com
-	provides latest
-end
-
-strip antihero
-	name Antihero For Hire
-	artist Mark Shallow
-	homepage http://www.antiheroforhire.com
-	type search
-	searchpattern <img.+?alt="comic".+?src="[^"]*(comics/[^/.]+\.gif)"[^>]*>
-	baseurl http://www.antiheroforhire.com/
-	provides latest
-end
-
-strip somethingpositive
-	name Something Positive
-	homepage http://www.somethingpositive.net/
-	type search
-	searchpattern <img.+?src="(arch/sp\d+\.gif)"
-	baseurl http://www.somethingpositive.net/
-	provides latest
-end
-
-# Ubersoft - we are all one strip, with Ubersoft
-strip ubersoft
-	name Ubersoft
-	artist Christopher Wright
-	homepage http://www.ubersoft.net/
-	type generate
-	imageurl http://www.ubersoft.net/comics/hd%Y%m%d.png
-	provides any
-end
-
-#works
-strip statsministeren
-	name Statsministeren
-	homepage http://www.bt.dk/statsministeren:year=%Y:month=%m:day=%d
-	artist Carsten Graabæk
-	type search
-	searchpattern <img.+?src="(http://images.bt2.metropol.dk/.+_large.jpg)\"
-	provides any
-end
-
-# subscribers only. needs cookies to work?
-#strip blacktapsdonate
-#    name Black Tapestries (Donators)
-#    homepage http://donators.drakkolupen.com
-#    type generate
-#    imageurl http://donators.drakkolupen.com/pages/%Y%m%d.jpg
-#    provides any
-#end
-
-strip talesquestor
-    name Tales of the Questor
-    homepage http://npc.keenspace.com
-    type generate
-    imageurl http://npc.keenspace.com/comics/npc%Y%m%d.png
-    provides any
-end
-
-# works. current.
-strip antiherohire
-    name Anti-hero for Hire
-    homepage http://antihero.keenspot.com
-    type generate
-    imageurl http://antihero.keenspot.com/comics/afh%Y%m%da.gif
-    provides any
-end
-
-# works. current.
-strip bobgeorge
-    name Bob and George
-    homepage http://www.bobandgeorge.com
-    type generate
-    imageurl http://www.bobandgeorge.com/%y%m%d.gif
-    provides any
-end
-
-strip danmabfur
-    name Dan and Mab's Furry Adventures
-    homepage http://www.missmab.com/
-    type search
-    searchpattern <img.+?src="(comics/Vol\d+\..+?)"
-    baseurl $homepage
-    provides latest
-end
-
-strip perfectworld
-    name In a Perfect World
-    homepage http://iapw.keenspace.com
-    type generate
-    imageurl http://iapw.keenspace.com/comics/iapw%Y%m%d.gif
-    provides any
-end
-
-strip kaerwyn
-    name The Realm of Kaerwyn
-    homepage http://comic.kaerwyn.com
-    type generate
-    imageurl http://comic.kaerwyn.com/pages/%Y%m%d.jpg
-    provides any
-end
-
-# works. current
-strip vgcats
-    name VG Cats
-    homepage http://www.vgcats.com
-    type generate
-    imageurl http://www.vgcats.com/vgc_comics/images/%y%m%d.jpg
-    provides any
-end
-
-# hasn't been updated since 12/02/2003
-#strip ghostcat
-#    name Ghost Cat
-#    homepage http://www.ghostcat.cycomics.com
-#    type generate
-#    imageurl http://www.ghostcat.cycomics.com/newcomics/%m%d%Yghostcat.png
-#    provides any
-#end
-
-# works. current.
-strip suburbanjungle
-    name Suburban Jungle
-    homepage http://www.suburbanjungle.com/
-    type generate
-    imageurl http://http://www.suburbanjungle.com/comics/sj%Y%m%d.gif
-    provides any
-end
-
-strip freefall
-    name Freefall
-    homepage http://freefall.purrsia.com
-    type search
-    searchpattern <img.+?src="(/ff.+?/.+?\..+?)"
-    baseurl $homepage
-    provides latest
-end
-
-strip daybyday
-	name Day by Day
-	artist Chris Muir
-	homepage http://www.daybydaycartoon.com/
-	type generate
-	imageurl http://www.daybydaycartoon.com/Cartoons/%m-%d-%Y.gif
-	provides any
-end
-
-strip wulffmorgenthaler
-	name Wulffmorgenthaler
-	artist Mikael Wulff and Anders Morgenthaler
-	homepage http://www.wulffmorgenthaler.com
-	type search
-	searchpage $homepage/thestrip.asp?cDay=%d&cMonth=%m&cYear=%Y
-        searchpattern <img.+?src="(log/\w+\.gif)"
-	imageurl $homepage/$match
-	provides any
-end
-
-strip oots
-	name Order of the Stick
-	homepage http://www.giantitp.com/cgi-bin/GiantITP/ootscript
-	artist Rich Burlew
-	type search
-	searchpattern <IMG src="\.\./\.\./(oots/oots\d+\..+?)">
-	baseurl http://www.giantitp.com/
-	provides latest
-end
-
-strip phdcomics
-	name Piled Higher & Deeper
-	artist Jorge Cham
-	homepage http://www.phdcomics.com/
-	type search
-	searchpage http://www.phdcomics.com/comics/comics.php
-	searchpattern <img.+?src=http://www.phdcomics.com(/comics/archive/\S+.gif)
-	baseurl $homepage
-	provides latest
-end
-
-strip coxandforkum
-	name Cox and Forkum
-	artist John Cox and Allen Forkum
-	homepage http://www.coxandforkum.com/
-	type search
-	searchpattern (/archives/(.*?)\.gif)
-	baseurl http://www.coxandforkum.com
-	provides latest
-end
-
-strip questionablecontent
-	name Questionable Content
-	artist Jeph Jacques
-	homepage http://www.questionablecontent.net/
-	type search
-	provides latest
-	searchpattern <img.+?src="\./(comics/\d+\..{3})">
-	baseurl $homepage
-end
-
-strip gucomics
-	name GU Comics
-	artist Woody Hearn
-	homepage http://www.gucomics.com/
-	type generate
-	provides any
-	imageurl http://www.gucomics.com/comics/gu_%Y%m%d.jpg
-end
-
-strip mrwiggles
-	name Rehabilitating Mr. Wiggles
-	artist Neal Swaab
-	homepage http://neilswaab.com/comics/wiggles/
-	type search
-	provides latest
-	searchpage http://neilswaab.com/comics/wiggles/wiggles_content.html
-	searchpattern <IMG.+?SRC="(images/rehab\d+\..{3})"
-	baseurl $homepage
-end
-
-strip mais
-	name Magical Adventures in Space
-	artist Jeffrey Rowland
-	homepage http://www.wigu.com/
-	type search
-	searchpattern <img.+?src="(strips/\d{8}\.png)"
-	baseurl $homepage
-	provides latest
-end
+# Strip Groups
+group andrews
+	desc Andrew's Favorite Strips
+	include userfriendly dilbert foxtrot
+	include pennyarcade joyoftech thefifthwave monty bc
+	include wizardofid garfield adamathome
+end
+
+group michael
+	desc Michael's Favorite Strips
+	include foxtrot boondocks doonesbury zits dilbert babyblues
+	include monty bc blondie calvinandhobbes funkywinkerbean
+	include zippythecolorpinhead peanuts adamathome forbetter bizarro
+	include userfriendly geech shoe wizardofid
+end
+
+group gloucestertimes
+	desc Gloucester Daily Times Strips
+	include garfield broomhilda bc wizardofid roseisrose
+	include dilbert cathy sallyforth monty grimmy peanuts
+	include forbetter foxtrot offthemark
+end
+
+group bgsunday
+	desc Boston Globe Sunday Comics
+	include dilbert doonesbury garfield getfuzzy adamathome grimmy forbetter
+	include foxtrot jumpstart zits zippythecolorpinhead curtis
+	include rhymeswithorange boondocks nonsequitur stonesoup roseisrose monty
+	include arlonjanis askshagg
+end
+
+
+# Class definitions
+class ucomics-srch
+        homepage http://www.ucomics.com/$strip/
+        type search
+        searchpattern <img.+?src=".+?(/$1/(\d+)/$1(\d+).+?)"
+        baseurl http://images.ucomics.com/comics
+        provides latest
+end
+
+class ucomics-gen
+	homepage http://www.ucomics.com/$strip/
+	type generate
+	imageurl http://images.ucomics.com/comics/$1/%Y/$1%y%m%d.gif
+	provides any
+
+end
+
+class unitedmedia-srch-comics
+	homepage http://www.unitedmedia.com/comics/$strip/
+	type search
+	searchpage http://www.unitedmedia.com/comics/$strip/archive/$strip-%Y%m%d.html
+	searchpattern <img.+?src="(/comics/$strip/archive/images/$strip.+?)"
+	baseurl http://www.unitedmedia.com
+	provides any
+end
+
+class unitedmedia-srch-comics-lag
+	homepage http://www.unitedmedia.com/comics/$strip/
+	type search
+	searchpattern <img.+?src="(/comics/$strip/archive/images/$strip.+?)"
+	baseurl http://www.unitedmedia.com
+	provides latest
+end
+
+class unitedmedia-srch-creators
+	homepage http://www.unitedmedia.com/creators/$strip/
+	type search
+	searchpattern <img.+?src="?(/creators/$strip/archive/images/.+?\.(gif|jpg))"?
+	baseurl http://www.unitedmedia.com
+	provides latest
+end
+
+class unitedmedia-srch-wash
+	homepage http://www.unitedmedia.com/wash/$strip/
+	type search
+	searchpattern (/wash/$strip/archive/images/(.*?)\.(gif|jpg))
+	baseurl http://www.unitedmedia.com
+	provides latest
+end
+
+class unitedmedia-srch-editoons
+	homepage http://www.unitedmedia.com/editoons/$1/
+	type search
+	searchpattern <img src="(/editoons/$1/archive/images/$1\d+\..+?)"
+	baseurl http://www.unitedmedia.com
+	provides latest
+end
+
+class sfgate-gen-zippy
+	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
+	type generate
+	imageurl http://pst.rbma.com/content/$3
+	provides latest
+	prefetch $homepage
+end
+
+class sfgate-gen-zippycolor
+	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
+	type generate
+	imageurl http://pst.rbma.com/content/$2
+	provides latest
+end
+
+class sfgate-gen
+	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
+	type generate
+	imageurl http://pst.rbma.com/content/$1
+	provides latest
+	prefetch $homepage
+end
+
+class sfgate-srch
+	homepage http://www.sfgate.com/cgi-bin/article.cgi?file=/comics/$1.dtl
+	type search
+	searchpattern <img.+?src=".+?(/comics/graphics/$2/.+?\..+?)"
+	baseurl http://www.sfgate.com
+	provides latest
+end
+
+class sfgate-columnists
+	homepage http://www.sfgate.com/columnists/$1/
+	type search
+	provides latest
+	searchpattern <IMG.+?SRC="(http://www\.sfgate\.com/chronicle/pictures/\d+/\d+/\d+/.+?-farley.gif)"
+end
+
+class comicspage-strips-gen
+        # $1 - more or less the real name
+        # $2 - 3-letter abbreviation of $1
+        referer http://www.comicspage.com/$1/
+        homepage http://www.comicspage.com/$1/
+        type generate
+        imageurl http://www.tmsfeatures.com/tmsfeatures/servlet/com.featureserv.util.Download?file=%Y%m%dcs$2-<code:"s" if %w==0><code:"a" if %w!=0>-p.jpg&code=cs$2
+        provides any
+end
+
+class comicspage-panels-gen
+	# $1 - more or less the real name
+	# $2 - 3-letter abbreviation of $1
+	homepage http://www.comicspage.com/$1/
+	type generate
+	imageurl http://www.tmsfeatures.com/tmsfeatures/servlet/com.featureserv.util.Download?file=%Y%m%dcp$2-<code:"s" if %w==0><code:"a" if %w!=0>-p.jpg&code=cp$2
+	provides any
+end
+
+class comicspage-editorial-gen
+	# $1 - more or less the real name
+	# $2 - 3-letter abbreviation of $1
+	homepage http://www.comicspage.com/$1/
+	type generate
+	imageurl http://www.tmsfeatures.com/tmsfeatures/servlet/com.featureserv.util.Download?file=%Y%m%ded$2-a-p.jpg&code=ed$2
+	provides any
+end
+
+class mercurycenter
+        # $1 - number of strip (unique to Mercury Center?)
+        # $2 - name of strip spaces=_?
+        homepage http://cgi.mercurycenter.com/cgi-bin/comics/show.cgi?ID=$1&DATE=TODAY
+        type generate
+        imageurl http://cgi.mercurycenter.com/premium/comics/%m_%d/$2.gif
+        provides any
+end
+
+class sev-comics
+        homepage http://www.sev.com.au/toonzone/$strip.asp
+        type generate
+        imageurl http://www.sev.com.au/toonzone/$strip.jpg
+        provides latest
+end
+
+class washpost-creators
+        homepage http://featurepage.creators.com/washpost.html?name=$1
+        type generate
+	prefetch $homepage
+        imageurl http://www.creators.com/<code:use POSIX;my$o=0;while(strftime("\%"."w",localtime($time_today-86400*$o))!=0){$o++}my$d=strftime("\%"."m"."\%"."d",localtime($time_today-86400*$o));"$d">/$1/$1%m%dg.gif
+        provides any
+end
+
+class washpost-king
+        homepage http://www.washingtonpost.com/wp-srv/style/comics/king.htm?$1
+        prefetch $homepage
+        imageurl http://est.rbma.com/content/$1
+        type generate
+        provides latest
+end
+
+class washpost-uclick
+	homepage http://www2.uclick.com/client/wpc/$1/
+	type search
+	searchpattern <IMG.+?SRC="(http://images\.ucomics\.com/comics/$1/\d+/$1\d+.gif)">
+	provides latest
+end
+
+class slate-cagle
+        homepage http://cagle.slate.msn.com/politicalcartoons/PCcartoons/$1.asp
+        type search
+        searchpattern <IMG.+?SRC=".+?(/working/\d+/$2\d*\.(gif|jpg))"
+        baseurl http://cagle.slate.msn.com
+        provides latest
+end
+
+class slate-cagle-alt
+        homepage http://cagle.slate.msn.com/politicalcartoons/PCcartoons/$1.asp
+        type search
+        searchpattern <IMG.+?SRC=.+?(/comics/updating/$2\d*\.(gif|jpg))"
+        baseurl http://cagle.slate.msn.com
+        provides latest
+end
+
+class kingfeatures
+	homepage http://www.kingfeatures.com/features/comics/$1/about.htm
+	type search
+	searchpage http://www.kingfeatures.com/features/comics/$1/aboutMaina.php
+	searchpattern <img.+?src='(http://est\.rbma\.com/content/$2\?date=\d+)'
+	provides latest
+end
+
+class kingfeatures-alt
+        homepage http://www.kingfeatures.com/features/comics/$1/about.htm
+        type search
+        searchpage http://www.kingfeatures.com/features/comics/$1/aboutMaina.php
+        searchpattern <img.+?src='($2\d+\..+?)'
+	baseurl http://www.kingfeatures.com/features/comics/$1/
+        provides latest
+end
+
+class cnsnews
+	homepage http://www.cnsnews.com/cartoon/$1.asp
+	type search
+	searchpage http://www.cnsnews.com/cartoon/$1.asp
+	searchpattern <img.+?src="(/cartoon/$1images/\d+/.+?\..+?)"
+	baseurl http://www.cnsnews.com
+	provides latest
+end
+
+class graphicsmash
+        type search
+	homepage http://www.graphicsmash.com/series.php?name=$1
+        searchpage http://www.moderntales.com/tooncast.php?series=$1
+        searchpattern <img.+?src=(.+?)>
+        provides latest
+end
+
+class graphicsmash-serializer
+        type search
+        homepage http://www.serializer.net/series.php?name=$1&view=current
+        searchpage http://www.moderntales.com/tooncast.php?series=$1
+        searchpattern <img.+?src=(.+?)>
+        provides latest
+end
+
+
+class graphicsmash-girlamatic
+        type search
+        homepage http://girlamatic.com/series.php?name=$1
+        searchpage http://www.moderntales.com/tooncast.php?series=$1
+        searchpattern <img.+?src=(.+?)>
+        provides latest
+end
+
+class graphicsmash-moderntales
+        type search
+        homepage http://www.moderntales.com/series2.php?name=$1&view=current
+        searchpage http://www.moderntales.com/tooncast.php?series=$1
+        searchpattern <img.+?src=(.+?)>
+        provides latest
+end
+
+# Non-standard strips
+
+# discontinued = removed 20050109
+# should be possible to generate?
+# sometimes multi-image - need a new way to handle this
+#strip avalonhigh
+#	name Avalon High
+#	homepage http://www.avalonhigh.com/
+#	type search
+#	searchpattern <IMG.+?SRC="(/?comics/avalon\d{8}.*?\.gif)"
+#	baseurl $homepage
+#	provides latest
+#end
+
+strip drfun
+	name Doctor Fun
+	homepage http://www.ibiblio.org/Dave/Dr-Fun/html/
+	type generate
+	imageurl http://www.ibiblio.org/Dave/Dr-Fun/latest.jpg
+	provides latest
+end
+
+strip goats
+	name Goats
+	homepage http://www.goats.com/
+	type search
+	searchpattern <IMG.+?SRC="(/comix/\d+/goats\d+.+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip jokesonyou
+	name The Joke's on You
+	homepage http://www.thefunnypages.com/
+	type search
+	searchpattern <img.+src="(http://www\.thefunnypages\.com/archives/.+?\.gif)"
+	provides latest
+end
+
+strip innies
+	name Innies and Outies
+	homepage http://www.inniesandoutties.com/
+	type generate
+	imageurl http://www.inniesandoutties.com/images/front.jpg
+	provides latest
+end
+
+strip joyoftech
+	name The Joy of Tech
+	homepage http://www.joyoftech.com/joyoftech/
+	type search
+	searchpattern <img.+?src="(joyimages/.+?\d+.+?)"
+	baseurl http://www.joyoftech.com/joyoftech/
+	provides latest
+end
+
+strip megatokyo
+	name MegaTokyo
+	homepage http://www.megatokyo.com/
+	type search
+	searchpattern <IMG.+?SRC="(/?strips/\d+\..+?)"
+	baseurl http://www.megatokyo.com/
+	provides latest
+
+end
+
+strip mostlybusiness
+	name Mostly Business
+	homepage http://www.tedgoff.com/
+	type generate
+	imageurl http://www.tedgoff.com/mb/images/today.gif
+	provides latest
+end
+
+strip pennyarcade
+	name Penny Arcade
+	artist Mike Krahulik and Jerry Holkins
+	homepage http://www.penny-arcade.com/
+	type search
+	searchpage http://www.penny-arcade.com/view.php3
+	searchpattern <img.+?src="(http://img.penny-arcade.com/\d{4}/\d{8}[lh]\..{3})
+	provides latest
+end
+
+strip plif
+      name Parking Lot is Full
+      homepage http://www.plif.com
+      type generate
+      imageurl http://www.plif.com/thisweek.gif
+      provides latest
+end
+
+strip pvp
+	name Player vs. Player
+	homepage http://www.pvponline.com/
+	type generate
+	imageurl http://www.pvponline.com/archive/%Y/pvp%Y%m%d.gif
+	provides any
+end
+
+strip pvpcurrent
+	name Player vs. Player - Current
+	homepage http://www.pvponline.com/
+	type search
+	searchpattern <img SRC="(archive/%Y/pvp%Y\d{4}\.gif)">
+	baseurl $homepage
+	provides latest
+end
+
+strip redmeat
+	name Redmeat
+	homepage http://www.redmeat.com/redmeat/current/
+	type generate
+	imageurl http://www.redmeat.com/redmeat/current/index-1.gif
+	provides latest
+end
+
+strip rudypark
+	name Rudy Park
+	homepage http://www.rudypark.com/
+	type generate
+	imageurl http://www.rudypark.com/comics/rudy%Y%m%d.gif
+	provides latest
+end
+
+strip sinfest
+	name Sinfest
+	homepage http://sinfest.net
+	type generate
+	imageurl http://sinfest.net/comics/sf%Y%m%d.gif
+	provides any
+end
+
+strip sluggy
+	name Sluggy Freelance
+	homepage http://www.sluggy.com/
+	type search
+	searchpage http://www.sluggy.com/daily.php?date=%y%m%d
+	searchpattern <img.+?src="?(http://pics\.sluggy\.com/comics/%y%m%d.+?\.(gif|jpg))
+	provides any
+end
+
+strip squinkers
+	name Squinkers
+	homepage http://www.squinkers.com/
+	type generate
+	imageurl http://www.squinkers.com/sqkrs/Images/today.gif
+	provides latest
+end
+
+strip superosity
+	name Superosity
+	homepage http://www.superosity.com/
+	type generate
+	imageurl http://www.superosity.com/comics/sup%Y%m%d.gif
+	provides any
+end
+
+strip theweedpatch
+	name The WeedPatch
+	homepage http://www.jpjennings.com/toons/
+	type generate
+	imageurl http://www.jpjennings.com/toons/%m%d%Y.gif
+	provides any
+end
+
+strip userfriendly
+	name User Friendly
+	homepage http://www.userfriendly.org/static/
+	type search
+	searchpage http://ars.userfriendly.org/cartoons/?id=%Y%m%d&mode=classic
+	searchpattern <img.+?src="(http://www\.userfriendly\.org/cartoons/archives/%y.+?/uf.+?\.gif)"
+	provides any
+end
+
+strip classm
+	name The Class Menagerie
+	homepage http://www.theclassm.com/
+	type search
+	searchpattern <IMG.+?SRC="(/comics/cmc\d+\..+?)"
+	baseurl http://www.theclassm.com/
+	provides latest
+end
+
+strip bruno
+	name The Bruno Daily Times
+	homepage http://www.brunostrip.com/bruno.html
+	type generate
+	imageurl http://www.brunostrip.com/%Ypics/%Y%m%d.gif
+	provides any
+end
+
+strip nukees
+	name Nukees
+	homepage http://www.nukees.com
+	type search
+	searchpattern <IMG.+?SRC="(/comics/\d+\..+?)"
+	baseurl http://www.nukees.com/
+	provides latest
+end
+
+strip joeaverage
+	name Joe Average
+	homepage http://www.joeaverage.org
+	type search
+	searchpattern <IMG.+?SRC="(/comics/\d+\..+?)"
+	baseurl http://www.joeaverage.org/
+	provides latest
+end
+
+strip angst
+	name Angst Technology
+	homepage http://www.inktank.com/AT/
+	type generate
+	imageurl http://www.inktank.com/images/AT/cartoons/%m-%d-%y.gif
+	provides any
+end
+
+strip clanofthecats
+	name Clan of the cats
+	homepage http://www.clanofthecats.com/
+	type search
+	searchpage http://www.clanofthecats.com/d/%Y%m%d.html
+	searchpattern <img.+?SRC="/(comics/%Y%m%d.+?)"
+	baseurl $homepage
+	provides any
+end
+
+strip gpf
+	name General Protection Fault
+	homepage http://www.gpf-comics.com/
+	type search
+	searchpattern <IMG.+?SRC="(/comics/gpf\d+.+?\..+?)"
+	baseurl http://www.gpf-comics.com
+	provides latest
+end
+
+strip crfh
+	name College Roomies from Hell
+	homepage http://www.crfh.net
+	type generate
+	imageurl http://www.crfh.net/comics/crfh%Y%m%d.png
+	provides any
+end
+
+strip striptease
+	name Strip Tease Comic
+	homepage http://www.stripteasecomic.com/
+	type search
+	searchpattern <img.+?src="(/?strips\d+/\d+\..+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip dorktower
+	name Dork Tower
+	homepage http://www.dorktower.com/
+	type search
+	searchpattern <img.+?src="(/?images/comics/.+?\..+?)"
+	baseurl http://www.gamespy.com/comics/dorktower/
+	provides latest
+end
+
+strip jerkcity
+	name Jerkcity
+	homepage http://www.jerkcity.com/
+  	type generate
+	imageurl http://www.jerkcity.com/today.gif
+	provides latest
+end
+
+strip kevinandkell
+	name Kevin and Kell
+	homepage http://www.kevinandkell.com/
+	type generate
+	imageurl http://www.kevinandkell.com/%Y/strips/kk%Y%m%d.gif
+	provides any
+end
+
+# superceded
+#strip freefall
+#	name Freefall
+#	homepage http://www.purrsia.com/freefall/
+#	type generate
+#	imageurl $homepage<code:use POSIX;my $w=strftime("\%"."u",localtime($time_today));my $s=517+3*floor(($time_today-995839200)/604800);$s++if$w\>2;$s++if$w\>4;my$c=int(($s+99)/100);"ff${c}00/fv00$s.gif">
+#	provides any
+#end
+
+strip 8bit
+	name 8-Bit Theater
+	homepage http://www.nuklearpower.com/latest.php
+	type search
+	searchpattern <img.+?src="(http://www\.nuklearpower\.com/comics/\d+\..+?)">
+	provides latest
+end
+
+strip apodbig
+	name Astronomy Picture of the Day (big image)
+	homepage http://antwrp.gsfc.nasa.gov/apod/
+	type search
+	searchpattern <a.+?href="(image/\d{4}/.+?\.(jpg|gif))"
+	baseurl $homepage
+	provides latest
+end
+
+strip apod
+	name Astronomy Picture of the Day
+	homepage http://antwrp.gsfc.nasa.gov/apod/
+	type search
+	searchpattern <img.+?SRC="(image/\d{4}/.+?\..+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip pgs
+	name Pathetic Geek Stories
+	homepage http://www.theonionavclub.com/
+	type search
+	searchpage http://www.theonionavclub.com/current_pgs.html
+	searchpattern <IMG.+?src="(/images/\d+/image_article\d+..+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip adventurers
+	name Adventurers!
+	homepage http://www.adventurers-comic.com/
+	type generate
+	imageurl http://www.adventurers-comic.com/comics/adventurers%Y%m%da.gif
+	provides any
+end
+
+strip btaf
+	name Bob, The Angry Flower
+	homepage http://angryflower.com/
+	type search
+	searchpage http://angryflower.com/archive.html
+	searchpattern <a href="(.+?.gif)"
+	provides latest
+	baseurl http://angryflower.com/
+end
+
+strip boasas
+	name Boy on a Stick and Slither
+	homepage http://www.boasas.com/
+	type search
+	searchpattern <img.+?src="(boasas/\d+\..+?)"
+	provides latest
+	baseurl http://www.boasas.com/
+end
+
+strip brunothebandit
+	name Bruno the Bandit
+	homepage http://www.brunothebandit.com
+	type generate
+	imageurl http://www.brunothebandit.com/comics/%Y%m%da.gif
+	provides any
+end
+
+strip brunothebanditcurrent
+	name Bruno the Bandit - Current
+	homepage http://www.brunothebandit.com
+	type search
+	searchpattern <IMG.+?SRC="(/comics/%Y\d{4}[a-z]{0,1}\.gif)"
+	baseurl $homepage
+	provides latest
+end
+
+strip dieselsweeties
+	name Diesel Sweeties
+	homepage http://www.dieselsweeties.com/
+	type search
+	searchpattern <img.+?src="(/hstrips/.+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip fuzzylogic
+	name Fuzzy Logic
+	homepage http://www.bbspot.com/comics/fuzzy_logic/index.html
+	type generate
+	imageurl http://www.bbspot.com/Images/comics/fuzzy_logic/%Y/%Y%m%d.jpg
+	provides any
+end
+
+strip littlegamers
+	name Little Gamers
+	homepage http://www.little-gamers.com/
+	type search
+	searchpattern <img.+?src='/(index.php\?do_command=show_strip&strip_id=\d+.+?)'
+	baseurl $homepage
+	provides latest
+end
+
+strip machall
+	name Mac Hall
+	homepage http://www.MacHall.com/
+	type search
+	searchpattern <img.+?src='(/index.php\?do_command=show_strip\&strip_id=\d+\&auth=.+?)'
+	baseurl $homepage
+	provides latest
+end
+
+strip mrchuckshow
+	name Mr. Chuck Show
+	homepage http://www.mrchuckshow.com/
+	type generate
+	imageurl http://www.mrchuckshow.com/strips/mcs%Y%m%db.png
+	provides any
+end
+
+strip pentasmal
+	name Pentasmal
+	homepage http://www.pentasmal.com/
+	type generate
+	imageurl http://www.pentasmal.com/comics/%Y%m%d.png
+	provides any
+end
+
+strip rpgworld
+	name RPG World
+	homepage http://www.rpgworldcomic.com/
+	type search
+	searchpattern <IMG.+?SRC="(/comics/.+?\..+?)"
+	provides latest
+	baseurl $homepage
+end
+
+strip spazlabs
+	name Spaz Labs
+	homepage http://www.stonebrokestudios.com
+	type generate
+	imageurl http://www.stonebrokestudios.com/archives/spaz/%y%m%dspaz.gif
+	provides any
+end
+
+strip glasbergen
+	name Randy Glasbergen
+	homepage http://www.glasbergen.com
+	type generate
+	imageurl http://www.glasbergen.com/images/toon.gif
+	provides latest
+end
+
+strip spiderman
+	name Spider Man
+	homepage http://www.kingfeatures.com/features/comics/spidermn/about.htm
+	type search
+	searchpage http://www.kingfeatures.com/features/comics/spidermn/aboutMaina.php
+	searchpattern <img.+?src='(http://est\.rbma\.com/content/Spiderman\?date=\d{8})'
+	provides latest
+	prefetch http://www.kingfeatures.com/images/clear.gif
+end
+
+#dead?
+strip shelton
+	name Barry Shelton Cartoon
+	homepage http://www.cnsnews.com/cartoon/shelton.asp
+	type search
+	searchpattern <img.+?border="0".+?src="(Sheltonimages/%Y/.+?\..+?)"
+	baseurl http://www.cnsnews.com/cartoon/
+	provides latest
+end
+
+strip elflifeadult
+	name Elf Life: R Rated
+	homepage http://www.elflife.com/adults.html
+	type generate
+	imageurl http://www.elflife.com/current/%Y%m%dm.gif
+	provides any
+end
+
+strip funnyfarm
+	name Funny Farm
+	homepage http://www.funnyfarmcomics.com/
+	type search
+	searchpage http://www.funnyfarmcomics.com/d/%Y%m%d.html
+	searchpattern <IMG.+?SRC="(/comics/%Y%m%da\..+?)"
+	baseurl $homepage
+	provides any
+end
+
+strip elflife
+	name Elf Life
+	homepage http://www.elflife.com/
+	type generate
+	imageurl http://www.elflife.com/comics/%Y%m%dm.gif
+	provides any
+end
+
+strip ozyandmillie
+	name Ozy and Millie
+	homepage http://www.ozyandmillie.org/
+	type generate
+	imageurl http://www.ozyandmillie.org/comics/om%Y%m%d.gif
+	provides any
+end
+
+# superceded
+#strip suburbanjungle
+#	name Suburban Jungle
+#	homepage http://www.suburbanjungle.com/
+#	type search
+#	searchpage http://suburbanjungle.com/d/%Y%m%d.html
+#	searchpattern <img.+?SRC="(/comics/sj%Y%m%d\..+?)"
+#	baseurl http://www.suburbanjungle.com
+#	provides any
+#end
+
+#discontinued - removed 20050109
+#strip acidreflux
+#	name Acid Reflux
+#	homepage http://www.acidrefluxcomic.com/
+#	type search
+#	baseurl http://www.acidrefluxcomic.com/
+#	searchpattern <img.+?src="(archive/c\d+\..+?)"
+#	provides latest
+#end
+
+#discontinued - removed 20050227
+#strip whenigrowup
+#	name When I Grow Up
+#	homepage http://www.whenigrowup.net/
+#	type generate
+#	imageurl http://www.whenigrowup.net/comics/wigu%Y%m%d.png
+#	provides any
+#end
+
+strip walky
+	name It's Walky
+	homepage http://www.itswalky.com/
+	baseurl $homepage
+	type search
+	searchpattern <img.+?SRC="/(comics/.+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip jackiesfridge
+	name Jackie's Fridge
+	type generate
+	homepage http://jackiesfridge.keenspace.com/
+	imageurl http://jackiesfridge.keenspace.com/comics/jf%Y%m%da.jpg
+	provides any
+end
+
+strip schlockmercenary
+	name Schlock Mercenary
+	type generate
+	homepage http://www.schlockmercenary.com/
+	imageurl http://www.schlockmercenary.com/comics/schlock%Y%m%d.png
+	provides any
+end
+
+strip downtoearth
+	name Down To Earth
+	homepage http://www.downtoearthcomic.com/
+	artist Gavin Chafin and Steve Wood
+	type search
+	searchpattern <img.+?src="(strips/\d+_72dpi.gif)"
+	baseurl $homepage
+	provides latest
+end
+
+strip wandering
+	name Wandering Ones
+	homepage http://www.wanderingones.com/
+	type generate
+	imageurl http://www.wanderingones.com/comics/wan%Y%m%d.gif
+	provides any
+end
+
+strip rvfun
+	name Reverend Fun
+	homepage http://rev-fun.gospelcom.net/
+	type generate
+	imageurl http://rev-fun.gospelcom.net/add_toon_info.php?date=%Y%m%d
+	provides any
+end
+
+strip slowwave
+        name Slow Wave
+        homepage http://www.slowwave.com/
+        type generate
+	imageurl $homepage/cgi-bin/archive.cgi?thisweek.gif
+        provides latest
+end
+
+strip sexylosers
+	name Sexy Losers
+	homepage http://sexylosers.com/
+	type search
+	searchpattern <A.+?HREF="/(\d+).html"
+	imageurl http://sexylosers.com/comics/sl$match_1.jpg
+	provides latest
+end
+
+# weekly
+strip youdamnkid
+        name You Damn Kid
+        homepage http://www.youdamnkid.com/
+        type search
+        baseurl $homepage
+        provides latest
+        searchpattern <IMG.+?SRC="/(comics/ydk\d+\.gif)"
+end
+
+strip houndshome
+        name Hound's Home
+        homepage http://www.houndshome.com/
+        type search
+        baseurl $homepage
+        provides latest
+        searchpattern <IMG.+?SRC="/(comics/hh.+?)"
+end
+
+strip cutewendy
+        name CuteWendy
+        homepage http://www.wendycomic.com/
+        type generate
+        imageurl http://www.wendycomic.com/comics/wendy%Y%m%d.gif
+        provides any
+end
+
+strip lifesorad
+        name Life's So Rad
+        homepage http://www.radcomics.com/
+        type search
+        baseurl $homepage
+        provides latest
+        searchpattern <IMG.+?SRC="/(comics/\d+.+?)"
+end
+
+# formerly known as otakufeh. NC-17.
+strip bigones
+        name Big Ones
+        homepage http://otakufeh.keenspace.com/
+        type generate
+        provides any
+        imageurl $homepage/comics/big%Y%m%d.gif
+end
+
+strip offthemark
+	name Off the Mark
+	homepage http://www.offthemark.com/
+	type search
+	provides latest
+	searchpage $homepage/daily.asp
+	searchpattern <img.+?src="(http://www\.offthemark\.com/rotate/\d+.gif)"
+end
+
+strip asif
+	name As If
+	homepage http://www.asifcomic.com/
+	type search
+	searchpage http://www.asifcomic.com/main.html
+	searchpattern <img src="(strips/\d+.jpg)"
+	baseurl $homepage
+	provides latest
+end
+
+strip nipandtuck
+	name Nip 'N Tuck
+	homepage http://nipandtuck.keenspace.com
+	type search
+	searchpattern SRC=".+?(/comics/nt(\d{8})\.gif)"
+	baseurl $homepage
+	provides latest
+end
+
+strip lemontree
+	name Under The Lemon Tree
+	homepage http://utlt.keenspace.com
+	type search
+	searchpattern <IMG.+?SRC=".+?(/comics/.+?\d{8}\..+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip winter
+	name Winter
+	homepage http://www.wintercomic.com/
+	type search
+	searchpattern <img.+?src='(/index.php\?do_command=show_strip&.+?)'
+	baseurl $homepage
+	provides latest
+end
+
+#looks gone 2003-11-12
+strip brainbuzz
+	name Brainbuzz
+	homepage http://cramsession.brainbuzz.com/lists/cartoon/
+	type generate
+	imageurl http://i.brainbuzz.com/CS/Lists/Cartoon/%y%m%d.gif
+	provides any
+end
+
+#they win... for now (8394022423 levels of frames and i don't feel like building a full-blown web browser right now)
+strip swamp
+	name Swamp
+	homepage http://www.swamp.com.au
+	type search
+	searchpage http://s1.emcs.com.au/SwampStrips/Strips/Strip.asp?Date=<code:strftime("%-d-%b-%Y", @localtime_today)
+	searchpattern <img.+?src="(http://s1\.emcs\.com\.au/swampstrips/Strips_Images/\d+\..+?)"
+	provides any
+end
+
+strip thenorm
+	name The Norm
+	homepage http://www.thenorm.com/
+	type generate
+	imageurl http://www.thenorm.com/arch/%Y/%y%m%d.gif
+	provides any
+end
+
+strip melonpool
+	name Melonpool
+	homepage http://www.melonpool.com/
+	type generate
+	imageurl http://www.melonpool.com/comics/MM%Y%m%d.gif
+	provides any
+end
+
+strip flem
+        name FLEM!
+        homepage http://www.flemcomics.com/
+        type generate
+        imageurl http://flem.dhs.org/new.jpg
+        provides latest
+end
+
+strip sheldon
+        name Sheldon
+        useclass unitedmedia-srch-comics
+end
+
+strip weakendwarriors
+        name Weak-end Warriors
+        homepage http://www.inktank.com/WW/
+        type generate
+        imageurl http://www.inktank.com/images/WW/cartoons/%m-%d-%y.gif
+        provides any
+end
+
+strip alice
+	name Alice!
+	homepage http://www.alicecomics.com/today.html
+	type search
+	searchpattern <IMG.+?SRC="(/comics/alice.+?\..+?)"
+	baseurl http://www.alicecomics.com/
+	provides latest
+end
+
+strip theshadows
+	name The Shadows
+	homepage http://www.alicecomics.com/shadows.html
+	type search
+	searchpattern <IMG.+?SRC="(/shadcomics/shad.+?\..+?)"
+	baseurl http://www.alicecomics.com/
+	provides latest
+end
+
+strip lcd
+	name Lowest Common Denominator
+	homepage http://lcd.keenspace.com
+	type search
+	searchpattern <IMG.+?SRC=".+?(/comics/(lcd|soph).+?\..+?)"
+	baseurl http://lcd.keenspace.com
+	provides latest
+end
+
+strip devilspanties
+        name The Devil's Panties
+        homepage http://devilspanties.keenspot.com
+        type search
+        searchpattern <IMG.+?SRC="(/comics/.+?\..+?)"
+        baseurl http://devilspanties.keenspot.com
+        provides latest
+end
+
+
+strip fatjesus
+	name Fat Jesus
+	homepage http://www.fat-jesus.com
+	type search
+	searchpattern <IMG.+?SRC="(/comics/fatjesus.+?)"
+	baseurl http://fatjesus.keenspace.com
+	provides latest
+end
+
+strip sexandviolence
+	name Sex and Violence
+	homepage http://www.mrbang.net
+	type search
+	searchpattern <IMG.+?SRC="(/comics/.+?\..+?)"
+	baseurl http://www.mrbang.net
+	provides latest
+end
+
+# not working
+#strip fans
+#	name Fans!
+#	homepage http://faans.com
+#	type search
+#	searchpattern <IMG.+?SRC="?(http://(www\.)?faans.com/\d+/\d+.+?\..+?)[">\s]
+#	provides latest
+#end
+
+strip spooner
+        name Spooner
+        homepage http://www.hookedoncomics.com/
+        type generate
+        imageurl http://www.hookedoncomics.com/comics/Sp%Y%m%d.gif
+        provides any
+end
+
+strip underpower
+        name Under Power
+        artist Jorge "Vaz" Rivas and David "vanishing" Trischuk
+        homepage http://underpower.non-essential.com/
+        type generate
+        imageurl http://underpower.non-essential.com/comics/%Y%m%d.jpg
+        provides any
+end
+
+strip nekobox
+        name Nekobox
+        artist Jorge "Vaz" Rivas and David "vanishing" Trischuk
+        homepage http://www.nekobox.org
+        type generate
+        imageurl http://www.nekobox.org/comic/%Y-%m-%d.jpg
+        provides any
+end
+
+strip perscheid
+	name Perscheids Abgruende
+	artist Martin Perscheid -> www.martin-perscheid.de
+	homepage http://portale.web.de/Boulevard/Comics/Perscheid/
+	type search
+	searchpattern <img.+?src="(http:)?(//)?(img.web.de/c/00.+?)"
+	matchpart 3
+	provides latest
+end
+
+strip harmbengen
+	name Harm Bengen's Alltagsskizzen
+	artist Harm Bergen -> www.harmbengen.de
+	homepage http://portale.web.de/Boulevard/Comics/Bengen/
+	type search
+	searchpattern <img.+?src="(http:)?(//)?(img.web.de/c/00.+?)"
+	matchpart 3
+	provides latest
+end
+
+strip weyershausenwelt
+	name Weyershausen - Wunderbare Welt
+	artist Karsten Weyershausen -> www.weyershausen.de
+	homepage http://portale.web.de/Boulevard/Comics/Weyershausen/
+	type search
+	searchpattern <img.+?src="(http:)?(//)?(img.web.de/c/00.+?)"
+	matchpart 3
+	provides latest
+end
+
+strip quirit
+	name Quirit - alltaegliches auf den Punkt gebracht
+	artist Quirit -> www.quirit.com
+	homepage http://portale.web.de/Boulevard/Comics/Quirit/
+	type search
+	searchpattern <img.+?src="(http:)?(//)?(img.web.de/c/00.+?)"
+	matchpart 3
+	provides latest
+end
+
+strip touche
+        name Touche
+        artist Tom
+        homepage http://www.drive-in-cartoons.de/touche/
+        type search
+        searchpage http://www.drive-in-cartoons.de/touche/hauptteil.php
+        searchpattern <img.+?src='(.+?)'
+        baseurl http://www.drive-in-cartoons.de/touche/
+        provides latest
+end
+
+strip achewood
+	name Achewood
+	artist Chris Onstad
+	homepage http://www.achewood.com
+	type generate
+	imageurl $homepage/dat/comic/%m%d%Y.gif
+	provides any
+end
+
+# ucomics.com strips
+strip adamathome
+	name Adam@home
+	useclass ucomics-gen
+	$1 ad
+end
+
+strip baldo
+	name Baldo
+	useclass ucomics-gen
+	$1 ba
+end
+
+strip thebigpicture
+	name The Big Picture
+	useclass ucomics-gen
+	$1 bi
+end
+
+strip boondocks
+	name The Boondocks
+	useclass ucomics-gen
+	$1 bo
+end
+
+strip calvinandhobbes
+	name Calvin and Hobbes
+	useclass ucomics-srch
+	$1 ch
+end
+
+strip cathy
+	name Cathy
+	useclass ucomics-gen
+	$1 ca
+end
+
+strip closetohome
+	name Close to Home
+	useclass ucomics-gen
+	$1 cl
+end
+
+strip cornered
+	name Cornered
+	useclass ucomics-gen
+	$1 co
+end
+
+strip doonesbury
+	name Doonesbury
+	useclass ucomics-gen
+	$1 db
+end
+
+strip thefifthwave
+	name The 5th Wave
+	useclass ucomics-srch
+	$1 fw
+end
+
+strip bensargent
+	name Ben Sargent
+	useclass ucomics-srch
+	$1 bs
+end
+
+strip patoliphant
+	name Pat Oliphant
+	useclass ucomics-srch
+	$1 po
+end
+
+strip foxtrot
+	name FoxTrot
+	useclass ucomics-gen
+	$1 ft
+end
+
+strip thefuscobrothers
+	name The Fusco Brothers
+	useclass ucomics-gen
+	$1 fu
+end
+
+strip garfield
+	name Garfield
+	useclass ucomics-gen
+	$1 ga
+end
+
+strip heartofthecity
+	name Heart of the City
+	useclass ucomics-gen
+	$1 hc
+end
+
+strip inthebleachers
+	name In the Bleachers
+	useclass ucomics-gen
+	$1 bl
+end
+
+strip james
+	name James
+	useclass ucomics-gen
+	$1 jm
+end
+
+strip mrpotatohead
+        name Mr. Potato Head
+        useclass ucomics-gen
+        $1 mrp
+end
+
+strip nonsequitur
+	name Non Sequitur
+	useclass ucomics-gen
+	$1 nq
+end
+
+strip oddlyenough
+	name Oddly Enough
+	useclass ucomics-gen
+	$1 oe
+end
+
+strip overboard
+	name Overboard
+	useclass ucomics-gen
+	$1 ob
+end
+
+strip reallifeadventures
+	name Real Life Adventures
+	useclass ucomics-gen
+	$1 rl
+end
+
+strip reynoldsunwrapped
+	name Reynolds Unwrapped
+	useclass ucomics-gen
+	$1 rw
+end
+
+strip stonesoup
+	name Stone Soup
+	useclass ucomics-gen
+	$1 ss
+end
+
+strip tankmcnamara
+	name Tank McNamara
+	useclass ucomics-gen
+	$1 tm
+end
+
+strip tomthedancingbug
+	name Tom the Dancing Bug
+	useclass ucomics-srch
+	$1 td
+end
+
+strip ziggy
+	name Ziggy
+	useclass ucomics-gen
+	$1 zi
+end
+
+strip theduplex
+        name The Duplex
+        useclass ucomics-gen
+        $1 dp
+end
+
+strip psmueller
+	name P. S. Mueller
+	useclass ucomics-gen
+	$1 psm
+end
+
+strip misterboffo
+	name Mister Boffo
+	useclass ucomics-gen
+	$1 mb
+end
+
+strip bottomliners
+	name Bottom Liners
+	artist	Eric and Bill Teitelbaum
+        useclass ucomics-gen
+        $1 tmbot
+end
+
+# unitedmedia.com strips
+strip alleyoop
+	name Alley Oop
+	useclass unitedmedia-srch-comics
+end
+
+strip arlonjanis
+	name Arlo & Janis
+	useclass unitedmedia-srch-comics
+end
+
+strip betty
+	name Betty
+	useclass unitedmedia-srch-comics
+end
+
+strip bignate
+	name Big Nate
+	useclass unitedmedia-srch-comics
+end
+
+strip bornloser
+	name The Born Loser
+	useclass unitedmedia-srch-comics
+end
+
+strip buckets
+	name The Buckets
+	useclass unitedmedia-srch-comics
+end
+
+strip bullsnbears
+	name Bull$ 'N' Bear$
+	useclass unitedmedia-srch-comics
+end
+
+strip cheapthrills
+	name Cheap Thrills
+	useclass unitedmedia-srch-wash
+end
+
+strip chickweed
+	name 9 Chickweed Lane
+	useclass unitedmedia-srch-comics
+end
+
+strip committed
+	name Committed
+	useclass unitedmedia-srch-comics
+end
+
+strip drabble
+	name Drabble
+	useclass unitedmedia-srch-comics
+end
+
+#strip dilbert
+#	name Dilbert
+#	useclass unitedmedia-srch-comics
+#end
+
+strip dilbert
+        name Dilbert
+        artist Scott Adams
+        homepage http://www.dilbert.com/comics/dilbert/
+        baseurl $homepage
+        type search
+#       searchpattern <IMG SRC="(/comics/dilbert/archive/images/.+?\.gif)"
+        searchpattern <IMG SRC="(/comics/dilbert/archive/images/.+?\....)"
+        provides latest
+end
+
+strip fatcats
+	name Fat Cats
+	useclass unitedmedia-srch-comics-lag
+end
+
+strip ferdnand
+	name Ferd'nand
+	useclass unitedmedia-srch-comics
+end
+
+strip forbetter
+       name For Better or For Worse
+       homepage http://www.fborfw.com/strip_fix/
+       type search
+       searchpattern <img.+?src="(/strip_fix/.+?\d{6}.{3}\.(gif|jpg))"
+       baseurl http://www.fborfw.com
+       provides latest
+end
+
+
+strip franknernest
+	name Frank & Ernest
+	useclass unitedmedia-srch-comics
+end
+
+strip frazz
+        name Frazz
+        useclass unitedmedia-srch-comics
+end
+
+strip geech
+	name Geech
+	useclass unitedmedia-srch-comics
+end
+
+strip getfuzzy
+	name Get Fuzzy
+	useclass unitedmedia-srch-comics
+end
+
+strip gingermeggs
+	name Ginger Meggs
+	useclass unitedmedia-srch-comics
+end
+
+strip graffiti
+	name Graffiti
+	useclass unitedmedia-srch-comics
+end
+
+strip grandave
+	name Grand Avenue
+	useclass unitedmedia-srch-comics
+end
+
+strip grizzwells
+	name The Grizzwells
+	useclass unitedmedia-srch-comics
+end
+
+strip hedge
+	name Over the Hedge
+	useclass unitedmedia-srch-comics
+end
+
+strip herman
+	name Herman
+	useclass unitedmedia-srch-comics
+end
+
+strip janesworld
+        name Jane's World
+        useclass unitedmedia-srch-comics
+end
+
+strip jumpstart
+	name Jump Start
+	useclass unitedmedia-srch-comics
+end
+
+strip kitncarlyle
+	name Kit 'N' Carlyle
+	useclass unitedmedia-srch-comics
+end
+
+#can't use the class - dates are 53 years ago
+strip lilabner
+	name Li'l Abner
+	homepage http://www.unitedmedia.com/comics/lilabner/index.html
+	type search
+	searchpattern <img.+?src="(/comics/lilabner/archive/images/lilabner.+?\..+?)"
+	baseurl http://www.unitedmedia.com
+	provides latest
+end
+
+strip luann
+	name Luann
+	useclass unitedmedia-srch-comics
+end
+
+strip lupo
+	name Lupo Alberto
+	useclass unitedmedia-srch-comics
+end
+
+strip marmaduke
+	name Marmaduke
+	useclass unitedmedia-srch-comics
+end
+
+strip meatloaf
+	name Meatloaf Night
+	useclass unitedmedia-srch-comics
+end
+
+strip meg
+	name Meg!
+	useclass unitedmedia-srch-comics-lag
+end
+
+strip motley
+	name Motley
+	useclass unitedmedia-srch-comics-lag
+end
+
+strip nancy
+	name Nancy
+	useclass unitedmedia-srch-comics
+end
+
+strip peanuts
+	name Peanuts
+	useclass unitedmedia-srch-comics
+end
+
+strip pearls
+	name Pearls Before Swine
+	useclass unitedmedia-srch-comics
+end
+
+strip pibgorn
+	name Pibgorn
+	useclass unitedmedia-srch-comics
+end
+
+strip pickles
+	name Pickles
+	useclass unitedmedia-srch-wash
+end
+
+strip potluck
+	name Potluck Parish
+	useclass unitedmedia-srch-comics
+end
+
+strip raisingduncan
+	name Raising Duncan
+	useclass unitedmedia-srch-comics
+end
+
+strip reality
+	name Reality Check
+	useclass unitedmedia-srch-comics
+end
+
+strip redandrover
+	name Red and Rover
+	useclass unitedmedia-srch-wash
+end
+
+strip ripleys
+	name Ripley's Believe It or Not!
+	useclass unitedmedia-srch-comics
+end
+
+strip monty
+	name Monty
+	useclass unitedmedia-srch-comics
+end
+
+strip roseisrose
+	name Rose Is Rose
+	useclass unitedmedia-srch-comics
+end
+
+strip shirleynson
+	name Shirley And Son
+	useclass unitedmedia-srch-comics
+end
+
+strip soup2nutz
+	name Soup To Nutz
+	useclass unitedmedia-srch-comics
+end
+
+strip stockcartoons
+	name StockcarToons
+	useclass unitedmedia-srch-comics
+	searchpage $homepage
+	provides latest
+end
+
+strip tarzan
+	name Tarzan
+	useclass unitedmedia-srch-comics
+end
+
+strip thatslife
+	name That's Life
+	useclass unitedmedia-srch-wash
+end
+
+strip topofworld
+	name Top of the World!
+	useclass unitedmedia-srch-comics-lag
+end
+
+strip workingdaze
+	name Working Daze
+	useclass unitedmedia-srch-comics
+end
+
+strip pcnpixel
+	name PC and Pixel
+	useclass unitedmedia-srch-wash
+	provides latest
+end
+
+strip billday
+	name Bill Day
+	useclass unitedmedia-srch-editoons
+	$1 day
+end
+
+strip billschorr
+	name Bill Schorr
+	useclass unitedmedia-srch-editoons
+	$1 schorr
+end
+
+strip claybennett
+	name Clay Bennett
+	useclass unitedmedia-srch-editoons
+	$1 bennett
+end
+
+strip drewlitton
+	name Drew Litton
+	useclass unitedmedia-srch-editoons
+	$1 litton
+end
+
+strip edstein
+	name Ed Stein
+	useclass unitedmedia-srch-editoons
+	$1 stein
+end
+
+strip ettahulme
+	name Etta Hulme
+	useclass unitedmedia-srch-editoons
+	$1 hulme
+end
+
+strip henrypayne
+	name Henry Payne
+	useclass unitedmedia-srch-editoons
+	$1 payne
+end
+
+strip jeffstahler
+	name Jeff Stahler
+	useclass unitedmedia-srch-editoons
+	$1 stahler
+end
+
+strip jerryholbert
+	name Jerry Holbert
+	useclass unitedmedia-srch-editoons
+	$1 holbert
+end
+
+strip jimberry
+	name Jim Berry
+	useclass unitedmedia-srch-editoons
+	$1 berry
+end
+
+strip mikesmith
+	name Mike Smith
+	useclass unitedmedia-srch-editoons
+	$1 smith
+end
+
+strip robrogers
+	name Rob Rogers
+	useclass unitedmedia-srch-editoons
+	$1 rogers
+end
+
+strip stevebenson
+	name Steve Benson
+	useclass unitedmedia-srch-editoons
+	$1 benson
+end
+
+# sfgate strips
+strip babyblues
+	name Baby Blues
+	useclass sfgate-gen
+	$1 Baby_Blues
+end
+
+strip beetlebailey
+	name Beetle Bailey
+	useclass sfgate-gen
+	$1 Beetle_Bailey
+end
+
+strip blondie
+	name Blondie
+	useclass sfgate-gen
+	$1 $name
+end
+
+strip crock
+	name Crock
+	useclass sfgate-gen
+	$1 $name
+end
+
+strip curtis
+	name Curtis
+	useclass sfgate-gen
+	$1 $name
+end
+
+strip dennisthemenace
+	name Dennis the Menace
+	useclass sfgate-gen
+	$1 Dennis_The_Menace
+end
+
+#non-standard
+strip farley
+	name Farley
+        homepage http://www.sfgate.com/columnists/farley/
+        type search
+        provides latest
+        searchpattern <IMG.+?SRC="(http://(www\.)?sfgate\.com/chronicle/pictures/\d+/\d+/\d+/.+?-farley.gif)"
+end
+
+strip fastrack
+	name On The Fast Track
+	useclass sfgate-gen
+	$1 Fast_Track
+end
+
+strip funkywinkerbean
+	name Funky Winkerbean
+	useclass sfgate-gen
+	$1 Funky_Winkerbean
+end
+
+strip hagarthehorrible
+	name Hagar the Horrible
+	useclass sfgate-gen
+	$1 Hagar_The_Horrible
+end
+
+strip mallardfillmore
+	name Mallard Fillmore
+	useclass sfgate-gen
+	$1 Mallard_Fillmore
+end
+
+strip mutts
+	name Mutts
+	useclass sfgate-gen
+	$1 $name
+end
+
+strip newbreed
+	name New Breed
+	useclass sfgate-gen
+	$1 New_Breed
+end
+
+strip thephantom
+	name The Phantom
+	useclass sfgate-gen
+	$1 Phantom
+end
+
+strip piranhaclub
+	name Piranha Club
+	useclass sfgate-gen
+	$1 Piranha
+end
+
+strip popeye
+	name Popeye
+	useclass sfgate-gen
+	$1 $name
+end
+
+strip rhymeswithorange
+	name Rhymes with Orange
+	useclass sfgate-gen
+	$1 Rhymes_with_Orange
+end
+
+strip sallyforth
+	name Sally Forth
+	useclass sfgate-gen
+	$1 Sally_Forth
+end
+
+strip safehavn
+	name Safe Havens
+	useclass sfgate-gen
+	$1 Safe_Havens
+end
+
+strip sixchix
+	name Six Chix
+	useclass sfgate-gen
+	$1 6Chix
+end
+
+strip zippythecolorpinhead
+	name Zippy the Pinhead (in color)
+	useclass sfgate-gen-zippycolor
+	$1 Zippy_the_Pinhead_Color
+	$2 Zippy_the_Pinhead
+end
+
+strip zippythepinhead
+	name Zippy the Pinhead
+	useclass sfgate-gen-zippy
+	$1 Zippy_the_Pinhead
+	$3 Zippy_BW
+	$2 zippy
+end
+
+strip zits
+	name Zits
+	useclass sfgate-gen
+	$1 $name
+end
+
+#comicspage.com strips
+strip animal
+	name Animal Crackers
+	useclass comicspage-strips-gen
+	$1 animal
+	$2 ack
+end
+
+strip annie
+	name Annie
+	useclass comicspage-strips-gen
+	$1 annie
+	$2 ann
+end
+
+strip bound
+	name Bound and Gagged
+	useclass comicspage-strips-gen
+	$1 bound
+	$2 bgg
+end
+
+strip brenda
+	name Brenda Starr
+	useclass comicspage-strips-gen
+	$1 brenda
+	$2 bsr
+end
+
+strip broomhilda
+	name Broom Hilda
+	useclass comicspage-strips-gen
+	$1 broomhilda
+	$2 bhl
+end
+
+strip cats
+	name Cats with Hands
+	useclass comicspage-strips-gen
+	$1 cats
+	$2 cwh
+end
+
+strip dicktracy
+	name Dick Tracy
+	useclass comicspage-strips-gen
+	$1 dicktracy
+	$2 dty
+end
+
+strip doodles
+	name Doodles
+	useclass comicspage-strips-gen
+	$1 profdoodles
+	$2 dod
+end
+
+strip fred
+	name Fred Basset
+	useclass comicspage-strips-gen
+	$1 fred
+	$2 fbt
+end
+
+strip gasolinealley
+	name Gasoline Alley
+	useclass comicspage-strips-gen
+	$1 gasolinealley
+	$2 gas
+end
+
+strip gilthorp
+	name Gil Thorp
+	useclass comicspage-strips-gen
+	$1 gilthorp
+	$2 gtp
+end
+
+strip helen
+	name Helen, Sweetheart of the Internet
+	useclass comicspage-strips-gen
+	$1 helen
+	$2 hln
+end
+
+strip kudzu
+	name Kudzu
+	useclass comicspage-strips-gen
+	$1 kudzu
+	$2 kdz
+end
+
+strip lewis
+	name Lewis
+	useclass comicspage-strips-gen
+	$1 lewis
+	$2 lew
+end
+
+strip lola
+	name Lola
+	useclass comicspage-strips-gen
+	$1 lola
+	$2 lol
+end
+
+strip looseparts
+	name Loose Parts
+	useclass comicspage-strips-gen
+	$1 looseparts2
+	$2 lsp
+end
+
+strip meehan
+	name Meehan Streak
+	useclass comicspage-strips-gen
+	$1 meehan
+	$2 mst
+end
+
+strip middletons
+	name The Middletons
+	useclass comicspage-strips-gen
+	$1 middletons
+	$2 mid
+end
+
+strip mixedmedia
+	name Mixed Media
+	useclass comicspage-strips-gen
+	$1 mixedmedia
+	$2 mix
+end
+
+strip monkeyhouse
+	name Monkeyhouse
+	useclass comicspage-strips-gen
+	$1 monkeyhouse
+	$2 mhs
+end
+
+strip shoe
+	name Shoe
+	useclass comicspage-strips-gen
+	$1 shoe
+	$2 sho
+end
+
+strip sylvia
+	name Sylvia
+	useclass comicspage-strips-gen
+	$1 sylvia
+	$2 syl
+end
+
+strip willynethel
+	name Willy 'n' Ethel
+	useclass comicspage-strips-gen
+	$1 willynethel
+	$2 wil
+end
+
+
+strip 9to5
+	name 9 to 5
+	useclass comicspage-panels-gen
+	$1 9to5
+	$2 ntf
+end
+
+strip computoon
+	name Compu-toon
+	useclass comicspage-panels-gen
+	$1 computoon
+	$2 cpt
+end
+
+strip loveis
+	name Love Is...
+	useclass comicspage-panels-gen
+	$1 loveis
+	$2 lis
+end
+
+strip pluggers
+	name Pluggers
+	useclass comicspage-panels-gen
+	$1 pluggers
+	$2 plg
+end
+
+strip quigmans
+	name The Quiqmans
+	useclass comicspage-panels-gen
+	$1 quigmans
+	$2 qgm
+end
+
+# gone? 2002-05-24
+strip thatsjake
+	name That's Jake
+	useclass comicspage-panels-gen
+	$1 thatsjake
+	$2 tjk
+end
+
+strip conrad
+	name Paul Conrad
+	useclass comicspage-editorial-gen
+	$1 conrad
+	$2 con
+end
+
+strip danziger
+	name Jeff Danziger
+	useclass comicspage-editorial-gen
+	$1 danziger
+	$2 dan
+end
+
+strip davies
+	name Matt Davies
+	useclass comicspage-editorial-gen
+	$1 davies
+	$2 dav
+end
+
+strip handelsman
+	name Walt Handelsman
+	useclass comicspage-editorial-gen
+	$1 handelsman
+	$2 han
+end
+
+strip horsey
+	name David Horsey
+	useclass comicspage-editorial-gen
+	$1 horsey
+	$2 hor
+end
+
+strip jones
+	name Taylor Jones
+	useclass comicspage-editorial-gen
+	$1 jones
+	$2 jon
+end
+
+strip locher
+	name Dick Locher
+	useclass comicspage-editorial-gen
+	$1 locher
+	$2 dik
+end
+
+strip lowe
+	name Chan Lowe
+	useclass comicspage-editorial-gen
+	$1 lowe
+	$2 low
+end
+
+strip marlette
+	name Doug Marlette
+	useclass comicspage-editorial-gen
+	$1 marlette
+	$2 mar
+end
+
+strip peters
+	name Mike Peters
+	useclass comicspage-editorial-gen
+	$1 peters
+	$2 pet
+end
+
+strip sack
+	name Steve Sack
+	useclass comicspage-editorial-gen
+	$1 sack
+	$2 sak
+end
+
+strip sheneman
+	name Drew Sheneman
+	useclass comicspage-editorial-gen
+	$1 sheneman
+	$2 she
+end
+
+strip stayskal
+	name Wayne Stayskal
+	useclass comicspage-editorial-gen
+	$1 stayskal
+	$2 sty
+end
+
+strip telnaes
+	name Ann Telnaes
+	useclass comicspage-editorial-gen
+	$1 telnaes
+	$2 tel
+end
+
+strip wasserman
+	name Dan Wasserman
+	useclass comicspage-editorial-gen
+	$1 wasserman
+	$2 was
+end
+
+strip wrightd
+	name Dick Wright
+	useclass comicspage-editorial-gen
+	$1 wrightd
+	$2 dwr
+end
+
+strip wright
+	name Don Wright
+	useclass comicspage-editorial-gen
+	$1 wright
+	$2 wrt
+end
+
+strip captainribman
+	name Captain RibMan
+	homepage http://www.comicspage.com/ribman/index.html
+	type search
+	searchpage http://www.supercomics.com/strips/new.html
+	searchpattern <img.+?src="(.+?)".+?ALT="Captain RibMan"
+	baseurl http://www.supercomics.com/strips/
+	provides latest
+end
+
+#could possibly provide any with a code block to calculate the right date, but i'm lazy.
+#email me if you want it.
+strip bfriends
+	name Between Friends
+	artist Sandra Bell-lundy
+	homepage http://www.betweenfriendscartoons.com/
+	type search
+	searchpattern <img.+?src='(http://est\.rbma\.com/content/Between_Friends\?date=\d+)'
+	provides latest
+end
+
+# sev.com.au strips
+strip sevtrek
+        name Sev Trek
+        useclass sev-comics
+end
+
+strip fotr
+        name Fraud of the Rings
+        useclass sev-comics
+end
+
+strip sevgate
+        name Sevgate SEV1
+        useclass sev-comics
+end
+
+strip bluffy
+        name Bluffy the Vampedup Stunner
+        useclass sev-comics
+end
+
+strip sevfiles
+        name The Sev Files
+        useclass sev-comics
+end
+
+strip sevwars
+        name Sev Wars
+        useclass sev-comics
+end
+
+strip sevylon5
+        name Sevylon 5
+        useclass sev-comics
+end
+
+# doesn't fit class
+strip sevscifi
+        name Sev Sci-Fi TV
+        homepage http://www.sev.com.au/toonzone/
+        type generate
+        imageurl http://www.sev.com.au/toonzone/scifitv.jpg
+        provides latest
+end
+
+#washpost strips
+strip andycapp
+        name Andy Capp
+        useclass washpost-creators
+        $1 cap
+end
+
+strip wizardofid
+        name Wizard of Id
+        useclass washpost-creators
+        $1 wiz
+end
+
+strip bc
+        name BC
+        useclass washpost-creators
+        $1 bc
+end
+
+strip marvin
+        name Marvin
+        useclass washpost-king
+        $1 $name
+end
+
+#creators.com strips
+strip agnes
+	name Agnes
+	homepage http://www.creators.com/comics_show.cfm?comicname=agn
+	type search
+	searchpattern <img.+?alt="Agnes".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip archie
+	name Archie
+	homepage http://www.creators.com/comics_show.cfm?comicname=arc
+	type search
+	searchpattern <img.+?alt="Archie".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip askshagg
+	name Ask Shagg
+	homepage http://www.creators.com/comics_show.cfm?comicname=shg
+	type search
+	searchpattern <img.+?alt="Ask Shagg".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip ballardstreet
+	name Ballard Street
+	homepage http://www.creators.com/comics_show.cfm?comicname=bs
+	type search
+	searchpattern <img.+?alt="Ballard Street".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+# apparently gone 20050126
+#strip bachelorparty
+#	name Bachelor Party
+#	homepage http://www.creators.com/comics_show.cfm?comicname=bch
+#	type search
+#	searchpattern <img.+?alt="Bachelor Party".+?src="(.+?)"
+#	baseurl http://www.creators.com/
+#	provides latest
+#end
+
+strip charlie
+	name Charlie
+	homepage http://www.creators.com/comics_show.cfm?comicname=cha
+	type search
+	searchpattern <img.+?alt="Charlie".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip flightdeck
+	name Flight Deck
+	homepage http://www.creators.com/comics_show.cfm?comicname=fli
+	type search
+	searchpattern <img.+?alt="Flight Deck".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip flofriends
+	name Flo & Friends
+	homepage http://www.creators.com/comics_show.cfm?comicname=flo
+	type search
+	searchpattern <img.+?alt="Flo & Friends".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip forheavenssake
+	name For Heaven's Sake
+	homepage http://www.creators.com/comics_show.cfm?comicname=hev
+	type search
+	searchpattern <img.+?alt="For Heavens Sake".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip heathcliff
+	name Heathcliff
+	homepage http://www.creators.com/comics_show.cfm?comicname=hth
+	type search
+	searchpattern <img.+?alt="Heathcliff".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip herbandjamaal
+	name Herb and Jamaal
+	homepage http://www.creators.com/comics_show.cfm?comicname=hrb
+	type search
+	searchpattern <img.+?alt="Herb and Jamal".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip libertymeadows
+	name Liberty Meadows
+	homepage http://www.creators.com/comics_show.cfm?comicname=lib
+	type search
+	searchpattern <img.+?alt="Liberty Meadows".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip momma
+	name Momma
+	homepage http://www.creators.com/comics_show.cfm?comicname=mom
+	type search
+	searchpattern <img.+?alt="Momma".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip mrhousewife
+	name Mr. Housewife
+	homepage http://www.creators.com/comics_show.cfm?comicname=mrh
+	type search
+	searchpattern <img.+?alt="Mr. Housewife".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip naturalselection
+	name Natural Selection
+	homepage http://www.creators.com/comics_show.cfm?comicname=nat
+	type search
+	searchpattern <img.+?alt="Natural Selection".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip onebighappy
+	name One Big Happy
+	homepage http://www.creators.com/comics_show.cfm?comicname=obh
+	type search
+	searchpattern <img.+?alt="One Big Happy".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip theothercoast
+	name The Other Coast
+	homepage http://www.creators.com/comics_show.cfm?comicname=oc
+	type search
+	searchpattern <img.+?alt="The Other Coast".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip rubes
+	name Rubes
+	homepage http://www.creators.com/comics_show.cfm?comicname=rub
+	type search
+	searchpattern <img.+?alt="Rubes".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip rugrats
+	name Rugrats
+	homepage http://www.creators.com/comics_show.cfm?comicname=rug
+	type search
+	searchpattern <img.+?alt="Rugrats".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip speedbump
+	name Speed Bump
+	homepage http://www.creators.com/comics_show.cfm?comicname=bmp
+	type search
+	searchpattern <img.+?alt="Speed Bump".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip strangebrew
+	name Strange Brew
+	homepage http://www.creators.com/comics_show.cfm?comicname=brw
+	type search
+	searchpattern <img.+?alt="Strange Brew".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip weepals
+	name Wee Pals
+	homepage http://www.creators.com/comics_show.cfm?comicname=wee
+	type search
+	searchpattern <img.+?alt="Wee Pals".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip bobgorrell
+	name Bob Gorrell
+	homepage http://www.creators.com/editorial_show.cfm?comicname=bg
+	type search
+	searchpattern <img.+?alt="Bob Gorrell".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip clayjones
+	name Clay Jones
+	homepage http://www.creators.com/editorial_show.cfm?comicname=cj
+	type search
+	searchpattern <img.+?alt="Clay Jones".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip mikeluckovich
+	name Mike Luckovich
+	homepage http://www.creators.com/editorial_show.cfm?comicname=lk
+	type search
+	searchpattern <img.+?alt="Mike Luckovich".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip jimmymargulies
+	name Jimmy Margulies
+	homepage http://www.creators.com/editorial_show.cfm?comicname=jm
+	type search
+	searchpattern <img.+?alt="Jimmy Margulies".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip dwanepowell
+	name Dwane Powell
+	homepage http://www.creators.com/editorial_show.cfm?comicname=dp
+	type search
+	searchpattern <img.+?alt="Dwane Powell".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip paulszep
+	name Paul Szep
+	homepage http://www.creators.com/editorial_show.cfm?comicname=ps
+	type search
+	searchpattern <img.+?alt="Paul Szep".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip geoffreymoss
+	name Geoffrey Moss
+	homepage http://www.creators.com/editorial_show.cfm?comicname=gm
+	type search
+	searchpattern <img.+?alt="Mossprints".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip juliasuits
+	name Julia Suits
+	homepage http://www.creators.com/editorial_show.cfm?comicname=su
+	type search
+	searchpattern <img.+?alt="Suits".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+strip garyvarvel
+	name Gary Varvel
+	homepage http://www.creators.com/editorial_show.cfm?comicname=gv
+	type search
+	searchpattern <img.+?alt="Varvel".+?src="(.+?)"
+	baseurl http://www.creators.com/
+	provides latest
+end
+
+#additional non-standard strips
+strip dtte
+	name Death to the Extremist
+	homepage http://www.zole.org/extremist/
+	type search
+	searchpage http://www.zole.org/extremist/
+	searchpattern <img.+?src="comics/(.+?)"
+	baseurl http://www.zole.org/extremist/comics/
+	provides latest
+end
+
+strip jack
+	name Jack
+	artist David Hopkins
+	homepage http://jack.keenspace.com
+	type generate
+	imageurl $homepage/comics/Jack%Y%m%d.jpg
+	provides any
+end
+
+strip errantstory
+	name Errant Story
+	artist Michael Poe
+	homepage http://www.errantstory.com
+	type search
+	searchpattern <IMG.+?SRC="(/comics/es.+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip catandgirl
+        name Cat and Girl
+        artist Dorothy Gambrell
+        homepage http://www.catandgirl.com/
+        type search
+        searchpattern <img.+?src="(archive/cg.+?\.gif)"
+        baseurl http://www.catandgirl.com/
+        provides latest
+end
+
+strip scarygoround
+      name Scary Go Round
+      artist John Allison
+      homepage http://scarygoround.com/
+      type search
+      searchpattern <img src="(strips/\d+.+?)"
+      baseurl $homepage
+      provides latest
+end
+
+strip erniepook
+      name Ernie Pook's Comeek
+      artist Lynda Barry
+      homepage http://www.marlysmagazine.com/
+      type search
+      searchpage http://www.marlysmagazine.com/main.html
+      searchpattern <img.+?src='(strips/comeek..\.gif)'
+      baseurl $homepage
+      provides latest
+end
+
+strip erniepookbig
+      name Ernie Pook's Comeek (big image)
+      artist Lynda Barry
+      homepage http://www.marlysmagazine.com/
+      type search
+      searchpage http://www.marlysmagazine.com/main.html
+      searchpattern <a.+?href='(strips/bigcomeek..\.gif)'
+      baseurl $homepage
+      provides latest
+end
+
+strip raeside
+      name Adrian Raeside
+      homepage http://www.raesidecartoon.com/
+      type generate
+      imageurl http://www.raesidecartoon.com/images/today.gif
+      provides latest
+end
+
+strip chappatte
+      name Patrick Chappatte
+      homepage http://www.globecartoon.com/
+      type generate
+      imageurl http://www.globecartoon.com/Images/week.gif
+      provides latest
+end
+
+strip cranandlerma
+      name Cran and Lerma
+      artist Nik Scott
+      homepage http://toons.net/
+      type generate
+      imageurl http://toons.net/toon.gif
+      provides latest
+end
+
+strip curiousmoments
+      name Curious Moments
+      artist Nik Scott
+      homepage http://toons.net/
+      type generate
+      imageurl http://www.toons.net/cur.gif
+      provides latest
+end
+
+strip wolvertoon
+      name The Wolvertoon
+      artist Monte Wolverton
+      homepage http://www.pacificnet.net/toons/
+      type generate
+      imageurl http://www.pacificnet.net/toons/wolvertoon.gif
+      provides latest
+end
+
+strip toles
+	name Tom Toles
+	useclass washpost-uclick
+	$1 tt
+end
+
+strip auth
+	name Tony Auth
+	useclass washpost-uclick
+	$1 ta
+end
+
+strip carlson
+	name Stuart Carlson
+	useclass washpost-uclick
+	$1 sc
+end
+
+strip deore
+	name Bill Deore
+	useclass washpost-uclick
+	$1 bd
+end
+
+strip oliphant
+	Name Pat Oliphant
+	useclass washpost-uclick
+	$1 po
+end
+
+strip rall
+	name Ted Rall
+	useclass washpost-uclick
+	$1 tr
+end
+
+#cagle strips
+strip topsyturvey
+	name Topsy Turvey
+	artist Peter Kuper
+	useclass slate-cagle
+	$1 kuper
+	$2 kuper
+end
+
+strip toomuchcoffeeman
+	name Too Much Coffee Man
+	artist Shannon Wheeler
+	useclass slate-cagle
+	$1 wheeler
+	$2 wheeler
+end
+
+strip alcarez
+	name Lalo Alcarez
+	useclass slate-cagle
+	$1 lalo
+	$2 lalo
+end
+
+strip andersonk
+	name Kirk Anderson
+	useclass slate-cagle
+	$1 anderson
+	$2 kirk
+end
+
+strip andersonn
+	name Nick Anderson
+	useclass slate-cagle
+	$1 andersonNICK
+	$2 nick
+end
+
+strip asay
+	name Chuck Asay
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ariail
+	name Robert Ariail
+	useclass slate-cagle
+	$1 arial
+	$2 arial
+end
+
+strip babin
+	name Rex Babin
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip bateman
+	name Scott Bateman
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip beattie
+	name Bruce Beattie
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip bish
+	name Randy Bish
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip bok
+	name Chip Bok
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip breen
+	name Steve Breen
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip britt
+	name Chris Britt
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip brookins
+	name Gary Brookins
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip brown
+	name Jonathan Brown
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip cagle
+	name Daryl Cagle
+	useclass slate-cagle
+	$1 $strip
+	$2 cagle00
+end
+
+strip casciari
+	name James Casciari
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip catalino
+	name Ken Catalino
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip catrow
+	name David Catrow
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+#non-template
+strip cole
+	name John Cole
+	homepage http://cagle.slate.msn.com/politicalcartoons/PCcartoons/cole.asp
+	type generate
+	provides latest
+	imageurl http://www.heraldsun.com/images/photos/live/coletoon.jpg
+end
+
+strip crowe
+	name J.D. Crowe
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip curry
+	name Tom Curry
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip day
+	name Jim Day
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip deering
+	name John Deering
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip duffy
+	name Brian Duffy
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip englehart
+	name Bob Englehart
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip greenberg
+	name Steve Greenberg
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip harville
+	name Vic Harville
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip heller
+	name Joe Heller
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip jacobson
+	name David Jacobson
+	useclass slate-cagle
+	$1 davidjacobson
+	$2 davidjacobson
+end
+
+strip kallaugher
+	name Kevin Kallaugher
+	useclass slate-cagle
+	$1 $strip
+	$2 kal
+end
+
+strip keefe
+	name Mike Keefe
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip koterba
+	name Jeff Koterba
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip lane
+	name Mike Lane
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip macgregor
+	name Doug MacGregor
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip markstein
+	name Gary Markstein
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip matson
+	name R.J. Matson
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip mccloskey
+	name Jim McCloskey
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip mckee
+	name Rick McKee
+	useclass slate-cagle
+	$1 $strip
+	$2 wells
+end
+
+strip menees
+	name Tim Menees
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip morin
+	name Jim Morin
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ohman
+	name Jack Ohman
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip parker
+	name Jeff Parker
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip plante
+	name Bruce Plante
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip priggee
+	name Milt Priggee
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ramirez
+	name Mike Ramirez
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ramsey
+	name Marshall Ramsey
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip reddick
+	name David Reddick
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ritter
+	name Mike Ritter
+	useclass slate-cagle
+	$1 $strip
+	$2 ritter00
+end
+
+strip sherffius
+	name John Sherffius
+	useclass slate-cagle
+	$1 $strip
+	$2 sherffius21
+end
+
+strip siers
+	name Kevin Siers
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip stantis
+	name Scott Stantis
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip summers
+	name Dana Summers
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip streeter
+	name Mark Streeter
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip thompson
+	name Mike Thompson
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip trever
+	name John Trever
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip trinidad
+	name Corky Trinidad
+	useclass slate-cagle
+	$1 corky
+	$2 corky
+end
+
+strip walters
+	name Kirk Walters
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip wilkinson
+	name Signe Wilkinson
+	useclass slate-cagle
+	$1 signe
+	$2 signe
+end
+
+strip wrightl
+	name Larry Wright
+	useclass slate-cagle
+	$1 wright
+	$2 wright
+end
+
+strip bizwit
+	name Bizwit
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip troubletown
+	name Troubletown
+	artist Lloyd Dangle
+	useclass slate-cagle
+	$1 dangle
+	$2 dangle
+end
+
+strip grondahl
+	name Cal Grondahl
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip huffaker
+	name Sandy Huffaker
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip randompropaganda
+	name Random Propaganda
+	artist Ryan Inzana
+	useclass slate-cagle
+	$1 inzana
+	$2 inzana
+end
+
+strip swill
+	name Swill
+	artist Peter Kohlsaat
+	useclass slate-cagle-alt
+	$1 kohlsaat
+	$2 kohlsaat
+end
+
+strip cartoonfix
+	name Cartoonfix
+	artist John Kurtz
+	useclass slate-cagle-alt
+	$1 kurtz
+	$2 kurtz
+end
+
+strip incontempt
+	name In Contempt
+	artist Kevin Moore
+	useclass slate-cagle
+	$1 moore
+	$2 moore
+end
+
+strip noexit
+	name No Exit
+	artist Andy Singer
+	useclass slate-cagle
+	$1 singer
+	$2 singer
+end
+
+strip slowpoke
+	name Slowpoke
+	artist Jen Sorenson
+	useclass slate-cagle-alt
+	$1 sorenson
+	$2 sorenson
+end
+
+strip snibbe
+	name Kurt Snibbe
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip spencer
+	name John Spencer
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip wallace
+	name Russ Wallace
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip linttrap
+	name Lint Trap
+	artist Matt Wuerker
+	useclass slate-cagle
+	$1 wuerker
+	$2 wuerker
+end
+
+strip aislin
+	name Aislin
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip bado
+	name Bado
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip cardow
+	name Cameron Cardow
+	useclass slate-cagle
+	$1 cam
+	$2 cam
+end
+
+strip corrigan
+	name Patrick Corrigan
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip clement
+	name Gary Clement
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip cummings
+	name Dale Cummings
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip deadder
+	name Michael DeAdder
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip dolighan
+	name Tim Dolighan
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip donato
+	name Andy Donato
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip gable
+	name Brian Gable
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip graston
+	name Michael Graston
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip mackay
+	name Graeme MacKay
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip mackinnon
+	name Bruce MacKinnon
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip moudakis
+	name Theo Moudakis
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 mou
+end
+
+strip peterson
+	name Roy Peterson
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip rodewalt
+	name Vance Rodewalt
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ammer
+	name Wolfgang Ammer
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip anjornooz
+	name Sepideh Anjornooz
+	useclass slate-cagle
+	$1 sepideh
+	$2 sepideh
+end
+
+strip esquivel
+	name Arcadio Esquivel
+	useclass slate-cagle
+	$1 arcadio
+	$2 arcadio
+end
+
+strip ares
+	name Ares
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip mitropoulos
+	name Bas Mitropoulos
+	useclass slate-cagle-alt
+	$1 bas
+	$2 bas
+end
+
+strip behrendt
+	name Fritz Behrendt
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip bertrams
+	name Joep Bertrams
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip boligan
+	name Angel Boligan
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip boyle
+	name Francis Boyle
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip cajas
+	name Pancho Cajas
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip carlucho
+	name Carlucho
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip cherepanov
+	name Yuri Cherepanov
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip coco
+	name Coco
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip corax
+	name Corax
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip deangelis
+	name Marco DeAngelis
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip doloricon
+	name Doloricon
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip drybones
+	name Dry Bones
+	artist Yaakov Kirschen
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip emmerson
+	name Rod Emmerson
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip evans
+	name Malcolm Evans
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip gado
+	name Gado
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip garrincha
+	name Garrincha
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip gomaa
+	name Gomaa
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip graff
+	name Finn Graff
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip hachfeld
+	name Rainer Hachfeld
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip hajjaj
+	name Emad Hajjaj
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip hansson
+	name Riber Hansson
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip hervi
+	name Hervi
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip kazanevsky
+	name Vladmir Kazanevsky
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip heng
+	name Heng Kim Song
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip olle
+	name Olle
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip keshav
+	name Keshav
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip christo
+	name Christo
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip kowsar
+	name Nik Kowsar
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip langer
+	name Langer
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip leahy
+	name Sean Leahy
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip moir
+	name Alan Moir
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip medi
+	name Medi
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip molina
+	name Pedro Molina
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip miel
+	name Deng Coy Miel
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip alimov
+	name Murat Alimov
+	useclass slate-cagle-alt
+	$1 murat
+	$2 murat
+end
+
+strip paresh
+	name Paresh
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip nicholson
+	name Peter Nicholson
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ofarrell
+	name Vince O'Farrell
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip obi
+	name Obi
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip palomo
+	name Palomo
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip pancho
+	name Pancho
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip peel
+	name Peel
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip pismestrovic
+	name Petar Pismestrovic
+	useclass slate-cagle
+	$1 petar
+	$2 petar
+end
+
+strip plantu
+	name Jean Plantu
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip persitoons
+	name Persitoons
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ricardo
+	name Ricaro
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip ronnen
+	name Meir Ronnen
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip rowe
+	name David Rowe
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip sakurai
+	name Heiko Sakurai
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip schopf
+	name Oliver Schopf
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip schot
+	name Bas van der Schot
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip serguei
+	name Serguei
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip slane
+	name Chris Slane
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip kim
+	name Kim Gyung Soo
+	useclass slate-cagle-alt
+	$1 soo
+	$2 soo
+end
+
+strip stavro
+	name Stavro
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip tayo
+	name Tayo
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip tom
+	name Tom
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip touka
+	name Touka
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip turner
+	name Martyn Turner
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip wonsoo
+	name Wonsoo Li
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip zapiro
+	name Zapiro
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip zeev
+	name Ze'ev
+	useclass slate-cagle-alt
+	$1 $strip
+	$2 $strip
+end
+
+strip zetterling
+	name Leif Zetterling
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+strip zudin
+	name Alexandr Zudin
+	useclass slate-cagle
+	$1 $strip
+	$2 $strip
+end
+
+# azcentral strips
+class azcentral-srch
+	homepage http://www.azcentral.com/ent/comics/$strip.html
+	type search
+	searchpattern <img.+?SRC="(http://mst\.rbma\.com/content/$1)"
+	prefetch $homepage
+	provides latest
+end
+
+strip apt3g
+	name Apartment 3-G
+	useclass azcentral-srch
+	$1 Apartment_3-G
+end
+
+strip barneygoogle
+	name Barney Google
+	useclass azcentral-srch
+	$1 Barney_Google
+end
+
+strip betterhalf
+	name Better Half
+	useclass azcentral-srch
+	$1 Better_Half
+end
+
+strip buckles
+	name Buckles
+	useclass azcentral-srch
+	$1 Buckles
+end
+
+strip dinetteset
+	name Dinette Set
+	useclass azcentral-srch
+	$1 Dinette_Set
+end
+
+strip grinandbearit
+	name Grin and Bear It
+	useclass azcentral-srch
+	$1 Grin_and_Bear_It
+end
+
+strip hiandlois
+	name Hi and Lois
+	useclass azcentral-srch
+	$1 Hi_and_Lois
+end
+
+strip judgeparker
+	name Judge Parker
+	useclass azcentral-srch
+	$1 Judge_Parker
+end
+
+strip lockhorns
+	name Lockhorns
+	useclass azcentral-srch
+	$1 Lockhorns
+end
+
+strip marktrail
+	name Mark Trail
+	useclass azcentral-srch
+	$1 Mark_Trail
+end
+
+strip maryworth
+	name Mary Worth
+	useclass azcentral-srch
+	$1 Mary_Worth
+end
+
+strip pardonmyplanet
+	name Pardon My Planet
+	useclass azcentral-srch
+	$1 Pardon_My_Planet
+end
+
+strip redeye
+	name Redeye
+	useclass azcentral-srch
+	$1 Redeye
+end
+
+strip rexmorgan
+	name Rex Morgan, MD
+	useclass azcentral-srch
+	$1 Rex_Morgan
+end
+
+strip steveroper
+	name Steve Roper
+	useclass azcentral-srch
+	$1 Steve_Roper
+end
+
+strip theylldoiteverytime
+	name They'll Do It Every Time
+	useclass azcentral-srch
+	$1 TDIE
+end
+
+strip tiger
+	name Tiger
+	useclass azcentral-srch
+	$1 Tiger
+end
+
+strip tinasgroove
+	name Tina's Groove
+	useclass azcentral-srch
+	$1 Tinas_Groove
+end
+
+strip tumbleweeds
+	name Tumbleweeds
+	useclass azcentral-srch
+	$1 Tumbleweeds
+end
+
+strip edgecity
+	name Edge City
+	useclass sfgate-gen
+	$1 Edge_City
+end
+
+# more non-standard
+strip fleem
+	name fleem
+	homepage http://flem.keenspace.com/
+	type generate
+	imageurl http://flem.keenspace.com/comics/%Y%m%d.jpg
+	provides any
+end
+
+strip queenofwands
+	name Queen of Wands
+	homepage http://www.queenofwands.net/
+	type generate
+	imageurl http://www.queenofwands.net/comics/%Y%m%d.gif
+	provides any
+end
+
+strip wigu
+	name WIGU
+	artist Jeffrey Rowland
+	homepage http://www.wigu.com/
+	type generate
+	imageurl http://www.wigu.com/strips/%Y%m%d.png
+	provides any
+end
+
+strip overdue
+	name Overdue
+	artist Bill Barnes and Gene Ambaum
+	homepage http://www.overduemedia.com/
+	type generate
+	imageurl http://www.overduemedia.com/strips/%Y%m%d.gif
+	provides latest
+end
+
+strip nichtlustig
+	name Nicht Lustig
+	homepage http://www.nichtlustig.de/
+	type generate
+	imageurl http://www.nichtlustig.de/comics/full/%y%m%d.jpg
+	provides any
+end
+
+strip hackles
+	name Hackles
+	homepage http://hackles.org
+	type generate
+	imageurl http://hackles.org/latest/cartoon.png
+	provides latest
+end
+
+strip aford
+	name Aford Turtle
+	homepage http://www.afordturtle.com
+	type generate
+	imageurl http://www.afordturtle.com.cnchost.com/comicstrips/neweststrip.gif
+	provides latest
+end
+
+strip dragontails
+	name Dragon Tails
+	artist Tim Dawson
+	homepage http://www.dragon-tails.com/
+	type search
+	searchpattern SRC="(comics/.+?\..+?)"
+	provides latest
+	baseurl $homepage
+end
+
+strip shermanslagoon
+	name Sherman's Lagoon
+	artist Jim Toomey
+	homepage http://www.slagoon.com
+	type generate
+	imageurl $homepage/dailies/SL%y.%m.%d.gif
+	provides latest
+end
+
+strip dicebox
+	name Dicebox
+	homepage http://www.girlamatic.com/series.php?name=dicebox
+	type search
+	searchpattern <img src=(http://www\.girlamatic\.com/jmlee/\w+?\.jpg)
+	provides latest
+end
+
+strip nothingnice
+	name Nothing Nice to Say
+	homepage http://www.nothingnice.com/
+	type generate
+	imageurl http://www.nothingnice.com/strips/%y/%m-%d-%y.gif
+	provides any
+end
+
+strip ctrlaltdel
+	name Ctrl+Alt+Del
+	artist Tim Buckley
+	homepage http://www.ctrlaltdel-online.com/
+	type generate
+	imageurl http://www.ctrlaltdel-online.com/images/comics/%Y%m%d.jpg
+	provides any
+end
+
+strip tasteslikegravel
+	name Tastes Like Gravel
+	artist Todd Oliver
+	homepage http://www.tasteslikegravel.com/
+	type generate
+	imageurl http://www.tasteslikegravel.com/strips/%Y%m%d.png
+	provides any
+end
+
+strip instantclassic
+	name Instant Classic
+	artist Brian Carroll
+	homepage http://www.briworld.com
+	type generate
+	imageurl http://www.briworld.com/ICimages/IC%Y%m%d.jpg
+	provides any
+end
+
+strip geeksalad
+	name Geek Salad
+	artist Warwick Rendell
+	homepage http://www.geeksalad.net/
+	type generate
+	imageurl http://www.geeksalad.net/strips/%Y%m%d.png
+	provides any
+end
+
+strip reallife
+	name Real Life Comics
+	artist Greg Dean
+	homepage http://www.reallifecomics.com/
+	type search
+	searchpattern src=.(/index.php.*?00000-00000-11111-00000-00000)
+	baseurl http://www.reallifecomics.com/
+	provides latest
+end
+
+strip comet7
+	name Comet 7
+	artist David Tekiela
+	homepage http://www.comet7.com/
+	type search
+	searchpattern <img src="(http://www.comet7.com/strips/\d+.+?)"
+	provides latest
+end
+
+strip moviepunks
+	name Movie Punks
+	artist Carrington Vanston
+	homepage http://www.moviepunks.com/
+	type search
+	searchpattern "(http://www\.moviepunks\.com/comics/\d+\..+?)"
+	#<img CLASS="COMIC" SRC="http://www.moviepunks.com/comics/242.gif"
+	provides latest
+end
+
+strip building12
+	name Building 12
+	artist Chris Hazelton
+	homepage http://www.building12.net/
+	type search
+	searchpattern <img.+?src="(http://www\.building12\.net/issue\d/page\d+\.jpg)"
+	provides latest
+end
+
+strip saraanddavid
+	name Sara And David
+	artist Alex Aberle
+	homepage http://www.sara-and-david.com/comic.php?comic=latest
+	type search
+	searchpattern (comics/\d+\.(jpg|gif))
+	baseurl http://www.sara-and-david.com/
+	provides latest
+end
+
+strip haiopeis
+	name Haiopeis
+	homepage http://www.drive-in-cartoons.de/haiopeis/hauptteil.php
+	type search
+	searchpattern <img src=http://www\.drive-in-cartoons\.de/albums/haiopeis/(\S+\.png)
+	baseurl http://www.drive-in-cartoons.de/albums/haiopeis/
+	provides latest
+end
+
+strip grimmy
+	name Mother Goose and Grimm
+	homepage http://www.grimmy.com/comics.php
+	type generate
+	imageurl http://www.grimmy.com/images/MGG_Archive/MGG_%Y/MGG%m%d.gif
+	provides any
+end
+
+strip biloynano
+	name Tira ecol de Bilo y Nano
+	homepage http://tira.escomposlinux.org/
+	type generate
+	imageurl http://tira.escomposlinux.org/tira.png
+	provides latest
+end
+
+strip gallegoyrey
+	name Gallego Y Rey
+	homepage http://www.elmundo.es/diario/opinion/humor.html
+	type generate
+	imageurl http://estaticos.elmundo.es/diario/Library/chiste1.gif
+	provides latest
+end
+
+strip ricardomundo
+	name Ricardo (El Mundo)
+	homepage http://www.elmundo.es/diario/opinion/humor2.html
+	type generate
+	imageurl http://estaticos.elmundo.es/diario/Library/%dchiste2.gif
+	provides latest
+end
+
+strip idigoras
+	name Idigoras
+	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/idigoras.gif
+	type generate
+	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/idigoras.gif
+	provides latest
+end
+
+strip zulet
+	name Zulet
+	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/zulet.gif
+	type generate
+	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/zulet.gif
+	provides latest
+end
+
+strip elgar
+	name Elgar
+	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/elgar.gif
+	type generate
+	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/elgar.gif
+	provides latest
+end
+
+strip pachideportes
+	name Pachi
+	homepage http://www.diariosur.es/edicion/actualidad/vinnetas/pachideportes.gif
+	type generate
+	imageurl http://www.diariosur.es/edicion/actualidad/vinnetas/pachideportes.gif
+	provides latest
+end
+
+strip biloynanoenglish
+	name Tira ecol de Bilo y Nano (english)
+	homepage http://comic.escomposlinux.org/
+	type generate
+	imageurl http://comic.escomposlinux.org/strip.png
+	provides latest
+end
+
+
+strip amores
+	name Amor es...
+	useclass comicspage-panels-gen
+	$1 amores
+	$2 amr
+end
+strip nemi
+	name Nemi
+	homepage http://spray.nettavisen.no/kultur/tegneserie/nemi/
+	type generate
+	imageurl http://spray.nettavisen.no/shared/nemi/img/%d.%m.%y.gif
+	provides any
+end
+
+strip halge
+	name Halge
+	homepage http://www.halge.com
+	type generate
+	imageurl http://www.halge.com/svenska/strip/strip_vardag/%Y%m%d.gif
+	provides any
+end
+
+strip berglin
+	name Berglin
+	homepage http://www.svd.se/berglin
+	type generate
+	imageurl http://svd.se/images/ettan/berglin/berglin.gif
+	provides latest
+end
+
+strip elvis
+	name Elvis
+	homepage http://www.metro.se/site/metro/cartoons/?cartoon=0
+	type generate
+	imageurl http://www.metro.se/content/cartoons/elvis/%Y%m%d.gif
+	provides any
+end
+
+strip pondus
+	name Pondus
+	homepage http://www.start.no/pondus/
+	type generate
+	imageurl http://www.start.no/pondus/striper/%d%m%Y.gif
+	provides any
+end
+
+strip dela
+	name Dela the Hooda
+	homepage http://www.delathehooda.com/
+	type search
+	searchpage http://www.delathehooda.com
+	searchpattern <img SRC="(<code:"Delac" if %w==0><code:"dela" if %w!=0>~[^"]+)"
+	baseurl http://www.delathehooda.com/
+	provides latest
+end
+
+strip extralife
+	name Extra Life
+	homepage http://dynamic5.gamespy.com/~extralife/
+	type search
+	searchpattern <img.+?src="(strips/\d+-\d+-\d+.+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip forcemonkeys
+	name Force Monkeys
+	homepage http://www.gamespy.com/comics/forcemonkeys/
+	type search
+	searchpage http://www.gamespy.com/comics/forcemonkeys/latest.html
+	searchpattern <img.+?src="(comics/\d+-\d+-\d+/.+?)"
+	baseurl $homepage
+	provides latest
+end
+
+strip irregular
+	name Irregular Webcomic!
+	artist David Morgan-Mar
+	homepage http://www.dangermouse.net/irregular/
+	type search
+	searchpattern <img src="/irregular/(comics/irreg\d+\.jpg)"
+	baseurl $homepage
+	provides latest
+end
+
+strip thismodernworld
+	name This Modern World
+	artist Tom Tomorrow
+	homepage http://www.thismodernworld.com
+	type generate
+	imageurl http://workingforchange.speedera.net/www.workingforchange.com/webgraphics/wfc/TMW%m-%d-%y.gif
+	provides any
+end
+
+strip toytrunkrailroad
+	name Toy Trunk Railroad
+	homepage http://www.toytrunkrailroad.com/
+	type generate
+	imageurl http://www.toytrunkrailroad.com/today.gif
+	provides latest
+end
+
+strip escomposlinux
+	name Escomposlinux
+	homepage http://comic.escomposlinux.org/
+	type generate
+	imageurl http://comic.escomposlinux.org/strip.png
+	provides latest
+end
+
+strip warbucket
+	name Warbucket
+	homepage http://www.warbucket.com/comic.php?state=current&id=0
+	type search
+	searchpattern <img.+?src="(comics/\d+\.gif)">
+	baseurl http://www.warbucket.com/
+	provides latest
+end
+
+strip ghastly
+	name Ghastly's Ghastly Comic
+	homepage http://ghastly.keenspace.com
+	type search
+	searchpattern <img.+?SRC="(http://www\.ghastlycomic\.com/comics/\d+\.jpg)"
+	provides latest
+end
+
+# kingfeatures
+strip crankshaft
+	name Crankshaft
+	useclass kingfeatures
+	$1 crank
+	$2 Crankshaft
+	artist Tom Batiuk and Chuck Ayers
+end
+
+# already handled
+#strip apartment3g
+#	name Apartment 3-G
+#	artist Frank Bolle and Lisa Trusiani
+#	useclass kingfeatures
+#	$1 apt3g
+#	$2 Apartment_3-G
+#end
+
+strip familycircus
+        name Family Circus
+        artist Bil Keane
+        useclass kingfeatures
+        $1 familyc
+        $2 Family_Circus
+end
+
+strip flashgordon
+        name Flash Gordon
+        artist Jim Keefe
+        useclass kingfeatures
+        $1 fgordon
+        $2 Flash
+end
+
+strip hots
+	name The Hots
+	artist Stephen Hersh and Nina Paley
+	useclass kingfeatures
+	$1 hots
+	$2 The_Hots
+end
+
+strip princevaliant
+	name Prince Valiant
+	artist John Cullen Murphy and Cullen Murphy
+	useclass kingfeatures
+	$1 pvaliant
+	$2 Prince_Valiant
+end
+
+strip slylock
+	name Slylock Fox
+	artist Bob Weber Jr.
+	useclass kingfeatures
+	$1 slylock
+	$2 Slylock
+end
+
+# apparently gone 20050126
+#strip babsandaldo
+#	name Babs and Aldo
+#	artist Buddy Valentine
+#	useclass kingfeatures-alt
+#	$1 babs
+#	$2 bvt
+#end
+
+strip hazel
+	name Hazel
+	artist Ted Key
+	useclass kingfeatures-alt
+	$1 hazel
+	$2 hat
+end
+
+strip henry
+	name Henry
+	artist Carl Anderson
+	useclass kingfeatures-alt
+	$1 henry
+	$2 het
+end
+
+strip katzkids
+	name The Katzenjammer Kids
+	artist Hy Eisman
+	useclass kingfeatures-alt
+	$1 katzkids
+	$2 kk
+end
+
+strip mandrake
+	name Mandrake the Magician
+	artist Fred Fredericks -- Created by Lee Falk
+	useclass kingfeatures-alt
+	$1 mandrake
+	$2 mmt
+end
+
+strip moose
+        name Moose & Molly
+        artist Bob Weber Sr.
+        useclass kingfeatures-alt
+        $1 moosemol
+        $2 mot
+end
+
+strip samsilo
+	name Sam and Silo
+        artist Jerry Dumas
+        useclass kingfeatures-alt
+        $1 sam_silo
+        $2 sst
+end
+
+strip trudy
+	name Trudy
+	artist Jerry Marcus
+	useclass kingfeatures-alt
+	$1 trudy
+	$2 trt
+end
+
+strip bizarro
+	name Bizarro
+	artist Dan Piraro
+	useclass kingfeatures
+	$1 bizarro
+	$2 Bizarro
+end
+
+strip leftersons
+        name The Leftersons
+        useclass cnsnews
+	$1 leftersons
+end
+
+strip tuma
+        name Kevin Tuma Cartoon
+        useclass cnsnews
+	$1 tuma
+end
+
+strip nowak
+        name Paul Nowak Cartoon
+        useclass cnsnews
+	$1 nowak
+end
+
+strip lang
+        name Bob Lang Cartoon
+        useclass cnsnews
+	$1 lang
+end
+
+strip politicallycorrect
+        name Politically Correct
+        homepage http://www.conservativecartoons.com
+        type search
+        searchpattern <img.+?SRC="(/%Y/\w+.gif)".+?ALT="This week's cartoon"
+        baseurl http://www.conservativecartoons.com
+        provides latest
+end
+
+strip countyoursheep
+        name Count Your Sheep
+        homepage http://sheep123.keenspace.com/
+        type search
+        searchpattern <img.+?alt="comic".+?src="[^"]*(comics/[^/.]+\.gif)"[^>]*>
+        baseurl http://sheep123.keenspace.com/
+        provides latest
+end
+
+strip catharsis
+        name Catharsis
+        homepage http://catharsiscomic.com/
+        type search
+        searchpattern <img.+?src="(strips/\d{6}-\d+\.jpg)"
+        baseurl http://catharsiscomic.com/
+        provides latest
+end
+
+strip noroomformagic
+        name No Room for Magic
+        homepage http://www.drunkduck.com/No_Room_For_Magic/
+        type search
+        searchpattern <img.+?src='(\d+%Y\d+\.gif)'
+        baseurl $homepage
+        provides latest
+end
+
+#graphicsmash.com strips
+strip gimbley
+	name A Tale From Gimbley
+	artist Paul Elliot
+	useclass graphicsmash-serializer
+	$1 pooltales
+end
+
+strip americanbornchinese
+	name American Born Chinese
+	artist Gene Yang
+	useclass graphicsmash-moderntales
+	$1 americanbornchinese
+end
+
+strip americanelf
+	name American Elf: the Sketchbook Diaries of James Kochalka
+	artist James Kochalka
+	homepage http://www.americanelf.com/
+	useclass graphicsmash
+	$1 americanelf
+end
+
+strip arcaynajaynesoul
+	name Arcana Jayne: A'Soulin
+	artist Lisa Jonte
+	useclass graphicsmash-girlamatic
+	$1 arcaynajaynesoul
+end
+
+strip arcanajayne
+	name Arcana Jayne: Hair of the Dog
+	artist Lisa Jonte
+	useclass graphicsmash-girlamatic
+	$1 arcanajayne
+end
+
+strip athena
+	name Athena Voltaire
+	artist Paul Daly, Steve Bryant, and Chad Fidler
+	useclass graphicsmash-moderntales
+	$1 athena
+end
+
+strip biteme
+	name Bite Me!
+	artist Dylan Meconis
+	useclass graphicsmash-girlamatic
+	$1 biteme
+end
+
+strip crss
+	name Charlie Red Eye Sunday Specials
+	artist Edward J. Grug III and Matthew William Boyd Langfield
+ 	useclass graphicsmash-moderntales
+	$1 crss
+end
+
+strip chasingrainbows
+	name Chasing Rainbows
+	artist Svetlana Chmakova
+	useclass graphicsmash-girlamatic
+	$1 svetlanaseries
+end
+
+strip circleweave
+	name Circle Weave
+	artist Indigo Kelleigh
+	useclass graphicsmash-moderntales
+	$1 circleweave
+end
+
+strip doublehappiness
+	name Double Happiness
+	artist Jason Shiga
+	useclass graphicsmash-moderntales
+	$1 2xhappiness
+end
+
+strip edie
+	name Edie in Orbit
+	artist Shaenon K. Garrity
+	homepage http://www.joeymanley.com/edie/series.php
+	useclass graphicsmash
+	$1 edie
+end
+
+strip fancyfroglin
+	name Fancy Froglin
+	artist James Kochalka
+	useclass graphicsmash-moderntales
+	$1 fancyfroglin
+end
+
+strip fearmongers
+	name Fear Mongers
+	artist Joe Zabel
+	useclass graphicsmash-moderntales
+	$1 fearmongers
+end
+
+strip fetusx
+	name Fetus-X
+	artist Eric Millikin and Casey Sorrow
+	useclass graphicsmash-serializer
+	$1 fetusx
+end
+
+strip fredtheclown
+	name Fred the Clown
+	artist Roger Langridge
+	useclass graphicsmash-moderntales
+	$1 fredtheclown
+end
+
+strip hutchowen
+	name HUTCH OWEN - Public Relations!
+	artist Tom Hart
+	useclass graphicsmash-moderntales
+	$1 hutchowen
+end
+
+strip hope
+	name I Was There & Just Returned
+	artist Hope Larson
+	useclass graphicsmash-girlamatic
+	$1 hope
+end
+
+strip jeepers
+	name Jeepers
+	artist Andre Richard
+	useclass graphicsmash-girlamatic
+	$1 jeepers
+end
+
+strip kismet
+	name Kismet: Hunter's Moon
+	artist Layla Lawlor
+	useclass graphicsmash-girlamatic
+	$1 kismet
+end
+
+strip mell
+	name L'il Mell
+	artist Shaenon K. Garrity and Vera Brosgol
+	useclass graphicsmash-girlamatic
+	$1 mell
+end
+
+strip lionel_am
+	name Lionel's Lament - AM
+	artist Josh Neufeld and Dean Haspiel
+	useclass graphicsmash-serializer
+	$1 lionel_am
+end
+
+strip lionel
+	name Lionel's Lament - PM
+	artist Dean Haspiel and Josh Neufeld
+	useclass graphicsmash-serializer
+	$1 lionel
+end
+
+strip locationlocationlocation
+	name Location Location Location
+	artist John Barber
+	useclass graphicsmash-moderntales
+	$1 locationlocationlocation
+end
+
+strip narbonic
+	name Narbonic
+	artist Shaenon K. Garrity
+	useclass graphicsmash-moderntales
+	$1 narbonic
+end
+
+strip nostereotypes
+	name No Stereotypes
+	artist Amber "Glych" Greenlee
+	useclass graphicsmash-moderntales
+	$1 NS
+end
+
+strip oddjobs
+	name Odd Jobs3: Cash and Carry
+	artist Tim Broderick
+	useclass graphicsmash-moderntales
+	$1 oddjobscashandcarry
+end
+
+strip paradigmshift
+	name Paradigm Shift: Part Two
+	artist Dirk Tiede
+	useclass graphicsmash-moderntales
+	$1 PS2
+end
+
+strip pewfell
+	name Pewfell
+	artist Chuck Whelon
+	useclass graphicsmash-moderntales
+	$1 pewfell
+end
+
+strip robotbarber
+	name Robot Barber
+	artist Caleb Sevcik
+	useclass graphicsmash-moderntales
+	$1 robotbarber
+end
+
+strip rogues
+	name Rogues of Clwyd-Rhan
+	artist Reinder Dijkhuis
+	useclass graphicsmash-moderntales
+	$1 rogues
+end
+
+strip northampton
+	name Streets of Northampton
+	artist Chris Shadoian
+	useclass graphicsmash-moderntales
+	$1 northampton
+end
+
+strip charlieredeye
+	name The Bizarre Life of Charlie Red Eye
+	artist Matthew William Boyd Langfield, Esq. and Edward J. Grug III
+	useclass graphicsmash-moderntales
+	$1 charlieredeye
+end
+
+strip death
+	name The New Adventures of Death
+	artist Dorothy Gambrell
+	useclass graphicsmash-moderntales
+	$1 death
+end
+
+strip thestiff
+	name The Stiff
+	artist Jason Thompson
+	homepage http://girlamatic.com/series.php?name=thestiff
+	useclass graphicsmash-girlamatic
+	$1 thestiff
+end
+
+strip tokyohigh
+	name TokyoHigh
+	artist George Panella
+	useclass graphicsmash-moderntales
+	$1 tokyohigh
+end
+
+strip tokyohighdayout
+	name TokyoHigh: A Day Out
+	artist Amber "Glych" Greenlee
+	useclass graphicsmash-moderntales
+	$1 tokyohighguestrun
+end
+
+strip tween
+	name Tween: The Bad Mojo Saga
+	artist Anthony P. Furtado
+	useclass graphicsmash-moderntales
+	$1 tween
+end
+
+strip yeslogo
+	name Yes Logo!
+	artist Paulo Patricio
+	useclass graphicsmash-serializer
+	$1 yeslogo
+end
+
+strip digger
+	name Digger
+	artist Ursula Vernon
+	useclass graphicsmash
+	$1 digger
+end
+
+# not running right now?
+#strip fans
+#	name Fans
+#	homepage
+#	useclass graphicsmash
+#	$1 fans
+#end
+
+strip felicity
+	name Felicity
+	artist John Troutman
+	useclass graphicsmash
+	$1 felicity
+end
+
+strip flick
+	name Flick
+	artist Mikael Oskarsson
+	useclass graphicsmash
+	$1 flick
+end
+
+strip gsg
+	name Gun Street Girl
+	artist Barb Lien and Ryan Howe
+	useclass graphicsmash
+	$1 gsg
+end
+
+strip grift
+	name Interplanetary Grift
+	artist Jim Keplinger and Scott Story
+	useclass graphicsmash
+	$1 grift
+end
+
+strip killroyandtina
+	name Killroy and Tina
+	artist Justin Pierce
+	useclass graphicsmash
+	$1 killroyandtina
+end
+
+strip mam
+	name Mythos and Magick
+	artist Brynn Sheridan
+	useclass graphicsmash
+	$1 mam
+end
+
+strip nonpersons
+	name NonPersons
+	artist Amber "Glych" Greenlee
+	useclass graphicsmash
+	$1 nonpersons
+end
+
+strip rip
+	name Rip & Teri
+	artist T Campbell and John Waltrip
+	useclass graphicsmash
+	$1 rip
+end
+
+strip ram
+	name Saga of The Ram
+	artist Brian Daniel
+	useclass graphicsmash
+	$1 ram
+end
+
+strip shesanightmare
+	name She's a Nightmare
+	artist Jesse Chen
+	useclass graphicsmash
+	$1 shesanightmare
+end
+
+strip skirting
+	name Skirting Danger
+	artist Meredith Gran
+	useclass graphicsmash
+	$1 skirting
+end
+
+strip skritch
+	name Skritch
+	artist Lucas Phelps
+	useclass graphicsmash
+	$1 skritch
+end
+
+strip soulchaserbetty
+	name Soul Chaser Betty
+	artist Brian Babendererde
+	useclass graphicsmash
+	$1 soulchaserbetty
+end
+
+strip stealingjustice
+	name Stealing Justice
+	artist Paul D. Storrie and Jason Howard with Terri Boyle
+	useclass graphicsmash
+	$1 stealingjustice
+end
+
+strip guardians
+	name The Guardians
+	artist Graveyard Greg and Webtroll
+	useclass graphicsmash
+	$1 guardians
+end
+
+strip thetwisting
+	name The Twisting
+	artist Patric Lewandowski
+	useclass graphicsmash
+	$1 thetwisting
+end
+
+strip vigilanteho
+	name Vigilante, Ho!
+	artist Meaghan Quinn and John Troutman
+	useclass graphicsmash
+	$1 vigilanteho
+end
+
+strip krakow
+	name Krakow
+	artist Krazy Krow
+	type search
+	homepage http://www.krakowstudios.com
+	searchpattern <img.+?src="http://www.krakowstudios.com(/comicpro/strips/\d+-\d+\.jpg)
+	baseurl http://www.krakowstudios.com
+	provides latest
+end
+
+strip antihero
+	name Antihero For Hire
+	artist Mark Shallow
+	homepage http://www.antiheroforhire.com
+	type search
+	searchpattern <img.+?alt="comic".+?src="[^"]*(comics/[^/.]+\.gif)"[^>]*>
+	baseurl http://www.antiheroforhire.com/
+	provides latest
+end
+
+strip somethingpositive
+	name Something Positive
+	homepage http://www.somethingpositive.net/
+	type search
+	searchpattern <img.+?src="(arch/sp\d+\.gif)"
+	baseurl http://www.somethingpositive.net/
+	provides latest
+end
+
+# Ubersoft - we are all one strip, with Ubersoft
+strip ubersoft
+	name Ubersoft
+	artist Christopher Wright
+	homepage http://www.ubersoft.net/
+	type generate
+	imageurl http://www.ubersoft.net/comics/hd%Y%m%d.png
+	provides any
+end
+
+#works
+strip statsministeren
+	name Statsministeren
+	homepage http://www.bt.dk/statsministeren:year=%Y:month=%m:day=%d
+	artist Carsten Graabæk
+	type search
+	searchpattern <img.+?src="(http://images.bt2.metropol.dk/.+_large.jpg)\"
+	provides any
+end
+
+# subscribers only. needs cookies to work?
+#strip blacktapsdonate
+#    name Black Tapestries (Donators)
+#    homepage http://donators.drakkolupen.com
+#    type generate
+#    imageurl http://donators.drakkolupen.com/pages/%Y%m%d.jpg
+#    provides any
+#end
+
+strip talesquestor
+    name Tales of the Questor
+    homepage http://npc.keenspace.com
+    type generate
+    imageurl http://npc.keenspace.com/comics/npc%Y%m%d.png
+    provides any
+end
+
+# works. current.
+strip antiherohire
+    name Anti-hero for Hire
+    homepage http://antihero.keenspot.com
+    type generate
+    imageurl http://antihero.keenspot.com/comics/afh%Y%m%da.gif
+    provides any
+end
+
+# works. current.
+strip bobgeorge
+    name Bob and George
+    homepage http://www.bobandgeorge.com
+    type generate
+    imageurl http://www.bobandgeorge.com/%y%m%d.gif
+    provides any
+end
+
+strip danmabfur
+    name Dan and Mab's Furry Adventures
+    homepage http://www.missmab.com/
+    type search
+    searchpattern <img.+?src="(comics/Vol\d+\..+?)"
+    baseurl $homepage
+    provides latest
+end
+
+strip perfectworld
+    name In a Perfect World
+    homepage http://iapw.keenspace.com
+    type generate
+    imageurl http://iapw.keenspace.com/comics/iapw%Y%m%d.gif
+    provides any
+end
+
+strip kaerwyn
+    name The Realm of Kaerwyn
+    homepage http://comic.kaerwyn.com
+    type generate
+    imageurl http://comic.kaerwyn.com/pages/%Y%m%d.jpg
+    provides any
+end
+
+# works. current
+strip vgcats
+    name VG Cats
+    homepage http://www.vgcats.com
+    type generate
+    imageurl http://www.vgcats.com/vgc_comics/images/%y%m%d.jpg
+    provides any
+end
+
+# hasn't been updated since 12/02/2003
+#strip ghostcat
+#    name Ghost Cat
+#    homepage http://www.ghostcat.cycomics.com
+#    type generate
+#    imageurl http://www.ghostcat.cycomics.com/newcomics/%m%d%Yghostcat.png
+#    provides any
+#end
+
+# works. current.
+strip suburbanjungle
+    name Suburban Jungle
+    homepage http://www.suburbanjungle.com/
+    type generate
+    imageurl http://http://www.suburbanjungle.com/comics/sj%Y%m%d.gif
+    provides any
+end
+
+strip freefall
+    name Freefall
+    homepage http://freefall.purrsia.com
+    type search
+    searchpattern <img.+?src="(/ff.+?/.+?\..+?)"
+    baseurl $homepage
+    provides latest
+end
+
+strip daybyday
+	name Day by Day
+	artist Chris Muir
+	homepage http://www.daybydaycartoon.com/
+	type generate
+	imageurl http://www.daybydaycartoon.com/Cartoons/%m-%d-%Y.gif
+	provides any
+end
+
+strip wulffmorgenthaler
+	name Wulffmorgenthaler
+	artist Mikael Wulff and Anders Morgenthaler
+	homepage http://www.wulffmorgenthaler.com
+	type search
+	searchpage $homepage/thestrip.asp?cDay=%d&cMonth=%m&cYear=%Y
+        searchpattern <img.+?src="(log/\w+\.gif)"
+	imageurl $homepage/$match
+	provides any
+end
+
+strip oots
+	name Order of the Stick
+	homepage http://www.giantitp.com/cgi-bin/GiantITP/ootscript
+	artist Rich Burlew
+	type search
+	searchpattern <IMG src="\.\./\.\./(oots/oots\d+\..+?)">
+	baseurl http://www.giantitp.com/
+	provides latest
+end
+
+strip phdcomics
+	name Piled Higher & Deeper
+	artist Jorge Cham
+	homepage http://www.phdcomics.com/
+	type search
+	searchpage http://www.phdcomics.com/comics/comics.php
+	searchpattern <img.+?src=http://www.phdcomics.com(/comics/archive/\S+.gif)
+	baseurl $homepage
+	provides latest
+end
+
+strip coxandforkum
+	name Cox and Forkum
+	artist John Cox and Allen Forkum
+	homepage http://www.coxandforkum.com/
+	type search
+	searchpattern (/archives/(.*?)\.gif)
+	baseurl http://www.coxandforkum.com
+	provides latest
+end
+
+strip questionablecontent
+	name Questionable Content
+	artist Jeph Jacques
+	homepage http://www.questionablecontent.net/
+	type search
+	provides latest
+	searchpattern <img.+?src="\./(comics/\d+\..{3})">
+	baseurl $homepage
+end
+
+strip gucomics
+	name GU Comics
+	artist Woody Hearn
+	homepage http://www.gucomics.com/
+	type generate
+	provides any
+	imageurl http://www.gucomics.com/comics/gu_%Y%m%d.jpg
+end
+
+strip mrwiggles
+	name Rehabilitating Mr. Wiggles
+	artist Neal Swaab
+	homepage http://neilswaab.com/comics/wiggles/
+	type search
+	provides latest
+	searchpage http://neilswaab.com/comics/wiggles/wiggles_content.html
+	searchpattern <IMG.+?SRC="(images/rehab\d+\..{3})"
+	baseurl $homepage
+end
+
+strip mais
+	name Magical Adventures in Space
+	artist Jeffrey Rowland
+	homepage http://www.wigu.com/
+	type search
+	searchpattern <img.+?src="(strips/\d{8}\.png)"
+	baseurl $homepage
+	provides latest
+end
diff --git a/web/ia5/security/webcam.shtml b/web/ia5/security/webcam.shtml
index e966b9e89..1d0484574 100644
--- a/web/ia5/security/webcam.shtml
+++ b/web/ia5/security/webcam.shtml
@@ -106,19 +106,19 @@
         <tr>
           <td align="center">
 
-          </td>
-        </tr>
-      </table>
-      <table width="102" border="0" cellspacing="0" cellpadding="4">
-        <tr>
-          <td align="center">
-            <p class="rightnav">&nbsp;</p>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
+          </td>
+        </tr>
+      </table>
+      <table width="102" border="0" cellspacing="0" cellpadding="4">
+        <tr>
+          <td align="center">
+            <p class="rightnav">&nbsp;</p>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
 </table>
-</BODY>
-</HTML>
+</BODY>
+</HTML>
 
diff --git a/web/iphone/icons/LICENSE.TXT b/web/iphone/icons/LICENSE.TXT
index 29719c080..922d4ab6f 100644
--- a/web/iphone/icons/LICENSE.TXT
+++ b/web/iphone/icons/LICENSE.TXT
@@ -1,7 +1,7 @@
-Diese Buttons sind ausschließlich zur privaten Nutzung freigegeben. 
-Bei kommerzieller Nutzung kontaktieren Sie bitte für eine Lizenz r(at)lf-klueber(dot)de
-
-This is only for using non commercial sites! For a commercial licence contact r(at)lf-klueber(dot)de
-
-Ralf 
-18.09.2008
+Diese Buttons sind ausschließlich zur privaten Nutzung freigegeben. 
+Bei kommerzieller Nutzung kontaktieren Sie bitte für eine Lizenz r(at)lf-klueber(dot)de
+
+This is only for using non commercial sites! For a commercial licence contact r(at)lf-klueber(dot)de
+
+Ralf 
+18.09.2008
diff --git a/web/lib/android.xsl b/web/lib/android.xsl
index 7d6106399..6fd6dec09 100644
--- a/web/lib/android.xsl
+++ b/web/lib/android.xsl
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
   <xsl:template match="/misterhouse">
     <html>
-
+
       <head>
         <link rel="stylesheet" href="/lib/default.css" type="text/css" />
       </head>
-
+
       <body>
         <xsl:for-each select="objects">
           <xsl:call-template name="object"/>
@@ -28,10 +28,10 @@
           </xsl:for-each>
         </ul>
       </body>
-
+
     </html>
   </xsl:template>
-
+
   <xsl:template name="object">
     <ul>
       <xsl:for-each select="object">
@@ -63,7 +63,7 @@
       </xsl:for-each>
     </ul>
   </xsl:template>
-
+
   <xsl:template name="var">
     <xsl:for-each select="var">
       <li>
@@ -80,7 +80,7 @@
       </xsl:if>
     </xsl:for-each>
   </xsl:template>
-
+
   <xsl:template name="link">
     <xsl:element name="a">
       <xsl:attribute name="href">
@@ -111,7 +111,7 @@
       <xsl:value-of select="name"/>
     </xsl:element>
   </xsl:template>
-
+
   <xsl:template name="replace-string">
     <xsl:param name="text"/>
     <xsl:param name="replace"/>
@@ -131,5 +131,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-</xsl:stylesheet>
+
+</xsl:stylesheet>
diff --git a/web/lib/default.xsl b/web/lib/default.xsl
index dca03344e..ea30c04e6 100755
--- a/web/lib/default.xsl
+++ b/web/lib/default.xsl
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
   <xsl:template match="/misterhouse">
     <html>
-
+
       <head>
         <link rel="stylesheet" href="/lib/default.css" type="text/css" />
       </head>
-
+
       <body>
         <xsl:for-each select="objects">
           <xsl:call-template name="object"/>
@@ -28,10 +28,10 @@
           </xsl:for-each>
         </ul>
       </body>
-
+
     </html>
   </xsl:template>
-
+
   <xsl:template name="object">
     <ul>
       <xsl:for-each select="object">
@@ -63,7 +63,7 @@
       </xsl:for-each>
     </ul>
   </xsl:template>
-
+
   <xsl:template name="var">
     <xsl:for-each select="var">
       <li>
@@ -80,7 +80,7 @@
       </xsl:if>
     </xsl:for-each>
   </xsl:template>
-
+
   <xsl:template name="link">
     <xsl:element name="a">
       <xsl:attribute name="href">
@@ -111,7 +111,7 @@
       <xsl:value-of select="name"/>
     </xsl:element>
   </xsl:template>
-
+
   <xsl:template name="replace-string">
     <xsl:param name="text"/>
     <xsl:param name="replace"/>
@@ -131,5 +131,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-</xsl:stylesheet>
+
+</xsl:stylesheet>
diff --git a/web/lib/pod.css b/web/lib/pod.css
index 7f32e3b0f..276624913 100644
--- a/web/lib/pod.css
+++ b/web/lib/pod.css
@@ -130,16 +130,16 @@ dt {
 	margin-top: 15px;
 }
 
-a:link, a:active {
-  color: #36415c;
+a:link, a:active {
+  color: #36415c;
 }
-
-a:visited {
-  color: #666666;
+
+a:visited {
+  color: #666666;
 }
-
-a:hover {
-  color: #888;
+
+a:hover {
+  color: #888;
 }
 
 pre {
diff --git a/web/misc/actiontec_traffic.html b/web/misc/actiontec_traffic.html
index dcc1ce167..8515752c9 100755
--- a/web/misc/actiontec_traffic.html
+++ b/web/misc/actiontec_traffic.html
@@ -1,112 +1,112 @@
-
-
-<HTML>
-
-<head>
-
-<title>Internet Traffic Graphs for 1289 Old Topanga Canyon Rd</title>
-
-<BODY>
-
-
-<BASE TARGET ="Internet Traffic output">
-
-
-
-
-<LINK REL="STYLESHEET" HREF="/default.css" TYPE="text/css">
-
-
-<table width=100% bgcolor='9999CC'>
-
-
-<td><center>
-
-
-<font size=3 color="black"><b>
-
-
-Internet Traffic Graphs
-
-
-</b></font></center>
-
-
-</td>
-
-
-</table><br>
-
-
-
-
-<meta http-equiv='refresh' content='600;url='>
-
-
- <CENTER>
-
-
- <TABLE WIDTH="591" BORDER="0" CELLPADDING="0" CELLSPACING="0">
-
-
- <TR>
-
-<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#6hour"> 6 hours</A></B></TD>
-<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#1day"> 1 day</A></B></TD>
-<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#2day"> 2 days</A></B></TD>
-<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#1week"> 1 week</A></B></TD>
-</TR><TR>
-<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#1month"> 1 month</A></B></TD>
-<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#2month"> 2 months</A></B></TD>
-<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#6month"> 6 months</A></B></TD>
-<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#1year"> 1 year</A></B></TD>
-
-</TR><TR></TR></TABLE>
-</TABLE>
-
-<A NAME="6hour"></A><BR>
-<p>6hour<p><BR>
-
-<IMG SRC = '/sub;?graph_actiontec_rrd(21600)' border=0><BR><BR>
-
-<A NAME="1day"></A><BR>
-<p>1day<p><BR>
-
-<IMG SRC = '/sub;?graph_actiontec_rrd(86400)' border=0><BR><BR>
-
-<A NAME="2day"></A><BR>
-<p>2day<p><BR>
-
-<IMG SRC = '/sub;?graph_actiontec_rrd(175680)' border=0><BR><BR>
-
-<A NAME="1week"></A><BR>
-<p>1week<p><BR>
-
-<IMG SRC = '/sub;?graph_actiontec_rrd(614880)' border=0><BR><BR>
-
-<A NAME="1month"></A><BR>
-<p>1month<p><BR>
-
-<IMG SRC = '/sub;?graph_actiontec_rrd(2723040)' border=0><BR><BR>
-
-<A NAME="6month"></A><BR>
-<p>6month<p><BR>
-
-<IMG SRC = '/sub;?graph_actiontec_rrd(16338240)' border=0><BR><BR>
-
-<A NAME="1year"></A><BR>
-<p>1year<p><BR>
-
-<IMG SRC = '/sub;?graph_actiontec_rrd(32061600)' border=0><BR><BR>
-
-</CENTER></BODY></HTML>
-</CENTER></BODY></HTML>
-
-
-
-
-
-</BODY>
-
-</HTML>
-
+
+
+<HTML>
+
+<head>
+
+<title>Internet Traffic Graphs for 1289 Old Topanga Canyon Rd</title>
+
+<BODY>
+
+
+<BASE TARGET ="Internet Traffic output">
+
+
+
+
+<LINK REL="STYLESHEET" HREF="/default.css" TYPE="text/css">
+
+
+<table width=100% bgcolor='9999CC'>
+
+
+<td><center>
+
+
+<font size=3 color="black"><b>
+
+
+Internet Traffic Graphs
+
+
+</b></font></center>
+
+
+</td>
+
+
+</table><br>
+
+
+
+
+<meta http-equiv='refresh' content='600;url='>
+
+
+ <CENTER>
+
+
+ <TABLE WIDTH="591" BORDER="0" CELLPADDING="0" CELLSPACING="0">
+
+
+ <TR>
+
+<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#6hour"> 6 hours</A></B></TD>
+<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#1day"> 1 day</A></B></TD>
+<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#2day"> 2 days</A></B></TD>
+<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#1week"> 1 week</A></B></TD>
+</TR><TR>
+<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#1month"> 1 month</A></B></TD>
+<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#2month"> 2 months</A></B></TD>
+<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#6month"> 6 months</A></B></TD>
+<TD><IMG src="/graphics/graph.gif" align="absbottom"><B><A href="#1year"> 1 year</A></B></TD>
+
+</TR><TR></TR></TABLE>
+</TABLE>
+
+<A NAME="6hour"></A><BR>
+<p>6hour<p><BR>
+
+<IMG SRC = '/sub;?graph_actiontec_rrd(21600)' border=0><BR><BR>
+
+<A NAME="1day"></A><BR>
+<p>1day<p><BR>
+
+<IMG SRC = '/sub;?graph_actiontec_rrd(86400)' border=0><BR><BR>
+
+<A NAME="2day"></A><BR>
+<p>2day<p><BR>
+
+<IMG SRC = '/sub;?graph_actiontec_rrd(175680)' border=0><BR><BR>
+
+<A NAME="1week"></A><BR>
+<p>1week<p><BR>
+
+<IMG SRC = '/sub;?graph_actiontec_rrd(614880)' border=0><BR><BR>
+
+<A NAME="1month"></A><BR>
+<p>1month<p><BR>
+
+<IMG SRC = '/sub;?graph_actiontec_rrd(2723040)' border=0><BR><BR>
+
+<A NAME="6month"></A><BR>
+<p>6month<p><BR>
+
+<IMG SRC = '/sub;?graph_actiontec_rrd(16338240)' border=0><BR><BR>
+
+<A NAME="1year"></A><BR>
+<p>1year<p><BR>
+
+<IMG SRC = '/sub;?graph_actiontec_rrd(32061600)' border=0><BR><BR>
+
+</CENTER></BODY></HTML>
+</CENTER></BODY></HTML>
+
+
+
+
+
+</BODY>
+
+</HTML>
+
diff --git a/web/newclock/GlobeClock.html b/web/newclock/GlobeClock.html
index 85ca36e3f..cd0522d5e 100644
--- a/web/newclock/GlobeClock.html
+++ b/web/newclock/GlobeClock.html
@@ -1,96 +1,96 @@
-<HEAD>
-<TITLE>CME House</TITLE>
-<meta HTTP-EQUIV='Refresh' CONTENT='3600;URL=earthclock.html'>
-
-
-<SCRIPT LANGUAGE="JavaScript">
-<!-- Original:  Ramandeep Singh (ramandeepji@yahoo.com) -->
-<!-- Web Site:  http://hard-drive.hypermart.net -->
-
-<!-- This script and many more are available free online at -->
-<!-- The JavaScript Source!! http://javascript.internet.com -->
-
-<!-- Begin
-var dn;
-c1 = new Image(); c1.src = "numbers/c1.gif";
-c2 = new Image(); c2.src = "numbers/c2.gif";
-c3 = new Image(); c3.src = "numbers/c3.gif";
-c4 = new Image(); c4.src = "numbers/c4.gif";
-c5 = new Image(); c5.src = "numbers/c5.gif";
-c6 = new Image(); c6.src = "numbers/c6.gif";
-c7 = new Image(); c7.src = "numbers/c7.gif";
-c8 = new Image(); c8.src = "numbers/c8.gif";
-c9 = new Image(); c9.src = "numbers/c9.gif";
-c0 = new Image(); c0.src = "numbers/c0.gif";
-cb = new Image(); cb.src = "numbers/cb.gif";
-cam = new Image(); cam.src = "numbers/cam.gif";
-cpm = new Image(); cpm.src = "numbers/cpm.gif";
-function extract(h,m,s,type) {
-if (!document.images) return;
-if (h <= 9) {
-document.images.a.src = cb.src;
-document.images.b.src = eval("c"+h+".src");
-}
-else {
-document.images.a.src = eval("c"+Math.floor(h/10)+".src");
-document.images.b.src = eval("c"+(h%10)+".src");
-}
-if (m <= 9) {
-document.images.d.src = c0.src;
-document.images.e.src = eval("c"+m+".src");
-}
-else {
-document.images.d.src = eval("c"+Math.floor(m/10)+".src");
-document.images.e.src = eval("c"+(m%10)+".src");
-}
-if (s <= 9) {
-document.g.src = c0.src;
-document.images.h.src = eval("c"+s+".src");
-}
-else {
-document.images.g.src = eval("c"+Math.floor(s/10)+".src");
-document.images.h.src = eval("c"+(s%10)+".src");
-}
-if (dn == "AM") document.j.src = cam.src;
-else document.images.j.src = cpm.src;
-}
-function show3() {
-if (!document.images)
-return;
-var Digital = new Date();
-var hours = Digital.getHours();
-var minutes = Digital.getMinutes();
-var seconds = Digital.getSeconds();
-dn = "AM";
-if ((hours >= 12) && (minutes >= 1) || (hours >= 13)) {
-dn = "PM";
-hours = hours-12;
-}
-if (hours == 0)
-hours = 12;
-extract(hours, minutes, seconds, dn);
-setTimeout("show3()", 1000);
-}
-//  End -->
-</script>
-</HEAD>
-
-<BODY onLoad="show3()" bgcolor="#000000">
-<center>
-<a href='/'  target='_top'> <img src='http://www.fourmilab.ch/cgi-bin/uncgi/Earth?img=learth.evif&imgsize=380&dynimg=y&opt=-l&lat=37&ns=North&lon=89&ew=West&alt=&tle=&date=0&utc=&jd=' border=0></a>
-<p>
-</center>
-<right>
-<img height=45 src="numbers/cb.gif" width=30 name=a>
-<img height=45 src="numbers/cb.gif" width=30 name=b>
-<img height=45 src="numbers/colon.gif" width=26 name=c>
-<img height=45 src="numbers/cb.gif" width=30 name=d>
-<img height=45 src="numbers/cb.gif" width=30 name=e>
-<img height=45 src="numbers/colon.gif" width=26 name=f>
-<img height=45 src="numbers/cb.gif" width=30 name=g>
-<img height=45 src="numbers/cb.gif" width=30 name=h>
-<img height=45 src="numbers/cam.gif" width=30 name=j>
-</right>
-
-</BODY>
-</HTML>
+<HEAD>
+<TITLE>CME House</TITLE>
+<meta HTTP-EQUIV='Refresh' CONTENT='3600;URL=earthclock.html'>
+
+
+<SCRIPT LANGUAGE="JavaScript">
+<!-- Original:  Ramandeep Singh (ramandeepji@yahoo.com) -->
+<!-- Web Site:  http://hard-drive.hypermart.net -->
+
+<!-- This script and many more are available free online at -->
+<!-- The JavaScript Source!! http://javascript.internet.com -->
+
+<!-- Begin
+var dn;
+c1 = new Image(); c1.src = "numbers/c1.gif";
+c2 = new Image(); c2.src = "numbers/c2.gif";
+c3 = new Image(); c3.src = "numbers/c3.gif";
+c4 = new Image(); c4.src = "numbers/c4.gif";
+c5 = new Image(); c5.src = "numbers/c5.gif";
+c6 = new Image(); c6.src = "numbers/c6.gif";
+c7 = new Image(); c7.src = "numbers/c7.gif";
+c8 = new Image(); c8.src = "numbers/c8.gif";
+c9 = new Image(); c9.src = "numbers/c9.gif";
+c0 = new Image(); c0.src = "numbers/c0.gif";
+cb = new Image(); cb.src = "numbers/cb.gif";
+cam = new Image(); cam.src = "numbers/cam.gif";
+cpm = new Image(); cpm.src = "numbers/cpm.gif";
+function extract(h,m,s,type) {
+if (!document.images) return;
+if (h <= 9) {
+document.images.a.src = cb.src;
+document.images.b.src = eval("c"+h+".src");
+}
+else {
+document.images.a.src = eval("c"+Math.floor(h/10)+".src");
+document.images.b.src = eval("c"+(h%10)+".src");
+}
+if (m <= 9) {
+document.images.d.src = c0.src;
+document.images.e.src = eval("c"+m+".src");
+}
+else {
+document.images.d.src = eval("c"+Math.floor(m/10)+".src");
+document.images.e.src = eval("c"+(m%10)+".src");
+}
+if (s <= 9) {
+document.g.src = c0.src;
+document.images.h.src = eval("c"+s+".src");
+}
+else {
+document.images.g.src = eval("c"+Math.floor(s/10)+".src");
+document.images.h.src = eval("c"+(s%10)+".src");
+}
+if (dn == "AM") document.j.src = cam.src;
+else document.images.j.src = cpm.src;
+}
+function show3() {
+if (!document.images)
+return;
+var Digital = new Date();
+var hours = Digital.getHours();
+var minutes = Digital.getMinutes();
+var seconds = Digital.getSeconds();
+dn = "AM";
+if ((hours >= 12) && (minutes >= 1) || (hours >= 13)) {
+dn = "PM";
+hours = hours-12;
+}
+if (hours == 0)
+hours = 12;
+extract(hours, minutes, seconds, dn);
+setTimeout("show3()", 1000);
+}
+//  End -->
+</script>
+</HEAD>
+
+<BODY onLoad="show3()" bgcolor="#000000">
+<center>
+<a href='/'  target='_top'> <img src='http://www.fourmilab.ch/cgi-bin/uncgi/Earth?img=learth.evif&imgsize=380&dynimg=y&opt=-l&lat=37&ns=North&lon=89&ew=West&alt=&tle=&date=0&utc=&jd=' border=0></a>
+<p>
+</center>
+<right>
+<img height=45 src="numbers/cb.gif" width=30 name=a>
+<img height=45 src="numbers/cb.gif" width=30 name=b>
+<img height=45 src="numbers/colon.gif" width=26 name=c>
+<img height=45 src="numbers/cb.gif" width=30 name=d>
+<img height=45 src="numbers/cb.gif" width=30 name=e>
+<img height=45 src="numbers/colon.gif" width=26 name=f>
+<img height=45 src="numbers/cb.gif" width=30 name=g>
+<img height=45 src="numbers/cb.gif" width=30 name=h>
+<img height=45 src="numbers/cam.gif" width=30 name=j>
+</right>
+
+</BODY>
+</HTML>
diff --git a/web/newclock/MapClock.html b/web/newclock/MapClock.html
index 22c2bfccf..1737aa67e 100644
--- a/web/newclock/MapClock.html
+++ b/web/newclock/MapClock.html
@@ -1,95 +1,95 @@
-<HEAD>
-<TITLE>Mr. House Clock</TITLE>
-<meta HTTP-EQUIV='Refresh' CONTENT='3600;URL=map.html'>
-
-
-<SCRIPT LANGUAGE="JavaScript">
-<!-- Original:  Ramandeep Singh (ramandeepji@yahoo.com) -->
-<!-- Web Site:  http://hard-drive.hypermart.net -->
-
-<!-- This script and many more are available free online at -->
-<!-- The JavaScript Source!! http://javascript.internet.com -->
-
-<!-- Begin
-var dn;
-c1 = new Image(); c1.src = "numbers/c1.gif";
-c2 = new Image(); c2.src = "numbers/c2.gif";
-c3 = new Image(); c3.src = "numbers/c3.gif";
-c4 = new Image(); c4.src = "numbers/c4.gif";
-c5 = new Image(); c5.src = "numbers/c5.gif";
-c6 = new Image(); c6.src = "numbers/c6.gif";
-c7 = new Image(); c7.src = "numbers/c7.gif";
-c8 = new Image(); c8.src = "numbers/c8.gif";
-c9 = new Image(); c9.src = "numbers/c9.gif";
-c0 = new Image(); c0.src = "numbers/c0.gif";
-cb = new Image(); cb.src = "numbers/cb.gif";
-cam = new Image(); cam.src = "numbers/cam.gif";
-cpm = new Image(); cpm.src = "numbers/cpm.gif";
-function extract(h,m,s,type) {
-if (!document.images) return;
-if (h <= 9) {
-document.images.a.src = cb.src;
-document.images.b.src = eval("c"+h+".src");
-}
-else {
-document.images.a.src = eval("c"+Math.floor(h/10)+".src");
-document.images.b.src = eval("c"+(h%10)+".src");
-}
-if (m <= 9) {
-document.images.d.src = c0.src;
-document.images.e.src = eval("c"+m+".src");
-}
-else {
-document.images.d.src = eval("c"+Math.floor(m/10)+".src");
-document.images.e.src = eval("c"+(m%10)+".src");
-}
-if (s <= 9) {
-document.g.src = c0.src;
-document.images.h.src = eval("c"+s+".src");
-}
-else {
-document.images.g.src = eval("c"+Math.floor(s/10)+".src");
-document.images.h.src = eval("c"+(s%10)+".src");
-}
-if (dn == "AM") document.j.src = cam.src;
-else document.images.j.src = cpm.src;
-}
-function show3() {
-if (!document.images)
-return;
-var Digital = new Date();
-var hours = Digital.getHours();
-var minutes = Digital.getMinutes();
-var seconds = Digital.getSeconds();
-dn = "AM";
-if ((hours >= 12) && (minutes >= 1) || (hours >= 13)) {
-dn = "PM";
-hours = hours-12;
-}
-if (hours == 0)
-hours = 12;
-extract(hours, minutes, seconds, dn);
-setTimeout("show3()", 1000);
-}
-//  End -->
-</script>
-</HEAD>
-
-<BODY onLoad="show3()" bgcolor="#000000">
-<center>
-<p>
-
-<img height=45 src="numbers/cb.gif" width=30 name=a>
-<img height=45 src="numbers/cb.gif" width=30 name=b>
-<img height=45 src="numbers/colon.gif" width=26 name=c>
-<img height=45 src="numbers/cb.gif" width=30 name=d>
-<img height=45 src="numbers/cb.gif" width=30 name=e>
-<img height=45 src="numbers/colon.gif" width=26 name=f>
-<img height=45 src="numbers/cb.gif" width=30 name=g>
-<img height=45 src="numbers/cb.gif" width=30 name=h>
-<img height=45 src="numbers/cam.gif" width=30 name=j>
-<P>
-<a href='/'  target='_top'> <img src='./maps/earth.jpg' width='620' height='300' border=0></a>
-
-</BODY>
-</HTML>
+<HEAD>
+<TITLE>Mr. House Clock</TITLE>
+<meta HTTP-EQUIV='Refresh' CONTENT='3600;URL=map.html'>
+
+
+<SCRIPT LANGUAGE="JavaScript">
+<!-- Original:  Ramandeep Singh (ramandeepji@yahoo.com) -->
+<!-- Web Site:  http://hard-drive.hypermart.net -->
+
+<!-- This script and many more are available free online at -->
+<!-- The JavaScript Source!! http://javascript.internet.com -->
+
+<!-- Begin
+var dn;
+c1 = new Image(); c1.src = "numbers/c1.gif";
+c2 = new Image(); c2.src = "numbers/c2.gif";
+c3 = new Image(); c3.src = "numbers/c3.gif";
+c4 = new Image(); c4.src = "numbers/c4.gif";
+c5 = new Image(); c5.src = "numbers/c5.gif";
+c6 = new Image(); c6.src = "numbers/c6.gif";
+c7 = new Image(); c7.src = "numbers/c7.gif";
+c8 = new Image(); c8.src = "numbers/c8.gif";
+c9 = new Image(); c9.src = "numbers/c9.gif";
+c0 = new Image(); c0.src = "numbers/c0.gif";
+cb = new Image(); cb.src = "numbers/cb.gif";
+cam = new Image(); cam.src = "numbers/cam.gif";
+cpm = new Image(); cpm.src = "numbers/cpm.gif";
+function extract(h,m,s,type) {
+if (!document.images) return;
+if (h <= 9) {
+document.images.a.src = cb.src;
+document.images.b.src = eval("c"+h+".src");
+}
+else {
+document.images.a.src = eval("c"+Math.floor(h/10)+".src");
+document.images.b.src = eval("c"+(h%10)+".src");
+}
+if (m <= 9) {
+document.images.d.src = c0.src;
+document.images.e.src = eval("c"+m+".src");
+}
+else {
+document.images.d.src = eval("c"+Math.floor(m/10)+".src");
+document.images.e.src = eval("c"+(m%10)+".src");
+}
+if (s <= 9) {
+document.g.src = c0.src;
+document.images.h.src = eval("c"+s+".src");
+}
+else {
+document.images.g.src = eval("c"+Math.floor(s/10)+".src");
+document.images.h.src = eval("c"+(s%10)+".src");
+}
+if (dn == "AM") document.j.src = cam.src;
+else document.images.j.src = cpm.src;
+}
+function show3() {
+if (!document.images)
+return;
+var Digital = new Date();
+var hours = Digital.getHours();
+var minutes = Digital.getMinutes();
+var seconds = Digital.getSeconds();
+dn = "AM";
+if ((hours >= 12) && (minutes >= 1) || (hours >= 13)) {
+dn = "PM";
+hours = hours-12;
+}
+if (hours == 0)
+hours = 12;
+extract(hours, minutes, seconds, dn);
+setTimeout("show3()", 1000);
+}
+//  End -->
+</script>
+</HEAD>
+
+<BODY onLoad="show3()" bgcolor="#000000">
+<center>
+<p>
+
+<img height=45 src="numbers/cb.gif" width=30 name=a>
+<img height=45 src="numbers/cb.gif" width=30 name=b>
+<img height=45 src="numbers/colon.gif" width=26 name=c>
+<img height=45 src="numbers/cb.gif" width=30 name=d>
+<img height=45 src="numbers/cb.gif" width=30 name=e>
+<img height=45 src="numbers/colon.gif" width=26 name=f>
+<img height=45 src="numbers/cb.gif" width=30 name=g>
+<img height=45 src="numbers/cb.gif" width=30 name=h>
+<img height=45 src="numbers/cam.gif" width=30 name=j>
+<P>
+<a href='/'  target='_top'> <img src='./maps/earth.jpg' width='620' height='300' border=0></a>
+
+</BODY>
+</HTML>
diff --git a/web/newclock/OriginalLED.html b/web/newclock/OriginalLED.html
index c2e0ccb4b..3573c8ae7 100644
--- a/web/newclock/OriginalLED.html
+++ b/web/newclock/OriginalLED.html
@@ -1,92 +1,92 @@
-<HEAD>
-<TITLE>CME House</TITLE>
-<SCRIPT LANGUAGE="JavaScript">
-<!-- Original:  Ramandeep Singh (ramandeepji@yahoo.com) -->
-<!-- Web Site:  http://hard-drive.hypermart.net -->
-
-<!-- This script and many more are available free online at -->
-<!-- The JavaScript Source!! http://javascript.internet.com -->
-
-<!-- Begin
-var dn;
-c1 = new Image(); c1.src = "numbers/c1.gif";
-c2 = new Image(); c2.src = "numbers/c2.gif";
-c3 = new Image(); c3.src = "numbers/c3.gif";
-c4 = new Image(); c4.src = "numbers/c4.gif";
-c5 = new Image(); c5.src = "numbers/c5.gif";
-c6 = new Image(); c6.src = "numbers/c6.gif";
-c7 = new Image(); c7.src = "numbers/c7.gif";
-c8 = new Image(); c8.src = "numbers/c8.gif";
-c9 = new Image(); c9.src = "numbers/c9.gif";
-c0 = new Image(); c0.src = "numbers/c0.gif";
-cb = new Image(); cb.src = "numbers/cb.gif";
-cam = new Image(); cam.src = "numbers/cam.gif";
-cpm = new Image(); cpm.src = "numbers/cpm.gif";
-function extract(h,m,s,type) {
-if (!document.images) return;
-if (h <= 9) {
-document.images.a.src = cb.src;
-document.images.b.src = eval("c"+h+".src");
-}
-else {
-document.images.a.src = eval("c"+Math.floor(h/10)+".src");
-document.images.b.src = eval("c"+(h%10)+".src");
-}
-if (m <= 9) {
-document.images.d.src = c0.src;
-document.images.e.src = eval("c"+m+".src");
-}
-else {
-document.images.d.src = eval("c"+Math.floor(m/10)+".src");
-document.images.e.src = eval("c"+(m%10)+".src");
-}
-if (s <= 9) {
-document.g.src = c0.src;
-document.images.h.src = eval("c"+s+".src");
-}
-else {
-document.images.g.src = eval("c"+Math.floor(s/10)+".src");
-document.images.h.src = eval("c"+(s%10)+".src");
-}
-if (dn == "AM") document.j.src = cam.src;
-else document.images.j.src = cpm.src;
-}
-function show3() {
-if (!document.images)
-return;
-var Digital = new Date();
-var hours = Digital.getHours();
-var minutes = Digital.getMinutes();
-var seconds = Digital.getSeconds();
-dn = "AM";
-if ((hours >= 12) && (minutes >= 1) || (hours >= 13)) {
-dn = "PM";
-hours = hours-12;
-}
-if (hours == 0)
-hours = 12;
-extract(hours, minutes, seconds, dn);
-setTimeout("show3()", 1000);
-}
-//  End -->
-</script>
-</HEAD>
-
-<BODY onLoad="show3()" bgcolor="#000000">
-
-<td><a href='/' target='_top'> <img src='img/1pixel.gif' width='580' height='150' border=0></a></td>
-
-<center>
-<img height=90 src="numbers/cb.gif" width=64 name=a>
-<img height=90 src="numbers/cb.gif" width=64 name=b>
-<img height=90 src="numbers/colon.gif" width=36 name=c>
-<img height=90 src="numbers/cb.gif" width=64 name=d>
-<img height=90 src="numbers/cb.gif" width=64 name=e>
-<img height=90 src="numbers/colon.gif" width=36 name=f>
-<img height=90 src="numbers/cb.gif" width=64 name=g>
-<img height=90 src="numbers/cb.gif" width=64 name=h>
-<img height=90 src="numbers/cam.gif" width=64 name=j>
-</center>
-
-</BODY>
-</HTML>
+<HEAD>
+<TITLE>CME House</TITLE>
+<SCRIPT LANGUAGE="JavaScript">
+<!-- Original:  Ramandeep Singh (ramandeepji@yahoo.com) -->
+<!-- Web Site:  http://hard-drive.hypermart.net -->
+
+<!-- This script and many more are available free online at -->
+<!-- The JavaScript Source!! http://javascript.internet.com -->
+
+<!-- Begin
+var dn;
+c1 = new Image(); c1.src = "numbers/c1.gif";
+c2 = new Image(); c2.src = "numbers/c2.gif";
+c3 = new Image(); c3.src = "numbers/c3.gif";
+c4 = new Image(); c4.src = "numbers/c4.gif";
+c5 = new Image(); c5.src = "numbers/c5.gif";
+c6 = new Image(); c6.src = "numbers/c6.gif";
+c7 = new Image(); c7.src = "numbers/c7.gif";
+c8 = new Image(); c8.src = "numbers/c8.gif";
+c9 = new Image(); c9.src = "numbers/c9.gif";
+c0 = new Image(); c0.src = "numbers/c0.gif";
+cb = new Image(); cb.src = "numbers/cb.gif";
+cam = new Image(); cam.src = "numbers/cam.gif";
+cpm = new Image(); cpm.src = "numbers/cpm.gif";
+function extract(h,m,s,type) {
+if (!document.images) return;
+if (h <= 9) {
+document.images.a.src = cb.src;
+document.images.b.src = eval("c"+h+".src");
+}
+else {
+document.images.a.src = eval("c"+Math.floor(h/10)+".src");
+document.images.b.src = eval("c"+(h%10)+".src");
+}
+if (m <= 9) {
+document.images.d.src = c0.src;
+document.images.e.src = eval("c"+m+".src");
+}
+else {
+document.images.d.src = eval("c"+Math.floor(m/10)+".src");
+document.images.e.src = eval("c"+(m%10)+".src");
+}
+if (s <= 9) {
+document.g.src = c0.src;
+document.images.h.src = eval("c"+s+".src");
+}
+else {
+document.images.g.src = eval("c"+Math.floor(s/10)+".src");
+document.images.h.src = eval("c"+(s%10)+".src");
+}
+if (dn == "AM") document.j.src = cam.src;
+else document.images.j.src = cpm.src;
+}
+function show3() {
+if (!document.images)
+return;
+var Digital = new Date();
+var hours = Digital.getHours();
+var minutes = Digital.getMinutes();
+var seconds = Digital.getSeconds();
+dn = "AM";
+if ((hours >= 12) && (minutes >= 1) || (hours >= 13)) {
+dn = "PM";
+hours = hours-12;
+}
+if (hours == 0)
+hours = 12;
+extract(hours, minutes, seconds, dn);
+setTimeout("show3()", 1000);
+}
+//  End -->
+</script>
+</HEAD>
+
+<BODY onLoad="show3()" bgcolor="#000000">
+
+<td><a href='/' target='_top'> <img src='img/1pixel.gif' width='580' height='150' border=0></a></td>
+
+<center>
+<img height=90 src="numbers/cb.gif" width=64 name=a>
+<img height=90 src="numbers/cb.gif" width=64 name=b>
+<img height=90 src="numbers/colon.gif" width=36 name=c>
+<img height=90 src="numbers/cb.gif" width=64 name=d>
+<img height=90 src="numbers/cb.gif" width=64 name=e>
+<img height=90 src="numbers/colon.gif" width=36 name=f>
+<img height=90 src="numbers/cb.gif" width=64 name=g>
+<img height=90 src="numbers/cb.gif" width=64 name=h>
+<img height=90 src="numbers/cam.gif" width=64 name=j>
+</center>
+
+</BODY>
+</HTML>
diff --git a/web/newclock/alarm.pl b/web/newclock/alarm.pl
index 7899b7cdf..70b820b40 100644
--- a/web/newclock/alarm.pl
+++ b/web/newclock/alarm.pl
@@ -1,60 +1,60 @@
-#!/usr/bin/perl
-
-
-use CGI;
-my $query = new CGI ;
-my $mode = $query->param("mode");
-my $hourOpt = $query->param("hourOpt");
-my $minOpt = $query->param("minOpt");
-my $ampm = $query->param("ampm");
-
-my $alarmfile = "C:/mh/data/web/data_clock.txt";
-
-
-my $script_url = "alarm.pl";
-
-print "Content-Type: text/html\n\n";
-
-print "<html><Body bgcolor ='white'><font size='3' face='Arial'><body>";
-
-  if ($mode ne "setdate") {
-
-	print qq~
-	
-
-<form name=clock action=$script_url method=post>	
-<input type=hidden name=mode and value=setdate>
-
-Current Alarm: $alarmfile OR $hourOpt:$minOpt $ampm
-<select name=hourOpt onChange="alarmSet()" size=1>
-<option value="00">00<option value="01">01<option value="02">02<option value="03">03
-<option value="04">04<option value="05">05<option value="06">06<option selected value="07">07
-<option value="08">08<option value="09">09<option value="10">10<option value="11">11
-<option value="12">12
-</option>
-</select> 
-<select name=minOpt onChange="alarmSet()" size=1>
-<option selected value="00">00<option value="05">05<option value="10">10<option value="15">15
-<option value="20">20<option value="25">25<option value="30">30<option value="35">35
-<option value="40">40<option value="45">45<option value="50">50<option value="55">55
-</option>
-</select>
-
-<input type=radio name=ampm value="AM" checked>AM
-<input type=radio name=ampm value="PM">PM
-
-
-<input type=submit value=setdate>\n</form>
-
-
-~;
-} else {
-
-	print "<br><P>SET DATE TO $hourOpt:$minOpt $ampm";
-
-&file_write($alarmfile, "$hourOpt:$minOpt $ampm");
-
-}
-	print "</body></html>";
-
-1;
+#!/usr/bin/perl
+
+
+use CGI;
+my $query = new CGI ;
+my $mode = $query->param("mode");
+my $hourOpt = $query->param("hourOpt");
+my $minOpt = $query->param("minOpt");
+my $ampm = $query->param("ampm");
+
+my $alarmfile = "C:/mh/data/web/data_clock.txt";
+
+
+my $script_url = "alarm.pl";
+
+print "Content-Type: text/html\n\n";
+
+print "<html><Body bgcolor ='white'><font size='3' face='Arial'><body>";
+
+  if ($mode ne "setdate") {
+
+	print qq~
+	
+
+<form name=clock action=$script_url method=post>	
+<input type=hidden name=mode and value=setdate>
+
+Current Alarm: $alarmfile OR $hourOpt:$minOpt $ampm
+<select name=hourOpt onChange="alarmSet()" size=1>
+<option value="00">00<option value="01">01<option value="02">02<option value="03">03
+<option value="04">04<option value="05">05<option value="06">06<option selected value="07">07
+<option value="08">08<option value="09">09<option value="10">10<option value="11">11
+<option value="12">12
+</option>
+</select> 
+<select name=minOpt onChange="alarmSet()" size=1>
+<option selected value="00">00<option value="05">05<option value="10">10<option value="15">15
+<option value="20">20<option value="25">25<option value="30">30<option value="35">35
+<option value="40">40<option value="45">45<option value="50">50<option value="55">55
+</option>
+</select>
+
+<input type=radio name=ampm value="AM" checked>AM
+<input type=radio name=ampm value="PM">PM
+
+
+<input type=submit value=setdate>\n</form>
+
+
+~;
+} else {
+
+	print "<br><P>SET DATE TO $hourOpt:$minOpt $ampm";
+
+&file_write($alarmfile, "$hourOpt:$minOpt $ampm");
+
+}
+	print "</body></html>";
+
+1;
diff --git a/web/newclock/calendar.js b/web/newclock/calendar.js
index 73dd5bddf..943e5ae69 100644
--- a/web/newclock/calendar.js
+++ b/web/newclock/calendar.js
@@ -1,176 +1,176 @@
-<!-- To install: 					-->
-<!-- Save this as "calendar.js" 			-->
-
-<!-- DO NOT TAKE THE FOLLOWING OUT OF THE CODE:		-->
-
-<!-------------------------------------------------------->
-<!--   AUTHOR: Bryan Gamble				-->
-<!--  PROGRAM: Calendar					-->
-<!--      URL: www.bmgamble.com  			-->
-<!--  UPDATED: 06.21.2004				-->
-<!-- Update includes more modification to fonts and colors--> 
-<!-------------------------------------------------------->
-
-<!--
-
-/************************************************************************
-GLOBAL VARIABLES FOR FORMATTING FONTS AND TEXT
-************************************************************************/
-/***********************
-COLORS
-***********************/
-var DATE_HIGHLIGHT_BACKGROUND		= '#DEDEFF';
-var DATE_HIGHLIGHT_COLOR		= '#555555';
-var DATE_HIGHLIGHT_BORDER_COLOR		= '#CCCCCC';
-var DAY_OF_WEEK_COLOR			= '#555555'; 
-var HIGHLIGHT_DAY_OF_WEEK		= '#555555';
-var DATE_COLOR				= '#555555';
-var MONTH_COLOR				= '#555555';
-var YEAR_COLOR				= '#555555';
-var MONTH_YEAR_BACKGROUND		= '#EEEEEE';
-var CALENDAR_BORDER_COLOR		= '#CCCCCC';
-var CALENDAR_BACKGROUND			= '#FFFFFF';
-
-/***********************
-FONTS
-***********************/
-var DATE_HIGHLIGHT_FONT			= 'Tahoma';
-var DAY_OF_WEEK_FONT			= 'Tahoma';
-var HIGHLIGHT_DAY_OF_WEEK_FONT		= 'Tahoma';
-var DATE_FONT				= 'Tahoma';
-var MONTH_FONT				= 'Tahoma';
-var YEAR_FONT				= 'Tahoma';
-
-/***********************
-FONT SIZES
-***********************/
-var DATE_HIGHLIGHT_SIZE			= 1;
-var DATE_HIGHLIGHT_BORDER_SIZE		= 1;
-var DATE_SIZE				= 1;
-var DAY_OF_WEEK_SIZE			= 1;
-var HIGHLIGHT_DAY_OF_WEEK_SIZE		= 1;
-var MONTH_SIZE				= 1;
-var YEAR_SIZE				= 1;
-var CALENDAR_BORDER_SIZE		= 1; 
-
-/*******************************
-SET ARRAYS
-*******************************/
-var day_of_week = new Array('Sun','Mon','Tue','Wed','Thu','Fri','Sat'); 
-var month_of_year = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
-
-/********************************
-DECLARE AND INITIALIZE VARIABLES
-********************************/
-var Calendar = new Date();
-
-var year = Calendar.getFullYear();	// Returns year
-var month = Calendar.getMonth();	// Returns month (0-11)
-var today = Calendar.getDate();		// Returns day (1-31)
-var weekday = Calendar.getDay();	// Returns day (1-31)
-
-var DAYS_OF_WEEK = 7;			// "constant" for number of days in a week
-var DAYS_OF_MONTH = 31;			// "constant" for number of days in a month
-var cal;				// Used for printing
-
-Calendar.setDate(1);			// Start the calendar day at '1'
-Calendar.setMonth(month);		// Start the calendar month at now
-
-
-var TR_start = '<TR>';
-var TR_end = '</TR>';
-var highlight_start = '<TD WIDTH="30"><TABLE CELLSPACING=0 BORDER="0" BGCOLOR="'+ DATE_HIGHLIGHT_BACKGROUND +'" BORDERCOLOR="' + DATE_HIGHLIGHT_BORDER_COLOR + '"><TR><TD WIDTH=20><B><CENTER>';
-var highlight_end   = '</CENTER></TD></TR></TABLE></B>';
-var TD_start = '<TD WIDTH="30" BACKGROUND="' + CALENDAR_BACKGROUND +'"><CENTER>';
-var TD_end = '</CENTER></TD>';
-
-/*************************************************************************
-BEGIN CODE FOR CALENDAR
-NOTE: You can format the 'BORDER', 'BGCOLOR', 'CELLPADDING', 'BORDERCOLOR'
-      tags to customize your caledanr's look. I used a style sheet on my
-      '.html' page to format the table fonts. You may just want to add it
-      in here.  If you have any trouble, just e-mail me at: 
-                      bryan_1978@yahoo.com
-*************************************************************************/
-cal =  '<TABLE BORDER="0" CELLSPACING=0 CELLPADDING=0 BORDERCOLOR="' + CALENDAR_BORDER_COLOR + '"><TR><TD>';
-cal += '<TABLE BORDER="0" CELLSPACING=0 CELLPADDING=2 BGCOLOR="' + CALENDAR_BACKGROUND + '">' + TR_start;
-cal += '<TD COLSPAN="' + DAYS_OF_WEEK + '" BGCOLOR="' + MONTH_YEAR_BACKGROUND + '"><CENTER><B>';
-cal += '<FONT COLOR="' + MONTH_COLOR + '" FACE="'+ MONTH_FONT +'" SIZE="'+ MONTH_SIZE +'">' + month_of_year[month]  + ' </FONT>&nbsp;&nbsp;' + '<FONT COLOR="' + YEAR_COLOR + '" FACE="'+ YEAR_FONT +'" SIZE="'+ YEAR_SIZE +'">' + year + '</B></FONT>' + TD_end + TR_end;
-cal += TR_start;
-
-
- /**********************************************************************
- ***********************************************************************
-                      DO NOT EDIT BELOW THIS POINT
- ***********************************************************************
- **********************************************************************/
-// LOOPS FOR EACH DAY OF WEEK
-for(index=0; index < DAYS_OF_WEEK; index++)
-{
-  // BOLD TODAY'S DAY OF WEEK
-  if(weekday == index){
-    cal += TD_start + '<B><FONT COLOR="' + HIGHLIGHT_DAY_OF_WEEK + '" FACE="'+ HIGHLIGHT_DAY_OF_WEEK_FONT +'" SIZE="'+ HIGHLIGHT_DAY_OF_WEEK_SIZE +'">' + day_of_week[index] + '</FONT></B>' + TD_end;
-  }
-
-  // PRINTS DAY
-  else{
-    cal += TD_start + '<FONT COLOR="' + DAY_OF_WEEK_COLOR + '" FACE="'+ DAY_OF_WEEK_FONT +'" SIZE="'+ DAY_OF_WEEK_SIZE +'">' + day_of_week[index] + '</FONT>' + TD_end;
-  }
-}
-
-cal += TD_end + TR_end;
-cal += TR_start;
-
-// FILL IN BLANK GAPS UNTIL TODAY'S DAY
-for(index=0; index < Calendar.getDay(); index++)
-  cal += TD_start + '&nbsp; ' + TD_end;
-
-// LOOPS FOR EACH DAY IN CALENDAR
-for(index=0; index < DAYS_OF_MONTH; index++)
-{
-  if( Calendar.getDate() > index )
-  {
-     // RETURNS THE NEXT DAY TO PRINT
-     week_day =Calendar.getDay();
-
-     // START NEW ROW FOR FIRST DAY OF WEEK
-     if(week_day == 0)
-       cal += TR_start; 
-  
-     if(week_day != DAYS_OF_WEEK)
-     { 		
-       // SET VARIABLE INSIDE LOOP FOR INCREMENTING PURPOSES	
-       var day  = Calendar.getDate();
-
-
-       // HIGHLIGHT TODAY'S DATE
-       if( today==Calendar.getDate() ){
-         cal += highlight_start + '<FONT COLOR="' + DATE_HIGHLIGHT_COLOR + '" FACE="'+ DATE_HIGHLIGHT_FONT +'" SIZE="'+ DATE_HIGHLIGHT_SIZE +'">' + day + '</FONT>' + highlight_end + TD_end;
-       }
-
-       // PRINTS DAY
-       else{  
-         cal += TD_start + '<FONT COLOR="' + DATE_COLOR + '" FACE="'+ DATE_FONT +'" SIZE="'+ DATE_SIZE +'">' +  day + '</FONT>' + TD_end;        
-       }
-
-      }
-
-      // END ROW FOR LAST DAY OF WEEK	 
-      if(week_day == DAYS_OF_WEEK)
-         cal += TR_end;
-   }
-
-   // INCREMENTS UNTIL END OF THE MONTH
-   Calendar.setDate(Calendar.getDate()+1);
-
-}// end for loop
-
-cal += '</TD></TR></TABLE></TABLE>';
-
-/*********************************
-PRINT CALENDAR
-********************************/
-document.write(cal);
-//-->
-	
+<!-- To install: 					-->
+<!-- Save this as "calendar.js" 			-->
+
+<!-- DO NOT TAKE THE FOLLOWING OUT OF THE CODE:		-->
+
+<!-------------------------------------------------------->
+<!--   AUTHOR: Bryan Gamble				-->
+<!--  PROGRAM: Calendar					-->
+<!--      URL: www.bmgamble.com  			-->
+<!--  UPDATED: 06.21.2004				-->
+<!-- Update includes more modification to fonts and colors--> 
+<!-------------------------------------------------------->
+
+<!--
+
+/************************************************************************
+GLOBAL VARIABLES FOR FORMATTING FONTS AND TEXT
+************************************************************************/
+/***********************
+COLORS
+***********************/
+var DATE_HIGHLIGHT_BACKGROUND		= '#DEDEFF';
+var DATE_HIGHLIGHT_COLOR		= '#555555';
+var DATE_HIGHLIGHT_BORDER_COLOR		= '#CCCCCC';
+var DAY_OF_WEEK_COLOR			= '#555555'; 
+var HIGHLIGHT_DAY_OF_WEEK		= '#555555';
+var DATE_COLOR				= '#555555';
+var MONTH_COLOR				= '#555555';
+var YEAR_COLOR				= '#555555';
+var MONTH_YEAR_BACKGROUND		= '#EEEEEE';
+var CALENDAR_BORDER_COLOR		= '#CCCCCC';
+var CALENDAR_BACKGROUND			= '#FFFFFF';
+
+/***********************
+FONTS
+***********************/
+var DATE_HIGHLIGHT_FONT			= 'Tahoma';
+var DAY_OF_WEEK_FONT			= 'Tahoma';
+var HIGHLIGHT_DAY_OF_WEEK_FONT		= 'Tahoma';
+var DATE_FONT				= 'Tahoma';
+var MONTH_FONT				= 'Tahoma';
+var YEAR_FONT				= 'Tahoma';
+
+/***********************
+FONT SIZES
+***********************/
+var DATE_HIGHLIGHT_SIZE			= 1;
+var DATE_HIGHLIGHT_BORDER_SIZE		= 1;
+var DATE_SIZE				= 1;
+var DAY_OF_WEEK_SIZE			= 1;
+var HIGHLIGHT_DAY_OF_WEEK_SIZE		= 1;
+var MONTH_SIZE				= 1;
+var YEAR_SIZE				= 1;
+var CALENDAR_BORDER_SIZE		= 1; 
+
+/*******************************
+SET ARRAYS
+*******************************/
+var day_of_week = new Array('Sun','Mon','Tue','Wed','Thu','Fri','Sat'); 
+var month_of_year = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
+
+/********************************
+DECLARE AND INITIALIZE VARIABLES
+********************************/
+var Calendar = new Date();
+
+var year = Calendar.getFullYear();	// Returns year
+var month = Calendar.getMonth();	// Returns month (0-11)
+var today = Calendar.getDate();		// Returns day (1-31)
+var weekday = Calendar.getDay();	// Returns day (1-31)
+
+var DAYS_OF_WEEK = 7;			// "constant" for number of days in a week
+var DAYS_OF_MONTH = 31;			// "constant" for number of days in a month
+var cal;				// Used for printing
+
+Calendar.setDate(1);			// Start the calendar day at '1'
+Calendar.setMonth(month);		// Start the calendar month at now
+
+
+var TR_start = '<TR>';
+var TR_end = '</TR>';
+var highlight_start = '<TD WIDTH="30"><TABLE CELLSPACING=0 BORDER="0" BGCOLOR="'+ DATE_HIGHLIGHT_BACKGROUND +'" BORDERCOLOR="' + DATE_HIGHLIGHT_BORDER_COLOR + '"><TR><TD WIDTH=20><B><CENTER>';
+var highlight_end   = '</CENTER></TD></TR></TABLE></B>';
+var TD_start = '<TD WIDTH="30" BACKGROUND="' + CALENDAR_BACKGROUND +'"><CENTER>';
+var TD_end = '</CENTER></TD>';
+
+/*************************************************************************
+BEGIN CODE FOR CALENDAR
+NOTE: You can format the 'BORDER', 'BGCOLOR', 'CELLPADDING', 'BORDERCOLOR'
+      tags to customize your caledanr's look. I used a style sheet on my
+      '.html' page to format the table fonts. You may just want to add it
+      in here.  If you have any trouble, just e-mail me at: 
+                      bryan_1978@yahoo.com
+*************************************************************************/
+cal =  '<TABLE BORDER="0" CELLSPACING=0 CELLPADDING=0 BORDERCOLOR="' + CALENDAR_BORDER_COLOR + '"><TR><TD>';
+cal += '<TABLE BORDER="0" CELLSPACING=0 CELLPADDING=2 BGCOLOR="' + CALENDAR_BACKGROUND + '">' + TR_start;
+cal += '<TD COLSPAN="' + DAYS_OF_WEEK + '" BGCOLOR="' + MONTH_YEAR_BACKGROUND + '"><CENTER><B>';
+cal += '<FONT COLOR="' + MONTH_COLOR + '" FACE="'+ MONTH_FONT +'" SIZE="'+ MONTH_SIZE +'">' + month_of_year[month]  + ' </FONT>&nbsp;&nbsp;' + '<FONT COLOR="' + YEAR_COLOR + '" FACE="'+ YEAR_FONT +'" SIZE="'+ YEAR_SIZE +'">' + year + '</B></FONT>' + TD_end + TR_end;
+cal += TR_start;
+
+
+ /**********************************************************************
+ ***********************************************************************
+                      DO NOT EDIT BELOW THIS POINT
+ ***********************************************************************
+ **********************************************************************/
+// LOOPS FOR EACH DAY OF WEEK
+for(index=0; index < DAYS_OF_WEEK; index++)
+{
+  // BOLD TODAY'S DAY OF WEEK
+  if(weekday == index){
+    cal += TD_start + '<B><FONT COLOR="' + HIGHLIGHT_DAY_OF_WEEK + '" FACE="'+ HIGHLIGHT_DAY_OF_WEEK_FONT +'" SIZE="'+ HIGHLIGHT_DAY_OF_WEEK_SIZE +'">' + day_of_week[index] + '</FONT></B>' + TD_end;
+  }
+
+  // PRINTS DAY
+  else{
+    cal += TD_start + '<FONT COLOR="' + DAY_OF_WEEK_COLOR + '" FACE="'+ DAY_OF_WEEK_FONT +'" SIZE="'+ DAY_OF_WEEK_SIZE +'">' + day_of_week[index] + '</FONT>' + TD_end;
+  }
+}
+
+cal += TD_end + TR_end;
+cal += TR_start;
+
+// FILL IN BLANK GAPS UNTIL TODAY'S DAY
+for(index=0; index < Calendar.getDay(); index++)
+  cal += TD_start + '&nbsp; ' + TD_end;
+
+// LOOPS FOR EACH DAY IN CALENDAR
+for(index=0; index < DAYS_OF_MONTH; index++)
+{
+  if( Calendar.getDate() > index )
+  {
+     // RETURNS THE NEXT DAY TO PRINT
+     week_day =Calendar.getDay();
+
+     // START NEW ROW FOR FIRST DAY OF WEEK
+     if(week_day == 0)
+       cal += TR_start; 
+  
+     if(week_day != DAYS_OF_WEEK)
+     { 		
+       // SET VARIABLE INSIDE LOOP FOR INCREMENTING PURPOSES	
+       var day  = Calendar.getDate();
+
+
+       // HIGHLIGHT TODAY'S DATE
+       if( today==Calendar.getDate() ){
+         cal += highlight_start + '<FONT COLOR="' + DATE_HIGHLIGHT_COLOR + '" FACE="'+ DATE_HIGHLIGHT_FONT +'" SIZE="'+ DATE_HIGHLIGHT_SIZE +'">' + day + '</FONT>' + highlight_end + TD_end;
+       }
+
+       // PRINTS DAY
+       else{  
+         cal += TD_start + '<FONT COLOR="' + DATE_COLOR + '" FACE="'+ DATE_FONT +'" SIZE="'+ DATE_SIZE +'">' +  day + '</FONT>' + TD_end;        
+       }
+
+      }
+
+      // END ROW FOR LAST DAY OF WEEK	 
+      if(week_day == DAYS_OF_WEEK)
+         cal += TR_end;
+   }
+
+   // INCREMENTS UNTIL END OF THE MONTH
+   Calendar.setDate(Calendar.getDate()+1);
+
+}// end for loop
+
+cal += '</TD></TR></TABLE></TABLE>';
+
+/*********************************
+PRINT CALENDAR
+********************************/
+document.write(cal);
+//-->
+	
 	
\ No newline at end of file
diff --git a/web/newclock/index.html b/web/newclock/index.html
index 661e3d3f0..c3d657b89 100644
--- a/web/newclock/index.html
+++ b/web/newclock/index.html
@@ -1,217 +1,217 @@
-<HEAD>
-<TITLE>CME House</TITLE>
-<meta HTTP-EQUIV='Refresh' CONTENT='3600;URL=index.html'>
-
-<SCRIPT LANGUAGE="JavaScript">
-<!-- The JavaScript Source!! http://javascript.internet.com -->
-
-<!-- Begin   function extract(h,m,s,type) {
-
-var dn;
-c1 = new Image(); c1.src = "numbers2/c1.gif";
-c2 = new Image(); c2.src = "numbers2/c2.gif";
-c3 = new Image(); c3.src = "numbers2/c3.gif";
-c4 = new Image(); c4.src = "numbers2/c4.gif";
-c5 = new Image(); c5.src = "numbers2/c5.gif";
-c6 = new Image(); c6.src = "numbers2/c6.gif";
-c7 = new Image(); c7.src = "numbers2/c7.gif";
-c8 = new Image(); c8.src = "numbers2/c8.gif";
-c9 = new Image(); c9.src = "numbers2/c9.gif";
-c0 = new Image(); c0.src = "numbers2/c0.gif";
-cb = new Image(); cb.src = "numbers2/cb.gif";
-cam = new Image(); cam.src = "numbers2/cam.gif";
-cpm = new Image(); cpm.src = "numbers2/cpm.gif";
-function extract(h,m,s,type) {
-if (!document.images) return;
-if (h <= 9) {
-document.images.a.src = cb.src;
-document.images.b.src = eval("c"+h+".src");
-}
-else {
-document.images.a.src = eval("c"+Math.floor(h/10)+".src");
-document.images.b.src = eval("c"+(h%10)+".src");
-}
-if (m <= 9) {
-document.images.d.src = c0.src;
-document.images.e.src = eval("c"+m+".src");
-}
-else {
-document.images.d.src = eval("c"+Math.floor(m/10)+".src");
-document.images.e.src = eval("c"+(m%10)+".src");
-}
-if (s <= 9) {
-document.g.src = c0.src;
-document.images.h.src = eval("c"+s+".src");
-}
-else {
-document.images.g.src = eval("c"+Math.floor(s/10)+".src");
-document.images.h.src = eval("c"+(s%10)+".src");
-}
-if (dn == "AM") document.j.src = cam.src;
-else document.images.j.src = cpm.src;
-}
-function show3() {
-if (!document.images)
-return;
-var Digital = new Date();
-var hours = Digital.getHours();
-var minutes = Digital.getMinutes();
-var seconds = Digital.getSeconds();
-dn = "AM";
-if ((hours >= 12) && (minutes >= 1) || (hours >= 13)) {
-dn = "PM";
-hours = hours-12;
-}
-if (hours == 0)
-hours = 12;
-extract(hours, minutes, seconds, dn);
-setTimeout("show3()", 1000);
-}
-//  End -->
-</script>
-</HEAD>
-
-<BODY onLoad="show3()" bgcolor="#FFFFFF">
-
-<center><table width="550" border=0>
+<HEAD>
+<TITLE>CME House</TITLE>
+<meta HTTP-EQUIV='Refresh' CONTENT='3600;URL=index.html'>
+
+<SCRIPT LANGUAGE="JavaScript">
+<!-- The JavaScript Source!! http://javascript.internet.com -->
+
+<!-- Begin   function extract(h,m,s,type) {
+
+var dn;
+c1 = new Image(); c1.src = "numbers2/c1.gif";
+c2 = new Image(); c2.src = "numbers2/c2.gif";
+c3 = new Image(); c3.src = "numbers2/c3.gif";
+c4 = new Image(); c4.src = "numbers2/c4.gif";
+c5 = new Image(); c5.src = "numbers2/c5.gif";
+c6 = new Image(); c6.src = "numbers2/c6.gif";
+c7 = new Image(); c7.src = "numbers2/c7.gif";
+c8 = new Image(); c8.src = "numbers2/c8.gif";
+c9 = new Image(); c9.src = "numbers2/c9.gif";
+c0 = new Image(); c0.src = "numbers2/c0.gif";
+cb = new Image(); cb.src = "numbers2/cb.gif";
+cam = new Image(); cam.src = "numbers2/cam.gif";
+cpm = new Image(); cpm.src = "numbers2/cpm.gif";
+function extract(h,m,s,type) {
+if (!document.images) return;
+if (h <= 9) {
+document.images.a.src = cb.src;
+document.images.b.src = eval("c"+h+".src");
+}
+else {
+document.images.a.src = eval("c"+Math.floor(h/10)+".src");
+document.images.b.src = eval("c"+(h%10)+".src");
+}
+if (m <= 9) {
+document.images.d.src = c0.src;
+document.images.e.src = eval("c"+m+".src");
+}
+else {
+document.images.d.src = eval("c"+Math.floor(m/10)+".src");
+document.images.e.src = eval("c"+(m%10)+".src");
+}
+if (s <= 9) {
+document.g.src = c0.src;
+document.images.h.src = eval("c"+s+".src");
+}
+else {
+document.images.g.src = eval("c"+Math.floor(s/10)+".src");
+document.images.h.src = eval("c"+(s%10)+".src");
+}
+if (dn == "AM") document.j.src = cam.src;
+else document.images.j.src = cpm.src;
+}
+function show3() {
+if (!document.images)
+return;
+var Digital = new Date();
+var hours = Digital.getHours();
+var minutes = Digital.getMinutes();
+var seconds = Digital.getSeconds();
+dn = "AM";
+if ((hours >= 12) && (minutes >= 1) || (hours >= 13)) {
+dn = "PM";
+hours = hours-12;
+}
+if (hours == 0)
+hours = 12;
+extract(hours, minutes, seconds, dn);
+setTimeout("show3()", 1000);
+}
+//  End -->
+</script>
+</HEAD>
+
+<BODY onLoad="show3()" bgcolor="#FFFFFF">
+
+<center><table width="550" border=0>
 <tr><td>
-<! -------------------- Mr. House Logo ------------------------>
-<a href="/" target="_parent"><img src="img/logo.gif" height=45 width=120 border="0"></a>
-</td></tr>
-<tr><td>
-<table width="550" border=0><tr>
+<! -------------------- Mr. House Logo ------------------------>
+<a href="/" target="_parent"><img src="img/logo.gif" height=45 width=120 border="0"></a>
+</td></tr>
+<tr><td>
+<table width="550" border=0><tr>
 <td>
 <! -------------------- Alarm Clock Button .pl ---------------->
-
-<a href='index.pl'  target='_top'><img src="img/a_on.gif" height=30 width=80 border="0"</a></td>
+
+<a href='index.pl'  target='_top'><img src="img/a_on.gif" height=30 width=80 border="0"</a></td>
 <td>
-<! -------------------- Clock ---------------------------------->
-<center>
-<img height=80 src="numbers2/cb.gif" width=50 name=a>
-<img height=80 src="numbers2/cb.gif" width=50 name=b>
-<img height=60 src="numbers2/colon.gif" width=34 name=c>
-<img height=80 src="numbers2/cb.gif" width=50 name=d>
-<img height=80 src="numbers2/cb.gif" width=50 name=e>
-<img height=60 src="numbers2/colon.gif" width=30 name=f>
-<img height=45 src="numbers2/cb.gif" width=30 name=g>
-<img height=45 src="numbers2/cb.gif" width=30 name=h>
-<img height=45 src="numbers2/cam.gif" width=30 name=j>
-</center>
-</td>
-</tr></table>
-</td></tr>
-<tr><td><hr></hr></td></tr>
-<tr><td><img src='numbers/text.gif' border=0></td></tr>
-<tr><td>
-
-<table width="500" border=0>
-<tr><td width="70" > 
-<script language=javascript>
-<!-----------------------------------MONTH --------------------->
-nctDay= new Date();
-var month = nctDay.getMonth()+1;
-
-var numberofimagesm = 12;
-imagesm = new Array(numberofimagesm+1);
-imagesm[1] = "<img src='numbers/m1.gif' height=45 width=60>";
-imagesm[2] = "<img src='numbers/m2.gif' height=45 width=60>";
-imagesm[3] = "<img src='numbers/m3.gif' height=45 width=60>";
-imagesm[4] = "<img src='numbers/m4.gif' height=45 width=60>";
-imagesm[5] = "<img src='numbers/m5.gif' height=45 width=60>";
-imagesm[6] = "<img src='numbers/m6.gif' height=45 width=60>";
-imagesm[7] = "<img src='numbers/m7.gif' height=45 width=60>";
-imagesm[8] = "<img src='numbers/m8.gif' height=45 width=60>";
-imagesm[9] = "<img src='numbers/m9.gif' height=45 width=60>";
-imagesm[10] = "<img src='numbers/m10.gif' height=45 width=60>";
-imagesm[11] = "<img src='numbers/m11.gif' height=45 width=60>";
-imagesm[12] = "<img src='numbers/m12.gif' height=45 width=60>";
-document.write(imagesm[month]);
-//-->
-</script>
-</td>
-
-<td width="70" > 
-<script language=javascript>
-<!-----------------------------------DATE------------------------>
-
-var curdate = new Date()
-var mday = curdate.getDate()
-
-var dateimages = 31;
-images = new Array(dateimages+1);
-images[1] = "<img src='numbers/date/1.gif' height=45 width=60>";
-images[2] = "<img src='numbers/date/2.gif' height=45 width=60>";
-images[3] = "<img src='numbers/date/3.gif' height=45 width=60>";
-images[4] = "<img src='numbers/date/4.gif' height=45 width=60>";
-images[5] = "<img src='numbers/date/5.gif' height=45 width=60>";
-images[6] = "<img src='numbers/date/6.gif' height=45 width=60>";
-images[7] = "<img src='numbers/date/7.gif' height=45 width=60>";
-images[8] = "<img src='numbers/date/8.gif' height=45 width=60>";
-images[9] = "<img src='numbers/date/9.gif' height=45 width=60>";
-images[10] = "<img src='numbers/date/10.gif' height=45 width=60>";
-images[11] = "<img src='numbers/date/11.gif' height=45 width=60>";
-images[12] = "<img src='numbers/date/12.gif' height=45 width=60>";
-images[13] = "<img src='numbers/date/13.gif' height=45 width=60>";
-images[14] = "<img src='numbers/date/14.gif' height=45 width=60>";
-images[15] = "<img src='numbers/date/15.gif' height=45 width=60>";
-images[16] = "<img src='numbers/date/16.gif' height=45 width=60>";
-images[17] = "<img src='numbers/date/17.gif' height=45 width=60>";
-images[18] = "<img src='numbers/date/18.gif' height=45 width=60>";
-images[19] = "<img src='numbers/date/19.gif' height=45 width=60>";
-images[20] = "<img src='numbers/date/20.gif' height=45 width=60>";
-images[21] = "<img src='numbers/date/21.gif' height=45 width=60>";
-images[22] = "<img src='numbers/date/22.gif' height=45 width=60>";
-images[23] = "<img src='numbers/date/23.gif' height=45 width=60>";
-images[24] = "<img src='numbers/date/24.gif' height=45 width=60>";
-images[25] = "<img src='numbers/date/25.gif' height=45 width=60>";
-images[26] = "<img src='numbers/date/26.gif' height=45 width=60>";
-images[27] = "<img src='numbers/date/27.gif' height=45 width=60>";
-images[28] = "<img src='numbers/date/28.gif' height=45 width=60>";
-images[29] = "<img src='numbers/date/29.gif' height=45 width=60>";
-images[30] = "<img src='numbers/date/30.gif' height=45 width=60>";
-images[31] = "<img src='numbers/date/31.gif' height=45 width=60>";
-document.write(images[mday]);
-//-->
-</script>
-</td>
-
-<td width="70" >   
-<script language=javascript>
-<!-----------------------------------WEEK------------------------->
-nctday=new Date();
-day=nctday.getDay();
-
-var numberofimages = 7;
-images = new Array(numberofimages+1);
-images[0] = "<img src='numbers/w0.gif' height=45 width=60>";
-images[1] = "<img src='numbers/w1.gif' height=45 width=60>";
-images[2] = "<img src='numbers/w2.gif' height=45 width=60>";
-images[3] = "<img src='numbers/w3.gif' height=45 width=60>";
-images[4] = "<img src='numbers/w4.gif' height=45 width=60>";
-images[5] = "<img src='numbers/w5.gif' height=45 width=60>";
-images[6] = "<img src='numbers/w6.gif' height=45 width=60>";
-document.write(images[day]);
-//-->
+<! -------------------- Clock ---------------------------------->
+<center>
+<img height=80 src="numbers2/cb.gif" width=50 name=a>
+<img height=80 src="numbers2/cb.gif" width=50 name=b>
+<img height=60 src="numbers2/colon.gif" width=34 name=c>
+<img height=80 src="numbers2/cb.gif" width=50 name=d>
+<img height=80 src="numbers2/cb.gif" width=50 name=e>
+<img height=60 src="numbers2/colon.gif" width=30 name=f>
+<img height=45 src="numbers2/cb.gif" width=30 name=g>
+<img height=45 src="numbers2/cb.gif" width=30 name=h>
+<img height=45 src="numbers2/cam.gif" width=30 name=j>
+</center>
+</td>
+</tr></table>
+</td></tr>
+<tr><td><hr></hr></td></tr>
+<tr><td><img src='numbers/text.gif' border=0></td></tr>
+<tr><td>
+
+<table width="500" border=0>
+<tr><td width="70" > 
+<script language=javascript>
+<!-----------------------------------MONTH --------------------->
+nctDay= new Date();
+var month = nctDay.getMonth()+1;
+
+var numberofimagesm = 12;
+imagesm = new Array(numberofimagesm+1);
+imagesm[1] = "<img src='numbers/m1.gif' height=45 width=60>";
+imagesm[2] = "<img src='numbers/m2.gif' height=45 width=60>";
+imagesm[3] = "<img src='numbers/m3.gif' height=45 width=60>";
+imagesm[4] = "<img src='numbers/m4.gif' height=45 width=60>";
+imagesm[5] = "<img src='numbers/m5.gif' height=45 width=60>";
+imagesm[6] = "<img src='numbers/m6.gif' height=45 width=60>";
+imagesm[7] = "<img src='numbers/m7.gif' height=45 width=60>";
+imagesm[8] = "<img src='numbers/m8.gif' height=45 width=60>";
+imagesm[9] = "<img src='numbers/m9.gif' height=45 width=60>";
+imagesm[10] = "<img src='numbers/m10.gif' height=45 width=60>";
+imagesm[11] = "<img src='numbers/m11.gif' height=45 width=60>";
+imagesm[12] = "<img src='numbers/m12.gif' height=45 width=60>";
+document.write(imagesm[month]);
+//-->
+</script>
+</td>
+
+<td width="70" > 
+<script language=javascript>
+<!-----------------------------------DATE------------------------>
+
+var curdate = new Date()
+var mday = curdate.getDate()
+
+var dateimages = 31;
+images = new Array(dateimages+1);
+images[1] = "<img src='numbers/date/1.gif' height=45 width=60>";
+images[2] = "<img src='numbers/date/2.gif' height=45 width=60>";
+images[3] = "<img src='numbers/date/3.gif' height=45 width=60>";
+images[4] = "<img src='numbers/date/4.gif' height=45 width=60>";
+images[5] = "<img src='numbers/date/5.gif' height=45 width=60>";
+images[6] = "<img src='numbers/date/6.gif' height=45 width=60>";
+images[7] = "<img src='numbers/date/7.gif' height=45 width=60>";
+images[8] = "<img src='numbers/date/8.gif' height=45 width=60>";
+images[9] = "<img src='numbers/date/9.gif' height=45 width=60>";
+images[10] = "<img src='numbers/date/10.gif' height=45 width=60>";
+images[11] = "<img src='numbers/date/11.gif' height=45 width=60>";
+images[12] = "<img src='numbers/date/12.gif' height=45 width=60>";
+images[13] = "<img src='numbers/date/13.gif' height=45 width=60>";
+images[14] = "<img src='numbers/date/14.gif' height=45 width=60>";
+images[15] = "<img src='numbers/date/15.gif' height=45 width=60>";
+images[16] = "<img src='numbers/date/16.gif' height=45 width=60>";
+images[17] = "<img src='numbers/date/17.gif' height=45 width=60>";
+images[18] = "<img src='numbers/date/18.gif' height=45 width=60>";
+images[19] = "<img src='numbers/date/19.gif' height=45 width=60>";
+images[20] = "<img src='numbers/date/20.gif' height=45 width=60>";
+images[21] = "<img src='numbers/date/21.gif' height=45 width=60>";
+images[22] = "<img src='numbers/date/22.gif' height=45 width=60>";
+images[23] = "<img src='numbers/date/23.gif' height=45 width=60>";
+images[24] = "<img src='numbers/date/24.gif' height=45 width=60>";
+images[25] = "<img src='numbers/date/25.gif' height=45 width=60>";
+images[26] = "<img src='numbers/date/26.gif' height=45 width=60>";
+images[27] = "<img src='numbers/date/27.gif' height=45 width=60>";
+images[28] = "<img src='numbers/date/28.gif' height=45 width=60>";
+images[29] = "<img src='numbers/date/29.gif' height=45 width=60>";
+images[30] = "<img src='numbers/date/30.gif' height=45 width=60>";
+images[31] = "<img src='numbers/date/31.gif' height=45 width=60>";
+document.write(images[mday]);
+//-->
+</script>
+</td>
+
+<td width="70" >   
+<script language=javascript>
+<!-----------------------------------WEEK------------------------->
+nctday=new Date();
+day=nctday.getDay();
+
+var numberofimages = 7;
+images = new Array(numberofimages+1);
+images[0] = "<img src='numbers/w0.gif' height=45 width=60>";
+images[1] = "<img src='numbers/w1.gif' height=45 width=60>";
+images[2] = "<img src='numbers/w2.gif' height=45 width=60>";
+images[3] = "<img src='numbers/w3.gif' height=45 width=60>";
+images[4] = "<img src='numbers/w4.gif' height=45 width=60>";
+images[5] = "<img src='numbers/w5.gif' height=45 width=60>";
+images[6] = "<img src='numbers/w6.gif' height=45 width=60>";
+document.write(images[day]);
+//-->
 </script> 
-
+
 <!------------------Insert Temperature ( numbers/date/temp.gif saved by URL_get_weather.pl in code dir------------>
-
-</td>
-<td width="70" > <img src='numbers/date/temp.gif' height=45 width=60><img src='numbers2/celc.gif' height=35 width=40>
-</td></tr></table>
-</td></tr>
-<tr><td>
+
+</td>
+<td width="70" > <img src='numbers/date/temp.gif' height=45 width=60><img src='numbers2/celc.gif' height=35 width=40>
+</td></tr></table>
+</td></tr>
+<tr><td>
 <table width="100%" border=0>
 
 <!-----------------------------------Insert Calendar.js------------>
-
+
 <tr><td width="40%"><SCRIPT SRC="calendar.js"></SCRIPT></td><td>
 
 <!----------Insert Earth Map (Updated every hour each month (So as not to tax earth server) ------>
 <!----------See "http://www.fourmilab.ch/earthview" for more information about earth viewer ------>
-
-<center><a href='/'  target='_top'> <img src='./maps/earth.jpg' width='250' height='120' border=0></a>
-</td></tr></table>
-</td></tr></table>
-</BODY>
-</HTML>
+
+<center><a href='/'  target='_top'> <img src='./maps/earth.jpg' width='250' height='120' border=0></a>
+</td></tr></table>
+</td></tr></table>
+</BODY>
+</HTML>
diff --git a/web/newclock/index.pl b/web/newclock/index.pl
index f73215d1e..4786ab1f3 100644
--- a/web/newclock/index.pl
+++ b/web/newclock/index.pl
@@ -1,170 +1,170 @@
-#!/usr/bin/perl
-
-
-use CGI;
-my $query = new CGI ;
-my $mode = $query->param("mode");
-my $hourOpt = $query->param("hourOpt");
-my $minOpt = $query->param("minOpt");
-my $ampm = $query->param("ampm");
-
-my $alarmfile = "C:/mh/data/web/data_clock.txt";
-
-my $alarmtime = file_read $alarmfile;
-
-my $script_url = "/clock/index.pl";
-
-print "Content-Type: text/html\n\n";
-
-print "<html><Body bgcolor ='white'><font size='3' face='Arial'><body>";
-
-  if ($mode ne "setdate") {
-
-	print qq~
-
-
-<HEAD>
-<TITLE>CME House</TITLE>
-<meta HTTP-EQUIV='Refresh' CONTENT='3600;URL=index.pl'>
-
-<SCRIPT LANGUAGE='JavaScript'>
-<!-- The JavaScript Source!! http://javascript.internet.com -->
-
-<!-- Begin   function extract(h,m,s,type) {
-
-var dn;
-c1 = new Image(); c1.src = 'numbers2/c1.gif';
-c2 = new Image(); c2.src = 'numbers2/c2.gif';
-c3 = new Image(); c3.src = 'numbers2/c3.gif';
-c4 = new Image(); c4.src = 'numbers2/c4.gif';
-c5 = new Image(); c5.src = 'numbers2/c5.gif';
-c6 = new Image(); c6.src = 'numbers2/c6.gif';
-c7 = new Image(); c7.src = 'numbers2/c7.gif';
-c8 = new Image(); c8.src = 'numbers2/c8.gif';
-c9 = new Image(); c9.src = 'numbers2/c9.gif';
-c0 = new Image(); c0.src = 'numbers2/c0.gif';
-cb = new Image(); cb.src = 'numbers2/cb.gif';
-cam = new Image(); cam.src = 'numbers2/cam.gif';
-cpm = new Image(); cpm.src = 'numbers2/cpm.gif';
-function extract(h,m,s,type) {
-if (!document.images) return;
-if (h <= 9) {
-document.images.a.src = cb.src;
-document.images.b.src = eval('c'+h+'.src');
-}
-else {
-document.images.a.src = eval('c'+Math.floor(h/10)+'.src');
-document.images.b.src = eval('c'+(h%10)+'.src');
-}
-if (m <= 9) {
-document.images.d.src = c0.src;
-document.images.e.src = eval('c'+m+'.src');
-}
-else {
-document.images.d.src = eval('c'+Math.floor(m/10)+'.src');
-document.images.e.src = eval('c'+(m%10)+'.src');
-}
-if (s <= 9) {
-document.g.src = c0.src;
-document.images.h.src = eval('c'+s+'.src');
-}
-else {
-document.images.g.src = eval('c'+Math.floor(s/10)+'.src');
-document.images.h.src = eval('c'+(s%10)+'.src');
-}
-if (dn == 'AM') document.j.src = cam.src;
-else document.images.j.src = cpm.src;
-}
-function show3() {
-if (!document.images)
-return;
-var Digital = new Date();
-var hours = Digital.getHours();
-var minutes = Digital.getMinutes();
-var seconds = Digital.getSeconds();
-dn = 'AM';
-if ((hours >= 12) && (minutes >= 1) || (hours >= 13)) {
-dn = 'PM';
-hours = hours-12;
-}
-if (hours == 0)
-hours = 12;
-extract(hours, minutes, seconds, dn);
-setTimeout('show3()', 1000);
-}
-//  End -->
-</script>
-</HEAD>
-
-<BODY onLoad='show3()' bgcolor='#FFFFFF'>
-
-<center><table width='500' border=0>
-<tr><td><a href='/ia5/' target='_parent'><img src='img/logo.gif' alt='Reload Page' height=45 width=120 border='0'></a></td></tr>
-
-<tr><td>
-<center>
-<img height=80 src='numbers2/cb.gif' width=50 name=a>
-<img height=80 src='numbers2/cb.gif' width=50 name=b>
-<img height=60 src='numbers2/colon.gif' width=34 name=c>
-<img height=80 src='numbers2/cb.gif' width=50 name=d>
-<img height=80 src='numbers2/cb.gif' width=50 name=e>
-<img height=60 src='numbers2/colon.gif' width=30 name=f>
-<img height=45 src='numbers2/cb.gif' width=30 name=g>
-<img height=45 src='numbers2/cb.gif' width=30 name=h>
-<img height=45 src='numbers2/cam.gif' width=30 name=j>
-</center>
-</td></tr>
-<tr><td><hr></hr></td></tr>
-<tr><td>
-<center>
-<form name=clock action=$script_url method=post>	
-<input type=hidden name=mode and value=setdate>
-
-<B><font size='6'><face='Arial'><FONT COLOR="#555555">Current Alarm: $alarmtime<br></font>
-<font size='3'><select name=hourOpt onChange="alarmSet()" size=1>
-<option value="00">00<option value="01">01<option value="02">02<option value="03">03
-<option value="04">04<option value="05">05<option value="06">06<option selected value="07">07
-<option value="08">08<option value="09">09<option value="10">10<option value="11">11
-<option value="12">12
-</option>
-</select> 
-<select name=minOpt onChange="alarmSet()" size=1>
-<option value="00">00<option value="05">05<option value="10">10<option value="15">15
-<option value="20">20<option value="25">25<option value="30">30<option value="35">35
-<option value="40">40<option selected value="45">45<option value="50">50<option value="55">55
-</option>
-</select>
-
-<input type=radio name=ampm value="AM" checked>AM
-<input type=radio name=ampm value="PM">PM
-
-
-<input type=submit value=setdate>\n</form>
-
-
-
-</td></tr>
-<tr><td>
-<table width='100%' border=0>
-<tr><td width='40%'><SCRIPT SRC='calendar.js'></SCRIPT></td><td>
-<center><a href='/'  target='_top'> <img src='./maps/earth.jpg' width='250' height='120' border=0></a>
-</td></tr></table>
-</td></tr></table>
-</BODY>
-</HTML>
-~;
-
-} else {
-
-print "<html><meta HTTP-EQUIV='Refresh' CONTENT='4;URL=index.html'>";
-print "<Body bgcolor ='white'><font size='6' face='Arial'><body>";
-print "<center><br><P>SET DATE TO $hourOpt:$minOpt $ampm";
-print "</body></html>";
-
-&file_write($alarmfile, "$hourOpt:$minOpt $ampm");
-
-}
-	
-
-1;
-
+#!/usr/bin/perl
+
+
+use CGI;
+my $query = new CGI ;
+my $mode = $query->param("mode");
+my $hourOpt = $query->param("hourOpt");
+my $minOpt = $query->param("minOpt");
+my $ampm = $query->param("ampm");
+
+my $alarmfile = "C:/mh/data/web/data_clock.txt";
+
+my $alarmtime = file_read $alarmfile;
+
+my $script_url = "/clock/index.pl";
+
+print "Content-Type: text/html\n\n";
+
+print "<html><Body bgcolor ='white'><font size='3' face='Arial'><body>";
+
+  if ($mode ne "setdate") {
+
+	print qq~
+
+
+<HEAD>
+<TITLE>CME House</TITLE>
+<meta HTTP-EQUIV='Refresh' CONTENT='3600;URL=index.pl'>
+
+<SCRIPT LANGUAGE='JavaScript'>
+<!-- The JavaScript Source!! http://javascript.internet.com -->
+
+<!-- Begin   function extract(h,m,s,type) {
+
+var dn;
+c1 = new Image(); c1.src = 'numbers2/c1.gif';
+c2 = new Image(); c2.src = 'numbers2/c2.gif';
+c3 = new Image(); c3.src = 'numbers2/c3.gif';
+c4 = new Image(); c4.src = 'numbers2/c4.gif';
+c5 = new Image(); c5.src = 'numbers2/c5.gif';
+c6 = new Image(); c6.src = 'numbers2/c6.gif';
+c7 = new Image(); c7.src = 'numbers2/c7.gif';
+c8 = new Image(); c8.src = 'numbers2/c8.gif';
+c9 = new Image(); c9.src = 'numbers2/c9.gif';
+c0 = new Image(); c0.src = 'numbers2/c0.gif';
+cb = new Image(); cb.src = 'numbers2/cb.gif';
+cam = new Image(); cam.src = 'numbers2/cam.gif';
+cpm = new Image(); cpm.src = 'numbers2/cpm.gif';
+function extract(h,m,s,type) {
+if (!document.images) return;
+if (h <= 9) {
+document.images.a.src = cb.src;
+document.images.b.src = eval('c'+h+'.src');
+}
+else {
+document.images.a.src = eval('c'+Math.floor(h/10)+'.src');
+document.images.b.src = eval('c'+(h%10)+'.src');
+}
+if (m <= 9) {
+document.images.d.src = c0.src;
+document.images.e.src = eval('c'+m+'.src');
+}
+else {
+document.images.d.src = eval('c'+Math.floor(m/10)+'.src');
+document.images.e.src = eval('c'+(m%10)+'.src');
+}
+if (s <= 9) {
+document.g.src = c0.src;
+document.images.h.src = eval('c'+s+'.src');
+}
+else {
+document.images.g.src = eval('c'+Math.floor(s/10)+'.src');
+document.images.h.src = eval('c'+(s%10)+'.src');
+}
+if (dn == 'AM') document.j.src = cam.src;
+else document.images.j.src = cpm.src;
+}
+function show3() {
+if (!document.images)
+return;
+var Digital = new Date();
+var hours = Digital.getHours();
+var minutes = Digital.getMinutes();
+var seconds = Digital.getSeconds();
+dn = 'AM';
+if ((hours >= 12) && (minutes >= 1) || (hours >= 13)) {
+dn = 'PM';
+hours = hours-12;
+}
+if (hours == 0)
+hours = 12;
+extract(hours, minutes, seconds, dn);
+setTimeout('show3()', 1000);
+}
+//  End -->
+</script>
+</HEAD>
+
+<BODY onLoad='show3()' bgcolor='#FFFFFF'>
+
+<center><table width='500' border=0>
+<tr><td><a href='/ia5/' target='_parent'><img src='img/logo.gif' alt='Reload Page' height=45 width=120 border='0'></a></td></tr>
+
+<tr><td>
+<center>
+<img height=80 src='numbers2/cb.gif' width=50 name=a>
+<img height=80 src='numbers2/cb.gif' width=50 name=b>
+<img height=60 src='numbers2/colon.gif' width=34 name=c>
+<img height=80 src='numbers2/cb.gif' width=50 name=d>
+<img height=80 src='numbers2/cb.gif' width=50 name=e>
+<img height=60 src='numbers2/colon.gif' width=30 name=f>
+<img height=45 src='numbers2/cb.gif' width=30 name=g>
+<img height=45 src='numbers2/cb.gif' width=30 name=h>
+<img height=45 src='numbers2/cam.gif' width=30 name=j>
+</center>
+</td></tr>
+<tr><td><hr></hr></td></tr>
+<tr><td>
+<center>
+<form name=clock action=$script_url method=post>	
+<input type=hidden name=mode and value=setdate>
+
+<B><font size='6'><face='Arial'><FONT COLOR="#555555">Current Alarm: $alarmtime<br></font>
+<font size='3'><select name=hourOpt onChange="alarmSet()" size=1>
+<option value="00">00<option value="01">01<option value="02">02<option value="03">03
+<option value="04">04<option value="05">05<option value="06">06<option selected value="07">07
+<option value="08">08<option value="09">09<option value="10">10<option value="11">11
+<option value="12">12
+</option>
+</select> 
+<select name=minOpt onChange="alarmSet()" size=1>
+<option value="00">00<option value="05">05<option value="10">10<option value="15">15
+<option value="20">20<option value="25">25<option value="30">30<option value="35">35
+<option value="40">40<option selected value="45">45<option value="50">50<option value="55">55
+</option>
+</select>
+
+<input type=radio name=ampm value="AM" checked>AM
+<input type=radio name=ampm value="PM">PM
+
+
+<input type=submit value=setdate>\n</form>
+
+
+
+</td></tr>
+<tr><td>
+<table width='100%' border=0>
+<tr><td width='40%'><SCRIPT SRC='calendar.js'></SCRIPT></td><td>
+<center><a href='/'  target='_top'> <img src='./maps/earth.jpg' width='250' height='120' border=0></a>
+</td></tr></table>
+</td></tr></table>
+</BODY>
+</HTML>
+~;
+
+} else {
+
+print "<html><meta HTTP-EQUIV='Refresh' CONTENT='4;URL=index.html'>";
+print "<Body bgcolor ='white'><font size='6' face='Arial'><body>";
+print "<center><br><P>SET DATE TO $hourOpt:$minOpt $ampm";
+print "</body></html>";
+
+&file_write($alarmfile, "$hourOpt:$minOpt $ampm");
+
+}
+	
+
+1;
+
diff --git a/web/robots.txt b/web/robots.txt
index bb698c250..16972ebd1 100644
--- a/web/robots.txt
+++ b/web/robots.txt
@@ -1,4 +1,4 @@
-# Robots.txt.  No need for robots to crawl mh webserver
-
-User-agent: *
-Disallow: /
+# Robots.txt.  No need for robots to crawl mh webserver
+
+User-agent: *
+Disallow: /
diff --git a/web/test/ajax_example1.shtml b/web/test/ajax_example1.shtml
index 988ed8cf8..8a9fef49a 100755
--- a/web/test/ajax_example1.shtml
+++ b/web/test/ajax_example1.shtml
@@ -1,111 +1,111 @@
-<html>
-<head>
-<title>Ajax Example #1</title>
-
-<script language="Javascript">
-
-function xmlhttpGet(strURL) {
-	var xmlHttpReq = false;
-	var self = this; 
-	// Mozilla/Safari
-	if (window.XMLHttpRequest) {
-		self.xmlHttpReq = new XMLHttpRequest();
-	} 
-	// IE
-	else if (window.ActiveXObject) {
-		self.xmlHttpReq = new ActiveXObject("Microsoft.XMLHTTP");
-	}
-	strURL = strURL + "?sid=" + Math.random();
-	self.xmlHttpReq.open('GET', strURL, true);
-	self.xmlHttpReq.onreadystatechange = function() {
-		if (self.xmlHttpReq.readyState == 4) {
-			var i;
-			var elmntName = '';
-			var x = self.xmlHttpReq.responseXML.getElementsByTagName('response');
-			for (i = 0; i < x[0].childNodes.length; i++) {
-				var e;
-				if (x[0].childNodes[i].nodeType != 1) {
-					continue;
-				}
-				elmntName = x[0].childNodes[i].nodeName; 
-				e = document.getElementById(elmntName);
-
-				// Skip over any result elements that aren't defined on our page
-				if (e) {
-					if (x[0].childNodes[i].firstChild) {
-						e.innerHTML = x[0].childNodes[i].firstChild.nodeValue;
-					}
-					else { 
-						e.innerHTML = '';
-					}
-				}
-			}
-		}
-	}
-	self.xmlHttpReq.send(null);
-}
-
-</script>
-</head>
-
-<body>
-<h3 align="center">Weather</h3>
-
-<p>This is a very simple example of using Ajax technology with Misterhouse.  It doesn't use 
-any special javascript library, but it does assume you are running a script that populates 
-the Misterhouse %Weather hash.  This script gets its data from <a href="weather.sxml">weather.sxml</a>
-every ten seconds.</p>
-
-<table>
-<tr>
-<td>
-<div id="weather" class="datapod">
-<div class="datapodspace">
-Outside Temperature: <span id="TempOutdoor"></span>º
- <!--#include var="$config_parms{weather_uom_temp}"-->
-<br />
-Outside Humidity: <span id="HumidOutdoor"></span>%
-<br />
-Dew Point: <span id="DewOutdoor"></span>º
- <!--#include var="$config_parms{weather_uom_temp}"-->
-<br />
-Rain Total: <span id="RainTotal"></span> 
- <!--#include var="$config_parms{weather_uom_rain}"-->
-<br />
-Rain Rate: <span id="RainRate"></span> 
- <!--#include var="$config_parms{weather_uom_rainrate}"-->
-<br />
-Wind Speed: <span id="WindAvgSpeed"></span> 
- <!--#include var="$config_parms{weather_uom_wind}"-->
-<br />
-Wind Direction: <span id="WindAvgDir"></span>º 
-<br />
-Wind Chill: <span id="WindChill"></span>º
- <!--#include var="$config_parms{weather_uom_temp}"-->
-<br />
-Barometer: <span id="Barom"></span> 
- <!--#include var="$config_parms{weather_uom_baro}"-->
-<br />
-Indoor Temperature: <span id="TempIndoor"></span>º
- <!--#include var="$config_parms{weather_uom_temp}"-->
-<br />
-Indoor Humidity: <span id="HumidIndoor"></span>%
-<br />
-</div>
-</div>
-<td>
-</tr>
-</table>
-<script>
-
-var url = "weather.sxml";
-
-window.onload = function() {
-	xmlhttpGet(url);
-	setInterval("xmlhttpGet(url)", 10000);
-}
-
-</script>
-</body>
-</html>
-
+<html>
+<head>
+<title>Ajax Example #1</title>
+
+<script language="Javascript">
+
+function xmlhttpGet(strURL) {
+	var xmlHttpReq = false;
+	var self = this; 
+	// Mozilla/Safari
+	if (window.XMLHttpRequest) {
+		self.xmlHttpReq = new XMLHttpRequest();
+	} 
+	// IE
+	else if (window.ActiveXObject) {
+		self.xmlHttpReq = new ActiveXObject("Microsoft.XMLHTTP");
+	}
+	strURL = strURL + "?sid=" + Math.random();
+	self.xmlHttpReq.open('GET', strURL, true);
+	self.xmlHttpReq.onreadystatechange = function() {
+		if (self.xmlHttpReq.readyState == 4) {
+			var i;
+			var elmntName = '';
+			var x = self.xmlHttpReq.responseXML.getElementsByTagName('response');
+			for (i = 0; i < x[0].childNodes.length; i++) {
+				var e;
+				if (x[0].childNodes[i].nodeType != 1) {
+					continue;
+				}
+				elmntName = x[0].childNodes[i].nodeName; 
+				e = document.getElementById(elmntName);
+
+				// Skip over any result elements that aren't defined on our page
+				if (e) {
+					if (x[0].childNodes[i].firstChild) {
+						e.innerHTML = x[0].childNodes[i].firstChild.nodeValue;
+					}
+					else { 
+						e.innerHTML = '';
+					}
+				}
+			}
+		}
+	}
+	self.xmlHttpReq.send(null);
+}
+
+</script>
+</head>
+
+<body>
+<h3 align="center">Weather</h3>
+
+<p>This is a very simple example of using Ajax technology with Misterhouse.  It doesn't use 
+any special javascript library, but it does assume you are running a script that populates 
+the Misterhouse %Weather hash.  This script gets its data from <a href="weather.sxml">weather.sxml</a>
+every ten seconds.</p>
+
+<table>
+<tr>
+<td>
+<div id="weather" class="datapod">
+<div class="datapodspace">
+Outside Temperature: <span id="TempOutdoor"></span>º
+ <!--#include var="$config_parms{weather_uom_temp}"-->
+<br />
+Outside Humidity: <span id="HumidOutdoor"></span>%
+<br />
+Dew Point: <span id="DewOutdoor"></span>º
+ <!--#include var="$config_parms{weather_uom_temp}"-->
+<br />
+Rain Total: <span id="RainTotal"></span> 
+ <!--#include var="$config_parms{weather_uom_rain}"-->
+<br />
+Rain Rate: <span id="RainRate"></span> 
+ <!--#include var="$config_parms{weather_uom_rainrate}"-->
+<br />
+Wind Speed: <span id="WindAvgSpeed"></span> 
+ <!--#include var="$config_parms{weather_uom_wind}"-->
+<br />
+Wind Direction: <span id="WindAvgDir"></span>º 
+<br />
+Wind Chill: <span id="WindChill"></span>º
+ <!--#include var="$config_parms{weather_uom_temp}"-->
+<br />
+Barometer: <span id="Barom"></span> 
+ <!--#include var="$config_parms{weather_uom_baro}"-->
+<br />
+Indoor Temperature: <span id="TempIndoor"></span>º
+ <!--#include var="$config_parms{weather_uom_temp}"-->
+<br />
+Indoor Humidity: <span id="HumidIndoor"></span>%
+<br />
+</div>
+</div>
+<td>
+</tr>
+</table>
+<script>
+
+var url = "weather.sxml";
+
+window.onload = function() {
+	xmlhttpGet(url);
+	setInterval("xmlhttpGet(url)", 10000);
+}
+
+</script>
+</body>
+</html>
+
diff --git a/web/test/ajax_example2.shtml b/web/test/ajax_example2.shtml
index 131e1227a..f40469b72 100755
--- a/web/test/ajax_example2.shtml
+++ b/web/test/ajax_example2.shtml
@@ -1,115 +1,115 @@
-<html>
-<head>
-<title>Ajax Example #2</title>
-
-<script language="Javascript">
-
-function xmlhttpGet(strURL) {
-  var xmlHttpReq = false;
-  var self = this; 
-  // Mozilla/Safari
-  if (window.XMLHttpRequest) {
-    self.xmlHttpReq = new XMLHttpRequest();
-  } 
-  // IE
-  else if (window.ActiveXObject) {
-    self.xmlHttpReq = new ActiveXObject("Microsoft.XMLHTTP");
-  }
-  strURL = strURL.replace(/SID/, Math.random());
-  self.xmlHttpReq.open('GET', strURL, true);
-  self.xmlHttpReq.onreadystatechange = function() {
-    if (self.xmlHttpReq.readyState == 4) {
-      var i;
-      var elmntName = '';
-      var x = self.xmlHttpReq.responseXML.getElementsByTagName('name');
-      for (i = 0; i < x.length; i++) {
-        var e;
-        if (x[i].nodeType != 1) {
-          continue;
-        }
-        elmntName = x[i].textContent; 
-        e = document.getElementById(elmntName);
-
-        // Skip over any result elements that aren't defined on our page
-        if (e) {
-          if (x[i].nextElementSibling.textContent) {
-            e.innerHTML = x[i].nextElementSibling.textContent;
-          }
-          else { 
-            e.innerHTML = '';
-          }
-        }
-      }
-    }
-  }
-  self.xmlHttpReq.send(null);
-}
-
-</script>
-</head>
-
-<body>
-<h3 align="center">Weather</h3>
-
-<p>This is a very simple example of using Ajax technology with Misterhouse.  It doesn't use 
-any special javascript library, but it does assume you are running a script that populates 
-the Misterhouse %Weather hash.  This script gets its data from  
-<a href="/sub?xml(weather=TempOutdoor|HumidOutdoor|DewOutdoor|RainTotal|RainRate|WindAvgSpeed|WindAvgDir|WindChill|Barom|TempIndoor|HumidIndoor)">
-the Misterhouse XML server</a> every ten seconds.</p>
-
-<table>
-<tr>
-<td>
-<div id="weather" class="datapod">
-<div class="datapodspace">
-Outside Temperature: <span id="$Weather{'TempOutdoor'}"></span>º
- <!--#include var="$config_parms{weather_uom_temp}"-->
-<br />
-Outside Humidity: <span id="$Weather{'HumidOutdoor'}"></span>%
-<br />
-Dew Point: <span id="$Weather{'DewOutdoor'}"></span>º
- <!--#include var="$config_parms{weather_uom_temp}"-->
-<br />
-Rain Total: <span id="$Weather{'RainTotal'}"></span> 
- <!--#include var="$config_parms{weather_uom_rain}"-->
-<br />
-Rain Rate: <span id="$Weather{'RainRate'}"></span> 
- <!--#include var="$config_parms{weather_uom_rainrate}"-->
-<br />
-Wind Speed: <span id="$Weather{'WindAvgSpeed'}"></span> 
- <!--#include var="$config_parms{weather_uom_wind}"-->
-<br />
-Wind Direction: <span id="$Weather{'WindAvgDir'}"></span>º 
-<br />
-Wind Chill: <span id="$Weather{'WindChill'}"></span>º
- <!--#include var="$config_parms{weather_uom_temp}"-->
-<br />
-Barometer: <span id="$Weather{'Barom'}"></span> 
- <!--#include var="$config_parms{weather_uom_baro}"-->
-<br />
-Indoor Temperature: <span id="$Weather{'TempIndoor'}"></span>º
- <!--#include var="$config_parms{weather_uom_temp}"-->
-<br />
-Indoor Humidity: <span id="$Weather{'HumidIndoor'}"></span>%
-<br />
-</div>
-</div>
-<td>
-</tr>
-</table>
-<script>
-
-var url = "/sub?xml(weather=TempOutdoor|HumidOutdoor|DewOutdoor|RainTotal|"
-  + "RainRate|WindAvgSpeed|WindAvgDir|WindChill|Barom|TempIndoor|HumidIndoor"
-  + ",SID)";
-
-
-window.onload = function() {
-  xmlhttpGet(url);
-  setInterval("xmlhttpGet(url)", 10000);
-}
-
-</script>
-</body>
-</html>
-
+<html>
+<head>
+<title>Ajax Example #2</title>
+
+<script language="Javascript">
+
+function xmlhttpGet(strURL) {
+  var xmlHttpReq = false;
+  var self = this; 
+  // Mozilla/Safari
+  if (window.XMLHttpRequest) {
+    self.xmlHttpReq = new XMLHttpRequest();
+  } 
+  // IE
+  else if (window.ActiveXObject) {
+    self.xmlHttpReq = new ActiveXObject("Microsoft.XMLHTTP");
+  }
+  strURL = strURL.replace(/SID/, Math.random());
+  self.xmlHttpReq.open('GET', strURL, true);
+  self.xmlHttpReq.onreadystatechange = function() {
+    if (self.xmlHttpReq.readyState == 4) {
+      var i;
+      var elmntName = '';
+      var x = self.xmlHttpReq.responseXML.getElementsByTagName('name');
+      for (i = 0; i < x.length; i++) {
+        var e;
+        if (x[i].nodeType != 1) {
+          continue;
+        }
+        elmntName = x[i].textContent; 
+        e = document.getElementById(elmntName);
+
+        // Skip over any result elements that aren't defined on our page
+        if (e) {
+          if (x[i].nextElementSibling.textContent) {
+            e.innerHTML = x[i].nextElementSibling.textContent;
+          }
+          else { 
+            e.innerHTML = '';
+          }
+        }
+      }
+    }
+  }
+  self.xmlHttpReq.send(null);
+}
+
+</script>
+</head>
+
+<body>
+<h3 align="center">Weather</h3>
+
+<p>This is a very simple example of using Ajax technology with Misterhouse.  It doesn't use 
+any special javascript library, but it does assume you are running a script that populates 
+the Misterhouse %Weather hash.  This script gets its data from  
+<a href="/sub?xml(weather=TempOutdoor|HumidOutdoor|DewOutdoor|RainTotal|RainRate|WindAvgSpeed|WindAvgDir|WindChill|Barom|TempIndoor|HumidIndoor)">
+the Misterhouse XML server</a> every ten seconds.</p>
+
+<table>
+<tr>
+<td>
+<div id="weather" class="datapod">
+<div class="datapodspace">
+Outside Temperature: <span id="$Weather{'TempOutdoor'}"></span>º
+ <!--#include var="$config_parms{weather_uom_temp}"-->
+<br />
+Outside Humidity: <span id="$Weather{'HumidOutdoor'}"></span>%
+<br />
+Dew Point: <span id="$Weather{'DewOutdoor'}"></span>º
+ <!--#include var="$config_parms{weather_uom_temp}"-->
+<br />
+Rain Total: <span id="$Weather{'RainTotal'}"></span> 
+ <!--#include var="$config_parms{weather_uom_rain}"-->
+<br />
+Rain Rate: <span id="$Weather{'RainRate'}"></span> 
+ <!--#include var="$config_parms{weather_uom_rainrate}"-->
+<br />
+Wind Speed: <span id="$Weather{'WindAvgSpeed'}"></span> 
+ <!--#include var="$config_parms{weather_uom_wind}"-->
+<br />
+Wind Direction: <span id="$Weather{'WindAvgDir'}"></span>º 
+<br />
+Wind Chill: <span id="$Weather{'WindChill'}"></span>º
+ <!--#include var="$config_parms{weather_uom_temp}"-->
+<br />
+Barometer: <span id="$Weather{'Barom'}"></span> 
+ <!--#include var="$config_parms{weather_uom_baro}"-->
+<br />
+Indoor Temperature: <span id="$Weather{'TempIndoor'}"></span>º
+ <!--#include var="$config_parms{weather_uom_temp}"-->
+<br />
+Indoor Humidity: <span id="$Weather{'HumidIndoor'}"></span>%
+<br />
+</div>
+</div>
+<td>
+</tr>
+</table>
+<script>
+
+var url = "/sub?xml(weather=TempOutdoor|HumidOutdoor|DewOutdoor|RainTotal|"
+  + "RainRate|WindAvgSpeed|WindAvgDir|WindChill|Barom|TempIndoor|HumidIndoor"
+  + ",SID)";
+
+
+window.onload = function() {
+  xmlhttpGet(url);
+  setInterval("xmlhttpGet(url)", 10000);
+}
+
+</script>
+</body>
+</html>
+
diff --git a/web/test/ajax_example3.shtml b/web/test/ajax_example3.shtml
index 0465d72d7..5d230970f 100755
--- a/web/test/ajax_example3.shtml
+++ b/web/test/ajax_example3.shtml
@@ -1,77 +1,77 @@
-
-<html>
-<head>
-<title>Ajax Example #3</title>
-
-<script language="Javascript">
-
-var prev_html; 
-
-function xmlhttpGet(strURL) {
-	var xmlHttpReq = false;		
-	var self = this; 
-	// Mozilla/Safari
-	if (window.XMLHttpRequest) {
-		self.xmlHttpReq = new XMLHttpRequest();
-	} 
-	// IE
-	else if (window.ActiveXObject) {
-		self.xmlHttpReq = new ActiveXObject("Microsoft.XMLHTTP");
-	}
-	strURL = strURL.replace(/SID/, Math.random());
-	self.xmlHttpReq.open('GET', strURL, true);
-	self.xmlHttpReq.onreadystatechange = function() {
-		if (self.xmlHttpReq.readyState == 4) {
-			var i;
-			var elmntName = '';
-			var html = '<table>';
-			var x = self.xmlHttpReq.responseXML.getElementsByTagName('object');
-			for (i = 0; i < x.length; i++) {
-				var e;
-				if (x[i].nodeType != 1) {
-					continue;
-				}
-				elmntName = x[i].getElementsByTagName("name")[0].text; 
-				html += '<tr id="' + elmntName + '">';
-				html += x[i].getElementsByTagName("html")[0].firstChild.nodeValue;
-				html += '</tr>';
-			}
-			html += '</table>';
-			if (prev_html != html) {
-				document.getElementById("lights").innerHTML = html;
-				prev_html = html;
-			}
-		}
-	}
-	self.xmlHttpReq.send(null);
-}
-
-</script>
-</head>
-
-<body>
-<h3 align="center">Lights</h3>
-
-<p>This is a very simple example of using Ajax technology with Misterhouse.  It doesn't use 
-any special javascript library, but it does assume you have an All_Lights group defined in your 
-pl or mht files and that group contains one or more lights.  This web page has been tested with
-Insteon lights, but should work with other light items as well (X10, UPB, etc.)
-This script gets its data from <a href="/sub?xml(groups=$All_Lights,fields=html,SID)">the Misterhouse XML server</a>
-every ten seconds.</p>
-
-<div id='lights'>
-</div>
-<script>
-
-var url = "/sub?xml(groups=$All_Lights,fields=html,SID)";
-
-window.onload = function() {
-	xmlhttpGet(url);
-	setInterval("xmlhttpGet(url)", 10000);
-}
-
-</script>
-
-</body>
-</html>
-
+
+<html>
+<head>
+<title>Ajax Example #3</title>
+
+<script language="Javascript">
+
+var prev_html; 
+
+function xmlhttpGet(strURL) {
+	var xmlHttpReq = false;		
+	var self = this; 
+	// Mozilla/Safari
+	if (window.XMLHttpRequest) {
+		self.xmlHttpReq = new XMLHttpRequest();
+	} 
+	// IE
+	else if (window.ActiveXObject) {
+		self.xmlHttpReq = new ActiveXObject("Microsoft.XMLHTTP");
+	}
+	strURL = strURL.replace(/SID/, Math.random());
+	self.xmlHttpReq.open('GET', strURL, true);
+	self.xmlHttpReq.onreadystatechange = function() {
+		if (self.xmlHttpReq.readyState == 4) {
+			var i;
+			var elmntName = '';
+			var html = '<table>';
+			var x = self.xmlHttpReq.responseXML.getElementsByTagName('object');
+			for (i = 0; i < x.length; i++) {
+				var e;
+				if (x[i].nodeType != 1) {
+					continue;
+				}
+				elmntName = x[i].getElementsByTagName("name")[0].text; 
+				html += '<tr id="' + elmntName + '">';
+				html += x[i].getElementsByTagName("html")[0].firstChild.nodeValue;
+				html += '</tr>';
+			}
+			html += '</table>';
+			if (prev_html != html) {
+				document.getElementById("lights").innerHTML = html;
+				prev_html = html;
+			}
+		}
+	}
+	self.xmlHttpReq.send(null);
+}
+
+</script>
+</head>
+
+<body>
+<h3 align="center">Lights</h3>
+
+<p>This is a very simple example of using Ajax technology with Misterhouse.  It doesn't use 
+any special javascript library, but it does assume you have an All_Lights group defined in your 
+pl or mht files and that group contains one or more lights.  This web page has been tested with
+Insteon lights, but should work with other light items as well (X10, UPB, etc.)
+This script gets its data from <a href="/sub?xml(groups=$All_Lights,fields=html,SID)">the Misterhouse XML server</a>
+every ten seconds.</p>
+
+<div id='lights'>
+</div>
+<script>
+
+var url = "/sub?xml(groups=$All_Lights,fields=html,SID)";
+
+window.onload = function() {
+	xmlhttpGet(url);
+	setInterval("xmlhttpGet(url)", 10000);
+}
+
+</script>
+
+</body>
+</html>
+
diff --git a/web/test/index.shtml b/web/test/index.shtml
index 1e0fd6d41..364d5460e 100755
--- a/web/test/index.shtml
+++ b/web/test/index.shtml
@@ -1,12 +1,12 @@
-<html>
-<title>MisterHouse web/test Directory</title>
-<link rel="STYLESHEET" href="/default.css" type="text/css">
-</head>
-
-<body>
-<h3>MisterHouse mh/test Directory</h3>
-
-<!--#include code="&dir_index('/test')"-->
-
-</body> 
-</html>
+<html>
+<title>MisterHouse web/test Directory</title>
+<link rel="STYLESHEET" href="/default.css" type="text/css">
+</head>
+
+<body>
+<h3>MisterHouse mh/test Directory</h3>
+
+<!--#include code="&dir_index('/test')"-->
+
+</body> 
+</html>

From b599462058744206e9cb31edfe65def79357200c Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 18 Nov 2013 18:13:08 -0800
Subject: [PATCH 325/330] Correct two MH_Control Voice Commands

The "re load" and "reload" statements are alternative phrasings and not two different commands and thus should be contained in braces not brackets.
---
 code/common/mh_control.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/common/mh_control.pl b/code/common/mh_control.pl
index 211f6430f..20b40423a 100644
--- a/code/common/mh_control.pl
+++ b/code/common/mh_control.pl
@@ -7,12 +7,12 @@
 #@ update docs.  This script also defines and lets you set the various modes.
 
 # Reload MisterHouse
-$v_reload_code  = new Voice_Cmd("[Reload,re load] code");
+$v_reload_code  = new Voice_Cmd("{Reload,re load} code");
 $v_reload_code->set_info('Load mh.ini, icon, and/or code changes');
 $v_reload_code->tie_event('push(@Nextpass_Actions, \&read_code)'); # noloop
 
 # Force reload MisterHouse
-$v_reload_code2 = new Voice_Cmd("Force [Reload,re load] code");
+$v_reload_code2 = new Voice_Cmd("Force {Reload,re load} code");
 $v_reload_code2->set_info('Force a code reload of all modules');
 $v_reload_code2->tie_event('push(@Nextpass_Actions, # noloop
   \&read_code_forced)'); # noloop

From 890d30bad0252db56bdcc69975a00e93cd2cff1e Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 18 Nov 2013 18:56:58 -0800
Subject: [PATCH 326/330] Insteon: Fix Error with DebugLevel in Message.pm

---
 lib/Insteon/Message.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index 3274fe885..770f0e0a3 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -231,9 +231,12 @@ sub send
 
         	if ($self->send_attempts > 0)
                 {
-                	&::print_log("[Insteon::BaseMessage] WARN: now resending "
-                        	. $self->to_string() . " after " . $self->send_attempts
-                        	. " attempts.") if $self->setby->debuglevel(1, 'insteon');
+			if ((ref $self->setby && $self->setby->debuglevel(1, 'insteon')) ||
+				((!ref $self->setby) && ::debug{'insteon'})){
+				::print_log("[Insteon::BaseMessage] WARN: now resending "
+				. $self->to_string() . " after " . $self->send_attempts
+				. " attempts.");
+			}
                         # revise default hop count to reflect retries
                         if (ref $self->setby && $self->setby->isa('Insteon::BaseObject') 
                         	&& !defined($$self{no_hop_increase}))

From 0e82f5af38092dfdd127928e5281666afb9248da Mon Sep 17 00:00:00 2001
From: hplato <hplato@gmail.com>
Date: Thu, 2 Jan 2014 22:02:33 -0700
Subject: [PATCH 327/330] 	new file:   AD2USB.pm

---
 lib/AD2USB.pm | 1305 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1305 insertions(+)
 create mode 100755 lib/AD2USB.pm

diff --git a/lib/AD2USB.pm b/lib/AD2USB.pm
new file mode 100755
index 000000000..8b6ac8520
--- /dev/null
+++ b/lib/AD2USB.pm
@@ -0,0 +1,1305 @@
+# ###########################################################################
+# Name: AD2USB Monitoring Module
+#
+# Description:
+#   Module that monitors a serial device for the AD2USB for known events and 
+#   maintains the state of the Ademco system in memory. Module also sends
+#   instructions to the panel as requested.
+#
+# Author: Kirk Friedenberger (kfriedenberger@gmail.com)
+# $Revision: $
+# $Date: $
+#
+# Change log:
+# - Added relay support (Wayne Gatlin, wayne@razorcla.ws)
+# - Added 2-way zone expander support (Wayne Gatlin, wayne@razorcla.ws)
+# - Completed Wireless support (Wayne Gatlin, wayne@razorcla.ws)  
+# - Added ser2sock support (Wayne Gatlin, wayne@razorcla.ws)
+# - Added in child MH-Style objects (Door & Motion items) (H Plato, hplato@gmail.com)
+##############################################################################
+# Copyright Kirk Friedenberger (kfriedenberger@gmail.com), 2013, All rights reserved
+##############################################################################
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+############################################################################### 
+
+use Switch;
+
+package AD2USB;
+
+@AD2USB::ISA = ('Generic_Item');
+
+my %CmdMsg;
+my %CmdMsgRev;
+my $Self;
+my %ErrorCode;
+my $IncompleteCmd;
+my $connecttype;
+
+#    Starting a new object                                                  {{{
+sub new {
+   my ($class) = @_;
+   my $self = {};
+   $$self{panel_status}   = 'Unknown';
+   $$self{Log}            = [];
+   $$self{ac_power}       = 0;
+   $$self{battery_low}    = 1;
+   $$self{chime}          = 0;
+
+   bless $self, $class;
+
+   # load command hash
+   DefineCmdMsg();
+
+
+   my @LogType = qw(AD2USB_part_log AD2USB_zone_log AD2USB_debug_log);
+   foreach (@LogType) {
+      if ( !exists $::config_parms{$_} ) {
+         $main::config_parms{$_} = 1;
+         &::print_log("Parameter $_ not defined in mh.private.ini, enabling by default");
+      }
+   }
+
+   if ( !exists $::config_parms{'AD2USB_ser2sock_recon'} ) {
+       $::config_parms{'AD2USB_ser2sock_recon'} = 10;
+       &::print_log("Parameter AD2USB_ser2sock_recon not defined in mh.private.ini, enabling by default");
+     }
+
+   &main::print_log("Starting ADEMCO panel interface module");
+   $Self = $self;
+   
+   #Set all zones to ready
+   ChangeZones( 1, 100, "ready", "ready", 0);
+   ChangePartitions( 1, 1, "ready", 0);
+   $self->{keys_sent} = 0;
+
+   return $self;
+}
+
+#}}}
+#    serial port configuration                                         {{{
+sub init {
+
+   my ($serial_port) = @_;
+   $serial_port->error_msg(1);
+   $serial_port->databits(8);
+   $serial_port->parity("none");
+   $serial_port->stopbits(1);
+   $serial_port->handshake('none');
+   $serial_port->datatype('raw');
+   $serial_port->dtr_active(1);
+   $serial_port->rts_active(0);
+
+   select( undef, undef, undef, .100 );    # Sleep a bit
+
+}
+
+#}}}
+#    module startup / enabling serial port                             {{{
+sub serial_startup {
+   my $self = $Self;
+   my $port; my $BaudRate; my $ip;
+     if ($::config_parms{'AD2USB_serial_port'} and $::config_parms{'AD2USB_serial_port'} ne '/dev/none') {
+	 $port = $::config_parms{'AD2USB_serial_port'}; 	  
+       $BaudRate = ( defined $::config_parms{AD2USB_baudrate} ) ? $main::config_parms{AD2USB_baudrate} : 115200;
+   if ( &main::serial_port_create( 'AD2USB', $port, $BaudRate, 'none', 'raw' ) ) {
+      init( $::Serial_Ports{AD2USB}{object}, $port );
+       &main::print_log("  AD2USB.pm initializing port $port at $BaudRate baud") if $main::config_parms{debug} eq 'AD2USB';
+         &::MainLoop_pre_add_hook( \&AD2USB::check_for_data, 1 ) if $main::Serial_Ports{AD2USB}{object};
+        $::Year_Month_Now = &::time_date_stamp( 10, time );    # Not yet set when we init.
+       LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "    ========= AD2USB.pm Serial Initialized =========" );
+      $connecttype = 'serial';
+    }
+   } elsif ($::config_parms{'AD2USB_ser2sock_ip'}) {
+      $recon_timer = new Timer;
+       $ip = $::config_parms{'AD2USB_ser2sock_ip'};
+	 $port = $::config_parms{'AD2USB_ser2sock_port'};
+         &main::print_log("  AD2USB.pm initializing TCP session with $ip on port $port") if $main::config_parms{debug} eq 'AD2USB';
+	  $AD2USB_ser2sock = new Socket_Item(undef, undef, "$ip:$port", 'AD2USB', 'tcp', 'raw');
+	  $AD2USB_ser2sock_sender = new Socket_Item(undef, undef, "$ip:$port", 'AD2USB_SENDER', 'tcp', 'rawout');
+             start $AD2USB_ser2sock;
+	      start $AD2USB_ser2sock_sender;
+             &::MainLoop_pre_add_hook( \&AD2USB::check_for_data, 1 );
+            $::Year_Month_Now = &::time_date_stamp( 10, time );    # Not yet set when we init.
+           LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "    ========= AD2USB.pm Socket Initialized =========" );
+         $connecttype = 'tcp';
+	 } else { 
+	  warn "AD2USB.pm->startup  AD2USB_serial_port or AD2USB_ser2sock_ip not defined in mh.ini file";
+	}
+  } 
+
+#}}}
+#    module startup; hack because of the startup error
+sub startup {
+}
+
+
+
+#}}}
+#    check for incoming data on serial port                                 {{{
+sub check_for_data {
+    my $NewCmd;
+   
+    if ($connecttype eq 'serial') {
+     &main::check_for_generic_serial_data('AD2USB');
+      $NewCmd = $main::Serial_Ports{'AD2USB'}{data};
+     $main::Serial_Ports{'AD2USB'}{data} = '';
+    }
+ 
+    if ($connecttype eq 'tcp') {
+       if (active $AD2USB_ser2sock) {
+        $NewCmd = said $AD2USB_ser2sock;
+       } else {
+	  # restart the TCP connection if its lost.
+         if (inactive $recon_timer) {
+             &main::print_log("Connection to AD2USB was lost, I will try to reconnect in $::config_parms{'AD2USB_ser2sock_recon'} seconds");
+	     # LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "AD2USB.pm ser2sock connection lost! Trying to reconnect." );
+                set $recon_timer $::config_parms{'AD2USB_ser2sock_recon'}, sub {
+                  start $AD2USB_ser2sock;
+	        start $AD2USB_ser2sock_sender;
+     	     }
+          } 
+       } 
+    }
+
+   $self=$Self;
+   # we need to buffer the information receive, because many command could be include in a single pass
+   $NewCmd = $IncompleteCmd . $NewCmd if $IncompleteCmd;
+   return if !$NewCmd;
+   $NewCmd =~ s/\r\n/#/g;    # Replace newlines with # (use # as command delimiter)
+	#LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "TCP DATA - - $NewCmd" ); 
+   my $Cmd = '';	     # Build up a command string by iterating each character
+   foreach my $c ( split( //, $NewCmd ) ) {
+      if ( $c eq '#' ) {
+         if ($Cmd) {
+		&main::print_log($Cmd);
+            # This is a full command that was terminated by \r\n
+            my $status_type = GetStatusType($Cmd);
+            if ($status_type >= 10) {
+               # This is a panel message
+               if (($Cmd ne $self->{panel_status}) || ($status_type == 11))  {
+                  &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "NEW: $Cmd") if $main::config_parms{AD2USB_debug_log};
+                  CheckCmd($Cmd);
+                  ResetAdemcoState();
+                  $self->{panel_status} = $Cmd;
+               }
+               else {
+                  &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "DUPE: $Cmd") if $main::config_parms{AD2USB_debug_log};
+               }
+            }
+            else {
+               # This is a relay or RF or zone expander message
+               &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "NONPANEL: $Cmd") if $main::config_parms{AD2USB_debug_log};
+               CheckCmd($Cmd);
+               ResetAdemcoState();
+	     #$self->{panel_status} = $Cmd;
+            }
+            $Cmd = '';
+         }
+      }
+      else {
+         # Append this character to the current command
+         $Cmd .= $c;
+      }
+
+   }
+   # Save partial command for next serial read
+   $IncompleteCmd = $Cmd;
+}
+
+#}}}
+#    Validate the command and perform action                                {{{
+
+sub CheckCmd {
+   my $CmdStr = shift;
+   my $status_type = GetStatusType($CmdStr);
+   my $self = $Self;
+   
+   switch ( $status_type ) {
+
+      case -1 {                         # UNRECOGNIZED STATUS
+         &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "UNKNOWN STATUS: $CmdStr" ) if $main::config_parms{AD2USB_debug_log};
+      }
+
+      case 0 {                          # Key send confirmation
+         if ($self->{keys_sent} == 0) {
+            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Key sent from ANOTHER panel." ) if $main::config_parms{AD2USB_debug_log};
+         }
+         else {
+            $self->{keys_sent}--;
+            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Key received ($self->{keys_sent} left)" ) if $main::config_parms{AD2USB_debug_log};
+         }
+
+      }
+
+      case 10 {               # FAULTS AVAILABLE
+#         &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Faults exist and are available to parse" ) if $main::config_parms{AD2USB_debug_log};
+         cmd( $self, "ShowFaults" );
+      }         
+      
+      case 11 {               # IN FAULT LOOP
+         my $status_codes = substr( $CmdStr, 1, 12 );
+         my $fault = substr( $CmdStr, 23, 3 );
+	$fault = substr($CmdStr, 67, 2);
+	$fault = "0$fault";
+         my $panel_message = substr( $CmdStr, 61, 32);
+
+         my $ZoneName = my $ZoneNum = $fault;
+         my $PartNum = "1";
+         $ZoneName = $main::config_parms{"AD2USB_zone_${ZoneNum}"} if exists $main::config_parms{"AD2USB_zone_${ZoneNum}"};
+         $ZoneNum =~ s/^0*//;
+         $fault = $ZoneNum;
+
+	 if (&MappedZones("00$ZoneNum")) { 
+           &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Zone $ZoneNum is mapped to a Relay or RF ID, skipping normal monitoring!") } 
+	 else {
+
+         #Check if this is the new lowest fault number and reset the zones before it
+         if (int($fault) <= int($self->{zone_lowest_fault})) {
+            $self->{zone_lowest_fault} = $fault;
+            #Reset zones to ready before the lowest
+            $start = 1;
+            $end = $self->{zone_lowest_fault} - 1;
+            ChangeZones( $start, $end, "ready", "bypass", 1);
+         }
+
+         #Check if this is a new highest fault number and reset zones after it
+         if (int($fault) > int($self->{zone_highest_fault})) {
+            $self->{zone_highest_fault} = $fault;
+            #Reset zones to ready after the highest
+            $start = $self->{zone_highest_fault} + 1;;
+            $end = 11;
+            ChangeZones( $start, $end, "ready", "bypass", 1);
+         }
+
+         # Check if this zone was already faulted
+         if ($self->{zone_status}{"$fault"} eq "fault") {
+
+            #Check if this fault is less than the last fault (and must now be the new lowest zone)
+            if (int($fault) <= int($self->{zone_last_num})) {
+               #This is the new lowest zone
+               $self->{zone_lowest_fault} = $fault;
+               #Reset zones to ready before the lowest
+               $start = 1;
+               $end = $self->{zone_lowest_fault} - 1;
+               ChangeZones( $start, $end, "ready", "bypass", 1);
+            }         
+
+            #Check if this fault is equal to the last fault (and must now be the only zone)
+            if (int($fault) == int($self->{zone_last_num})) {
+               #Reset zones to ready after the only one
+               $start = int($fault) + 1;
+               $end = 11;
+               ChangeZones( $start, $end, "ready", "bypass", 1);
+            }
+
+            #Check if this fault is greater than the last fault and reset the zones between it and the prior one
+            if (int($fault) > int($self->{zone_last_num})) {
+               $start = (($self->{zone_last_num} == $fault) ? 1 : int($self->{zone_last_num}) + 1);
+               $end = $fault - 1;
+               ChangeZones( $start, $end, "ready", "bypass", 1);
+            }
+         }
+       
+
+         $self->{zone_now_msg}            = "$panel_message";
+         $self->{zone_now_status}         = "fault";
+         $self->{zone_now_name}           = "$ZoneName";
+         $self->{zone_now_num}            = "$ZoneNum";
+         ChangeZones( int($ZoneNum), int($ZoneNum), "fault", "", 1);
+         }
+         $self->{partition_now_msg}       = "$panel_message"; 
+         $self->{partition_now_status}    = "not ready";
+         $self->{partition_now_num}       = "$PartNum";
+         ChangePartitions( int($PartNum), int($PartNum), "not ready", 1);
+      }
+
+      case 12 {               # IN BYPASS FLASH LOOP
+         my $status_codes = substr( $CmdStr, 1, 12 );
+         my $fault = substr( $CmdStr, 23, 3 );
+$fault = substr($CmdStr, 67, 2);
+$fault = "0$fault";
+         my $panel_message = substr( $CmdStr, 61, 32);
+
+         my $ZoneName = my $ZoneNum = $fault;
+         my $PartNum = "1";
+         $ZoneName = $main::config_parms{"AD2USB_zone_${ZoneNum}"} if exists $main::config_parms{"AD2USB_zone_${ZoneNum}"};
+         $ZoneNum =~ s/^0*//;
+         $fault = $ZoneNum;
+         
+         $self->{zone_now_msg}            = "$panel_message";
+         $self->{zone_now_status}         = "bypass";
+         $self->{zone_now_name}           = "$ZoneName";
+         $self->{zone_now_num}            = "$ZoneNum";
+         ChangeZones( int($ZoneNum), int($ZoneNum), "bypass", "", 1);
+         $self->{partition_now_msg}       = "$panel_message";
+         $self->{partition_now_status}    = "not ready";
+         $self->{partition_now_num}       = "$PartNum";
+         ChangePartitions( int($PartNum), int($PartNum), "not ready", 1);
+         
+      }
+
+      case 13 {               # NORMAL STATUS
+
+         # Get three sections of the Ademco status message
+         my $status_codes = substr( $CmdStr, 1, 12 );
+         my $fault = substr( $CmdStr, 23, 3 );
+         my $panel_message = substr( $CmdStr, 61, 32);
+            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Key received ($self->{keys_sent} left)" ) if $main::config_parms{AD2USB_debug_log};
+
+         # READY
+         $data = 0;
+         if ( substr($status_codes,$data,1) == "1" ) {
+            my $start = 1;
+            my $end = 11;
+            if ( substr($status_codes,6,1) ne "1" ) {
+               # Reset all zones to ready if partition is ready and not bypassed
+               ChangeZones( $start, $end, "ready", "", 1);
+            }
+            else {
+               # If zones are bypassed, reset unbypassed zones to ready
+               for ($i = $start; $i <= $end; $i++) {
+                  my $current_status = $self->{zone_status}{"$i"};
+                  if ($current_status eq "fault") {
+                     ChangeZones($i, $i, "ready", "bypass", 1);
+                  }
+               }
+            }
+
+            my $PartName = my $PartNum = "1";
+
+            $PartName = $main::config_parms{"AD2USB_part_${PartNum}"} if exists $main::config_parms{"AD2USB_part_${PartNum}"};
+            $self->{partition_now_msg}    = "$panel_message";
+            $self->{partition_now_num}    = "$PartNum";
+            $self->{partition_now_status} = "ready";
+            ChangePartitions( int($PartNum), int($PartNum), "ready", 1);
+            $self->{zone_lowest_fault} = 999;
+            $self->{zone_highest_fault} = -1;            
+
+            # Reset state for fault checks
+            $self->{zone_last_status} = "";
+            $self->{zone_last_num} = "";
+            $self->{zone_last_name} = "";
+         }
+
+         # ARMED AWAY
+         $data = 1;
+         if ( substr($status_codes,$data,1) == "1" ) {
+            my $PartNum = my $PartName = "1";
+            $PartName = $main::config_parms{"AD2USB_part_${PartNum}"} if exists $main::config_parms{"AD2USB_part_${PartNum}"};
+
+	    my $mode = "ERROR";
+            if (index($panel_message, "ALL SECURE")) {
+               $mode = "armed away";
+            }
+            elsif (index($panel_message, "You may exit now")) {
+               $mode = "exit delay";
+            }
+            elsif (index($panel_message, "or alarm occurs")) {
+               $mode = "entry delay";
+            }
+            elsif (index($panel_message, "ZONE BYPASSED")) {
+               $mode = "armed away";
+            }
+
+            set $self "$mode";
+            $self->{partition_now_msg}        = "$panel_message";
+            $self->{partition_now_status}     = "$mode";
+            $self->{partition_now_num}        = "$PartNum";
+            ChangePartitions( int($PartNum), int($PartNum), "$mode", 1);
+
+            # Reset state for fault checks
+            $self->{zone_last_status} = "";
+            $self->{zone_last_num} = "";
+            $self->{zone_last_name} = "";
+         }
+
+         # ARMED HOME
+         $data = 2;
+         if ( substr($status_codes,$data,1) eq "1" ) {
+            my $PartNum = my $PartName = "1";
+
+            my $mode = "armed stay";
+            $PartName = $main::config_parms{"AD2USB_part_${PartNum}"} if exists $main::config_parms{"AD2USB_part_${PartNum}"};
+            $self->{partition_now_msg}        = "$panel_message";
+            $self->{partition_now_status}     = "$mode";
+            $self->{partition_now_num}        = "$PartNum";
+            ChangePartitions( int($PartNum), int($PartNum), "$mode", 1);
+
+            # Reset state for fault checks
+            $self->{zone_last_status} = "";
+            $self->{zone_last_num} = "";
+            $self->{zone_last_name} = "";
+         }
+
+         # SKIP BACKLIGHT
+         $data = 3;
+
+         # PROGRAMMING MODE
+         $data = 4;
+         if ( substr($status_codes,$data,1) eq "1" ) {
+            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Panel is in programming mode" ) if $main::config_parms{AD2USB_debug_log};
+
+            # Reset state for fault checks
+            $self->{zone_last_status} = "";
+            $self->{zone_last_num} = "";
+            $self->{zone_last_name} = "";
+         }
+
+         # SKIP BEEPS
+         $data = 5;
+
+         # A ZONE OR ZONES ARE BYPASSED
+         $data = 6;
+         if ( substr($status_codes,$data,1) == "1" ) {
+
+            # Reset zones to ready that haven't appeared in the bypass loop
+#            if ($self->{zone_last_status} eq "bypass") {
+#               if (int($fault) < int($self->{zone_now_num})) {
+#                  $start = int($self->{zone_now_num}) + 1;
+#                  $end = 12;
+#               }
+#               ChangeZones( $start, $end - 1, "ready", "", 1);
+#               $self->{zone_now_status} = "";
+#               $self->{zone_now_num} = "0";
+#            }
+
+            # Reset state for fault checks
+            $self->{zone_last_status} = "";
+            $self->{zone_last_num} = "";
+            $self->{zone_last_name} = "";
+         }
+
+         # SKIP AC POWER
+         $data = 7;
+
+         # SKIP CHIME MODE
+         $data = 8;
+
+         # ALARM WAS TRIGGERED (Sticky until disarm)
+         $data = 9;
+         if ( substr($status_codes,$data,1) == "1" ) {
+            $EventName = "ALARM WAS TRIGGERED";
+            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "$EventName" ) if $main::config_parms{AD2USB_part_log};
+         }
+
+         # ALARM IS SOUNDING
+         $data = 10;
+         if ( substr($status_codes,$data,1) == "1" ) {
+            $EventName = "ALARM IS SOUNDING";
+
+            #TODO: figure out how to get a partition number
+            my $PartName = my $PartNum = "1";
+            my $ZoneNum = $fault;
+            $ZoneName = $main::config_parms{"AD2USB_zone_$ZoneNum"}  if exists $main::config_parms{"AD2USB_zone_$ZoneNum"};
+            $PartName = $main::config_parms{"AD2USB_part_$PartName"} if exists $main::config_parms{"AD2USB_part_$PartName"};
+            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "$EventName - Zone $ZoneNum ($ZoneName)" ) if $main::config_parms{AD2USB_part_log};
+            $ZoneNum =~ s/^0*//;
+            ChangeZones( int($ZoneNum), int($ZoneNum), "alarm", "", 1);
+            $self->{zone_now_msg}         = "$panel_message";
+            $self->{zone_now_status}      = "alarm";
+            $self->{zone_now_num}         = "$ZoneNum";
+            $self->{partition_now_msg}    = "$panel_message";
+            $self->{partition_now_status} = "alarm";
+            $self->{partition_now_num}    = "$PartNum";
+            ChangePartitions( int($PartNum), int($PartNum), "alarm", 1);
+         }
+
+         # SKIP BATTERY LOW
+         $data = 11;
+      }
+
+      case 2 {                # WIRELESS STATUS
+	 my $ZoneLoop = "";
+	 my $MZoneLoop = "";
+         # Parse raw status strings
+         my $rf_id = substr( $CmdStr, 5, 7 );
+         my $rf_status = substr( $CmdStr, 13, 2 );
+	 my $lc = 0;
+	 my $wnum = 0;
+
+         # UNKNOWN
+         my $unknown_1 = 0;
+         $unknown_1 = 1 if (hex(substr($rf_status, 1, 1)) & 1) == 1;
+         # Parse for low battery signal
+         my $low_batt = 0;
+         $low_batt = 1 if (hex(substr($rf_status, 1, 1)) & 2) == 2;
+         # Parse for supervision flag
+         my $supervised = 0;
+         $supervised = 1 if (hex(substr($rf_status, 1, 1)) & 4) == 4;
+         # UNKNOWN
+         my $unknown_8 = 0;
+         $unknown_8 = 1 if (hex(substr($rf_status, 1, 1)) & 8) == 8;
+
+         # Parse loop faults
+         my $loop_fault_1 = 0;
+         $loop_fault_1 = 1 if (hex(substr($rf_status, 0, 1)) & 8) == 8;
+         my $loop_fault_2 = 0;
+         $loop_fault_2 = 1 if (hex(substr($rf_status, 0, 1)) & 2) == 2;
+         my $loop_fault_3 = 0;
+         $loop_fault_3 = 1 if (hex(substr($rf_status, 0, 1)) & 1) == 1;
+         my $loop_fault_4 = 0;
+         $loop_fault_4 = 1 if (hex(substr($rf_status, 0, 1)) & 4) == 4;
+
+         &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "WIRELESS: rf_id($rf_id) status($rf_status) loop1($loop_fault_1) loop2($loop_fault_2) loop3($loop_fault_3) loop4($loop_fault_4)" ) if $main::config_parms{AD2USB_debug_log};
+         &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "WIRELESS: rf_id($rf_id) status($rf_status) low_batt($low_batt) supervised($supervised)" ) if $main::config_parms{AD2USB_debug_log};
+
+         my $ZoneStatus = "ready";
+         my $PartStatus = "";
+         my @parsest;
+         my $sensortype;
+
+         if (exists $main::config_parms{"AD2USB_wireless_$rf_id"}) {
+            # Assign zone
+            my @ParseNum = split(",", $main::config_parms{"AD2USB_wireless_$rf_id"});
+
+            # Assign status (zone and partition)
+            if ($low_batt == "1") {
+               $ZoneStatus = "low battery";
+            }
+	   
+	   foreach $wnum(@ParseNum) {
+	    if ($lc eq 0 or $lc eq 2 or $lc eq 4 or $lc eq 6) { 
+	     $ZoneNum = $wnum;
+	    }
+
+	    if ($lc eq 1 or $lc eq 3 or $lc eq 5 or $lc eq 7) {
+	    @parsest = split("", $wnum);
+	    $sensortype = $parsest[0];
+            $ZoneLoop = $parsest[1];
+            $ZoneName = "Unknown";
+            $ZoneName = $main::config_parms{"AD2USB_zone_$ZoneNum"} if exists $main::config_parms{"AD2USB_zone_$ZoneNum"};
+ 
+	    	if ($ZoneLoop eq "1") {$MZoneLoop = $loop_fault_1}
+            	if ($ZoneLoop eq "2") {$MZoneLoop = $loop_fault_2}
+           	if ($ZoneLoop eq "3") {$MZoneLoop = $loop_fault_3}
+            	if ($ZoneLoop eq "4") {$MZoneLoop = $loop_fault_4}
+	 
+	    	if ("$MZoneLoop" eq "1") {
+               	 $ZoneStatus = "fault";
+            	} elsif ("$MZoneLoop" eq 0) {
+                 $ZoneStatus = "ready";
+            	}
+	      
+            $self->{zone_now_msg}            = "$CmdStr";
+            $self->{zone_now_status}         = "$ZoneStatus";
+            $self->{zone_now_name}           = "$ZoneName";
+            $self->{zone_now_num}            = "$ZoneNum";
+            ChangeZones( int($ZoneNum), int($ZoneNum), "$ZoneStatus", "", 1);
+              if ($sensortype eq "k") {
+		  $ZoneStatus = "ready";
+                  $self->{zone_now_msg}            = "$CmdStr";
+            	  $self->{zone_now_status}         = "$ZoneStatus";
+            	  $self->{zone_now_name}           = "$ZoneName";
+                  $self->{zone_now_num}            = "$ZoneNum";
+                  ChangeZones( int($ZoneNum), int($ZoneNum), "$ZoneStatus", "", 1);
+              }
+            }
+	  $lc++
+          }
+         }
+
+      }
+
+      case 3 {                # EXPANDER STATUS
+         my $exp_id = substr( $CmdStr, 5, 2 );
+         my $input_id = substr( $CmdStr, 8, 2 );
+         my $status = substr( $CmdStr, 11, 2 );
+	 my $ZoneStatus;
+         my $PartStatus;
+
+         &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "EXPANDER: exp_id($exp_id) input($input_id) status($status)" ) if $main::config_parms{AD2USB_debug_log};
+
+       if (exists $main::config_parms{"AD2USB_expander_$exp_id$input_id"}) {
+            # Assign zone
+            $ZoneNum = $main::config_parms{"AD2USB_expander_$exp_id$input_id"};
+            $ZoneName = "Unknown";
+            $ZoneName = $main::config_parms{"AD2USB_zone_$ZoneNum"} if exists $main::config_parms{"AD2USB_zone_$ZoneNum"};
+            # Assign status (zone and partition)
+
+
+            if ($status == 01) {
+               $ZoneStatus = "fault";
+               $PartStatus = "not ready";
+            } elsif ($status == 00) {
+                $ZoneStatus = "ready";
+                $PartStatus = "";
+            }
+
+            $self->{zone_now_msg}            = "$CmdStr";
+            $self->{zone_now_status}         = "$ZoneStatus";
+            $self->{zone_now_name}           = "$ZoneName";
+            $self->{zone_now_num}            = "$ZoneNum";
+            ChangeZones( int($ZoneNum), int($ZoneNum), "$ZoneStatus", "", 1);
+         #  if (($self->{partition_status}{int($PartNum)}) eq "ready") { #only change the partition status if the current status is "ready". We dont change if the system is armed.
+         #   if ($PartStatus ne "") {
+         #      $self->{partition_now_msg}       = "$CmdStr";
+         #      $self->{partition_now_status}    = "$PartStatus";
+         #      $self->{partition_now_num}       = "$PartNum";
+         #      ChangePartitions( int($PartNum), int($PartNum), "$PartStatus", 1);
+         #   }
+         # }
+        }
+      }
+
+
+ case 4 {                # RELAY STATUS
+         my $rel_id = substr( $CmdStr, 5, 2 );
+         my $rel_input_id = substr( $CmdStr, 8, 2 );
+         my $rel_status = substr( $CmdStr, 11, 2 );
+	 my $PartName = my $PartNum = "1";
+         my $ZoneStatus;
+         my $PartStatus;
+
+
+         &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "RELAY: rel_id($rel_id) input($rel_input_id) status($rel_status)" ) if $main::config_parms{AD2USB_debug_log};
+
+          if (exists $main::config_parms{"AD2USB_relay_$rel_id$rel_input_id"}) {
+            # Assign zone
+            $ZoneNum = $main::config_parms{"AD2USB_relay_$rel_id$rel_input_id"};
+            $ZoneName = "Unknown";
+            $ZoneName = $main::config_parms{"AD2USB_zone_$ZoneNum"} if exists $main::config_parms{"AD2USB_zone_$ZoneNum"};
+            # Assign status (zone and partition)
+       	   
+          
+	    if ($rel_status == 01) {
+               $ZoneStatus = "fault";
+               $PartStatus = "not ready";
+            } elsif ($rel_status == 00) {
+		$ZoneStatus = "ready";
+		$PartStatus = "";
+	    }
+
+            $self->{zone_now_msg}            = "$CmdStr";
+            $self->{zone_now_status}         = "$ZoneStatus";
+            $self->{zone_now_name}           = "$ZoneName";
+            $self->{zone_now_num}            = "$ZoneNum";
+            ChangeZones( int($ZoneNum), int($ZoneNum), "$ZoneStatus", "", 1);
+	  # if (($self->{partition_status}{int($PartNum)}) eq "ready") { #only change the partition status if the current status is "ready". We dont change if the system is armed.
+          #  if ($PartStatus ne "") {
+          #     $self->{partition_now_msg}       = "$CmdStr";
+          #     $self->{partition_now_status}    = "$PartStatus";
+          #     $self->{partition_now_num}       = "$PartNum";
+          #     ChangePartitions( int($PartNum), int($PartNum), "$PartStatus", 1);
+          #  }
+         # }
+	}
+      }
+
+      else {
+         &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "SOMETHING SERIOUSLY WRONG - UNKNOWN COMMAND" ) if $main::config_parms{AD2USB_debug_log};
+      }
+   }
+
+   # NORMAL STATUS TYPE
+   # ALWAYS CHECK CHIME / AC POWER / BATTERY STATUS / BACKLIGHT / BEEPS
+   if ($status_type >= 10) {
+
+         # PARSE codes
+         my $status_codes = substr( $CmdStr, 1, 12 );
+         my $fault = substr( $CmdStr, 23, 3 );
+         my $panel_message = substr( $CmdStr, 61, 32);
+
+         # BACKLIGHT
+         $data = 3;
+         if ( substr($status_codes,$data,1) == "1" ) {
+            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Panel backlight is on" ) if $main::config_parms{AD2USB_debug_log};
+         }
+
+         # BEEPS
+         $data = 5;
+         if ( substr($status_codes,$data,1) != "0" ) {
+            $NumBeeps = substr($status_codes,$data,1);
+            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Panel beeped $NumBeeps times" ) if $main::config_parms{AD2USB_debug_log};
+         }
+
+         # AC POWER
+         $data = 7;
+	 if ( substr($status_codes,$data,1) == "0" ) {
+            $$self{ac_power} = 0;
+            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "AC Power has been lost" );
+         }
+         else {
+            $$self{ac_power} = 1;
+         }
+
+         # CHIME MODE
+         $data = 8;
+         if ( substr($status_codes,$data,1) == "0" ) { 
+            $self->{chime} = 0;
+#            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Chime is off" ) if $main::config_parms{AD2USB_debug_log};
+         }
+         else {
+            $self->{chime} = 1;
+#            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Chime is on" ) if $main::config_parms{AD2USB_debug_log};
+         }
+   
+         # BATTERY LOW
+         $data = 11;
+         if ( substr($status_codes,$data,1) == "1" ) {
+            $self->{battery_low} = 1;
+            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Panel is low on battery" );
+         }
+         else {
+            $self->{battery_low} = 0;
+         }
+
+   }
+
+   return;
+
+}
+
+#}}}
+# local logit call {{{
+sub LocalLogit {
+   my $file = shift;
+   my $str  = shift;
+   &::logit( "$file", "$str" );
+   my $Timestamp = &::time_date_stamp(16);
+   $str =~ s/  +/ /;
+   unshift @{ $Self->{Log} }, "$Timestamp: $str" if $str !~ /Temperature/;
+   pop @{ $Self->{Log} } if scalar( @{ $Self->{Log} } ) > 60;
+
+}
+
+#}}}
+#    Determine if the status string requires parsing                    {{{
+sub GetStatusType {
+   my $AdemcoStr   = shift;
+   my $ll       = length($AdemcoStr);
+
+   if ($ll eq 94) {
+      my $substatus = substr($AdemcoStr, 61, 5);
+      if ( $substatus eq "FAULT" ) {
+         &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Fault zones available: $AdemcoStr") if $main::config_parms{AD2USB_debug_log};
+         return 11;
+      }
+      elsif ( $substatus eq "BYPAS" ) {
+         &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Bypass zones available: $AdemcoStr") if $main::config_parms{AD2USB_debug_log};
+         return 12;
+      }
+      elsif (index($AdemcoStr, "Hit *") >= 0) {
+         &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Faults available: $AdemcoStr") if $main::config_parms{AD2USB_debug_log};
+         return 10;
+      }
+      else {
+#         &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Standard status received: $AdemcoStr");
+         return 13;
+      }
+   }
+   elsif (substr($AdemcoStr,0,5) eq "!RFX:") {
+      &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Wireless status received.") if $main::config_parms{AD2USB_debug_log};
+      return 2;
+   }
+   elsif (substr($AdemcoStr,0,5) eq "!EXP:") {
+      &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Expander status received.") if $main::config_parms{AD2USB_debug_log};
+      return 3;
+   }
+   elsif (substr($AdemcoStr,0,5) eq "!REL:") {
+      &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Relay status received.") if $main::config_parms{AD2USB_debug_log};
+      return 4;
+   }
+   elsif ($AdemcoStr eq "!Sending...done") {
+      &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Command sent successfully.") if $main::config_parms{AD2USB_debug_log};;
+      return 0;
+   }
+   return -1;
+}
+
+#}}}
+#    Change zone statuses for zone indices from start to end
+sub ChangeZones {
+   my $start  = @_[0];
+   my $end  = @_[1];
+   my $new_status = @_[2];
+   my $neq_status = @_[3];
+   my $log = @_[4];
+
+   my $self = $Self;
+   for ($i = $start; $i <= $end; $i++) {
+      $current_status = $self->{zone_status}{"$i"};
+      if (($current_status ne $new_status) && ($current_status ne $neq_status)) {
+         if (($main::config_parms{AD2USB_zone_log}) && ($log == 1)) {
+            my $ZoneNumPadded = $i; 
+            $ZoneNumPadded = sprintf("%3d", $ZoneNumPadded);
+            $ZoneNumPadded =~ tr/ /0/;
+            $ZoneName = "Unknown";
+            $ZoneName = $main::config_parms{"AD2USB_zone_$ZoneNumPadded"}  if exists $main::config_parms{"AD2USB_zone_$ZoneNumPadded"};
+            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Zone $i ($ZoneName) changed from '$current_status' to '$new_status'" ) if $main::config_parms{AD2USB_zone_log};
+         }
+         $self->{zone_status}{"$i"} = $new_status;
+	 #  Set child object status if it is registered to the zone
+	 $$self{zone_object}{"$i"}->set($new_status) if defined $$self{zone_object}{"$i"};
+      }
+   }
+}
+
+#}}}
+#    Change partition statuses for partition indices from start to end
+sub ChangePartitions {
+   my $start  = @_[0];
+   my $end  = @_[1];
+   my $new_status = @_[2];
+   my $log = @_[3];
+
+   my $self = $Self;
+   for ($i = $start; $i <= $end; $i++) {
+      $current_status = $self->{partition_status}{"$i"};
+      if ($current_status ne $new_status) {
+         if (($main::config_parms{AD2USB_part_log}) && ($log == 1)) {
+            $PartName = $main::config_parms{"AD2USB_part_$i"}  if exists $main::config_parms{"AD2USB_part_$i"};
+            &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Partition $i ($PartName) changed from '$current_status' to '$new_status'" ) if $main::config_parms{AD2USB_part_log};
+         }
+         $self->{partition_status}{"$i"} = $new_status;
+      }
+   }
+}
+
+ 
+#    Reset Ademco state to simulate a "now" on some value ie: zone, temp etc.  {{{
+sub ResetAdemcoState {
+
+   my $self = $Self;
+   # store faults (fault and bypass) for next message parsing
+   if (($self->{zone_now_status} eq "fault") || ($self->{zone_now_status} eq "bypass")) {
+      $self->{zone_last_status} = $self->{zone_now_status};
+      $self->{zone_last_num} = $self->{zone_now_num};
+      $self->{zone_last_name} = $self->{zone_now_name};
+   }
+
+   # reset zone
+   if ( defined $self->{zone_now_num} ) {
+      my $ZoneNum = $self->{zone_now_num};
+      $self->{zone_num}{$ZoneNum}   = $self->{zone_now_num};
+      $self->{zone_msg}{$ZoneNum}    = $self->{zone_now_msg};
+      $self->{zone_status}{$ZoneNum} = $self->{zone_now_status};
+      $self->{zone_time}{$ZoneNum}   = &::time_date_stamp( 17, time );
+      undef $self->{zone_now_num};
+      undef $self->{zone_now_name};
+      undef $self->{zone_now_status};
+      undef $self->{zone_now_msg};
+   }
+
+   # reset partition
+   if ( defined $self->{partition_now_num} ) {
+      my $PartNum = $self->{partition_now_num};
+      $self->{partition}{$PartNum}        = $self->{partition_now_num};
+      $self->{partition_msg}{$PartNum}    = $self->{partition_now_msg};
+      $self->{partition_status}{$PartNum} = $self->{partition_now_status};
+      $self->{partition_time}{$PartNum}   = &::time_date_stamp( 17, time );
+      undef $self->{partition_now_num};
+      undef $self->{partition_now_msg};
+      undef $self->{partition_now_status};
+   }
+
+   return;
+}
+
+#}}}
+#    Define hash with Ademco commands                                           {{{
+sub DefineCmdMsg {
+  my %OutputListco;
+   foreach my $key (keys(%::config_parms)) {
+    next if $key =~ /_MHINTERNAL_/;
+    next if $key !~ /^AD2USB_output_(\D+)_(\d+)$/;
+      if ($1 eq 'co') {
+       $OutputListco{"$::config_parms{$key}c"} = "$::config_parms{AD2USB_user_master_code}#70$2";
+       $OutputListco{"$::config_parms{$key}o"} = "$::config_parms{AD2USB_user_master_code}#80$2";
+       }
+      if ($1 eq 'oc') {
+       $OutputListco{"$::config_parms{$key}o"} = "$::config_parms{AD2USB_user_master_code}#80$2";
+       $OutputListco{"$::config_parms{$key}c"} = "$::config_parms{AD2USB_user_master_code}#70$2";
+       }
+      if ($1 eq 'o') {
+       $OutputListco{"$::config_parms{$key}o"} = "$::config_parms{AD2USB_user_master_code}#80$2";
+       }
+      if ($1 eq 'c') {
+       $OutputListco{"$::config_parms{$key}c"} = "$::config_parms{AD2USB_user_master_code}#70$2";
+       }
+     }
+ 
+ my %ExpListc;
+  my $srpzonenum;
+  foreach my $key (keys(%::config_parms)) {
+    next if $key =~ /_MHINTERNAL_/;
+    next if $key !~ /^AD2USB_expander_(\d+)$/;
+       $srpzonenum = substr($::config_parms{$key}, 1);
+       $ExpListc{"exp$::config_parms{$key}c"} = "L$srpzonenum"."0";
+       $ExpListc{"exp$::config_parms{$key}f"} = "L$srpzonenum"."1";
+       $ExpListc{"exp$::config_parms{$key}p"} = "L$srpzonenum"."2";  
+     } 
+
+   %CmdMsg = (
+      "Disarm"                            => "$::config_parms{AD2USB_user_master_code}1",
+      "ArmAway"                           => "$::config_parms{AD2USB_user_master_code}2",
+      "ArmStay"                           => "$::config_parms{AD2USB_user_master_code}3",
+      "ArmAwayMax"                        => "$::config_parms{AD2USB_user_master_code}4",
+      "Test"                              => "$::config_parms{AD2USB_user_master_code}5",
+      "Bypass"                            => "$::config_parms{AD2USB_user_master_code}6#",
+      "ArmStayInstant"                    => "$::config_parms{AD2USB_user_master_code}7",
+      "Code"                              => "$::config_parms{AD2USB_user_master_code}8",
+      "Chime"                             => "$::config_parms{AD2USB_user_master_code}9",
+      "ToggleVoice"                       => '#024',
+      "ShowFaults"                        => "*",
+      "AD2USBReboot"                      => "=",
+      "AD2USBConfigure"                   => "!"
+   );
+ 
+   my %newHash = (%OutputListco, %CmdMsg); 
+   %CmdMsg = %newHash;
+   %newHash = (%ExpListc, %CmdMsg);
+   %CmdMsg = %newHash;
+   %CmdMsgRev = reverse %CmdMsg;
+   return;
+}
+
+#}}}
+#    Define hash with all zone numbers and names {{{
+sub ZoneName {
+   #my $self = $Self;
+   my @Name = ["none"];
+
+	foreach my $key (keys(%::config_parms)) {
+		next if $key =~ /_MHINTERNAL_/;
+		next if $key !~ /^AD2USB_zone_(\d+)$/;
+		$Name[int($1)]=$::config_parms{$key};
+	}
+   return @Name;
+}
+
+
+sub MappedZones {
+	foreach my $mkey (keys(%::config_parms)) {
+                next if $mkey =~ /_MHINTERNAL_/;
+                next if $mkey !~ /^AD2USB_(relay|wireless|expander)_(\d+)$/;
+                if ("@_" eq $::config_parms{$mkey}) { return 1 }
+        }
+    return 0;
+}
+
+#}}}
+#    Sending command to ADEMCO panel                                           {{{
+sub cmd {
+
+   my ( $class, $cmd, $password ) = @_;
+   $cmd = $CmdMsg{$cmd};
+
+   $CmdName = ( exists $CmdMsgRev{$cmd} ) ? $CmdMsgRev{$cmd} : "unknown";
+   $CmdStr = $cmd;
+
+   # Exit if unknown command
+   if ( $CmdName =~ /^unknown/ ) {
+      &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Invalid ADEMCO panel command : $CmdName ($cmd)");
+      return;
+   }
+
+   # Exit if password is wrong
+   if ( ($password ne $::config_parms{AD2USB_user_master_code}) && ($CmdName ne "ShowFaults" ) ) {
+      &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", "Invalid password for command $CmdName ($password)");
+      return;
+   }
+
+   &LocalLogit( "$main::config_parms{data_dir}/logs/AD2USB.$main::Year_Month_Now.log", ">>> Sending to ADEMCO panel                      $CmdName ($cmd)" ) if $main::config_parms{AD2USB_debug_log};
+   $class->{keys_sent} = $class->{keys_sent} + length($CmdStr);
+   if ($connecttype eq 'serial') {
+    $main::Serial_Ports{AD2USB}{object}->write("$CmdStr");
+    } else {
+    set $AD2USB_ser2sock_sender "$CmdStr";
+    } 
+   return "Sending to ADEMCO panel: $CmdName ($cmd)";
+
+}
+
+#}}}
+#    user call from MH                                                         {{{
+
+sub zone_now {
+   return $_[0]->{zone_now_name} if defined $_[0]->{zone_now_name};
+}
+
+sub zone_msg {
+   return $_[0]->{zone_now_msg} if defined $_[0]->{zone_now_msg};
+}
+
+sub zone_now_restore {
+   return $_[0]->{zone_now_restore} if defined $_[0]->{zone_now_restore};
+}
+
+sub zone_now_tamper {
+   return $_[0]->{zone_now_tamper} if defined $_[0]->{zone_now_tamper};
+}
+
+sub zone_now_tamper_restore {
+   return $_[0]->{zone_now_tamper_restore} if defined $_[0]->{zone_now_tamper_restore};
+}
+
+sub zone_now_alarm {
+   return $_[0]->{zone_now_alarm} if defined $_[0]->{zone_now_alarm};
+}
+
+sub zone_now_alarm_restore {
+   return $_[0]->{zone_now_alarm_restore} if defined $_[0]->{zone_now_alarm_restore};
+}
+
+sub zone_now_fault {
+   return $_[0]->{zone_now_num} if defined $_[0]->{zone_now_num};
+}
+
+sub status_zone {
+   my ( $class, $zone ) = @_;
+   return $_[0]->{zone_status}{$zone} if defined $_[0]->{zone_status}{$zone};
+}
+
+sub zone_name {
+   my ( $class, $zone_num ) = @_;
+   $zone_num = sprintf "%03s", $zone_num;
+   my $ZoneName = $main::config_parms{"AD2USB_zone_$zone_num"} if exists $main::config_parms{"AD2USB_zone_$zone_num"};
+   return $ZoneName if $ZoneName;
+   return $zone_num;
+}
+
+sub partition_now {
+   my ( $class, $part ) = @_;
+   return $_[0]->{partition_now_num} if defined $_[0]->{partition_now_num};
+}
+
+sub partition_now_msg {
+   my ( $class, $part ) = @_;
+   return $_[0]->{partition_now_msg} if defined $_[0]->{partition_now_msg};
+}
+
+sub partition_name {
+   my ( $class, $part_num ) = @_;
+   my $PartName = $main::config_parms{"AD2USB_part_$part_num"} if exists $main::config_parms{"AD2USB_part_$part_num"};
+   return $PartName if $PartName;
+   return $part_num;
+}
+
+sub cmd_list {
+   foreach my $k ( sort keys %CmdMsg ) {
+      &::print_log("$k");
+   }
+}
+
+##Used to register a child object to the zone. Allows for MH-style Door & Motion sensors
+sub register {
+   my ($class, $object, $zone_num ) = @_;
+   &::print_log("Registering Child Object $object->{zone_number} on zone $zone_num"); 
+   $_[0]->{zone_object}{$zone_num} = $object;
+   }
+
+ 
+
+# MH-Style child objects
+# These allow zones to behave like Door_Items and Motion Sensors
+# to use, just create the item with the Master AD2USB object and the appropriate zone
+#
+# ie. 
+# $AD2USB = new AD2USB;
+# $Front_door = new AD2USB_Door_Item($AD2USB,1);
+# $Front_motion = new AD2USB_Motion_Item($AD2USB,2);
+
+package AD2USB_Door_Item;
+
+@AD2USB_Door_Item::ISA = ('Generic_Item');
+
+sub new
+{
+   my ($class,$object,$zone) = @_;
+
+   my $self={};
+   bless $self,$class;
+
+   $$self{m_write} = 0;
+   $$self{m_timerCheck} = new Timer() unless $$self{m_timerCheck};
+   $$self{m_timerAlarm} = new Timer() unless $$self{m_timerAlarm};
+   $$self{'alarm_action'} = '';
+   $$self{last_open} = 0;
+   $$self{last_closed} = 0;
+   @{$$self{states}} = ('open','closed','check');
+   $$self{zone_number} = $zone;
+   $$self{master_object} = $object;
+   $$self{item_type} = 'door';
+   $object->register($self,$zone);
+
+   return $self;
+
+}
+
+sub set
+{
+   my ($self,$p_state,$p_setby) = @_;
+
+      if (ref $p_setby and $p_setby->can('get_set_by')) {
+         &::print_log("AD2USB_Door_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by " . $p_setby->get_set_by) if $main::Debug{AD2USB};
+      } else {
+         &::print_log("AD2USB_Door_Item($$self{object_name})::set($p_state, $p_setby)") if $main::Debug{AD2USB};
+      }
+
+      if ($p_state =~ /^fault/) {
+         $p_state = 'open';
+         $$self{last_open} = $::Time;
+
+      } elsif ($p_state =~ /^ready/) {
+         $p_state = 'closed';
+         $$self{last_closed} = $::Time;
+
+      # Other door sensors?
+      } elsif ($p_state eq 'on') {
+         $p_state = 'open';
+         $$self{last_open} = $::Time;
+
+      } elsif ($p_state eq 'off') {
+         $p_state = 'closed';
+         $$self{last_closed} = $::Time;
+
+      } else {
+      	 $p_state = 'check';
+      }
+
+      $self->SUPER::set($p_state,$p_setby);
+}
+   
+sub get_last_close_time {
+   my ($self) = @_;
+   return $$self{last_closed};
+}
+
+sub get_last_open_time {
+   my ($self) = @_;
+   return $$self{last_open};
+}
+
+sub get_child_item_type {
+   my ($self) = @_;
+   return $$self{item_type};
+}
+
+#Left in these methods to maintain compatibility. Since we're not tracking inactivity, these won't return proper results.
+
+sub set_alarm($$$) {
+   my ($self, $time, $action, $repeat_time) = @_;
+   $$self{'alarm_action'} = $action;
+   $$self{'alarm_time'} = $time;
+   $$self{'alarm_repeat_time'} = $repeat_time if defined $repeat_time;
+   &::print_log ("AD2USB_Door_Item:: set_alarm not supported");
+
+}
+
+sub set_inactivity_alarm($$$) {
+   my ($self, $time, $action) = @_;
+   $$self{'inactivity_action'} = $action;
+   $$self{'inactivity_time'} = $time*3600;
+   &::print_log("AD2USB_Door_Item:: set_inactivity_alarm not supported");
+
+}
+
+
+package AD2USB_Motion_Item;
+@AD2USB_Motion_Item::ISA = ('Generic_Item');
+
+sub new
+{
+   my ($class,$object,$zone) = @_;
+
+   my $self={};
+   bless $self,$class;
+
+   $$self{m_write} = 0;
+   $$self{m_timerCheck} = new Timer() unless $$self{m_timerCheck};
+   $$self{m_timerAlarm} = new Timer() unless $$self{m_timerAlarm};
+   $$self{'alarm_action'} = '';
+   $$self{last_still} = 0;
+   $$self{last_motion} = 0;
+   @{$$self{states}} = ('motion','still','check');
+   $$self{zone_number} = $zone;
+   $$self{master_object} = $object;
+   $$self{item_type} = 'motion';
+
+   $object->register($self,$zone);
+
+   return $self;
+
+}
+
+sub set
+{
+	my ($self,$p_state,$p_setby) = @_;
+
+
+   if (ref $p_setby and $p_setby->can('get_set_by')) {
+      &::print_log("AD2USB_Motion_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by " . $p_setby->get_set_by) if $main::Debug{AD2USB};
+   } else {
+      &::print_log("AD2USB_Motion_Item($$self{object_name})::set($p_state, $p_setby)") if $main::Debug{AD2USB};
+   }
+
+   if ($p_state =~ /^fault/i) {
+      $p_state = 'motion';
+      $$self{last_motion} = $::Time;
+
+   } elsif ($p_state =~ /^ready/i) {
+      $p_state = 'still';
+      $$self{last_still} = $::Time;
+
+   } else {
+      $p_state = 'check';
+   }
+
+	$self->SUPER::set($p_state, $p_setby);
+}
+
+sub get_last_still_time {
+   my ($self) = @_;
+   return $$self{last_still};
+}
+
+sub get_last_motion_time {
+   my ($self) = @_;
+   return $$self{last_motion};
+}
+
+sub get_child_item_type {
+   my ($self) = @_;
+   return $$self{item_type};
+}
+
+#Left in these methods to maintain compatibility. Since we're not tracking inactivity, these won't return proper results.
+sub delay_off()
+{
+	my ($self,$p_time) = @_;
+	$$self{m_delay_off} = $p_time if defined $p_time;
+	&::print_log("AD2USB_Motion_Item:: delay_off not supported");
+	return $$self{m_delay_off};
+}
+
+sub set_inactivity_alarm($$$) {
+   my ($self, $time, $action) = @_;
+   $$self{'inactivity_action'} = $action;
+   $$self{'inactivity_time'} = $time*3600;
+	$$self{m_timerCheck}->set($time*3600, $self);
+	&::print_log("AD2USB_Motion_Item:: set_inactivity_alarm not supported");
+}
+
+1;
+
+#}}}
+#$Log:$
+
+__END__
+

From 361924383b10bc660c55ed1c1310eed76dfee477 Mon Sep 17 00:00:00 2001
From: hplato <hplato@gmail.com>
Date: Fri, 3 Jan 2014 17:12:19 -0700
Subject: [PATCH 328/330] 	modified:   AD2USB.pm

---
 lib/AD2USB.pm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/AD2USB.pm b/lib/AD2USB.pm
index 8b6ac8520..76577fb7e 100755
--- a/lib/AD2USB.pm
+++ b/lib/AD2USB.pm
@@ -1104,7 +1104,12 @@ sub register {
    $_[0]->{zone_object}{$zone_num} = $object;
    }
 
- 
+sub get_child_object_name {
+   my ($class,$zone_num) = @_;
+   my $object = $_[0]->{zone_object}{$zone_num};
+   return $object->get_object_name() if defined ($object);
+}
+
 
 # MH-Style child objects
 # These allow zones to behave like Door_Items and Motion Sensors
@@ -1113,7 +1118,11 @@ sub register {
 # ie. 
 # $AD2USB = new AD2USB;
 # $Front_door = new AD2USB_Door_Item($AD2USB,1);
+#   states include open, closed and check
 # $Front_motion = new AD2USB_Motion_Item($AD2USB,2);
+#   states include motion and still
+#
+# inactivity timers are not working...don't know if those are relevant for panel items.
 
 package AD2USB_Door_Item;
 

From dedfc5cf011d374853dc8b18a106653874aafd7c Mon Sep 17 00:00:00 2001
From: hplato <hplato@gmail.com>
Date: Wed, 8 Jan 2014 20:33:06 -0700
Subject: [PATCH 329/330] 	modified:   bin/ical2vsdb 	modified:  
 code/common/organizer.pl 	modified:   web/organizer/calendar.pl

---
 bin/ical2vsdb             | 48 ++++++++++++++++++++++------------
 code/common/organizer.pl  | 55 ++++++++++++++++++++++++++++++++-------
 web/organizer/calendar.pl | 32 +++++++++++++----------
 3 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/bin/ical2vsdb b/bin/ical2vsdb
index 591549c59..83d00dbdd 100755
--- a/bin/ical2vsdb
+++ b/bin/ical2vsdb
@@ -9,13 +9,18 @@ use strict;
 ##
 ## Date::Calc
 ## DateTime::TimeZone
+## Crypt::SSLeay is required if using https
 ##
 ## All other libs should exist w/i the core mh lib/site dir structure
 ##
 
 ## Changelog 3.4 10-04-06: for some reason ical parser is adding an 'ical' level in the
 ##  ical parse hash from a Darwin Calendar Server. Added a dcsfix option
-
+##
+##  v4.0 01-2014: Date bugfix, added https method, added control calendar, and made sync_dtstamp
+##    and dcsfix defaults. Added in nosync_dtstamp and nodcsfix option to override.
+##   NOTE: v4 requires the update 2014 vsdb calendar schema (adding a control attribute). 
+##         Common module organizer 2014 and vsdb calendar.pl 1.6.0-3 required.
 
 use lib '../lib', '../lib/site';
 use iCal::Parser;
@@ -33,12 +38,11 @@ use vsLock;
 # verify todos (uninitialized string message?)
 # verify locking works as expected
 
-
 my $progname = "ical2vsdb";
-my $progver  = "v3.4 10-04-06";
+my $progver  = "v4 01-2014";
 my $DB = 0;
 
-my $days_before = 180; # defaults to avoid large vsdb databases, can be overriden
+my $days_before = -180; # defaults to avoid large vsdb databases, can be overriden
 my $days_after = 180;  #
 
 my $config_file= "";
@@ -55,6 +59,7 @@ $config_file = $ARGV[0] if $ARGV[0];
 &help if ((lc $config_file eq "-h") or (lc $config_file eq "--h") or ($config_file eq ""));
 
 print "iCal to vsDB Misterhouse import ($progname $progver) starting...\n";
+print "Debug Level $DB\n" if ($DB);
 
 &purge_icals if ($config_file eq "--purge-ical-info");
 
@@ -120,10 +125,12 @@ while (1) {
 	print "done\n";
 	$process = 1;
 
-    } elsif ((lc $ical_data[$loop]->{method} eq "http") or (lc $ical_data[$loop]->{method} eq "webcal")) {
-        print "Fetching via LWP...";
+    } elsif ((lc $ical_data[$loop]->{method} eq "http") or (lc $ical_data[$loop]->{method} eq "https") or (lc $ical_data[$loop]->{method} eq "webcal")) {
         my $ua = new LWP::UserAgent;
-	my $req = new HTTP::Request GET => "http://" . $calendar_loc;
+        my $method = "http";
+        $method .= "s" if (lc $ical_data[$loop]->{method} eq "https");
+        print "Fetching via LWP:$method...";
+	my $req = new HTTP::Request GET => $method . "://" . $calendar_loc;
         if ($ical_data[$loop]->{username}) {
            $req->authorization_basic($ical_data[$loop]->{username},$ical_data[$loop]->{password});
         }
@@ -162,7 +169,7 @@ while (1) {
 
   if ($process) {
 
-    if ($ical_data[$loop]->{options}->{sync_dtstamp}) {
+    unless ($ical_data[$loop]->{options}->{nosync_dtstamp}) {
 	print "Syncing DTSTAMP attributes from CREATED...\n";
         $data =~ s/DTSTAMP:(.*)\n//g;
         $data =~ s/CREATED:(.*)\n/CREATED:$1\nDTSTAMP:$1\n/g;
@@ -178,7 +185,7 @@ while (1) {
 #    print "Debug: Hash=$ical_data[$loop]->{hash}\n" if (defined $ical_data[$loop]->{hash});
 
     if (!(defined $ical_data[$loop]->{hash}) or ($ical_data[$loop]->{hash} ne $digest)) {
-       print "New Calendar entries. Processing iCal...";
+       print "New Calendar entries. Processing iCal.";
        if ($ical_data[$loop]->{method} ne "dir") {
 	   eval {$parser->parse_strings($data); };
        }
@@ -299,14 +306,16 @@ sub parse_cal {
   my $opt_speak_todo = 0;
   my $opt_holiday = 0;
   my $opt_vacation = 0;
+  my $opt_control = 0;
 
   $opt_speak_cal = 1 if (exists $options->{speak_cal});
   $opt_speak_todo = 1 if (exists $options->{speak_todo});
   $opt_holiday = 1 if (exists $options->{holiday});
   $opt_vacation = 1 if (exists $options->{vacation});
+  $opt_control = 1 if (exists $options->{control});
+
   my ($opt_sourcename) = $options->{name} if (defined $options->{name});
-  $cal = $cal->{ical} if (exists $options->{dcsfix});
-  print "Fixing Darwin Calendar Server Settings...\n" if ($DB and (exists $options->{dcsfix}));
+  $cal = $cal->{ical} unless (exists $options->{nodcsfix});
   my $calname = $cal->{cals}->[0]->{'X-WR-CALNAME'};
   $calname = $opt_sourcename if $opt_sourcename;
 
@@ -334,16 +343,17 @@ sub parse_cal {
 	  print "."; #give some progress
 	  while (my $uid = each %{$cal->{events}->{$year}->{$month}->{$day}}) {
 		my $delta;
-
 		#is this event in range?
 		if ($days_before or $days_after) {
 		   $delta  = Delta_Days($lyear,$lmon,$lday, $year,$month,$day);
 		}
+		print "EventID:$uid, before=$days_before after=$days_after delta=$delta\n" if ($DB>2);
 
 		#if not then skip the item
 		next if ((($days_before) and ($days_before > $delta)) or
-		         (($days_after) and ($days_after < $delta)));		
-
+		         (($days_after) and ($days_after < $delta)));	
+			
+		print "Processing EventID:$uid\n" if ($DB >2);
 		my $event_ref = $cal->{events}->{$year}->{$month}->{$day}->{$uid};
 		my $starttime = "12:00 am"; # starttime and endtime are initialized the same if all day
                 my $endtime = "12:00 am";
@@ -380,6 +390,8 @@ sub parse_cal {
 		$holiday = "on" if $opt_holiday;
 		my $vacation = "off";
 		$vacation = "on" if $opt_vacation;
+		my $control = "off";
+		$control = "on" if $opt_control;
 
                 my $description = $event_ref->{DESCRIPTION} || '';
                 if ($description) {
@@ -399,6 +411,7 @@ sub parse_cal {
 		$out_cals[$count]->{DETAILS} = $description;
 		$out_cals[$count]->{HOLIDAY} = $holiday;
 		$out_cals[$count]->{VACATION} = $vacation;
+		$out_cals[$count]->{CONTROL} = $control;
 		$out_cals[$count]->{SOURCE} = $source;
 		$out_cals[$count]->{REMINDER} = $reminder;
 		$out_cals[$count]->{ENDTIME} = $endtime;
@@ -542,7 +555,8 @@ sub init {
 	    $ical_data[$count]->{options}->{$key} = $value;
 	  }
 	  $ical_data[$count]->{hash} = "none";
-	  
+	  print "Applying second level ical parsing (set nodscfix if this breaks anything) ...\n" unless (exists $ical_data[$count]->{options}->{nodcsfix});
+
 	  my ($method, $loc) = split(/:\/\//,$url);
           if ($loc) {
              my ($username, $password, $uri) = $loc =~ /^(\S+):(\S+)@(\S+)/i;
@@ -593,12 +607,14 @@ sub help {
 
   print "usage\t$progname CONFIGURATION_FILE OUTPUT_DIR\n";
   print " or\t$progname --purge-ical-info OUTPUT_DIR\n";
+  print "version $progver\n";
   print "\n\n";
   print " -- CONFIG FILE SYNTAX -- \n";
   print "TYPE<tab>VALUE<tab>option\n\n";
   print "TYPE = cfg_version|ical|days_before|days_after|sleep\n";
   print "VALUE = parameter value or ical location (http://, file://, dir://)\n";
-  print "OPTION = comma delimited values (holiday,name=Joe User,speak_todos,vacation,sync_dtstamp)\n";
+  print "OPTION = comma delimited values (holiday,name=Joe User,speak_todos,vacation,\n";
+  print "			control, nodcsfix, nosync_dtstamp)\n";
   print "\n";
 
   die;
diff --git a/code/common/organizer.pl b/code/common/organizer.pl
index 162fbd818..4fe66f6e6 100644
--- a/code/common/organizer.pl
+++ b/code/common/organizer.pl
@@ -1,18 +1,19 @@
 # Category = Time
 
-#@ This module is a significant update from 2.103, and has a few functions;
+#@ This module is a significant update from v3, and has a few functions;
 #@<br>
 #@ <ul>
 #@ <li> iCal2vsDB syncronization control. Imports iCal files (Apple iCal, 
 #@   Mozilla Sunbird) into MH as standard calendars, or holiday/vacation
 #@   calendars.
+#@ <li> New in v3.1 now can control objects using a control calendar
 #@ <li> Monitors the vsDB calendar and todo files and creates required events
 #@   to process these items (creates organizer_*.pl files in the code dir)
 #@ <li> Implements an Organizer_Events class for manipulating events, holidays
 #@   and vacations.
 #@ <li> Automatically updates vsDB 'databases' with the new required fields
 #@<br>
-#@ Minimum Requirements: calendar.pl 1.5.7-4 and tasks.pl 1.4.8-4 (Misterhouse v2.104)
+#@ Minimum Requirements: calendar.pl 1.6.0-3 and tasks.pl 1.4.8-4 (Misterhouse v2.104)
 
 =begin comment
 
@@ -37,22 +38,29 @@
 
 url examples:
 http://server/path/to/icalfile.ics
+https://server/path/to/icalfile.ics
 file://path/to/icalfile.ics
 http://user@pass:server/file.ics
 
 ical2vsdb_<name>_options = comma delimited list of ical processing options
 
 Options available:
-sync_dtstamp	some calendars (ie google) update the dtstamp field each time the calendar
-		is downloaded, such that it is processed each time. Setting this option
-		syncs the dtstamp field with created, ensuring that ical2vsdb only runs when
-		the calendar has changed.
+
 speak_cal 	to speak calendar entries
 speak_todo 	to speak task entries
 holiday		calendar entries should be treated as holiday time
 vacation	calendar entries should be treated as vacation time
 name=XXXX	set source name to XXX rather than parse it from inside the ical
-dcsfix		might be needed to parse calendars using the Darwin Calendar Server
+
+Changed in ical2vsdb 4
+nodcsfix	most calendar servers (ie google) need a second level parse. Set this if the ical
+		isn't being processed
+nosync_dtstamp	some calendars (ie google) update the dtstamp field each time the calendar
+		is downloaded, such that it is processed each time. ical2vsdb syncs these fields 
+		ensuring that ical2vsdb only runs when the calendar has changed. Set this if there is
+		too much processing not if non-google calendars aren't being processed
+control		For dedicated item control calendars. MH objects with the same name as the
+		event will be turned on during the event duration
 
 ie
 ical2vsdb_account1 = http://house/holical.ics
@@ -67,6 +75,8 @@
 iCal2vsDB uses iCal::Parser, which has several significant dependancies to operate correctly,
 these have been included in lib/site
 
+for https access Crypt::SSLeay needs to be installed manually as well
+
 =cut
 
 
@@ -198,7 +208,7 @@ package main;
        if defined $main::config_parms{organizer_announce_priorday_times};
 
    #Check to see if calendar and organizer databases need upgrade
-   my @_upd_cal = ( 'DATE','TIME','EVENT','CATEGORY','DETAILS','HOLIDAY','VACATION','SOURCE','REMINDER','ENDTIME' );
+   my @_upd_cal = ( 'DATE','TIME','EVENT','CATEGORY','DETAILS','HOLIDAY','VACATION','SOURCE','REMINDER','ENDTIME','CONTROL' );
    $calOk = &update_vsdb('Calendar',$_organizer_cal->name,@_upd_cal);
 
    my @_upd_todo = ( 'Complete','Description','DueDate','AssignedTo','Notes','SPEAK','SOURCE','REMINDER','STARTDATE','CATEGORY' );
@@ -309,12 +319,14 @@ package main;
            $data{reminder} = $objDB->FieldValue('REMINDER');
            $data{category} = $objDB->FieldValue('CATEGORY');
            $data{endtime} = $objDB->FieldValue('ENDTIME');
+	   $data{control} = $objDB->FieldValue('CONTROL');
            $data{endtime} = (!($data{endtime}) && $data{time}) ? $data{time} : $data{endtime};
            $data{allday} = ($data{time} eq $data{endtime}) ? 'Yes' : 'No';
            $data{notes} = $objDB->FieldValue('DETAILS');
            $data{startdt} = $data{date} . ' ' . (($data{time}) ? $data{time} : "12:00 am");
            $data{enddt} = $data{date} . ' ' 
-               . (($data{endtime} && $data{endtime} !~ /12:00 am/i) ? $data{time} : "11:59 pm");
+               . (($data{endtime} && $data{endtime} !~ /12:00 am/i) ? $data{endtime} : "11:59 pm");
+
 
            #changed to notify an array of email addresses
            $data{name_count} = 0;
@@ -474,6 +486,9 @@ sub generate_code {
     my $default_reminder = $main::config_parms{organizer_reminder};
     $default_reminder = '15m' unless $default_reminder;
     $data{reminder} = $default_reminder unless $data{reminder} or $data{allday} =~ /^y/i;
+
+#print_log "organizerDB: data{type}=$data{type} data{control}=$data{control} data{desc}=$data{description}";
+
     my $task_flag = $main::config_parms{organizer_vc_category};
     if (($task_flag) && ($data{type} eq 'task') && 
        (($data{category} and ($data{category} =~ /^$task_flag/i)) or ($data{description} =~ /^$task_flag/i))) {
@@ -494,6 +509,28 @@ sub generate_code {
        }
        return;
     }
+
+    # control calendars turn item on and off. Note that this only tests if an object exists. A better way
+    # might be to check if on & off are valid states...
+    if (($data{type} eq 'event') and ($data{control} eq 'on')) {
+       my $obj = $data{description};
+       #&main::print_log("organizerDB: found control event $obj starting $data{startdt} ending $data{enddt}");
+       my $obj_test = '';
+       my $obj_state = '';
+       eval { $obj_test = &main::get_object_by_name($obj); $obj_state = state $obj_test };
+       if ($obj_state) {
+          if (($data{startdt}) and ($data{enddt})) {
+             print MYCODE "if (time_now '$data{startdt}') { set \$$obj ON; }; #Control Event\n";
+             print MYCODE "if (time_now '$data{enddt}') { set \$$obj OFF; }; #Control Event\n";
+          } else {
+		&main::print_log("Organizer: Warning, invalid times for event object $obj. Ignoring Event on $data{startdt}");
+	  }
+       } else {
+	&main::print_log("Organizer: Warning, cannot determing state of event object $obj. This item might not exist. Ignoring Event on $data{startdt}");
+	}
+       return;
+    }
+
     if ($data{reminder} and !(time_greater_than($data{time_date}) or $data{reminder} eq 'none')) {
        my @reminders = split(/,/,$data{reminder});
        for my $reminder_info (@reminders) {
diff --git a/web/organizer/calendar.pl b/web/organizer/calendar.pl
index c224a889c..5fc036184 100644
--- a/web/organizer/calendar.pl
+++ b/web/organizer/calendar.pl
@@ -15,6 +15,7 @@
 # or indirectly caused by this software.
 # 
 # Version History
+# 1.6.0-3 - 01/03/14 - added support for control calendars (hide them)
 # 1.6.0-2 - 11/02/07 - minor bugfix to in icalsync name
 # 1.6.0-1 - 09/24/07 - Updated to organizer release 2.5.2 without admin login and ical customization
 #		       (1.6.0 added admin login & changed navigation)
@@ -30,7 +31,7 @@
 # 1.5.2   - 08/22/01 - added file locking
 # ----------------------------------------------------------------------------
 
-my $VERSION = "1.6.0-2";
+my $VERSION = "1.6.0-3";
 
 BEGIN {
 #	$SIG{__WARN__} = \&FatalError;
@@ -338,18 +339,19 @@ sub PrintDay {
     }
 
     while (!$objMyDb->EOF) {
-	my $custcolor = "";
-	$custcolor = " bgcolor='$dataHolidayColor' " if ($objMyDb->FieldValue("HOLIDAY") eq "on");
-	$custcolor = " bgcolor='$dataVacationColor' " if ($objMyDb->FieldValue("VACATION") eq "on");
-	$custcolor = " bgcolor='$dataMultipleColor' " if (($objMyDb->FieldValue("VACATION") eq "on") and ($objMyDb->FieldValue("HOLIDAY") eq "on")); # if a day is both vacation and holiday
-
-    my $icon = $detailIcon;
-    my $source = $objMyDb->FieldValue("SOURCE");
-    $icon = "images/ical_1.jpg" if ($source =~ /^ical=/);
-    my $link = "<a href='$scriptName?vsSD=$showDayDetails&vsMA=$showforAudrey&vsCOM=EDIT&vsMonth=$month&vsYear=$year&vsDay=$day&vsID=" . $objMyDb->FieldValue("ID") . "'>";
-	print "<tr $custcolor><td>" . $link . "<img src='$icon' border='0'></a></td>";
-	print "<td><font size='2' face='arial,helvetica'>" . $objMyDb->FieldValue("TIME") . "&nbsp;</font></td>";
-	print "<td>" . $link . "<font size='2' face='arial,helvetica'>" . $objMyDb->FieldValue("EVENT") . "&nbsp;</font></td></a></tr>\n";
+	unless  ($objMyDb->FieldValue("CONTROL") eq "on") { #Don't display CONTROL calendars
+	   my $custcolor = "";
+	   $custcolor = " bgcolor='$dataHolidayColor' " if ($objMyDb->FieldValue("HOLIDAY") eq "on");
+	   $custcolor = " bgcolor='$dataVacationColor' " if ($objMyDb->FieldValue("VACATION") eq "on");
+	   $custcolor = " bgcolor='$dataMultipleColor' " if (($objMyDb->FieldValue("VACATION") eq "on") and ($objMyDb->FieldValue("HOLIDAY") eq "on")); # if a day is both vacation and holiday
+    	   my $icon = $detailIcon;
+    	   my $source = $objMyDb->FieldValue("SOURCE");
+    	   $icon = "images/ical_1.jpg" if ($source =~ /^ical=/);
+    	   my $link = "<a href='$scriptName?vsSD=$showDayDetails&vsMA=$showforAudrey&vsCOM=EDIT&vsMonth=$month&vsYear=$year&vsDay=$day&vsID=" . $objMyDb->FieldValue("ID") . "'>";
+	   print "<tr $custcolor><td>" . $link . "<img src='$icon' border='0'></a></td>";
+	   print "<td><font size='2' face='arial,helvetica'>" . $objMyDb->FieldValue("TIME") . "&nbsp;</font></td>";
+	   print "<td>" . $link . "<font size='2' face='arial,helvetica'>" . $objMyDb->FieldValue("EVENT") . "&nbsp;</font></td></a></tr>\n";
+	}
 	$objMyDb->MoveNext;
     }
 
@@ -460,7 +462,7 @@ sub PrintMonth {
 		if ($showDayDetails) {
 		    print "<font size='1'>";
 		    while (!$objMyDb->EOF) {
-			print "<a href='$scriptName?vsSD=$showDayDetails&vsMA=$showforAudrey&vsCOM=EDIT&vsMonth=$month&vsYear=$year&vsDay=$weekDayCount&vsID=" . $objMyDb->FieldValue("ID") . "'>" .$objMyDb->FieldValue("EVENT") . "</a><br>";
+			print "<a href='$scriptName?vsSD=$showDayDetails&vsMA=$showforAudrey&vsCOM=EDIT&vsMonth=$month&vsYear=$year&vsDay=$weekDayCount&vsID=" . $objMyDb->FieldValue("ID") . "'>" .$objMyDb->FieldValue("EVENT") . "</a><br>"	unless  ($objMyDb->FieldValue("CONTROL") eq "on"); #Don't display CONTROL calendars;
 			$objMyDb->MoveNext;
 		    }
 		    print "</font>";
@@ -573,6 +575,8 @@ sub PrintCurrentRecord {
 		} elsif ($fieldName eq "ENDTIME") {
 		    $endtime_entry = $objMyDB->FieldValue($fieldName);
 		   
+		} elsif ($fieldName eq "CONTROL") {
+			#Don't display CONTROL field. Do nothing 
 		} else {
 		    print "<tr valign='top' bgcolor='#DDDDDD'>\n";
 		    print "<td><font face='arial' size='2'>" . $fieldName . "</font></td>\n";

From 1555d1357f54b63f8ab14ffad986e00a04f8ce65 Mon Sep 17 00:00:00 2001
From: hplato <hplato@gmail.com>
Date: Sat, 11 Jan 2014 11:52:57 -0700
Subject: [PATCH 330/330] Added Calendar v4, bug fixes, https and control
 calendar

	modified:   bin/ical2vsdb
	modified:   code/common/organizer.pl
	modified:   web/organizer/calendar.pl
---
 bin/ical2vsdb             | 1 +
 code/common/organizer.pl  | 2 +-
 web/organizer/calendar.pl | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/ical2vsdb b/bin/ical2vsdb
index 83d00dbdd..03e8efcfa 100755
--- a/bin/ical2vsdb
+++ b/bin/ical2vsdb
@@ -21,6 +21,7 @@ use strict;
 ##    and dcsfix defaults. Added in nosync_dtstamp and nodcsfix option to override.
 ##   NOTE: v4 requires the update 2014 vsdb calendar schema (adding a control attribute). 
 ##         Common module organizer 2014 and vsdb calendar.pl 1.6.0-3 required.
+##
 
 use lib '../lib', '../lib/site';
 use iCal::Parser;
diff --git a/code/common/organizer.pl b/code/common/organizer.pl
index 4fe66f6e6..61eac3806 100644
--- a/code/common/organizer.pl
+++ b/code/common/organizer.pl
@@ -1,6 +1,6 @@
 # Category = Time
 
-#@ This module is a significant update from v3, and has a few functions;
+#@ This module is a significant update from MH v2, and has a few functions;
 #@<br>
 #@ <ul>
 #@ <li> iCal2vsDB syncronization control. Imports iCal files (Apple iCal, 
diff --git a/web/organizer/calendar.pl b/web/organizer/calendar.pl
index 5fc036184..0e1d262e6 100644
--- a/web/organizer/calendar.pl
+++ b/web/organizer/calendar.pl
@@ -15,7 +15,7 @@
 # or indirectly caused by this software.
 # 
 # Version History
-# 1.6.0-3 - 01/03/14 - added support for control calendars (hide them)
+# 1.6.0-3 - 01/04/14 - added support for control calendars (hide them)
 # 1.6.0-2 - 11/02/07 - minor bugfix to in icalsync name
 # 1.6.0-1 - 09/24/07 - Updated to organizer release 2.5.2 without admin login and ical customization
 #		       (1.6.0 added admin login & changed navigation)