Codegen essentially works (it first worked on Jan 3rd), some uncommitted tests are still failing.