I'm leaving town for the weekend, and I don't want to commit this huge patch with dres, rlb, and dave also out of town, especially since even though I've been hammering on it a while it's probably going to break a bunch of stuff :) Anyway I'll work on cleaning it up some more over the weekend and then re-sync and commit on Monday. b.g.