Querying mostly works, more work on that has to be done