Okay, time is running out on this one.

I'd still like to see this stay in Hijack, but the code does need to be tightened up some. Have a look at it, please.

-ml