diff --git a/calendar/ical_test.php b/calendar/ical_test.php
deleted file mode 100755
index 71de55cb4c..0000000000
--- a/calendar/ical_test.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-  /**************************************************************************\
-  * phpGroupWare - Calendar                                                  *
-  * http://www.phpgroupware.org                                              *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Modified by Mark Peters <skeeter@phpgroupware.org>                       *
-  * --------------------------------------------                             *
-  *  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.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-	$phpgw_flags = Array(
-		'currentapp'					=>	'calendar',
-		'noappheader'					=>	True,
-		'noappfooter'					=>	True
-	);
-	$phpgw_info['flags'] = $phpgw_flags;
-	include('../header.inc.php');
-
-echo "Start Time : ".$phpgw->common->show_date()."<br>\n";
-	@set_time_limit(0);
-
-	$icsfile=PHPGW_APP_INC.'/events.ics';
-	$fp=fopen($icsfile,'rt');
-	$contents = explode("\n",fread($fp, filesize($icsfile)));
-	fclose($fp);
-
-//	$vcal = CreateObject('calendar.vCalendar');
-
-//	$vcalendar = $vcal->read($contents);
-
-//	echo "function_exists = ".function_exists("\$vcalendar->read()")."<br>\n";
-
-	$vcalendar = ExecMethod('calendar.vCalendar.read',$contents);
-	
-	echo "Product ID = ".$vcalendar['prodid']['value']."<br>\n";
-	echo "Method = ".$vcalendar['method']['value']."<br>\n";
-	echo "Version = ".$vcalendar['version']['value']."<br>\n";
-
-	for($i=0;$i<count($vcalendar['event']);$i++)
-	{
-		echo "<br>\nEVENT<br>\n";
-		if($vcalendar['event'][$i]['uid'])
-		{
-			echo 'UID = '.$vcalendar['event'][$i]['uid']['value']."<br>\n";
-		}
-		if($vcalendar['event'][$i]['calscale'])
-		{
-			echo "Calscale = ".$vcalendar['event'][$i]['calscale']."<br>\n";
-		}
-		if($vcalendar['event'][$i]['description']['value'])
-		{
-			echo "Description (Value) = ".$vcalendar['event'][$i]['description']['value']."<br>\n";
-		}
-		if($vcalendar['event'][$i]['description']['altrep'])
-		{
-			echo "Description (Alt Rep) = ".$vcalendar['event'][$i]['description']['altrep']."<br>\n";
-		}
-		if($vcalendar['event'][$i]['description']['x_type'])
-		{
-			for($j=0;$j<count($vcalendar['event'][$i]['description']['x_type']);$j++)
-			{
-				echo "Description (X-".$vcalendar['event'][$i]['description']['x_type'][$j]['name'].") = ".$vcalendar->event[$i]->description->x_type[$j]->value."<br>\n";
-			}
-		}
-		if($vcalendar['event'][$i]['summary']['value'])
-		{
-			echo "Summary = ".$vcalendar['event'][$i]['summary']['value']."<br>\n";
-		}
-		if(!empty($vcalendar['event'][$i]['comment']))
-		{
-			for($j=0;$j<count($vcalendar['event'][$i]['comment']);$j++)
-			{
-				echo "Comment = ".$vcalendar['event'][$i]['comment'][$j]['value']."<br>\n";
-			}
-		}		
-		if($vcalendar['event'][$i]['location']['value'])
-		{
-			echo "Location = ".$vcalendar['event'][$i]['location']['value']."<br>\n";
-		}
-		echo "Sequence = ".$vcalendar['event'][$i]['sequence']."<br>\n";
-//		echo _debug_array($vcalendar['event'][$i]['dtstart'])."<br>\n";
-		echo "Date Start : ".$phpgw->common->show_date(mktime($vcalendar['event'][$i]['dtstart']['hour'],$vcalendar['event'][$i]['dtstart']['min'],$vcalendar['event'][$i]['dtstart']['sec'],$vcalendar['event'][$i]['dtstart']['month'],$vcalendar['event'][$i]['dtstart']['mday'],$vcalendar['event'][$i]['dtstart']['year']) - $phpgw->calendar->datatime->tz_offset)."<br>\n";
-		if($vcalendar['event'][$i]['dtstart']['tzid'])
-		{
-			echo "Date Start TZID : ".$vcalendar['event'][$i]['dtstart']['tzid']."<br>\n";
-		}
-		if($vcalendar['event'][$i]['rrule'])
-		{
-			for($j=0;$j<count($vcalendar['event'][$i]['rrule']);$j++)
-			{
-				if($vcalendar['event'][$i]['rrule'][$j]['freq'])
-				{
-					echo "Recurrence : Frequency = ".$vcalendar['event'][$i]['rrule'][$j]['freq']."<br>\n";
-				}
-				if($vcalendar['event'][$i]['rrule'][$j]['byday'])
-				{
-					echo "Recurrence : Byday = ".$vcalendar['event'][$i]['rrule'][$j]['byday']."<br>\n";
-				}
-				if($vcalendar['event'][$i]['rrule'][$j]['until'])
-				{
-					echo "Recurrence : Until = ".date('Ymd',mktime($vcalendar['event'][$i]['rrule'][$j]['until']['hour'],$vcalendar['event'][$i]['rrule'][$j]['until']['min'],$vcalendar['event'][$i]['rrule'][$j]['until']['sec'],$vcalendar['event'][$i]['rrule'][$j]['until']['month'],$vcalendar['event'][$i]['rrule'][$j]['until']['mday'],$vcalendar['event'][$i]['rrule'][$j]['until']['year']))."<br>\n";
-				}
-			}
-		}
-		echo "Class = ".$vCalendar->switch_class($vcalendar['event'][$i]['class'])."<br>\n";
-		if($vcalendar['event'][$i]['organizer'])
-		{
-			echo "Organizer = ".$vcalendar['event'][$i]['organizer']['mailto']['user'].'@'.$vcalendar['event'][$i]['organizer']['mailto']['host']."<br>\n";
-			if($vcalendar['event'][$i]['organizer']['dir'])
-			{
-				echo "Organizer Dir     = ".$vcalendar['event'][$i]['organizer']['dir']."<br>\n";
-			}
-		}
-		for($j=0;$j<count($vcalendar['event'][$i]['attendee']);$j++)
-		{
-			echo "<br>\nAttendee[$j] CN      = ".$vcalendar['event'][$i]['attendee'][$j]['cn']."<br>\n";
-			if($vcalendar['event'][$i]['attendee'][$j]['dir'])
-			{
-				echo "Attendee[$j] Dir     = ".$vcalendar['event'][$i]['attendee'][$j]['dir']."<br>\n";
-			}
-			echo "Attendee[$j] Address = ".$vcalendar['event'][$i]['attendee'][$j]['mailto']['user'].'@'.$vcalendar['event'][$i]['attendee'][$j]['mailto']['host']."<br>\n";
-			echo "Attendee[$j] Role    = ".$vCalendar->switch_role($vcalendar['event'][$i]['attendee'][$j]['role'])."<br>\n";
-			echo "Attendee[$j] RSVP    = ".$vCalendar->switch_rsvp($vcalendar['event'][$i]['attendee'][$j]['rsvp'])."<br>\n";
-//			echo "Attendee[$j] RSVP    = ".$vcalendar['event'][$i]['attendee'][$j]['rsvp']."<br>\n";
-			if($vcalendar['event'][$i]['attendee'][$j]['x_type'])
-			{
-				for($k=0;$k<count($vcalendar['event'][$i]['attendee'][$j]['x_type']);$k++)
-				{
-					echo "Attendee[$j] (X-".$vcalendar['event'][$i]['attendee'][$j]['x_type'][$k]['name'].") = ".$vcalendar['event'][$i]['attendee'][$j]['x_type'][$k]['value']."<br>\n";
-				}
-			}
-			if($vcalendar['event'][$i]['attendee'][$j]['delegated_from']['user'] && $vcalendar['event'][$i]['attendee'][$j]['delegated_from']['host'])
-			{
-				echo "Attendee[$j] DELEGATED_FROM = ".$vcalendar['event'][$i]['attendee'][$j]['delegated_from']['user'].'@'.$vcalendar['event'][$i]['attendee'][$j]['delegated_from']['host']."<br>\n";
-			}
-		}
-		if($vcalendar['event'][$i]['alarm'])
-		{
-			for($j=0;$j<count($vcalendar['event'][$i]['alarm']);$j++)
-			{
-				echo "Alarm #$j<br>\n";
-				
-			}			
-		}
-	}
-
-/*
-	for($i=0;$i<count($vcalendar->todo);$i++)
-	{
-		echo "<br>\nTODO<br>\n";
-		if($vcalendar->todo[$i]->summary->value)
-		{
-			echo "Summary = ".$vcalendar->todo[$i]->summary->value."<br>\n";
-		}
-		if($vcalendar->todo[$i]->description->value)
-		{
-			echo "Description (Value) = ".$vcalendar->todo[$i]->description->value."<br>\n";
-		}
-		if($vcalendar->todo[$i]->description->altrep)
-		{
-			echo "Description (Alt Rep) = ".$vcalendar->todo[$i]->description->altrep."<br>\n";
-		}
-		if($vcalendar->event[$i]->location->value)
-		{
-			echo "Location = ".$vcalendar->todo[$i]->location->value."<br>\n";
-		}
-		echo "Sequence = ".$vcalendar->todo[$i]->sequence."<br>\n";	
-		echo "Date Start : ".$phpgw->common->show_date(mktime($vcalendar->todo[$i]->dtstart->value->hour,$vcalendar->todo[$i]->dtstart->value->min,$vcalendar->todo[$i]->dtstart->value->sec,$vcalendar->todo[$i]->dtstart->value->month,$vcalendar->todo[$i]->dtstart->value->mday,$vcalendar->todo[$i]->dtstart->value->year) - $phpgw->calendar->datatime->tz_offset)."<br>\n";
-		echo "Class = ".$vcalendar->todo[$i]->class->value."<br>\n";
-	}
-
-*/
-	include(PHPGW_APP_INC.'/../setup/setup.inc.php');
-
-	$vCalendar->set_var($vcalendar['prodid'],'value','-//phpGroupWare//phpGroupWare '.$setup_info['calendar']['version'].' MIMEDIR//'.strtoupper($phpgw_info['user']['preferences']['common']['lang']));
-	echo "<br><br><br>\n";
-	echo nl2br(execmethod('calendar.vCalendar.build_vcal',$vcalendar));
-echo "End Time : ".$phpgw->common->show_date()."<br>\n";
-	$phpgw->common->phpgw_footer();
-?>
diff --git a/calendar/inc/class.uiicalendar.inc.php b/calendar/inc/class.uiicalendar.inc.php
new file mode 100755
index 0000000000..f41294f093
--- /dev/null
+++ b/calendar/inc/class.uiicalendar.inc.php
@@ -0,0 +1,165 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Modified by Mark Peters <skeeter@phpgroupware.org>                       *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+	/* $Id$ */
+
+	class uiicalendar
+	{
+		var $bo;
+		var $datetime;
+
+		var $public_functions = array(
+			'test'		=> True
+		);
+
+
+
+		function uiicalendar()
+		{
+			$this->bo = CreateObject('calendar.boicalendar');
+			$this->datetime = CreateObject('phpgwapi.datetime');
+		}
+
+
+		function print_test($val,$title,$x_pre='')
+		{
+//			echo 'VAL = '._debug_array($val)."<br>\n";
+			if(is_array($val))
+			{
+				@reset($val);
+				while(list($key,$value) = each($val))
+				{
+					if(is_array($key))
+					{
+						$this->print_test($key,$title,$x_pre);
+					}
+					elseif(is_array($value))
+					{
+						$this->print_test($value,$title,$x_pre);
+					}
+					else
+					{
+						if($x_pre && $key == 'name')
+						{
+							$x_key = $x_pre.$value;
+							list($key,$value) = each($val);
+							$key=$x_key;
+						}
+						if($this->bo->parameter[$key]['type'] == 'function')
+						{
+							$function = $this->bo->parameter[$key]['function'];
+							$v_value = $this->bo->$function($value);
+						}
+						else
+						{
+							$v_value = $value;
+						}
+						echo $title.' ('.$key.') = '.$v_value."<br>\n";
+					}
+				}
+			}
+			elseif($val != '')
+			{
+				echo $title.' = '.$val."<br>\n";
+			}
+		}
+
+		function test()
+		{
+			$print_events = False;
+			
+			unset($GLOBALS['phpgw_info']['flags']['noheader']);
+			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
+			$GLOBALS['phpgw']->common->phpgw_header();
+
+			echo "Start Time : ".$GLOBALS['phpgw']->common->show_date()."<br>\n";
+			@set_time_limit(0);
+
+			$icsfile=PHPGW_APP_INC.'/events.ics';
+			$fp=fopen($icsfile,'rt');
+			$contents = explode("\n",fread($fp, filesize($icsfile)));
+			fclose($fp);
+
+			$vcalendar = $this->bo->parse($contents);
+
+			if($print_events)
+			{
+				$this->print_test($vcalendar['prodid'],'Product ID');
+				$this->print_test($vcalendar['method'],'Method');
+				$this->print_test($vcalendar['version'],'Version');
+
+				for($i=0;$i<count($vcalendar['event']);$i++)
+				{
+					$event = $vcalendar['event'][$i];
+
+					echo "<br>\nEVENT<br>\n";
+//					echo 'TEST Debug : '._debug_array($event)."<br>\n";
+					$this->print_test($event['uid'],'UID','X-');
+					$this->print_test($event['valscale'],'Calscale','X-');
+					$this->print_test($event['description'],'Description','X-');
+					$this->print_test($event['summary'],'Summary','X-');
+					$this->print_test($event['comment'],'Comment','X-');
+					$this->print_test($event['location'],'Location','X-');
+					$this->print_test($event['sequence'],'Sequence','X-');
+					$this->print_test($event['priority'],'Priority','X-');
+					$this->print_test($event['dtstart'],'Date Start','X-');
+					$this->print_test($event['dtstamp'],'Date Stamp','X-');
+					$this->print_test($event['rrule'],'Recurrence','X-');
+
+					echo "Class = ".$this->bo->switch_class($event['class'])."<br>\n";
+
+					$this->print_test($event['organizer'],'Organizer','X-');
+					$this->print_test($event['attendee'],'Attendee','X-');
+					$this->print_test($event['x_type'],'X-Type','X-');
+					$this->print_test($event['alarm'],'Alarm','X-');
+				}
+			}
+
+/*
+			for($i=0;$i<count($vcalendar->todo);$i++)
+			{
+				echo "<br>\nTODO<br>\n";
+				if($vcalendar['todo'][$i]['summary']['value'])
+				{
+					echo "Summary = ".$vcalendar['todo'][$i]['summary']['value']."<br>\n";
+				}
+				if($vcalendar['todo'][$i]['description']['value'])
+				{
+					echo "Description (Value) = ".$vcalendar['todo'][$i]['description']['value']."<br>\n";
+				}
+				if($vcalendar['todo'][$i]['description']['altrep'])
+				{
+					echo "Description (Alt Rep) = ".$vcalendar['todo'][$i]['description']['altrep']."<br>\n";
+				}
+				if($vcalendar['todo'][$i]['location']['value'])
+				{
+					echo "Location = ".$vcalendar['todo'][$i]['location']['value']."<br>\n";
+				}
+				echo "Sequence = ".$vcalendar['todo'][$i]['sequence']."<br>\n";	
+				echo "Date Start : ".$GLOBALS['phpgw']->common->show_date(mktime($vcalendar['todo'][$i]['dtstart']['hour'],$vcalendar['todo'][$i]['dtstart']['min'],$vcalendar['todo'][$i]['dtstart']['sec'],$vcalendar['todo'][$i]['dtstart']['month'],$vcalendar['todo'][$i]['dtstart']['mday'],$vcalendar['todo'][$i]['dtstart']['year']) - $this->datatime->tz_offset)."<br>\n";
+				echo "Class = ".$vcalendar['todo'][$i]['class']['value']."<br>\n";
+			}
+
+*/
+			include(PHPGW_APP_INC.'/../setup/setup.inc.php');
+
+			$this->bo->set_var($vcalendar['prodid'],'value','-//phpGroupWare//phpGroupWare '.$setup_info['calendar']['version'].' MIMEDIR//'.strtoupper($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']));
+			$this->bo->set_var($vcalendar['version'],'value','2.0');
+			$this->bo->set_var($vcalendar['method'],'value',strtoupper('publish'));
+			echo "<br><br><br>\n";
+			echo nl2br($this->bo->build_ical($vcalendar));
+			echo "End Time : ".$GLOBALS['phpgw']->common->show_date()."<br>\n";
+		}
+	}
+?>