adapted queries.  date stuff *still* not working right.