lots of query stuff started - added timestamps