Another round of general development.  Query interface is mostly complete.