Finish te new version of infer that does the freezing.
Convert main and tests for previous