diff -ur GSHAL_orig/GNUmakefile.preamble GSHAL/GNUmakefile.preamble
--- GSHAL_orig/GNUmakefile.preamble	2004-10-10 01:03:00.000000000 -0400
+++ GSHAL/GNUmakefile.preamble	2004-11-22 22:04:54.000000000 -0500
@@ -15,7 +15,7 @@
 ADDITIONAL_LDFLAGS += `pkg-config --libs hal` 
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += 
+ADDITIONAL_INCLUDE_DIRS += -I..
 
 # Additional library directories the linker should search
 ADDITIONAL_LIB_DIRS += 
Only in GSHAL_orig: GNUmakefile~
diff -ur GSHAL_orig/GSHALPropertySetIterator.h GSHAL/GSHALPropertySetIterator.h
--- GSHAL_orig/GSHALPropertySetIterator.h	2004-10-10 01:01:37.000000000 -0400
+++ GSHAL/GSHALPropertySetIterator.h	2004-11-26 03:04:28.329808656 -0500
@@ -63,13 +63,29 @@
 -(NSString*) key;
 
 //There can be various types of values to get....
--(NSString*) stringValue;
 
+// TODO: will we need to support these types, ever?
+// DBUS_TYPE_INVALID
+// DBUS_TYPE_NIL
+// DBUS_TYPE_BYTE
+// DBUS_TYPE_UINT32
+// DBUS_TYPE_INT64
+// More types like DBUS_TYPE_CUSTOM
+
+//DBUS_TYPE_BOOLEAN
+-(BOOL) boolValue;
+
+//DBUS_TYPE_INT32
 -(dbus_int32_t) intValue;
 
+//DBUS_TYPE_UINT64
+-(dbus_uint64_t) unsignedLongLongValue;
+
+//DBUS_TYPE_DOUBLE
 -(double) doubleValue;
 
--(BOOL) boolValue;
+//DBUS_TYPE_STRING
+-(NSString*) stringValue;
 
 //Give the value as a string no matter what it may be
 -(NSString*) valueConvertedToString;
diff -ur GSHAL_orig/GSHALPropertySetIterator.m GSHAL/GSHALPropertySetIterator.m
--- GSHAL_orig/GSHALPropertySetIterator.m	2004-10-10 01:01:46.000000000 -0400
+++ GSHAL/GSHALPropertySetIterator.m	2004-11-26 03:03:26.478211528 -0500
@@ -126,6 +126,16 @@
   return hal_psi_get_int( &_iterator );
 }
 
+-(dbus_uint64_t) unsignedLongLongValue
+{
+  if( [self type] != DBUS_TYPE_UINT64)
+    {
+      [NSException  raise: GSHALPropertySetIteratorException
+                   format: @"Getting an invalid type from property."];
+    }
+  return hal_psi_get_uint64( &_iterator );
+}
+
 
 -(double) doubleValue
 {
@@ -154,23 +164,26 @@
 {
   switch( [self type] )
     {
-      case DBUS_TYPE_STRING:
-        return [self stringValue];
-              
-      case DBUS_TYPE_INT32:
-        return [[NSNumber numberWithInt: [self intValue]] stringValue];
-     
       case DBUS_TYPE_BOOLEAN:
         return [[NSNumber numberWithBool: [self boolValue]] stringValue];
 
+      case DBUS_TYPE_INT32:
+        return [[NSNumber numberWithInt: [self intValue]] stringValue];
+
+      case DBUS_TYPE_UINT64:
+        return [[NSNumber numberWithUnsignedLongLong: [self unsignedLongLongValue]] stringValue];
+     
       case DBUS_TYPE_DOUBLE:
         return [[NSNumber numberWithDouble: [self doubleValue]] stringValue];
 
+      case DBUS_TYPE_STRING:
+        return [self stringValue];
+              
       default:
         return nil;
     }
 
-  //return nil;
+  return nil;
 }
 
 @end
diff -ur GSHAL_orig/ListDevices.subproj/GNUmakefile.preamble GSHAL/ListDevices.subproj/GNUmakefile.preamble
--- GSHAL_orig/ListDevices.subproj/GNUmakefile.preamble	2004-10-09 21:02:03.000000000 -0400
+++ GSHAL/ListDevices.subproj/GNUmakefile.preamble	2004-11-22 22:06:50.000000000 -0500
@@ -15,8 +15,8 @@
 ADDITIONAL_LDFLAGS +=  -lGSHAL `pkg-config --libs hal`
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += 
+ADDITIONAL_INCLUDE_DIRS += -I../..
 
 # Additional library directories the linker should search
-ADDITIONAL_LIB_DIRS += 
+ADDITIONAL_LIB_DIRS += -L../shared_obj