Oops, forgot about the COM plug-in code...