ability to fill in queries programatically AND system for expanding templates with queries...