First draft of "rich query and template objects".