some simple querying implemented, more aded to test - now going to re-work a few things before next steps