Tiny bit of progress
Make PVals stricter