WIP: query-string: Move code from old module, testing new module