Got it working (I think)

I've now got this working the way I think it ought to work.  Committing,
so I can pull it down at the office in Austin, and move to the server.