Simple test of a edge-source query
Simplified a lot of stuff
Some issues (type inference) with constructing evaluation for a composition of queries