Program now uses the XML query interface

This pretty much changes everything