It'd be good to get logging working in this code...I recall Arash fighting that one though...