Replaced that garbage with a much better, more generic design.  Still only partially implemented.