continue working toward semi-generic data query