WIP: Add a query designer