no more query vs payment => everything is an artifact; treat devices polymorphically (display, query or payment)