Runner saves data correctly, now to move criteria to the query side of life