Code gen progressing nicely