final(???) tweaks to where, and tests; start of sauce integration