Got to step 15/22 of code-gen