Added querying options. Should work now.
WIP commit

Added some auto coverage.
Need to backport the test_get_without_add test to master