Tue Jun 3 00:58:07 EDT 2008 geoff
    mostly implemented; haven't done the change to a table of capabilities
    at the end.