working on conversion to query mobile, cleaning up, adding more to default module