commit of updated database.  Minor changes were needed to get the correct queries working.  Note: this revision contains some test data that I need to remove.