Cleaned that old mess. That code gives me nightmares. I'll rewrite it from scratch