First run at porting to PEAR2