IPS->CorrectnessEngine pull request for review purposes

Doing a pull request for this now, even though it's not nearly done, in case we want to comment on the code while it's in progress.