Tie codegen into main
Merge resolve