Base case for generic queries is working. More to come...