Complex Queries: added files, updated localstorage, makefile, tests